Renamed plugin activator from org.commontk.dah.app

Renamed from ctkDicomWG23AppPlugin to ctkDicomAppPlugin

Plugins/org.commontk.dah.app/CMakeLists.txt

@@ -10,7 +10,7 @@ SET(PLUGIN_export_directive "org_commontk_dah_app_EXPORT")
 SET(PLUGIN_SRCS
   ctkDicomAppServer.cpp
   ctkDicomAppServerPrivate.cpp
-  ctkDicomWG23AppPlugin.cpp
+  ctkDicomAppPlugin.cpp
   ctkDicomAbstractApp.cpp
   ctkDicomHostService.cpp
   ctkAppSoapMessageProcessor.cpp
@@ -19,7 +19,7 @@ SET(PLUGIN_SRCS
 # Files which should be processed by Qts moc
 SET(PLUGIN_MOC_SRCS
   ctkDicomAppServerPrivate.h
-  ctkDicomWG23AppPlugin_p.h
+  ctkDicomAppPlugin_p.h
 )
 
 # Qt Designer files which should be processed by Qts uic

Plugins/org.commontk.dah.app/ctkAppSoapMessageProcessor.cpp

@@ -22,8 +22,7 @@
 #include "ctkAppSoapMessageProcessor.h"
 
 #include <ctkDicomWG23TypesHelper.h>
-#include "ctkPluginContext.h"
-#include "ctkDicomWG23AppPlugin_p.h"
+
 
 ctkAppSoapMessageProcessor::ctkAppSoapMessageProcessor(ctkDicomAppInterface* inter)
 : appInterface(inter)

Plugins/org.commontk.dah.app/ctkDicomWG23AppPlugin.cpp

@@ -20,44 +20,44 @@
 =============================================================================*/
 
 
-#include "ctkDicomWG23AppPlugin_p.h"
+#include "ctkDicomAppPlugin_p.h"
 
 #include <QtPlugin>
 
-ctkDicomWG23AppPlugin* ctkDicomWG23AppPlugin::instance = 0;
+ctkDicomAppPlugin* ctkDicomAppPlugin::instance = 0;
 
-ctkDicomWG23AppPlugin::ctkDicomWG23AppPlugin()
+ctkDicomAppPlugin::ctkDicomAppPlugin()
   : context(0)
 {
 
 }
 
-ctkDicomWG23AppPlugin::~ctkDicomWG23AppPlugin()
+ctkDicomAppPlugin::~ctkDicomAppPlugin()
 {
   
 }
 
-void ctkDicomWG23AppPlugin::start(ctkPluginContext* context)
+void ctkDicomAppPlugin::start(ctkPluginContext* context)
 {
   instance = this;
   this->context = context;
 }
 
-void ctkDicomWG23AppPlugin::stop(ctkPluginContext* context)
+void ctkDicomAppPlugin::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
 }
 
-ctkDicomWG23AppPlugin* ctkDicomWG23AppPlugin::getInstance()
+ctkDicomAppPlugin* ctkDicomAppPlugin::getInstance()
 {
   return instance;
 }
 
-ctkPluginContext* ctkDicomWG23AppPlugin::getPluginContext() const
+ctkPluginContext* ctkDicomAppPlugin::getPluginContext() const
 {
   return context;
 }
 
-Q_EXPORT_PLUGIN2(org_commontk_dah_app, ctkDicomWG23AppPlugin)
+Q_EXPORT_PLUGIN2(org_commontk_dah_app, ctkDicomAppPlugin)
 
 

Plugins/org.commontk.dah.app/ctkDicomWG23AppPlugin_p.h

@@ -20,12 +20,12 @@
 =============================================================================*/
 
 
-#ifndef CTKDICOMWG23APPPLUGIN_P_H
-#define CTKDICOMWG23APPPLUGIN_P_H
+#ifndef CTKDICOMAPPPLUGIN_P_H
+#define CTKDICOMAPPPLUGIN_P_H
 
 #include <ctkPluginActivator.h>
 
-class ctkDicomWG23AppPlugin :
+class ctkDicomAppPlugin :
   public QObject, public ctkPluginActivator
 {
   Q_OBJECT
@@ -33,23 +33,23 @@ class ctkDicomWG23AppPlugin :
 
 public:
 
-  ctkDicomWG23AppPlugin();
-  ~ctkDicomWG23AppPlugin();
+  ctkDicomAppPlugin();
+  ~ctkDicomAppPlugin();
 
   void start(ctkPluginContext* context);
   void stop(ctkPluginContext* context);
 
-  static ctkDicomWG23AppPlugin* getInstance();
+  static ctkDicomAppPlugin* getInstance();
 
   ctkPluginContext* getPluginContext() const;
 
 
 private:
 
-  static ctkDicomWG23AppPlugin* instance;
+  static ctkDicomAppPlugin* instance;
   ctkPluginContext* context;
 
 
-}; // ctkDicomWG23AppPlugin
+}; // ctkDicomAppPlugin
 
-#endif // CTKDICOMWG23APPPLUGIN_P_H
+#endif // CTKDICOMAPPPLUGIN_P_H

Plugins/org.commontk.dah.app/ctkDicomAppServerPrivate.cpp

@@ -29,7 +29,7 @@
 
 #include <stdexcept>
 #include <ctkDicomWG23TypesHelper.h>
-#include <ctkDicomWG23AppPlugin_p.h>
+#include <ctkDicomAppPlugin_p.h>
 
 #include <ctkExchangeSoapMessageProcessor.h>
 #include "ctkAppSoapMessageProcessor.h"
@@ -84,7 +84,7 @@ void ctkDicomAppServerPrivate::incomingSoapMessage(
 {
   if(appInterface == NULL)
   {
-    ctkPluginContext* context = ctkDicomWG23AppPlugin::getInstance()->getPluginContext();
+    ctkPluginContext* context = ctkDicomAppPlugin::getInstance()->getPluginContext();
     ctkServiceReference* serviceRef = context->getServiceReference("ctkDicomAppInterface");
     if (!serviceRef)
     {