[GNUnet-SVN] r7162 - in gnunet-qt/src: common plugins/about plugins/fs plugins/general plugins/stats

[gnunet]

Author: durner
Date: 2008-06-12 12:52:19 -0600 (Thu, 12 Jun 2008)
New Revision: 7162

Modified:
   gnunet-qt/src/common/pluginLoader.cc
   gnunet-qt/src/common/pluginLoader.h
   gnunet-qt/src/plugins/about/about.cc
   gnunet-qt/src/plugins/fs/fs.cc
   gnunet-qt/src/plugins/general/general.cc
   gnunet-qt/src/plugins/stats/statsPlugin.cc
Log:
use libtool instead of QLibrary

Modified: gnunet-qt/src/common/pluginLoader.cc
===================================================================
--- gnunet-qt/src/common/pluginLoader.cc        2008-06-12 18:31:07 UTC (rev 
7161)
+++ gnunet-qt/src/common/pluginLoader.cc        2008-06-12 18:52:19 UTC (rev 
7162)
@@ -38,20 +38,15 @@
   InitPlugin init;
   GPluginSpec spec;
 
-  spec.lib = new QLibrary("libgnunetqtmodule_" + strName);
+  spec.lib = GNUNET_plugin_load(errorContext, "libgnunetqtmodule_", 
qPrintable(strName));
   spec.wnd = NULL;
 
-  // TODO: error handling, see Jean Michault's mail
-
   if (spec.lib)
   {
     plugins.append(spec);
-    init = (InitPlugin) spec.lib->resolve("init_plugin");
+    init = (InitPlugin) GNUNET_plugin_resolve_function(spec.lib, "init_", 
GNUNET_YES);
     if (init)
       spec.wnd = init(config, errorContext);
-    else
-      GNUNET_GE_LOG(errorContext, (GNUNET_GE_KIND) (GNUNET_GE_FATAL | 
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE),
-        qPrintable(spec.lib->errorString()));
   }
     
   return spec.wnd;
@@ -66,11 +61,11 @@
   while (count)
   {
     spec = plugins.takeLast();
-    shutdown = (ShutdownPlugin) spec.lib->resolve("shutdown_plugin");
+    shutdown = (ShutdownPlugin) GNUNET_plugin_resolve_function(spec.lib, 
"shutdown_", GNUNET_YES);
     if (shutdown)
       shutdown(spec.wnd);
     
-    delete spec.lib;
+    GNUNET_plugin_unload(spec.lib);
     count--;
   }
 }

Modified: gnunet-qt/src/common/pluginLoader.h
===================================================================
--- gnunet-qt/src/common/pluginLoader.h 2008-06-12 18:31:07 UTC (rev 7161)
+++ gnunet-qt/src/common/pluginLoader.h 2008-06-12 18:52:19 UTC (rev 7162)
@@ -28,13 +28,13 @@
 #define PLUGINLOADER_H_
 
 #include <QObject>
-#include <QLibrary>
+#include <GNUnet/gnunet_util.h>
 
 #include "plugin.h"
 
 typedef struct
 {
-  class QLibrary *lib;
+  struct GNUNET_PluginHandle *lib;
   class GPlugin *wnd;
 } GPluginSpec;
 

Modified: gnunet-qt/src/plugins/about/about.cc
===================================================================
--- gnunet-qt/src/plugins/about/about.cc        2008-06-12 18:31:07 UTC (rev 
7161)
+++ gnunet-qt/src/plugins/about/about.cc        2008-06-12 18:52:19 UTC (rev 
7162)
@@ -311,7 +311,7 @@
 extern "C"
 {
 
-GNUNETQT_API GPlugin *init_plugin(struct GNUNET_GC_Configuration *config,
+GNUNETQT_API GPlugin *init_about(struct GNUNET_GC_Configuration *config,
   struct GNUNET_GE_Context *errorContext)
 {
   Q_UNUSED(config)
@@ -320,7 +320,7 @@
   return new GAboutPlugin();
 }
 
-GNUNETQT_API void shutdown_plugin(GPlugin *plugin)
+GNUNETQT_API void shutdown_about(GPlugin *plugin)
 {
   delete (GAboutPlugin *) plugin;
 }

Modified: gnunet-qt/src/plugins/fs/fs.cc
===================================================================
--- gnunet-qt/src/plugins/fs/fs.cc      2008-06-12 18:31:07 UTC (rev 7161)
+++ gnunet-qt/src/plugins/fs/fs.cc      2008-06-12 18:52:19 UTC (rev 7162)
@@ -556,13 +556,13 @@
 
 extern "C"
 {
-  GNUNETQT_API GPlugin *init_plugin(struct GNUNET_GC_Configuration *config,
+  GNUNETQT_API GPlugin *init_fs(struct GNUNET_GC_Configuration *config,
     struct GNUNET_GE_Context *errorContext)
   {
     return new GFSPlugin(config, errorContext);
   }
   
-  GNUNETQT_API void shutdown_plugin(GPlugin *plugin)
+  GNUNETQT_API void shutdown_fs(GPlugin *plugin)
   {
     delete plugin;
   }

Modified: gnunet-qt/src/plugins/general/general.cc
===================================================================
--- gnunet-qt/src/plugins/general/general.cc    2008-06-12 18:31:07 UTC (rev 
7161)
+++ gnunet-qt/src/plugins/general/general.cc    2008-06-12 18:52:19 UTC (rev 
7162)
@@ -183,13 +183,13 @@
 extern "C"
 {
   
-  GNUNETQT_API GPlugin *init_plugin(struct GNUNET_GC_Configuration *config,
+  GNUNETQT_API GPlugin *init_general(struct GNUNET_GC_Configuration *config,
     struct GNUNET_GE_Context *errorContext)
   {
     return new GGeneralPlugin(config, errorContext);
   }
   
-  GNUNETQT_API void shutdown_plugin(GPlugin *plugin)
+  GNUNETQT_API void shutdown_general(GPlugin *plugin)
   {
     delete (GGeneralPlugin *) plugin;
   }

Modified: gnunet-qt/src/plugins/stats/statsPlugin.cc
===================================================================
--- gnunet-qt/src/plugins/stats/statsPlugin.cc  2008-06-12 18:31:07 UTC (rev 
7161)
+++ gnunet-qt/src/plugins/stats/statsPlugin.cc  2008-06-12 18:52:19 UTC (rev 
7162)
@@ -119,13 +119,13 @@
 extern "C"
 {
   
-  GNUNETQT_API GPlugin *init_plugin(struct GNUNET_GC_Configuration *config,
+  GNUNETQT_API GPlugin *init_stats(struct GNUNET_GC_Configuration *config,
     struct GNUNET_GE_Context *errorContext)
   {
     return new GStatsPlugin(config, errorContext);
   }
   
-  GNUNETQT_API void shutdown_plugin(GPlugin *plugin)
+  GNUNETQT_API void shutdown_stats(GPlugin *plugin)
   {
     delete (GStatsPlugin *) plugin;
   }