[Debtags-commits] [svn] r1064 - in libdebtags1/trunk: . debtags

[Enrico Zini]

Author: enrico
Date: Wed Aug  3 21:20:37 2005
New Revision: 1064

Modified:
   libdebtags1/trunk/README
   libdebtags1/trunk/debtags/Update.cc
Log:
Removed some more throw()

Modified: libdebtags1/trunk/README
==============================================================================
--- libdebtags1/trunk/README	(original)
+++ libdebtags1/trunk/README	Wed Aug  3 21:20:37 2005
@@ -1,5 +1,5 @@
-README for libdebtags1 1.0.8, still unreleased
-==============================================
+README for libdebtags1 1.0.8
+============================
 
 Functionality
 -------------
@@ -119,6 +119,11 @@
 
 These are the TODO-list items completed so far::
 
+ * Done in version 1.0.8
+
+ + Also ignore /etc/tagvoc.d
+
+
  * Done in version 1.0.7
 
  + Don't read /usr/share/debtags/vocabulary on update: after a restructuring,

Modified: libdebtags1/trunk/debtags/Update.cc
==============================================================================
--- libdebtags1/trunk/debtags/Update.cc	(original)
+++ libdebtags1/trunk/debtags/Update.cc	Wed Aug  3 21:20:37 2005
@@ -63,25 +63,25 @@
 	VocabularyMerger& voc;
 	
 public:
-	VocabularyFilter(VocabularyMerger& voc) throw () : voc(voc) {}
+	VocabularyFilter(VocabularyMerger& voc) : voc(voc) {}
 
-	virtual void consume(const std::string& item) throw ();
-	virtual void consume(const std::string& item, const OpSet<std::string>& tags) throw ();
-	virtual void consume(const OpSet<string>& items) throw ();
-	virtual void consume(const OpSet<string>& items, const OpSet<string>& tags) throw ();
+	virtual void consume(const std::string& item);
+	virtual void consume(const std::string& item, const OpSet<std::string>& tags);
+	virtual void consume(const OpSet<string>& items);
+	virtual void consume(const OpSet<string>& items, const OpSet<string>& tags);
 };
 
-void VocabularyFilter::consume(const string& item) throw ()
+void VocabularyFilter::consume(const string& item)
 {
 	consumer->consume(item);
 }
-void VocabularyFilter::consume(const OpSet<string>& items) throw ()
+void VocabularyFilter::consume(const OpSet<string>& items)
 {
 	consumer->consume(items);
 }
 
 
-void VocabularyFilter::consume(const string& item, const OpSet<string>& tags) throw ()
+void VocabularyFilter::consume(const string& item, const OpSet<string>& tags)
 {
 	OpSet<string> patched;
 	for (OpSet<string>::const_iterator i = tags.begin();
@@ -98,7 +98,7 @@
 }
 
 // Process a set of items identically tagged, with their tags
-void VocabularyFilter::consume(const OpSet<string>& items, const OpSet<string>& tags) throw ()
+void VocabularyFilter::consume(const OpSet<string>& items, const OpSet<string>& tags)
 {
 	OpSet<string> patched;
 	for (OpSet<string>::const_iterator i = tags.begin();
@@ -133,22 +133,22 @@
 protected:
 	PackageDB packageDB;
 public:
-	APTFilter() throw (PackageDBException) {}
-	virtual ~APTFilter() throw () {}
-	virtual void consume(const std::string& item) throw ();
-	virtual void consume(const std::string& item, const OpSet<std::string>& tags) throw ();
-	virtual void consume(const OpSet<string>& items) throw ();
-	virtual void consume(const OpSet<string>& items, const OpSet<string>& tags) throw ();
+	APTFilter() {}
+	virtual ~APTFilter() {}
+	virtual void consume(const std::string& item);
+	virtual void consume(const std::string& item, const OpSet<std::string>& tags);
+	virtual void consume(const OpSet<string>& items);
+	virtual void consume(const OpSet<string>& items, const OpSet<string>& tags);
 };
 
-void APTFilter::consume(const string& item) throw ()
+void APTFilter::consume(const string& item)
 {
 	if (packageDB.hasPackage(item))
 		consumer->consume(item);
 //	else
 //		fprintf(stderr, "Removing package %.*s not found in APT database\n", PFSTR(item));
 }
-void APTFilter::consume(const OpSet<string>& items) throw ()
+void APTFilter::consume(const OpSet<string>& items)
 {
 	OpSet<string> filtered;
 	for (OpSet<string>::const_iterator i = items.begin();
@@ -161,7 +161,7 @@
 }
 
 
-void APTFilter::consume(const string& item, const OpSet<string>& tags) throw ()
+void APTFilter::consume(const string& item, const OpSet<string>& tags)
 {
 	if (packageDB.hasPackage(item))
 		consumer->consume(item, tags);
@@ -170,7 +170,7 @@
 }
 
 // Process a set of items identically tagged, with their tags
-void APTFilter::consume(const OpSet<string>& items, const OpSet<string>& tags) throw ()
+void APTFilter::consume(const OpSet<string>& items, const OpSet<string>& tags)
 {
 	OpSet<string> filtered;
 	for (OpSet<string>::const_iterator i = items.begin();
@@ -193,7 +193,7 @@
 
 	type_t type;
 	string uri;
-	source(type_t type, const std::string& uri) throw () : type(type), uri(uri) {}
+	source(type_t type, const std::string& uri) : type(type), uri(uri) {}
 };
 
 static void zreadCollection(const std::string& local, Debtags::VocabularyMerger& voc, InputMerger<string, string>& merger)
@@ -269,7 +269,7 @@
 	*/
 }
 
-static vector<source> readSources() throw (FileException)
+static vector<source> readSources()
     // TODO: remove in favor of apt-pkg sources.list parser?
 {
 	FILE* in = fopen(fn_sources, "rt");