Sascha Zelzer vor 15 Jahren
Ursprung
Commit
7a0643af04

+ 2 - 2
Applications/ctkExampleHostedApp/ctkExampleHostedAppMain.cpp

@@ -167,12 +167,12 @@ int main(int argv, char** argc)
   }
 qCritical() << "app about to start 1";
   // setup the communication infrastructure: DicomAppServer and DicomHostService
-  ctkDicomAppServer * appServer = new ctkDicomAppServer(QUrl(appURL).port()); // accesses the app-plugin via getService("ctkDicomAppInterface");
+  /*ctkDicomAppServer * appServer =*/ new ctkDicomAppServer(QUrl(appURL).port()); // accesses the app-plugin via getService("ctkDicomAppInterface");
   ctkDicomHostInterface * hostInterface = new ctkDicomHostService(QUrl(hostURL).port(), "/HostInterface");
   framework->getPluginContext()->registerService(QStringList("ctkDicomHostInterface"), hostInterface);
 qCritical() << "app about to start 2";
   // install and start the plugin with the business logic and remember pointer to start it later
-  ctkPlugin* plugin;
+  //ctkPlugin* plugin;
   try
   {
     ctkPlugin* plugin = framework->getPluginContext()->installPlugin(QUrl::fromLocalFile(pluginFileLocation));

+ 2 - 0
Plugins/org.commontk.dah.app/ctkAppSoapMessageProcessor.cpp

@@ -63,6 +63,8 @@ bool ctkAppSoapMessageProcessor::process(
 void ctkAppSoapMessageProcessor::processGetState(
     const QtSoapMessage &message, QtSoapMessage *reply) const
 {
+  Q_UNUSED(message)
+
   // extract arguments from input message: nothing to be done
   // query interface
   const ctkDicomAppHosting::State result = appInterface->getState();

+ 1 - 0
Plugins/org.commontk.dah.app/ctkDicomAbstractApp.cpp

@@ -6,6 +6,7 @@ class ctkDicomAbstractAppPrivate
   public:
   ctkDicomAbstractAppPrivate(ctkDicomAbstractApp* appInterface, int port) : port(port)
   {
+    Q_UNUSED(appInterface)
     // start server
     if (!port)
     {

+ 1 - 1
Plugins/org.commontk.dah.app/ctkDicomAppServerPrivate.cpp

@@ -35,7 +35,7 @@
 #include "ctkAppSoapMessageProcessor.h"
 
 ctkDicomAppServerPrivate::ctkDicomAppServerPrivate(int port) :
-      appInterface(0), port(port)
+      port(port), appInterface(0)
 {
   connect(&server, SIGNAL(incomingSoapMessage(QtSoapMessage,QtSoapMessage*)),
           this, SLOT(incomingSoapMessage(QtSoapMessage,QtSoapMessage*)));

+ 1 - 1
Plugins/org.commontk.dah.app/ctkDicomHostService.cpp

@@ -26,7 +26,7 @@
 #include "ctkDicomAppHostingTypesHelper.h"
 
 ctkDicomHostService::ctkDicomHostService(ushort port, QString path):
-    service(port, path), d(new ctkDicomServicePrivate(port, path))
+    d(new ctkDicomServicePrivate(port, path)), service(port, path)
 {
 }
 

+ 0 - 2
Plugins/org.commontk.dah.core/CMakeLists.txt

@@ -29,7 +29,6 @@ SET(PLUGIN_SRCS
 
 # Files which should be processed by Qts moc
 SET(PLUGIN_MOC_SRCS
-
   ctkDicomAppInterface.h
   ctkDicomExchangeInterface.h
   ctkDicomHostInterface.h
@@ -37,7 +36,6 @@ SET(PLUGIN_MOC_SRCS
   ctkDicomAppHostingCorePlugin_p.h
   ctkSimpleSoapServer.h
   ctkSoapConnectionRunnable_p.h
-  ctkDicomExchangeService.h
 )
 
 # Qt Designer files which should be processed by Qts uic

+ 1 - 1
Plugins/org.commontk.dah.core/ctkDicomExchangeService.cpp

@@ -63,7 +63,7 @@ QList<ctkDicomAppHosting::ObjectLocator>* ctkDicomExchangeService::getData(
 }
 
 void ctkDicomExchangeService::releaseData(QList<QUuid> objectUUIDs){
-
+  Q_UNUSED(objectUUIDs)
 }
 
 

+ 3 - 1
Plugins/org.commontk.dah.core/ctkExchangeSoapMessageProcessor.cpp

@@ -99,8 +99,10 @@ void ctkExchangeSoapMessageProcessor::processGetData(
 void ctkExchangeSoapMessageProcessor::processReleaseData(
     const QtSoapMessage &message, QtSoapMessage *reply) const
 {
+  Q_UNUSED(message)
+  Q_UNUSED(reply)
   // extract arguments from input message
-  const QtSoapType& inputType = message.method()["objectUUIDs"];
+  //const QtSoapType& inputType = message.method()["objectUUIDs"];
   const QList<QUuid> objectUUIDs;
   // query interface
   exchangeInterface->releaseData(objectUUIDs);

+ 2 - 0
Plugins/org.commontk.dah.core/ctkSoapMessageProcessor.h

@@ -41,6 +41,8 @@ public:
 		const QtSoapMessage& message,
     QtSoapMessage* reply) const
   {
+    Q_UNUSED(message)
+    Q_UNUSED(reply)
     // to implement
     return false;
   }

+ 6 - 0
Plugins/org.commontk.dah.exampleapp/ctkExampleDicomAppLogic.cpp

@@ -93,6 +93,8 @@ void ctkExampleDicomAppLogic::changeState(int anewstate)
 
 bool ctkExampleDicomAppLogic::notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData)
 {
+  Q_UNUSED(data)
+  Q_UNUSED(lastData)
   return false;
 }
 
@@ -101,8 +103,12 @@ QList<ctkDicomAppHosting::ObjectLocator>* ctkExampleDicomAppLogic::getData(
   QList<QString> acceptableTransferSyntaxUIDs, 
   bool includeBulkData)
 {
+  Q_UNUSED(objectUUIDs)
+  Q_UNUSED(acceptableTransferSyntaxUIDs)
+  Q_UNUSED(includeBulkData)
   return NULL;
 }
 void ctkExampleDicomAppLogic::releaseData(QList<QUuid> objectUUIDs)
 {
+  Q_UNUSED(objectUUIDs)
 }

+ 6 - 0
Plugins/org.commontk.dah.examplehost/ctkExampleDicomHost.cpp

@@ -75,6 +75,8 @@ void ctkExampleDicomHost::forwardConsoleOutput()
 
 bool ctkExampleDicomHost::notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData)
 {
+  Q_UNUSED(data)
+  Q_UNUSED(lastData)
   return false;
 }
 
@@ -83,8 +85,12 @@ QList<ctkDicomAppHosting::ObjectLocator>* ctkExampleDicomHost::getData(
   QList<QString> acceptableTransferSyntaxUIDs, 
   bool includeBulkData)
 {
+  Q_UNUSED(objectUUIDs)
+  Q_UNUSED(acceptableTransferSyntaxUIDs)
+  Q_UNUSED(includeBulkData)
   return NULL;
 }
 void ctkExampleDicomHost::releaseData(QList<QUuid> objectUUIDs)
 {
+  Q_UNUSED(objectUUIDs)
 }

+ 1 - 1
Plugins/org.commontk.dah.host/ctkDicomAppService.cpp

@@ -26,7 +26,7 @@
 #include "ctkDicomAppHostingTypesHelper.h"
 
 ctkDicomAppService::ctkDicomAppService(ushort port, QString path):
-  service(port, path), d(new ctkDicomServicePrivate(port, path))
+  d(new ctkDicomServicePrivate(port, path)), service(port, path)
 {
 }
 

+ 1 - 1
Plugins/org.commontk.dah.host/ctkDicomHostServerPrivate.cpp

@@ -33,7 +33,7 @@
 
 
 ctkDicomHostServerPrivate::ctkDicomHostServerPrivate(ctkDicomHostInterface* hostInterface, int port) :
-    hostInterface(hostInterface), port(port)
+    port(port), hostInterface(hostInterface)
 {
   connect(&server, SIGNAL(incomingSoapMessage(QtSoapMessage,QtSoapMessage*)),
           this, SLOT(incomingSoapMessage(QtSoapMessage,QtSoapMessage*)));

+ 1 - 0
Plugins/org.commontk.dah.host/ctkHostSoapMessageProcessor.cpp

@@ -107,6 +107,7 @@ void ctkHostSoapMessageProcessor::processNotifyStatus(
 void ctkHostSoapMessageProcessor::processGenerateUID(
   const QtSoapMessage& message, QtSoapMessage* reply) const
 {
+  Q_UNUSED(message)
   // extract arguments from input message: nothing to be done
   // query interface
   const QString uid = hostInterface->generateUID();