FIX: DAH: Introduced the namespace ctkDicomWG23 for global types

Plugins/org.commontk.dicom.wg23.app/ctkDicomHostInterfaceImpl.cpp

@@ -118,12 +118,12 @@ QString ctkDicomHostInterfaceImpl::getOutputLocation(const QStringList& preferre
   return QString();
 }
 
-void ctkDicomHostInterfaceImpl::notifyStateChanged(State state)
+void ctkDicomHostInterfaceImpl::notifyStateChanged(ctkDicomWG23::State state)
 {
   Q_UNUSED(state)
 }
 
-void ctkDicomHostInterfaceImpl::notifyStatus(const Status& status)
+void ctkDicomHostInterfaceImpl::notifyStatus(const ctkDicomWG23::Status& status)
 {
   Q_UNUSED(status)
 }

Plugins/org.commontk.dicom.wg23.app/ctkDicomHostInterfaceImpl_p.h

@@ -38,8 +38,8 @@ public:
     virtual QString generateUID();
     virtual QRect getAvailableScreen(const QRect& preferredScreen);
     virtual QString getOutputLocation(const QStringList& preferredProtocols);
-    virtual void notifyStateChanged(State state);
-    virtual void notifyStatus(const Status& status);
+    virtual void notifyStateChanged(ctkDicomWG23::State state);
+    virtual void notifyStatus(const ctkDicomWG23::Status& status);
 
 private slots:
 

Plugins/org.commontk.dicom.wg23.core/ctkDicomAppInterface.h

@@ -37,8 +37,8 @@ class org_commontk_dicom_wg23_core_EXPORT ctkDicomAppInterface : public QObject
 public:
 
   // Application interface methods
-  virtual State getState() = 0;
-  virtual bool setState(State newState) = 0;
+  virtual ctkDicomWG23::State getState() = 0;
+  virtual bool setState(ctkDicomWG23::State newState) = 0;
   virtual bool bringToFront(const QRect& requestedScreenArea) = 0;
 
   // Data exchange interface methods

Plugins/org.commontk.dicom.wg23.core/ctkDicomHostInterface.h

@@ -40,8 +40,8 @@ public:
   virtual QString generateUID() = 0;
   virtual QRect getAvailableScreen(const QRect& preferredScreen) = 0;
   virtual QString getOutputLocation(const QStringList& preferredProtocols) = 0;
-  virtual void notifyStateChanged(State state) = 0;
-  virtual void notifyStatus(const Status& status) = 0;
+  virtual void notifyStateChanged(ctkDicomWG23::State state) = 0;
+  virtual void notifyStatus(const ctkDicomWG23::Status& status) = 0;
 
   // Data exchange interface methods
   // ...

Plugins/org.commontk.dicom.wg23.core/ctkDicomWG23Types.h

@@ -23,7 +23,7 @@
 #ifndef CTKDICOMWG23TYPES_H
 #define CTKDICOMWG23TYPES_H
 
-namespace {
+namespace ctkDicomWG23 {
 
   enum State {
     IDLE,
@@ -47,6 +47,7 @@ namespace {
     QString codeValue;
     QString codeMeaning;
   };
+
 }
 
 #endif // CTKDICOMWG23TYPES_H