[SCM] Development fot GoFind! branch, master, updated. 41c32de2bf6bf8b3baa00bbd552c00eb2f9a8f08

Miriam Ruiz miriam at debian.org
Sat Nov 22 11:54:00 UTC 2008


The following commit has been merged in the master branch:
commit 41c32de2bf6bf8b3baa00bbd552c00eb2f9a8f08
Author: Miriam Ruiz <miriam at debian.org>
Date:   Sat Nov 22 12:56:32 2008 +0100

    pkgfilter is no longer global, moving it to plugin data class

diff --git a/filter.cpp b/filter.cpp
index e0d690b..a11f6b7 100644
--- a/filter.cpp
+++ b/filter.cpp
@@ -248,8 +248,6 @@ void PackageFilter::AddLast(const char * bool_expr)
 	}
 }
 
-PackageFilter pkgfilter;
-
 #ifdef UNIT_TEST
 TEST_FUNCTION TestCuPackageFilter(CuTest* tc)
 {
diff --git a/filter.h b/filter.h
index 19be7e9..55e34f2 100644
--- a/filter.h
+++ b/filter.h
@@ -118,6 +118,4 @@ inline std::ostream &operator << (std::ostream &out, const PackageFilter *filter
 	return out;
 }
 
-extern PackageFilter pkgfilter;
-
 #endif // _GOFIND_FILTER_H
diff --git a/gofind.cpp b/gofind.cpp
index 73c7ec7..809404c 100644
--- a/gofind.cpp
+++ b/gofind.cpp
@@ -443,7 +443,8 @@ int main(int argc, const char* argv[])
 		printResults(engine);
 		*/
 
-		GUIPlugInData data(engine);
+		PackageFilter pkgfilter;
+		GUIPlugInData data(engine, pkgfilter);
 		gui->Go(data);
 
 		delete gui;
diff --git a/gui_cli.cpp b/gui_cli.cpp
index 3c8a5fb..5416dd7 100644
--- a/gui_cli.cpp
+++ b/gui_cli.cpp
@@ -89,6 +89,7 @@ bool GUIPlugInCLI::Go(GUIPlugInData &data)
 {
 	std::ostream &out = std::cout;
 	Engine &engine = data.GetEngine();
+	PackageFilter &pkgfilter = data.GetPackageFilter();
 
 	bool run = true;
 
@@ -280,7 +281,7 @@ class GUIPlugInCLIFactory : public GUIPlugInFactory
 	{
 #ifdef GUIPLUGIN_VERSION
 		if (version != GUIPlugInFactory::version)
-			fprintf(stderr, "Wrong GUI Plugin Version: Program = 0x%04X, Plugin = 0x%04X\n", GUIPlugInFactory::version, version );			
+			fprintf(stderr, "Wrong GUI Plugin Version: Program = 0x%04X, Plugin = 0x%04X\n", GUIPlugInFactory::version, version );
 #endif
 	}
 
diff --git a/guiplugin.h b/guiplugin.h
index 60e13f3..28b077c 100644
--- a/guiplugin.h
+++ b/guiplugin.h
@@ -24,6 +24,7 @@
 
 #include "dll.h"
 #include "Engine.h"
+#include "filter.h"
 
 #include <iostream>
 
@@ -36,7 +37,8 @@ class GUIPlugInFactory;
 class GUIPlugInData
 {
  public:
-	 GUIPlugInData(Engine &e) : engine(e)
+	 GUIPlugInData(Engine &e, PackageFilter &pf) :
+		engine(e), pkgfilter(pf)
 	{
 	}
 
@@ -45,8 +47,14 @@ class GUIPlugInData
 		return engine;
 	}
 
+	PackageFilter &GetPackageFilter()
+	{
+		return pkgfilter;
+	}
+
  protected:
 	Engine &engine;
+	PackageFilter &pkgfilter;
 };
 
 class GUIPlugIn

-- 
Development fot GoFind!



More information about the Pkg-games-commits mailing list