[Debtags-commits] [svn] r1071 - in debtags-edit/trunk: . debian src
Enrico Zini
enrico at costa.debian.org
Wed Aug 3 22:13:06 UTC 2005
Author: enrico
Date: Wed Aug 3 22:13:05 2005
New Revision: 1071
Added:
debtags-edit/trunk/src/instantiations.cc
- copied, changed from r1064, debtags/trunk/src/instantiations.cc
Modified:
debtags-edit/trunk/README
debtags-edit/trunk/debian/control
debtags-edit/trunk/src/DebtagsDocument.cc
debtags-edit/trunk/src/DebtagsDocument.h
debtags-edit/trunk/src/DebtagsEditor.cc
debtags-edit/trunk/src/DebtagsEditor.h
debtags-edit/trunk/src/FilterPanel.cc
debtags-edit/trunk/src/FilterPanel.h
debtags-edit/trunk/src/Makefile.am
debtags-edit/trunk/src/RelatedPanel.cc
debtags-edit/trunk/src/RelatedPanel.h
debtags-edit/trunk/src/TagEditor.cc
debtags-edit/trunk/src/TagEditor.h
debtags-edit/trunk/src/TagMenu.cc
debtags-edit/trunk/src/TagMenu.h
debtags-edit/trunk/src/TagSelector.cc
debtags-edit/trunk/src/TagSelector.h
Log:
Compiles and links with gcc4
Increased the number of items displayed to a max of 500
Modified: debtags-edit/trunk/README
==============================================================================
--- debtags-edit/trunk/README (original)
+++ debtags-edit/trunk/README Wed Aug 3 22:13:05 2005
@@ -1,5 +1,5 @@
-README for debtags-edit 1.0.4, still unreleased
-===============================================
+README for debtags-edit 1.0.4
+=============================
Functionality
-------------
@@ -86,6 +86,10 @@
These are the TODO-list items completed so far::
* Done in 1.0.3
+
+ + Recompile after apt's gcc translation
+
+* Done in 1.0.3
+ Filter is activated when pressing enter, not on every single change in any
of its fields
Modified: debtags-edit/trunk/debian/control
==============================================================================
--- debtags-edit/trunk/debian/control (original)
+++ debtags-edit/trunk/debian/control Wed Aug 3 22:13:05 2005
@@ -2,7 +2,7 @@
Section: misc
Priority: optional
Maintainer: Enrico Zini <enrico at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1), dh-buildinfo, pkg-config, libdebtags1-dev (>= 1.0.5), libdebtags1-dev (<< 1.1), libgtkmm-2.4-dev
+Build-Depends: cdbs, debhelper (>= 4.1), dh-buildinfo, pkg-config, libdebtags1-dev (>= 1.0.8), libdebtags1-dev (<< 1.1), libgtkmm-2.4-dev
Standards-Version: 3.6.2.0
Package: debtags-edit
Modified: debtags-edit/trunk/src/DebtagsDocument.cc
==============================================================================
--- debtags-edit/trunk/src/DebtagsDocument.cc (original)
+++ debtags-edit/trunk/src/DebtagsDocument.cc Wed Aug 3 22:13:05 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma implementation
-
#include "config.h"
#include "DebtagsDocument.h"
@@ -74,10 +72,10 @@
TFLimit(int count, Tagcoll::TagcollConsumer<ITEM, Tag>* cons)
: Tagcoll::TagcollFilter<ITEM, Tag>(cons), count(count) {}
- void consume(const ITEM& pkg) { if (count > 0) { consumer->consume(pkg); count--; } }
+ void consume(const ITEM& pkg) { if (count > 0) { this->consumer->consume(pkg); count--; } }
void consume(const ITEM& pkg, const Tagcoll::OpSet<Tag>& tags)
{
- if (count > 0) { consumer->consume(pkg, tags); count--; }
+ if (count > 0) { this->consumer->consume(pkg, tags); count--; }
}
};
Modified: debtags-edit/trunk/src/DebtagsDocument.h
==============================================================================
--- debtags-edit/trunk/src/DebtagsDocument.h (original)
+++ debtags-edit/trunk/src/DebtagsDocument.h Wed Aug 3 22:13:05 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <sigc++/sigc++.h>
#include <debtags/DebtagsSimple.h>
Modified: debtags-edit/trunk/src/DebtagsEditor.cc
==============================================================================
--- debtags-edit/trunk/src/DebtagsEditor.cc (original)
+++ debtags-edit/trunk/src/DebtagsEditor.cc Wed Aug 3 22:13:05 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma implementation
-
#include "DebtagsEditor.h"
#include <tagcoll/stringf.h>
@@ -38,7 +36,7 @@
using namespace std;
using namespace Debtags;
-template class DebtagsEditor<DebtagsDocument>;
+//template class DebtagsEditor<DebtagsDocument>;
template<class DOC>
DebtagsEditor<DOC>::DebtagsEditor(DOC& doc)
Modified: debtags-edit/trunk/src/DebtagsEditor.h
==============================================================================
--- debtags-edit/trunk/src/DebtagsEditor.h (original)
+++ debtags-edit/trunk/src/DebtagsEditor.h Wed Aug 3 22:13:05 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
//#include <debtags/Package.h>
#include "FilterPanel.h"
#include "RelatedPanel.h"
Modified: debtags-edit/trunk/src/FilterPanel.cc
==============================================================================
--- debtags-edit/trunk/src/FilterPanel.cc (original)
+++ debtags-edit/trunk/src/FilterPanel.cc Wed Aug 3 22:13:05 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma implementation
-
#include "FilterPanel.h"
#include <tagcoll/stringf.h>
@@ -40,7 +38,7 @@
using namespace std;
using namespace Debtags;
-template class FilterPanel<DebtagsDocument>;
+//template class FilterPanel<DebtagsDocument>;
template<class DOC>
FilterPanel<DOC>::FilterPanel(DOC& doc)
@@ -531,7 +529,7 @@
template<class DOC>
void FilterPanel<DOC>::updateList() throw ()
{
- static const unsigned int max_pkg = 200;
+ static const unsigned int max_pkg = 500;
printf("UPDATELIST start\n");
doc.subCollection.clear();
Modified: debtags-edit/trunk/src/FilterPanel.h
==============================================================================
--- debtags-edit/trunk/src/FilterPanel.h (original)
+++ debtags-edit/trunk/src/FilterPanel.h Wed Aug 3 22:13:05 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <tagcoll/OpSet.h>
#include <debtags/BasicPackageMatcher.h>
//#include <debtags/PackageSet.h>
Modified: debtags-edit/trunk/src/Makefile.am
==============================================================================
--- debtags-edit/trunk/src/Makefile.am (original)
+++ debtags-edit/trunk/src/Makefile.am Wed Aug 3 22:13:05 2005
@@ -15,7 +15,8 @@
FilterPanel.cc \
RelatedPanel.cc \
DebtagsEditor.cc \
- debtags-edit.cc
+ debtags-edit.cc \
+ instantiations.cc
debtags_edit_LDADD = $(LIBDEBTAGS1_LIBS) $(LIBTAGCOLL1_LIBS) $(GTKMM_LIBS) -lpthread
INCLUDES = $(LIBTAGCOLL1_CFLAGS) $(LIBDEBTAGS1_CFLAGS) $(GTKMM_CFLAGS)
Modified: debtags-edit/trunk/src/RelatedPanel.cc
==============================================================================
--- debtags-edit/trunk/src/RelatedPanel.cc (original)
+++ debtags-edit/trunk/src/RelatedPanel.cc Wed Aug 3 22:13:05 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma implementation
-
#include "RelatedPanel.h"
#include <tagcoll/stringf.h>
@@ -38,7 +36,7 @@
using namespace std;
using namespace Debtags;
-template class RelatedPanel<DebtagsDocument>;
+//template class RelatedPanel<DebtagsDocument>;
template<class DOC>
RelatedPanel<DOC>::RelatedPanel(DOC& doc)
Modified: debtags-edit/trunk/src/RelatedPanel.h
==============================================================================
--- debtags-edit/trunk/src/RelatedPanel.h (original)
+++ debtags-edit/trunk/src/RelatedPanel.h Wed Aug 3 22:13:05 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <debtags/Package.h>
#include "TagSelector.h"
Modified: debtags-edit/trunk/src/TagEditor.cc
==============================================================================
--- debtags-edit/trunk/src/TagEditor.cc (original)
+++ debtags-edit/trunk/src/TagEditor.cc Wed Aug 3 22:13:05 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma implementation
-
#include "TagEditor.h"
#include "TagMenu.h"
#include "DebtagsDocument.h"
@@ -34,7 +32,7 @@
using namespace Tagcoll;
using namespace Debtags;
-template class TagEditor<DebtagsDocument>;
+//template class TagEditor<DebtagsDocument>;
template<class DOC>
void TagEditor<DOC>::do_changed()
@@ -141,7 +139,7 @@
updateView();
time_t end = time(NULL);
if (end != start)
- fprintf(stderr, "TagEditor<DOC>::on_document_changed: %d seconds\n", (end-start));
+ fprintf(stderr, "TagEditor<DOC>::on_document_changed: %ld seconds\n", (end-start));
}
template<class DOC>
@@ -387,7 +385,7 @@
time_t end = time(NULL);
if (end != start)
- fprintf(stderr, "TagEditor<DOC>::updateList: %d seconds\n", (end-start));
+ fprintf(stderr, "TagEditor<DOC>::updateList: %ld seconds\n", (end-start));
}
// vim:set ts=4 sw=4:
Modified: debtags-edit/trunk/src/TagEditor.h
==============================================================================
--- debtags-edit/trunk/src/TagEditor.h (original)
+++ debtags-edit/trunk/src/TagEditor.h Wed Aug 3 22:13:05 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/box.h>
#include <gtkmm/table.h>
Modified: debtags-edit/trunk/src/TagMenu.cc
==============================================================================
--- debtags-edit/trunk/src/TagMenu.cc (original)
+++ debtags-edit/trunk/src/TagMenu.cc Wed Aug 3 22:13:05 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma implementation
-
#include "TagMenu.h"
#include "Environment.h"
@@ -38,7 +36,7 @@
using namespace std;
using namespace Debtags;
-template class TagMenu<DebtagsDocument>;
+//template class TagMenu<DebtagsDocument>;
template<class DOC>
void TagMenu<DOC>::do_selected(Tag tag)
Modified: debtags-edit/trunk/src/TagMenu.h
==============================================================================
--- debtags-edit/trunk/src/TagMenu.h (original)
+++ debtags-edit/trunk/src/TagMenu.h Wed Aug 3 22:13:05 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <gtkmm/menu.h>
#include <debtags/Tag.h>
#include <debtags/TagSet.h>
Modified: debtags-edit/trunk/src/TagSelector.cc
==============================================================================
--- debtags-edit/trunk/src/TagSelector.cc (original)
+++ debtags-edit/trunk/src/TagSelector.cc Wed Aug 3 22:13:05 2005
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma implementation
-
#include "TagSelector.h"
#include "TagMenu.h"
@@ -134,7 +132,7 @@
updateView();
time_t end = time(NULL);
if (end != start)
- fprintf(stderr, "TagSelector::on_document_changed: %d seconds\n", (end-start));
+ fprintf(stderr, "TagSelector::on_document_changed: %ld seconds\n", (end-start));
}
TagSelector::TagSelector(DebtagsDocument& doc)
@@ -368,7 +366,7 @@
time_t end = time(NULL);
if (end != start)
- fprintf(stderr, "TagSelector::updateList: %d seconds\n", (end-start));
+ fprintf(stderr, "TagSelector::updateList: %ld seconds\n", (end-start));
}
// vim:set ts=4 sw=4:
Modified: debtags-edit/trunk/src/TagSelector.h
==============================================================================
--- debtags-edit/trunk/src/TagSelector.h (original)
+++ debtags-edit/trunk/src/TagSelector.h Wed Aug 3 22:13:05 2005
@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#pragma interface
-
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/box.h>
#include <gtkmm/table.h>
Copied: debtags-edit/trunk/src/instantiations.cc (from r1064, debtags/trunk/src/instantiations.cc)
==============================================================================
--- debtags/trunk/src/instantiations.cc (original)
+++ debtags-edit/trunk/src/instantiations.cc Wed Aug 3 22:13:05 2005
@@ -1,5 +1,22 @@
#define INSTANTIATING_TEMPLATES
+#include "TagMenu.cc"
+#include "TagEditor.cc"
+#include "FilterPanel.cc"
+#include "RelatedPanel.cc"
+#include "DebtagsEditor.cc"
+
+#include "DebtagsDocument.h"
+
+template class TagMenu<DebtagsDocument>;
+template class TagEditor<DebtagsDocument>;
+template class FilterPanel<DebtagsDocument>;
+template class RelatedPanel<DebtagsDocument>;
+template class DebtagsEditor<DebtagsDocument>;
+
+
+#if 0
+
#include <debtags/Package.h>
#include <debtags/Tag.h>
@@ -43,5 +60,6 @@
template class InputMerger<std::string, Debtags::Tag>;
template class ItemGrouper<std::string, Debtags::Tag>;
template class ExpressionFilter<Debtags::Package, Debtags::Tag>;
+#endif
// vim:set ts=4 sw=4:
More information about the Debtags-commits
mailing list