瀏覽代碼

Fixed warnings about structs and unused variables.

Sascha Zelzer 14 年之前
父節點
當前提交
8816438dc4

+ 4 - 4
Libs/PluginFramework/Testing/ConfigAdminTest/ctkConfigurationAdminTestSuite.cpp

@@ -62,7 +62,7 @@ void ctkConfigurationAdminTestSuite::testCreateConfigNullPid()
   {
   {
     cm->getConfiguration(QString());
     cm->getConfiguration(QString());
   }
   }
-  catch (const std::invalid_argument& e)
+  catch (const std::invalid_argument& )
   {
   {
     return;
     return;
   }
   }
@@ -81,7 +81,7 @@ void ctkConfigurationAdminTestSuite::testCreateConfigNullPidWithLocation()
   {
   {
     cm->getConfiguration(QString(), QString());
     cm->getConfiguration(QString(), QString());
   }
   }
-  catch (const std::invalid_argument& e)
+  catch (const std::invalid_argument& )
   {
   {
     return;
     return;
   }
   }
@@ -120,7 +120,7 @@ void ctkConfigurationAdminTestSuite::testCreateFactoryConfigNullPid()
   {
   {
     cm->createFactoryConfiguration(QString());
     cm->createFactoryConfiguration(QString());
   }
   }
-  catch (const std::invalid_argument& e)
+  catch (const std::invalid_argument& )
   {
   {
     return;
     return;
   }
   }
@@ -139,7 +139,7 @@ void ctkConfigurationAdminTestSuite::testCreateFactoryConfigNullPidWithLocation(
   {
   {
     cm->createFactoryConfiguration(QString(), QString());
     cm->createFactoryConfiguration(QString(), QString());
   }
   }
-  catch (const std::invalid_argument& e)
+  catch (const std::invalid_argument& )
   {
   {
     return;
     return;
   }
   }

+ 1 - 1
Libs/PluginFramework/Testing/ConfigAdminTest/ctkConfigurationAdminTestSuite_p.h

@@ -29,7 +29,7 @@
 #include <ctkTestSuiteInterface.h>
 #include <ctkTestSuiteInterface.h>
 
 
 class ctkPluginContext;
 class ctkPluginContext;
-class ctkConfigurationAdmin;
+struct ctkConfigurationAdmin;
 
 
 class ctkConfigurationAdminTestSuite : public QObject,
 class ctkConfigurationAdminTestSuite : public QObject,
     public ctkTestSuiteInterface
     public ctkTestSuiteInterface

+ 1 - 1
Libs/PluginFramework/Testing/FrameworkTest/ctkPluginFrameworkTestSuite.cpp

@@ -430,7 +430,7 @@ void ctkPluginFrameworkTestSuite::frame045a()
   {
   {
     pc->connectServiceListener(&sListen1, "serviceChanged", brokenFilter);
     pc->connectServiceListener(&sListen1, "serviceChanged", brokenFilter);
   }
   }
-  catch (const std::invalid_argument& ia)
+  catch (const std::invalid_argument& /*ia*/)
   {
   {
     //assertEquals("InvalidSyntaxException.getFilter should be same as input string", brokenFilter, ise.getFilter());
     //assertEquals("InvalidSyntaxException.getFilter should be same as input string", brokenFilter, ise.getFilter());
   }
   }

+ 1 - 1
Plugins/org.commontk.configadmin/ctkCMEventDispatcher_p.h

@@ -29,7 +29,7 @@
 #include "ctkCMSerializedTaskQueue_p.h"
 #include "ctkCMSerializedTaskQueue_p.h"
 
 
 struct ctkConfigurationListener;
 struct ctkConfigurationListener;
-class ctkLogService;
+struct ctkLogService;
 
 
 /**
 /**
  * EventDispatcher is responsible for delivering Configuration Events to ConfigurationListeners.
  * EventDispatcher is responsible for delivering Configuration Events to ConfigurationListeners.

+ 1 - 1
Plugins/org.commontk.configadmin/ctkConfigurationAdminFactory_p.h

@@ -35,7 +35,7 @@
 #include "ctkManagedServiceTracker_p.h"
 #include "ctkManagedServiceTracker_p.h"
 #include "ctkManagedServiceFactoryTracker_p.h"
 #include "ctkManagedServiceFactoryTracker_p.h"
 
 
-class ctkLogService;
+struct ctkLogService;
 class ctkConfigurationAdminImpl;
 class ctkConfigurationAdminImpl;
 class ctkConfigurationImpl;
 class ctkConfigurationImpl;
 
 

+ 1 - 1
Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceActivator_p.h

@@ -5,7 +5,7 @@
 
 
 class QObject;
 class QObject;
 
 
-class ctkLogService;
+struct ctkLogService;
 template<class S, class T> class ctkServiceTracker;
 template<class S, class T> class ctkServiceTracker;
 class ctkQtMobilityServiceRuntime;
 class ctkQtMobilityServiceRuntime;