BUG: Convert remaining classes (ctkDICOM, ctkMessaging, XIP, ...) to Qt Pimpl. Also fix "unused variable" warning + stylistic issues

Libs/Core/ctkBinaryFileDescriptor.cpp

@@ -31,6 +31,7 @@
 
 // CTK includes
 #include "ctkBinaryFileDescriptor.h"
+#include "ctkPimpl.h"
 
 // BinUtils includes
 #include <bfd.h>
@@ -41,7 +42,7 @@
 #include <vector>
 
 //-----------------------------------------------------------------------------
-class ctkBinaryFileDescriptorPrivate: public ctkPrivate<ctkBinaryFileDescriptor>
+class ctkBinaryFileDescriptorPrivate
 {
 public:
   // Convenient typedefs
@@ -141,16 +142,15 @@ void* ctkBinaryFileDescriptorPrivate::resolve(const char * symbol)
 // ctkBinaryFileDescriptor methods
 
 // --------------------------------------------------------------------------
-ctkBinaryFileDescriptor::ctkBinaryFileDescriptor()
+ctkBinaryFileDescriptor::ctkBinaryFileDescriptor(): d_ptr(new ctkBinaryFileDescriptorPrivate)
 {
-  CTK_INIT_PRIVATE(ctkBinaryFileDescriptor);
 }
 
 // --------------------------------------------------------------------------
-ctkBinaryFileDescriptor::ctkBinaryFileDescriptor(const QString& _fileName)
+ctkBinaryFileDescriptor::ctkBinaryFileDescriptor(const QString& _fileName): 
+  d_ptr(new ctkBinaryFileDescriptorPrivate)
 {
-  CTK_INIT_PRIVATE(ctkBinaryFileDescriptor);
-  CTK_D(ctkBinaryFileDescriptor);
+  Q_D(ctkBinaryFileDescriptor);
   d->FileName = _fileName;
 }
 
@@ -166,14 +166,14 @@ CTK_SET_CXX(ctkBinaryFileDescriptor, const QString&, setFileName, FileName);
 // --------------------------------------------------------------------------
 bool ctkBinaryFileDescriptor::isLoaded() const
 {
-  CTK_D(const ctkBinaryFileDescriptor);
+  Q_D(const ctkBinaryFileDescriptor);
   return (d->BFD != 0);
 }
 
 // --------------------------------------------------------------------------
 bool ctkBinaryFileDescriptor::load()
 {
-  CTK_D(ctkBinaryFileDescriptor);
+  Q_D(ctkBinaryFileDescriptor);
   
   bfd_init();
   bfd * abfd = bfd_openr(d->FileName.toLatin1(), NULL);
@@ -196,7 +196,7 @@ bool ctkBinaryFileDescriptor::load()
 // --------------------------------------------------------------------------
 bool ctkBinaryFileDescriptor::unload()
 {
-  CTK_D(ctkBinaryFileDescriptor);
+  Q_D(ctkBinaryFileDescriptor);
   
   if (d->BFD)
     {
@@ -209,6 +209,6 @@ bool ctkBinaryFileDescriptor::unload()
 // --------------------------------------------------------------------------
 void* ctkBinaryFileDescriptor::resolve(const char * symbol)
 {
-  CTK_D(ctkBinaryFileDescriptor);
+  Q_D(ctkBinaryFileDescriptor);
   return d->resolve(symbol);
 }

Libs/Core/ctkBinaryFileDescriptor.h

@@ -35,9 +35,6 @@
 // Qt includes
 #include <QString>
 
-// CTK includes
-#include "ctkPimpl.h"
-
 #include "CTKWidgetsExport.h"
 
 /// Allows to resolve global symbols contained into an executable.
@@ -66,8 +63,12 @@ public:
   /// Get the address of a symbol in memory
   void* resolve(const char * symbol);
 
+protected:
+  QScopedPointer<ctkBinaryFileDescriptorPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkBinaryFileDescriptor);
+  Q_DECLARE_PRIVATE(ctkBinaryFileDescriptor);
+  Q_DISABLE_COPY(ctkBinaryFileDescriptor);
 
 };
 

Libs/DICOM/Core/ctkDICOM.cpp

@@ -26,7 +26,7 @@
 #include <QFile>
 #include <QStringList>
 
-// ctkDICOM includes
+// ctkDICOMCore includes
 #include "ctkDICOM.h"
 
 // STD includes
@@ -34,7 +34,7 @@
 #include <stdexcept>
 
 //----------------------------------------------------------------------------
-class ctkDICOMPrivate: public ctkPrivate<ctkDICOM>
+class ctkDICOMPrivate
 {
 public:
   ctkDICOMPrivate(); 
@@ -57,9 +57,8 @@ ctkDICOMPrivate::ctkDICOMPrivate()
 // ctkDICOMWidget methods
 
 //------------------------------------------------------------------------------
-ctkDICOM::ctkDICOM(QObject* _parent): Superclass(_parent)
+ctkDICOM::ctkDICOM(QObject* _parent): Superclass(_parent), d_ptr(new ctkDICOMPrivate)
 {
-  CTK_INIT_PRIVATE(ctkDICOM);
 }
 
 //----------------------------------------------------------------------------
@@ -70,7 +69,7 @@ ctkDICOM::~ctkDICOM()
 //----------------------------------------------------------------------------
 void ctkDICOM::openDatabase(const QString& databaseFileName)
 {
-  CTK_D(ctkDICOM);
+  Q_D(ctkDICOM);
   d->Database = QSqlDatabase::addDatabase("QSQLITE","DICOM-DB");
   d->Database.setDatabaseName(databaseFileName);
   if ( ! (d->Database.open()) )
@@ -86,13 +85,13 @@ void ctkDICOM::openDatabase(const QString& databaseFileName)
 
 //------------------------------------------------------------------------------
 const QString& ctkDICOM::GetLastError() const {
-  CTK_D(const ctkDICOM);
+  Q_D(const ctkDICOM);
   return d->LastError; 
 }
 
 //------------------------------------------------------------------------------
 const QSqlDatabase& ctkDICOM::database() const {
-  CTK_D(const ctkDICOM);
+  Q_D(const ctkDICOM);
   return d->Database;
 }
 
@@ -134,13 +133,13 @@ bool ctkDICOMPrivate::executeScript(const QString& script) {
 //------------------------------------------------------------------------------
 bool ctkDICOM::initializeDatabase(const char* sqlFileName)
 {
-  CTK_D(ctkDICOM);
+  Q_D(ctkDICOM);
   return d->executeScript(sqlFileName);
 }
 
 //------------------------------------------------------------------------------
 void ctkDICOM::closeDatabase()
 {
-  CTK_D(ctkDICOM);
+  Q_D(ctkDICOM);
   d->Database.close();
 }

Libs/DICOM/Core/ctkDICOM.h

@@ -25,9 +25,6 @@
 #include <QObject>
 #include <QSqlDatabase>
 
-// CTK includes
-#include <ctkPimpl.h>
-
 #include "CTKDICOMCoreExport.h"
 
 class ctkDICOMPrivate;
@@ -54,8 +51,14 @@ public:
   ///
   /// delete all data and reinitialize the database.
   bool initializeDatabase(const char* schemaFile = ":/dicom/dicom-schema.sql");
+
+protected:
+  QScopedPointer<ctkDICOMPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkDICOM);
+  Q_DECLARE_PRIVATE(ctkDICOM);
+  Q_DISABLE_COPY(ctkDICOM);
+
 };
 
 #endif

Libs/DICOM/Core/ctkDICOMIndexer.cpp

@@ -50,7 +50,7 @@
 #define MITK_INFO std::cout
 
 //------------------------------------------------------------------------------
-class ctkDICOMIndexerPrivate: public ctkPrivate<ctkDICOMIndexer>
+class ctkDICOMIndexerPrivate
 {
 public:
   ctkDICOMIndexerPrivate();
@@ -75,7 +75,7 @@ ctkDICOMIndexerPrivate::~ctkDICOMIndexerPrivate()
 // ctkDICOMIndexer methods
 
 //------------------------------------------------------------------------------
-ctkDICOMIndexer::ctkDICOMIndexer()
+ctkDICOMIndexer::ctkDICOMIndexer():d_ptr(new ctkDICOMIndexerPrivate)
 {
 }
 

Libs/DICOM/Core/ctkDICOMIndexer.h

@@ -24,9 +24,6 @@
 // Qt includes 
 #include <QSqlDatabase>
 
-// CTK includes
-#include <ctkPimpl.h>
-
 #include "CTKDICOMCoreExport.h"
 
 class ctkDICOMIndexerPrivate;
@@ -39,8 +36,13 @@ public:
   void addDirectory(QSqlDatabase database, const QString& directoryName, const QString& destinationDirectoryName = "");
   void refreshDatabase(QSqlDatabase database, const QString& directoryName);
 
+protected:
+  QScopedPointer<ctkDICOMIndexerPrivate> d_ptr;
+  
 private:
-  CTK_DECLARE_PRIVATE(ctkDICOMIndexer);
+  Q_DECLARE_PRIVATE(ctkDICOMIndexer);
+  Q_DISABLE_COPY(ctkDICOMIndexer);
+
 };
 
 #endif

Libs/DICOM/Core/ctkDICOMIndexerBase.cpp

@@ -49,10 +49,12 @@
 #include <dcmtk/ofstd/ofstd.h>        /* for class OFStandard */
 #include <dcmtk/dcmdata/dcddirif.h>   /* for class DicomDirInterface */
 
-static ctkLogger logger ( "org.commontk.dicom.DICOMIndexerBase" );
+//------------------------------------------------------------------------------
+static ctkLogger logger("org.commontk.dicom.DICOMIndexerBase" );
+//------------------------------------------------------------------------------
 
 //------------------------------------------------------------------------------
-class ctkDICOMIndexerBasePrivate: public ctkPrivate<ctkDICOMIndexerBase>
+class ctkDICOMIndexerBasePrivate
 {
 public:
   ctkDICOMIndexerBasePrivate();
@@ -87,22 +89,26 @@ ctkDICOMIndexerBase::~ctkDICOMIndexerBase()
 {
 }
 
+//------------------------------------------------------------------------------
 void ctkDICOMIndexerBase::setDatabase ( QSqlDatabase database ) {
-  CTK_D(ctkDICOMIndexerBase);
+  Q_D(ctkDICOMIndexerBase);
   d->db = database;
 }
 
+//------------------------------------------------------------------------------
 const QSqlDatabase& ctkDICOMIndexerBase::database () const {
-  CTK_D(const ctkDICOMIndexerBase);
+  Q_D(const ctkDICOMIndexerBase);
   return d->db;
 }
 
+//------------------------------------------------------------------------------
 void ctkDICOMIndexerBase::insert ( DcmDataset *dataset ) {
   this->insert ( dataset, QString() );
 }
 
+//------------------------------------------------------------------------------
 void ctkDICOMIndexerBase::insert ( DcmDataset *dataset, QString filename ) {
-  CTK_D(ctkDICOMIndexerBase);
+  Q_D(ctkDICOMIndexerBase);
 
   // Check to see if the file has already been loaded
   QSqlQuery fileExists ( d->db );

Libs/DICOM/Core/ctkDICOMIndexerBase.h

@@ -25,9 +25,6 @@
 #include <QObject>
 #include <QSqlDatabase>
 
-// CTK includes
-#include <ctkPimpl.h>
-
 #include "CTKDICOMCoreExport.h"
 
 class ctkDICOMIndexerBasePrivate;
@@ -51,8 +48,12 @@ public:
    */
   void insert ( DcmDataset *dataset );
 
+protected:
+  QScopedPointer<ctkDICOMIndexerBasePrivate> d_ptr;
+  
 private:
-  CTK_DECLARE_PRIVATE(ctkDICOMIndexerBase);
+  Q_DECLARE_PRIVATE(ctkDICOMIndexerBase);
+  Q_DISABLE_COPY(ctkDICOMIndexerBase);
 };
 
 #endif

Libs/DICOM/Core/ctkDICOMModel.cpp

@@ -29,7 +29,7 @@
 #include <QTime>
 #include <QDebug>
 
-// ctkDICOM includes
+// ctkDICOMCore includes
 #include "ctkDICOMModel.h"
 #include "ctkLogger.h"
 
@@ -37,10 +37,14 @@ static ctkLogger logger ( "org.commontk.dicom.DICOMModel" );
 struct Node;
 
 //------------------------------------------------------------------------------
-class ctkDICOMModelPrivate:public ctkPrivate<ctkDICOMModel>
+class ctkDICOMModelPrivate
 {
+  Q_DECLARE_PUBLIC(ctkDICOMModel);
+protected:
+  ctkDICOMModel* const q_ptr;
+  
 public:
-  ctkDICOMModelPrivate();
+  ctkDICOMModelPrivate(ctkDICOMModel&);
   virtual ~ctkDICOMModelPrivate();
   void init();
 
@@ -94,7 +98,7 @@ struct Node
 };
 
 //------------------------------------------------------------------------------
-ctkDICOMModelPrivate::ctkDICOMModelPrivate()
+ctkDICOMModelPrivate::ctkDICOMModelPrivate(ctkDICOMModel& o):q_ptr(&o)
 {
   this->RootNode     = 0;
 }
@@ -123,7 +127,7 @@ Node* ctkDICOMModelPrivate::nodeFromIndex(const QModelIndex& indexValue)const
 //------------------------------------------------------------------------------
 QModelIndexList ctkDICOMModelPrivate::indexListFromNode(const Node* node)const
 {
-  CTK_P(const ctkDICOMModel);
+  Q_Q(const ctkDICOMModel);
   Q_ASSERT(node);
   QModelIndexList indexList;
   
@@ -148,7 +152,7 @@ QModelIndexList ctkDICOMModelPrivate::indexListFromNode(const Node* node)const
     }
   for (int column = 0 ; column < this->Headers.size(); ++column)
     {
-    indexList.append(p->createIndex(row, column, parentNode));
+    indexList.append(q->createIndex(row, column, parentNode));
     }
   return indexList;
 }
@@ -307,7 +311,7 @@ void ctkDICOMModelPrivate::updateQueries(Node* node)const
 //------------------------------------------------------------------------------
 void ctkDICOMModelPrivate::fetch(const QModelIndex& indexValue, int limit)
 {
-  CTK_P(ctkDICOMModel);
+  Q_Q(ctkDICOMModel);
   Node* node = this->nodeFromIndex(indexValue);
   if (node->AtEnd || limit <= node->RowCount || node->Fetching/*|| bottom.column() == -1*/)
     {
@@ -342,10 +346,10 @@ void ctkDICOMModelPrivate::fetch(const QModelIndex& indexValue, int limit)
     }
   if (newRowCount > 0 && newRowCount > node->RowCount) 
     {
-    p->beginInsertRows(indexValue, node->RowCount, newRowCount - 1);
+    q->beginInsertRows(indexValue, node->RowCount, newRowCount - 1);
     node->RowCount = newRowCount;
     node->Fetching = false;
-    p->endInsertRows();
+    q->endInsertRows();
     } 
   else 
     {
@@ -355,11 +359,11 @@ void ctkDICOMModelPrivate::fetch(const QModelIndex& indexValue, int limit)
 }
 
 //------------------------------------------------------------------------------
-ctkDICOMModel::ctkDICOMModel(QObject* parentValue)
+ctkDICOMModel::ctkDICOMModel(QObject* parentValue): d_ptr(new ctkDICOMModelPrivate(*this))
 {
   Q_UNUSED(parentValue);
-  CTK_INIT_PRIVATE(ctkDICOMModel);
-  ctk_d()->init();
+  Q_D(ctkDICOMModel);
+  d->init();
 }
 
 //------------------------------------------------------------------------------
@@ -370,7 +374,7 @@ ctkDICOMModel::~ctkDICOMModel()
 //------------------------------------------------------------------------------
 bool ctkDICOMModel::canFetchMore ( const QModelIndex & parentValue ) const
 {
-  CTK_D(const ctkDICOMModel);
+  Q_D(const ctkDICOMModel);
   Node* node = d->nodeFromIndex(parentValue);
   return !node->AtEnd;
 }
@@ -378,7 +382,7 @@ bool ctkDICOMModel::canFetchMore ( const QModelIndex & parentValue ) const
 //------------------------------------------------------------------------------
 int ctkDICOMModel::columnCount ( const QModelIndex & _parent ) const
 {
-  CTK_D(const ctkDICOMModel);
+  Q_D(const ctkDICOMModel);
   Q_UNUSED(_parent);
   return d->RootNode != 0 ? d->Headers.size() : 0;
 }
@@ -386,7 +390,7 @@ int ctkDICOMModel::columnCount ( const QModelIndex & _parent ) const
 //------------------------------------------------------------------------------
 QVariant ctkDICOMModel::data ( const QModelIndex & indexValue, int role ) const
 {
-  CTK_D(const ctkDICOMModel);
+  Q_D(const ctkDICOMModel);
   if (role & ~(Qt::DisplayRole | Qt::EditRole))
     {
     return QVariant();
@@ -416,7 +420,7 @@ QVariant ctkDICOMModel::data ( const QModelIndex & indexValue, int role ) const
 //------------------------------------------------------------------------------
 void ctkDICOMModel::fetchMore ( const QModelIndex & parentValue )
 {
-  CTK_D(ctkDICOMModel);
+  Q_D(ctkDICOMModel);
   Node* node = d->nodeFromIndex(parentValue);
   d->fetch(parentValue, qMax(node->RowCount, 0) + 256);
 }
@@ -431,7 +435,7 @@ Qt::ItemFlags ctkDICOMModel::flags ( const QModelIndex & indexValue ) const
 //------------------------------------------------------------------------------
 bool ctkDICOMModel::hasChildren ( const QModelIndex & parentValue ) const
 {
-  CTK_D(const ctkDICOMModel);
+  Q_D(const ctkDICOMModel);
   if (parentValue.column() > 0)
     {
     return false;
@@ -452,7 +456,7 @@ bool ctkDICOMModel::hasChildren ( const QModelIndex & parentValue ) const
 //------------------------------------------------------------------------------
 QVariant ctkDICOMModel::headerData(int section, Qt::Orientation orientation, int role)const
 {
-  CTK_D(const ctkDICOMModel);
+  Q_D(const ctkDICOMModel);
   // @bug: this expression is not "valid", DisplayRole and EditRole are not bitmasks
   if (role & ~(Qt::DisplayRole | Qt::EditRole))
     {
@@ -470,7 +474,7 @@ QVariant ctkDICOMModel::headerData(int section, Qt::Orientation orientation, int
 //------------------------------------------------------------------------------
 QModelIndex ctkDICOMModel::index ( int row, int column, const QModelIndex & parentValue ) const
 {
-  CTK_D(const ctkDICOMModel);
+  Q_D(const ctkDICOMModel);
   if (d->RootNode == 0 || parentValue.column() > 0)
     {
     return QModelIndex();
@@ -497,7 +501,7 @@ QModelIndex ctkDICOMModel::index ( int row, int column, const QModelIndex & pare
 //------------------------------------------------------------------------------
 QModelIndex ctkDICOMModel::parent ( const QModelIndex & indexValue ) const
 {
-  CTK_D(const ctkDICOMModel);
+  Q_D(const ctkDICOMModel);
   Node* node = d->nodeFromIndex(indexValue);
   Q_ASSERT(node);
   Node* parentNode = node->Parent;
@@ -530,7 +534,7 @@ QModelIndex ctkDICOMModel::parent ( const QModelIndex & indexValue ) const
 //------------------------------------------------------------------------------
 int ctkDICOMModel::rowCount ( const QModelIndex & parentValue ) const
 {
-  CTK_D(const ctkDICOMModel);
+  Q_D(const ctkDICOMModel);
   if (d->RootNode == 0 || parentValue.column() > 0)
     {
     return 0;
@@ -547,7 +551,7 @@ int ctkDICOMModel::rowCount ( const QModelIndex & parentValue ) const
 //------------------------------------------------------------------------------
 void ctkDICOMModel::setDatabase(const QSqlDatabase &db)
 {
-  CTK_D(ctkDICOMModel);
+  Q_D(ctkDICOMModel);
 
   this->beginResetModel();
   d->DataBase = db;
@@ -582,7 +586,7 @@ void ctkDICOMModel::setDatabase(const QSqlDatabase &db)
 //------------------------------------------------------------------------------
 void ctkDICOMModel::sort(int column, Qt::SortOrder order)
 {
-  CTK_D(ctkDICOMModel);
+  Q_D(ctkDICOMModel);
   /* The following would work if there is no fetch involved.
      ORDER BY doesn't just apply on the fetched item. By sorting
      new items can show up in the model, and we need to be more
@@ -612,7 +616,7 @@ void ctkDICOMModel::sort(int column, Qt::SortOrder order)
 //------------------------------------------------------------------------------
 bool ctkDICOMModel::setHeaderData ( int section, Qt::Orientation orientation, const QVariant & value, int role)
 {
-  CTK_D(ctkDICOMModel);
+  Q_D(ctkDICOMModel);
   if (role & ~(Qt::DisplayRole | Qt::EditRole))
     {
     return false;

Libs/DICOM/Core/ctkDICOMModel.h

@@ -25,9 +25,6 @@
 #include <QAbstractItemModel>
 #include <QSqlDatabase>
 
-// CTK includes
-#include <ctkPimpl.h>
-
 #include "CTKDICOMCoreExport.h"
 
 class ctkDICOMModelPrivate;
@@ -56,8 +53,12 @@ public:
   // Sorting resets the model because fetched/unfetched items could disappear/appear respectively.
   virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
 
+protected:
+  QScopedPointer<ctkDICOMModelPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkDICOMModel);
+  Q_DECLARE_PRIVATE(ctkDICOMModel);
+  Q_DISABLE_COPY(ctkDICOMModel);
 };
 
 #endif

Libs/DICOM/Core/ctkDICOMQuery.cpp

@@ -30,7 +30,7 @@
 #include <QFileInfo>
 #include <QDebug>
 
-// ctkDICOM includes
+// ctkDICOMCore includes
 #include "ctkDICOMQuery.h"
 #include "ctkLogger.h"
 
@@ -55,7 +55,7 @@
 static ctkLogger logger ( "org.commontk.dicom.DICOMQuery" );
 
 //------------------------------------------------------------------------------
-class ctkDICOMQueryPrivate: public ctkPrivate<ctkDICOMQuery>
+class ctkDICOMQueryPrivate
 {
 public:
   ctkDICOMQueryPrivate();
@@ -101,49 +101,49 @@ ctkDICOMQuery::~ctkDICOMQuery()
 
 void ctkDICOMQuery::addStudyInstanceUID ( QString s )
 {
-  CTK_D(ctkDICOMQuery);
+  Q_D(ctkDICOMQuery);
   d->StudyInstanceUIDList.append ( s );
 }
 
 /// Set methods for connectivity
 void ctkDICOMQuery::setCallingAETitle ( QString callingAETitle )
 {
-  CTK_D(ctkDICOMQuery);
+  Q_D(ctkDICOMQuery);
   d->CallingAETitle = callingAETitle;
 }
 const QString& ctkDICOMQuery::callingAETitle() 
 {
-  CTK_D(ctkDICOMQuery);
+  Q_D(ctkDICOMQuery);
   return d->CallingAETitle;
 }
 void ctkDICOMQuery::setCalledAETitle ( QString calledAETitle )
 {
-  CTK_D(ctkDICOMQuery);
+  Q_D(ctkDICOMQuery);
   d->CalledAETitle = calledAETitle;
 }
 const QString& ctkDICOMQuery::calledAETitle()
 {
-  CTK_D(ctkDICOMQuery);
+  Q_D(ctkDICOMQuery);
   return d->CalledAETitle;
 }
 void ctkDICOMQuery::setHost ( QString host )
 {
-  CTK_D(ctkDICOMQuery);
+  Q_D(ctkDICOMQuery);
   d->Host = host;
 }
 const QString& ctkDICOMQuery::host()
 {
-  CTK_D(ctkDICOMQuery);
+  Q_D(ctkDICOMQuery);
   return d->Host;
 }
 void ctkDICOMQuery::setPort ( int port ) 
 {
-  CTK_D(ctkDICOMQuery);
+  Q_D(ctkDICOMQuery);
   d->Port = port;
 }
 int ctkDICOMQuery::port()
 {
-  CTK_D(ctkDICOMQuery);
+  Q_D(ctkDICOMQuery);
   return d->Port;
 }
 
@@ -153,7 +153,7 @@ int ctkDICOMQuery::port()
 void ctkDICOMQuery::query(QSqlDatabase database )
 {
   ctkDICOMIndexerBase::setDatabase ( database );
-  CTK_D(ctkDICOMQuery);
+  Q_D(ctkDICOMQuery);
   if ( this->database().isOpen() )
     {
     logger.debug ( "DB open in Query" );

Libs/DICOM/Core/ctkDICOMQuery.h

@@ -58,8 +58,12 @@ public:
   // Add a StudyInstanceUID to be queried
   void addStudyInstanceUID ( QString StudyInstanceUID );
 
+protected:
+  QScopedPointer<ctkDICOMQueryPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkDICOMQuery);
+  Q_DECLARE_PRIVATE(ctkDICOMQuery);
+  Q_DISABLE_COPY(ctkDICOMQuery);
 };
 
 #endif

Libs/DICOM/Core/ctkDICOMRetrieve.cpp

@@ -30,7 +30,7 @@
 #include <QFileInfo>
 #include <QDebug>
 
-// ctkDICOM includes
+// ctkDICOMCore includes
 #include "ctkDICOMRetrieve.h"
 #include "ctkLogger.h"
 
@@ -59,10 +59,10 @@
 
 #include "dcmtk/oflog/oflog.h"
 
-static ctkLogger logger ( "org.commontk.dicom.DICOMRetrieve" );
+static ctkLogger logger("org.commontk.dicom.DICOMRetrieve");
 
 //------------------------------------------------------------------------------
-class ctkDICOMRetrievePrivate: public ctkPrivate<ctkDICOMRetrieve>
+class ctkDICOMRetrievePrivate
 {
 public:
   ctkDICOMRetrievePrivate();
@@ -78,8 +78,6 @@ public:
   // do the retrieve, handling both series and study retrieves
   enum RetrieveType { RetrieveSeries, RetrieveStudy };
   void retrieve ( QString UID, QDir directory, RetrieveType retriveType );
-  
-
 };
 
 //------------------------------------------------------------------------------
@@ -97,6 +95,7 @@ ctkDICOMRetrievePrivate::~ctkDICOMRetrievePrivate()
   delete parameters;
 }
 
+//------------------------------------------------------------------------------
 void ctkDICOMRetrievePrivate::retrieve ( QString UID, QDir directory, RetrieveType retriveType ) {
 
   // Register the JPEG libraries in case we need them
@@ -213,9 +212,6 @@ void ctkDICOMRetrievePrivate::retrieve ( QString UID, QDir directory, RetrieveTy
   delete responses;
 }
 
-
-
-
 //------------------------------------------------------------------------------
 // ctkDICOMRetrieve methods
 
@@ -229,71 +225,88 @@ ctkDICOMRetrieve::~ctkDICOMRetrieve()
 {
 }
 
+//------------------------------------------------------------------------------
 /// Set methods for connectivity
 void ctkDICOMRetrieve::setCallingAETitle ( QString callingAETitle )
 {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   d->CallingAETitle = callingAETitle;
 }
+
+//------------------------------------------------------------------------------
 const QString& ctkDICOMRetrieve::callingAETitle() 
 {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   return d->CallingAETitle;
 }
+
+//------------------------------------------------------------------------------
 void ctkDICOMRetrieve::setCalledAETitle ( QString calledAETitle )
 {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   d->CalledAETitle = calledAETitle;
 }
+
+//------------------------------------------------------------------------------
 const QString& ctkDICOMRetrieve::calledAETitle()
 {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   return d->CalledAETitle;
 }
+
+//------------------------------------------------------------------------------
 void ctkDICOMRetrieve::setHost ( QString host )
 {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   d->Host = host;
 }
+
+//------------------------------------------------------------------------------
 const QString& ctkDICOMRetrieve::host()
 {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   return d->Host;
 }
+
+//------------------------------------------------------------------------------
 void ctkDICOMRetrieve::setCallingPort ( int port ) 
 {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   d->CallingPort = port;
 }
+
+//------------------------------------------------------------------------------
 int ctkDICOMRetrieve::callingPort()
 {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   return d->CallingPort;
 }
 
+//------------------------------------------------------------------------------
 void ctkDICOMRetrieve::setCalledPort ( int port ) 
 {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   d->CalledPort = port;
 }
+
+//------------------------------------------------------------------------------
 int ctkDICOMRetrieve::calledPort()
 {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   return d->CalledPort;
 }
 
-
-
 //------------------------------------------------------------------------------
 void ctkDICOMRetrieve::retrieveSeries ( QString seriesInstanceUID, QDir directory ) {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   logger.info ( "Starting retrieveSeries" );
   d->retrieve ( seriesInstanceUID, directory, ctkDICOMRetrievePrivate::RetrieveSeries );
   return;
 }
 
+//------------------------------------------------------------------------------
 void ctkDICOMRetrieve::retrieveStudy ( QString studyInstanceUID, QDir directory ) {
-  CTK_D(ctkDICOMRetrieve);
+  Q_D(ctkDICOMRetrieve);
   logger.info ( "Starting retrieveStudy" );
   d->retrieve ( studyInstanceUID, directory, ctkDICOMRetrievePrivate::RetrieveStudy );
   return;

Libs/DICOM/Core/ctkDICOMRetrieve.h

@@ -26,9 +26,6 @@
 #include <QObject>
 #include <QDir>
 
-// CTK includes
-#include <ctkPimpl.h>
-
 #include "CTKDICOMCoreExport.h"
 
 class ctkDICOMRetrievePrivate;
@@ -55,9 +52,14 @@ public:
   void retrieveSeries ( QString seriesInstanceUID, QDir directory );
   void retrieveStudy ( QString studyInstanceUID, QDir directory );
 
+protected:
+  QScopedPointer<ctkDICOMRetrievePrivate> d_ptr;
+  
 private:
   void retrieve ( QDir directory );
-  CTK_DECLARE_PRIVATE(ctkDICOMRetrieve);
+  
+  Q_DECLARE_PRIVATE(ctkDICOMRetrieve);
+  Q_DISABLE_COPY(ctkDICOMRetrieve);
 
 };
 

Libs/DICOM/Widgets/ctkDICOMDirectoryListWidget.cpp

@@ -1,4 +1,5 @@
 
+// Qt includes
 #include <QFileDialog>
 #include <QSqlQueryModel>
 #include <QSqlTableModel>
@@ -6,24 +7,21 @@
 #include <QSqlRecord>
 #include <QSqlError>
 #include <QSqlField>
-
-
-
 #include <QDebug>
 
 // ctkDICOMWidgets includes
 #include "ctkDICOMDirectoryListWidget.h"
 #include "ui_ctkDICOMDirectoryListWidget.h"
 
+// STD includes
 #include <iostream>
 
 //----------------------------------------------------------------------------
-class ctkDICOMDirectoryListWidgetPrivate: public ctkPrivate<ctkDICOMDirectoryListWidget>,
-                                     public Ui_ctkDICOMDirectoryListWidget
+class ctkDICOMDirectoryListWidgetPrivate: public Ui_ctkDICOMDirectoryListWidget
 {
 public:
   ctkDICOMDirectoryListWidgetPrivate(){}
-  ctkDICOM* dicom;
+  ctkDICOM*       dicom;
   QSqlTableModel* directoryListModel;
 };
 
@@ -35,10 +33,10 @@ public:
 // ctkDICOMDirectoryListWidget methods
 
 //----------------------------------------------------------------------------
-ctkDICOMDirectoryListWidget::ctkDICOMDirectoryListWidget(QWidget* _parent):Superclass(_parent)
+ctkDICOMDirectoryListWidget::ctkDICOMDirectoryListWidget(QWidget* _parent):Superclass(_parent), 
+  d_ptr(new ctkDICOMDirectoryListWidgetPrivate)
 {
-  CTK_INIT_PRIVATE(ctkDICOMDirectoryListWidget);
-  CTK_D(ctkDICOMDirectoryListWidget);
+  Q_D(ctkDICOMDirectoryListWidget);
 
   d->setupUi(this);
 
@@ -46,9 +44,6 @@ ctkDICOMDirectoryListWidget::ctkDICOMDirectoryListWidget(QWidget* _parent):Super
   connect(d->removeButton, SIGNAL(clicked()), this, SLOT(removeDirectoryClicked()));
 
   d->removeButton->setDisabled(true);
-
-
-
 }
 
 //----------------------------------------------------------------------------
@@ -59,7 +54,7 @@ ctkDICOMDirectoryListWidget::~ctkDICOMDirectoryListWidget()
 //----------------------------------------------------------------------------
 void ctkDICOMDirectoryListWidget::addDirectoryClicked()
 {
-  CTK_D(ctkDICOMDirectoryListWidget);
+  Q_D(ctkDICOMDirectoryListWidget);
   QString newDir = QFileDialog::getExistingDirectory(this, tr("Open Directory"));
 
   if ( !newDir.isEmpty() )
@@ -67,7 +62,7 @@ void ctkDICOMDirectoryListWidget::addDirectoryClicked()
     QSqlRecord newDirRecord;
     newDirRecord.append(QSqlField("Dirname",QVariant::String));
     newDirRecord.setValue("Dirname",newDir);
-    bool success = d->directoryListModel->insertRecord(-1,newDirRecord);
+    /*bool success = */d->directoryListModel->insertRecord(-1,newDirRecord);
     bool success2 = d->directoryListModel->submitAll();
     if ( !success2 )
     {
@@ -87,7 +82,7 @@ void ctkDICOMDirectoryListWidget::addDirectoryClicked()
 //----------------------------------------------------------------------------
 void ctkDICOMDirectoryListWidget::removeDirectoryClicked()
 {
-  CTK_D(ctkDICOMDirectoryListWidget);
+  Q_D(ctkDICOMDirectoryListWidget);
   while ( ! d->directoryListView->selectionModel()->selectedIndexes().empty() )
   {
     d->directoryListModel->removeRow(
@@ -96,9 +91,10 @@ void ctkDICOMDirectoryListWidget::removeDirectoryClicked()
   }
 }
 
+//----------------------------------------------------------------------------
 void ctkDICOMDirectoryListWidget::setDICOM(ctkDICOM* dicom)
 {
-  CTK_D(ctkDICOMDirectoryListWidget);
+  Q_D(ctkDICOMDirectoryListWidget);
   d->dicom = dicom;
   d->directoryListModel =  new QSqlTableModel(this,d->dicom->database());
   d->directoryListModel->setTable("Directories");
@@ -110,13 +106,12 @@ void ctkDICOMDirectoryListWidget::setDICOM(ctkDICOM* dicom)
             SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)),
             this,
             SLOT(directorySelectionChanged(const QItemSelection & , const QItemSelection &  )));
-
-
 }
-//----------------------------------------------------------------------------
 
+//----------------------------------------------------------------------------
 void ctkDICOMDirectoryListWidget::directorySelectionChanged( const QItemSelection  & selected, const QItemSelection  & deselected )
 {
-  CTK_D(ctkDICOMDirectoryListWidget);
+  Q_UNUSED(deselected);
+  Q_D(ctkDICOMDirectoryListWidget);
   d->removeButton->setEnabled( ! selected.empty() );
 }

Libs/DICOM/Widgets/ctkDICOMDirectoryListWidget.h

@@ -25,12 +25,10 @@
 #include <QWidget>
 #include <QItemSelection>
 
-
-// CTK includes
-#include <ctkPimpl.h>
-
+// ctkDICOMWidgets includes
 #include "CTKDICOMWidgetsExport.h"
 #include "ctkDICOM.h"
+
 class ctkDICOMDirectoryListWidgetPrivate;
 
 class CTK_DICOM_WIDGETS_EXPORT ctkDICOMDirectoryListWidget : public QWidget
@@ -48,8 +46,12 @@ public slots:
   void removeDirectoryClicked();
   void directorySelectionChanged( const QItemSelection  & selected, const QItemSelection  & deselected );
 
+protected:
+  QScopedPointer<ctkDICOMDirectoryListWidgetPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkDICOMDirectoryListWidget);
+  Q_DECLARE_PRIVATE(ctkDICOMDirectoryListWidget);
+  Q_DISABLE_COPY(ctkDICOMDirectoryListWidget);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMItemTreeModel.cpp

@@ -22,7 +22,7 @@
 #include "ctkDICOMItemTreeModel.h"
 
 //----------------------------------------------------------------------------
-class ctkDICOMItemTreeModelPrivate: public ctkPrivate<ctkDICOMItemTreeModel>
+class ctkDICOMItemTreeModelPrivate
 {
 public:
   ctkDICOMItemTreeModelPrivate(){}
@@ -36,10 +36,10 @@ public:
 // ctkDICOMItemTreeModel methods
 
 //----------------------------------------------------------------------------
-ctkDICOMItemTreeModel::ctkDICOMItemTreeModel(QObject* _parent):Superclass(_parent)
+ctkDICOMItemTreeModel::ctkDICOMItemTreeModel(QObject* _parent):Superclass(_parent), 
+  d_ptr(new ctkDICOMItemTreeModelPrivate)
 {
-  CTK_INIT_PRIVATE(ctkDICOMItemTreeModel);
-  //CTK_D(ctkDICOMItemTreeModel);
+  //Q_D(ctkDICOMItemTreeModel);
 
 }
 

Libs/DICOM/Widgets/ctkDICOMItemTreeModel.h

@@ -25,9 +25,6 @@
 #include <QAbstractItemModel>
 #include <QModelIndex>
 
-// CTK includes
-#include <ctkPimpl.h>
-
 #include "CTKDICOMWidgetsExport.h"
 
 class ctkDICOMItemTreeModelPrivate;
@@ -54,8 +51,12 @@ public:
   virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
   virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
 
+protected:
+  QScopedPointer<ctkDICOMItemTreeModelPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkDICOMItemTreeModel);
+  Q_DECLARE_PRIVATE(ctkDICOMItemTreeModel);
+  Q_DISABLE_COPY(ctkDICOMItemTreeModel);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMListenerWidget.cpp

@@ -4,8 +4,7 @@
 #include "ui_ctkDICOMListenerWidget.h"
 
 //----------------------------------------------------------------------------
-class ctkDICOMListenerWidgetPrivate: public ctkPrivate<ctkDICOMListenerWidget>,
-                                     public Ui_ctkDICOMListenerWidget
+class ctkDICOMListenerWidgetPrivate: public Ui_ctkDICOMListenerWidget
 {
 public:
   ctkDICOMListenerWidgetPrivate(){}
@@ -19,10 +18,10 @@ public:
 // ctkDICOMListenerWidget methods
 
 //----------------------------------------------------------------------------
-ctkDICOMListenerWidget::ctkDICOMListenerWidget(QWidget* _parent):Superclass(_parent)
+ctkDICOMListenerWidget::ctkDICOMListenerWidget(QWidget* _parent):Superclass(_parent), 
+  d_ptr(new ctkDICOMListenerWidgetPrivate)
 {
-  CTK_INIT_PRIVATE(ctkDICOMListenerWidget);
-  CTK_D(ctkDICOMListenerWidget);
+  Q_D(ctkDICOMListenerWidget);
   
   d->setupUi(this);
 }

Libs/DICOM/Widgets/ctkDICOMListenerWidget.h

@@ -24,9 +24,6 @@
 // Qt includes 
 #include <QWidget>
 
-// CTK includes
-#include <ctkPimpl.h>
-
 #include "CTKDICOMWidgetsExport.h"
 
 class ctkDICOMListenerWidgetPrivate;
@@ -38,8 +35,12 @@ public:
   explicit ctkDICOMListenerWidget(QWidget* parent=0);
   virtual ~ctkDICOMListenerWidget();
 
+protected:
+  QScopedPointer<ctkDICOMListenerWidgetPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkDICOMListenerWidget);
+  Q_DECLARE_PRIVATE(ctkDICOMListenerWidget);
+  Q_DISABLE_COPY(ctkDICOMListenerWidget);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.cpp

@@ -11,8 +11,7 @@
 static ctkLogger logger("org.commontk.DICOM.Widgets.ctkDICOMQueryRetrieveWidget");
 
 //----------------------------------------------------------------------------
-class ctkDICOMQueryRetrieveWidgetPrivate: public ctkPrivate<ctkDICOMQueryRetrieveWidget>,
-                                          public Ui_ctkDICOMQueryRetrieveWidget
+class ctkDICOMQueryRetrieveWidgetPrivate: public Ui_ctkDICOMQueryRetrieveWidget
 {
 public:
   ctkDICOMQueryRetrieveWidgetPrivate(){}
@@ -26,10 +25,10 @@ public:
 // ctkDICOMQueryRetrieveWidget methods
 
 //----------------------------------------------------------------------------
-ctkDICOMQueryRetrieveWidget::ctkDICOMQueryRetrieveWidget(QWidget* _parent):Superclass(_parent)
+ctkDICOMQueryRetrieveWidget::ctkDICOMQueryRetrieveWidget(QWidget* _parent):Superclass(_parent), 
+  d_ptr(new ctkDICOMQueryRetrieveWidgetPrivate)
 {
-  CTK_INIT_PRIVATE(ctkDICOMQueryRetrieveWidget);
-  CTK_D(ctkDICOMQueryRetrieveWidget);
+  Q_D(ctkDICOMQueryRetrieveWidget);
   
   d->setupUi(this);
 
@@ -46,7 +45,7 @@ ctkDICOMQueryRetrieveWidget::~ctkDICOMQueryRetrieveWidget()
 //----------------------------------------------------------------------------
 void ctkDICOMQueryRetrieveWidget::onTabCloseRequested(int index)
 {
-  CTK_D(ctkDICOMQueryRetrieveWidget);
+  Q_D(ctkDICOMQueryRetrieveWidget);
 
   if (index == 0)
   {
@@ -59,7 +58,7 @@ void ctkDICOMQueryRetrieveWidget::onTabCloseRequested(int index)
 //----------------------------------------------------------------------------
 void ctkDICOMQueryRetrieveWidget::processQuery()
 {
-  CTK_D(ctkDICOMQueryRetrieveWidget);
+  Q_D(ctkDICOMQueryRetrieveWidget);
 
   d->serverNodeWidget->populateQuery();
   d->queryWidget->populateQuery();

Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.h

@@ -24,9 +24,6 @@
 // Qt includes 
 #include <QWidget>
 
-// CTK includes
-#include <ctkPimpl.h>
-
 #include "CTKDICOMWidgetsExport.h"
 
 class ctkDICOMQueryRetrieveWidgetPrivate;
@@ -43,8 +40,12 @@ public slots:
     void processQuery();
     void onTabCloseRequested(int index);
 
+protected:
+  QScopedPointer<ctkDICOMQueryRetrieveWidgetPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkDICOMQueryRetrieveWidget);
+  Q_DECLARE_PRIVATE(ctkDICOMQueryRetrieveWidget);
+  Q_DISABLE_COPY(ctkDICOMQueryRetrieveWidget);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMQueryWidget.cpp

@@ -1,12 +1,14 @@
-#include <iostream>
+
 
 // ctkDICOMWidgets includes
 #include "ctkDICOMQueryWidget.h"
 #include "ui_ctkDICOMQueryWidget.h"
 
+// STD includes
+#include <iostream>
+
 //----------------------------------------------------------------------------
-class ctkDICOMQueryWidgetPrivate: public ctkPrivate<ctkDICOMQueryWidget>,
-                                  public Ui_ctkDICOMQueryWidget
+class ctkDICOMQueryWidgetPrivate: public Ui_ctkDICOMQueryWidget
 {
 public:
   ctkDICOMQueryWidgetPrivate(){}
@@ -20,10 +22,10 @@ public:
 // ctkDICOMQueryWidget methods
 
 //----------------------------------------------------------------------------
-ctkDICOMQueryWidget::ctkDICOMQueryWidget(QWidget* _parent):Superclass(_parent)
+ctkDICOMQueryWidget::ctkDICOMQueryWidget(QWidget* _parent):Superclass(_parent), 
+  d_ptr(new ctkDICOMQueryWidgetPrivate)
 {
-  CTK_INIT_PRIVATE(ctkDICOMQueryWidget);
-  CTK_D(ctkDICOMQueryWidget);
+  Q_D(ctkDICOMQueryWidget);
   
   d->setupUi(this);
 }
@@ -37,7 +39,7 @@ ctkDICOMQueryWidget::~ctkDICOMQueryWidget()
 //----------------------------------------------------------------------------
 void ctkDICOMQueryWidget::populateQuery(/*ctkDICOMQuery &query*/)
 {
-  CTK_D(ctkDICOMQueryWidget);
+  Q_D(ctkDICOMQueryWidget);
   if ( d->CT->isChecked() )
   {
     std::cerr << "CT\n";

Libs/DICOM/Widgets/ctkDICOMQueryWidget.h

@@ -24,9 +24,6 @@
 // Qt includes 
 #include <QWidget>
 
-// CTK includes
-#include <ctkPimpl.h>
-
 #include "CTKDICOMWidgetsExport.h"
 
 class ctkDICOMQueryWidgetPrivate;
@@ -41,8 +38,12 @@ public:
   /// set properties of query based on current widget state
   void populateQuery (/*ctkDICOMQuery &query*/);
 
+protected:
+  QScopedPointer<ctkDICOMQueryWidgetPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkDICOMQueryWidget);
+  Q_DECLARE_PRIVATE(ctkDICOMQueryWidget);
+  Q_DISABLE_COPY(ctkDICOMQueryWidget);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.cpp

@@ -18,8 +18,6 @@
  
 =========================================================================*/
 
-#include <iostream>
-
 /// CTK includes
 #include <ctkCheckableHeaderView.h>
 
@@ -27,9 +25,11 @@
 #include "ctkDICOMServerNodeWidget.h"
 #include "ui_ctkDICOMServerNodeWidget.h"
 
+// STD includes
+#include <iostream>
+
 //----------------------------------------------------------------------------
-class ctkDICOMServerNodeWidgetPrivate: public ctkPrivate<ctkDICOMServerNodeWidget>,
-                                       public Ui_ctkDICOMServerNodeWidget
+class ctkDICOMServerNodeWidgetPrivate: public Ui_ctkDICOMServerNodeWidget
 {
 public:
   ctkDICOMServerNodeWidgetPrivate(){}
@@ -43,10 +43,10 @@ public:
 // ctkDICOMServerNodeWidget methods
 
 //----------------------------------------------------------------------------
-ctkDICOMServerNodeWidget::ctkDICOMServerNodeWidget(QWidget* _parent):Superclass(_parent)
+ctkDICOMServerNodeWidget::ctkDICOMServerNodeWidget(QWidget* _parent):Superclass(_parent), 
+  d_ptr(new ctkDICOMServerNodeWidgetPrivate)
 {
-  CTK_INIT_PRIVATE(ctkDICOMServerNodeWidget);
-  CTK_D(ctkDICOMServerNodeWidget);
+  Q_D(ctkDICOMServerNodeWidget);
   
   d->setupUi(this);
 
@@ -79,7 +79,7 @@ ctkDICOMServerNodeWidget::~ctkDICOMServerNodeWidget()
 //----------------------------------------------------------------------------
 void ctkDICOMServerNodeWidget::addNode()
 {
-  CTK_D(ctkDICOMServerNodeWidget);
+  //Q_D(ctkDICOMServerNodeWidget);
 
   std::cerr << "add server node\n";
 }
@@ -87,7 +87,9 @@ void ctkDICOMServerNodeWidget::addNode()
 //----------------------------------------------------------------------------
 void ctkDICOMServerNodeWidget::updateState(int row, int column)
 {
-  CTK_D(ctkDICOMServerNodeWidget);
+  Q_UNUSED(row);
+  Q_UNUSED(column);
+  Q_D(ctkDICOMServerNodeWidget);
 
   d->removeButton->setEnabled(true);
 }
@@ -95,7 +97,7 @@ void ctkDICOMServerNodeWidget::updateState(int row, int column)
 //----------------------------------------------------------------------------
 void ctkDICOMServerNodeWidget::populateQuery(/*ctkDICOMQuery &query*/)
 {
-  CTK_D(ctkDICOMServerNodeWidget);
+  //Q_D(ctkDICOMServerNodeWidget);
 
   std::cerr << "server node populate\n";
 }

Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.h

@@ -24,9 +24,6 @@
 // Qt includes 
 #include <QWidget>
 
-// CTK includes
-#include <ctkPimpl.h>
-
 #include "CTKDICOMWidgetsExport.h"
 
 class ctkDICOMServerNodeWidgetPrivate;
@@ -47,8 +44,12 @@ public slots:
   void addNode ();
   void updateState (int row, int column);
 
+protected:
+  QScopedPointer<ctkDICOMServerNodeWidgetPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkDICOMServerNodeWidget);
+  Q_DECLARE_PRIVATE(ctkDICOMServerNodeWidget);
+  Q_DISABLE_COPY(ctkDICOMServerNodeWidget);
 };
 
 #endif

Libs/Messaging/Core/ctkMessagingClient.cpp

@@ -20,7 +20,7 @@
 
 // ZMQ includes
 
-// ctkDICOM includes
+// ctkMessagingCore includes
 #include "ctkMessagingClient.h"
 
 // STD includes
@@ -28,7 +28,7 @@
 
 
 //------------------------------------------------------------------------------
-ctkMessagingClient::ctkMessagingClient()
+ctkMessagingClient::ctkMessagingClient()/*:d_ptr(new ctkMessagingClientPrivate)*/
 {
 }
 

Libs/Messaging/Core/ctkMessagingClient.h

@@ -35,8 +35,11 @@ public:
   virtual ~ctkMessagingClient();
   
 
-private:
-//  CTK_DECLARE_PRIVATE(ctkMessagingClient);
+//protected:
+//  QScopedPointer<ctkMessagingClientPrivate> d_ptr;
+//private:
+//  Q_DECLARE_PRIVATE(ctkMessagingClient);
+//  Q_DISABLE_COPY(ctkMessagingClient);
 
 };
 

Libs/Messaging/Core/ctkMessagingServer.cpp

@@ -20,7 +20,7 @@
 
 // ZMQ includes
 
-// ctkDICOM includes
+// ctkMessagingCore includes
 #include "ctkMessagingServer.h"
 
 // STD includes
@@ -28,7 +28,7 @@
 
 
 //------------------------------------------------------------------------------
-ctkMessagingServer::ctkMessagingServer()
+ctkMessagingServer::ctkMessagingServer()/*:d_ptr(new ctkMessagingServerPrivate)*/
 {
   zmq::context_t ctx (1, 1);
 

Libs/Messaging/Core/ctkMessagingServer.h

@@ -35,8 +35,11 @@ public:
   virtual ~ctkMessagingServer();
   
 
-private:
-//  CTK_DECLARE_PRIVATE(ctkMessagingServer);
+//protected:
+//  QScopedPointer<ctkMessagingServerPrivate> d_ptr;
+//private:
+//  Q_DECLARE_PRIVATE(ctkMessagingServer);
+//  Q_DISABLE_COPY(ctkMessagingServer);
 
 };
 

Libs/Visualization/XIP/ctkXIPAdaptor.cpp

@@ -25,7 +25,7 @@
 #include "ctkXIPAdaptor.h"
 
 //----------------------------------------------------------------------------
-class ctkXIPAdaptorPrivate: public ctkPrivate<ctkXIPAdaptor>
+class ctkXIPAdaptorPrivate
 {
 public:
   ctkXIPAdaptorPrivate();
@@ -43,9 +43,8 @@ ctkXIPAdaptorPrivate::ctkXIPAdaptorPrivate()
 // ctkXIPAdaptorWidget methods
 
 //------------------------------------------------------------------------------
-ctkXIPAdaptor::ctkXIPAdaptor(QObject* _parent): Superclass(_parent)
+ctkXIPAdaptor::ctkXIPAdaptor(QObject* _parent): Superclass(_parent), d_ptr(new ctkXIPAdaptorPrivate)
 {
-  CTK_INIT_PRIVATE(ctkXIPAdaptor);
 }
 
 //----------------------------------------------------------------------------

Libs/Visualization/XIP/ctkXIPAdaptor.h

@@ -24,9 +24,6 @@
 // Qt includes 
 #include <QObject>
 
-// CTK includes
-#include <ctkPimpl.h>
-
 #include "CTKVisualizationXIPExport.h"
 
 class ctkXIPAdaptorPrivate;
@@ -38,8 +35,12 @@ public:
   explicit ctkXIPAdaptor(QObject* parent = 0);
   virtual ~ctkXIPAdaptor();
   
+protected:
+  QScopedPointer<ctkXIPAdaptorPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkXIPAdaptor);
+  Q_DECLARE_PRIVATE(ctkXIPAdaptor);
+  Q_DISABLE_COPY(ctkXIPAdaptor);
 };
 
 #endif

Libs/Widgets/ctkTransferFunctionNativeItem.cpp

@@ -35,8 +35,8 @@
 #include <gl\gl.h>							// Header File For The OpenGL32 Library
 #include <gl\glu.h>							// Header File For The GLu32 Library
 
-
-class ctkTransferFunctionNativeItemPrivate:public ctkPrivate<ctkTransferFunctionNativeItem>
+//----------------------------------------------------------------------------
+class ctkTransferFunctionNativeItemPrivate
 {
 public:
   ctkTransferFunctionNativeItemPrivate();
@@ -45,11 +45,13 @@ public:
   GLuint		Texture[1];
 };
 
+//----------------------------------------------------------------------------
 ctkTransferFunctionNativeItemPrivate::ctkTransferFunctionNativeItemPrivate()
 {
   this->Texture[0] = GL_INVALID_VALUE;
 }
 
+//----------------------------------------------------------------------------
 void ctkTransferFunctionNativeItemPrivate::initTexture()
 {
   glGenTextures(1, &this->Texture[0]);
@@ -73,17 +75,16 @@ ctkTransferFunctionNativeItemPrivate::~ctkTransferFunctionNativeItemPrivate()
 
 //-----------------------------------------------------------------------------
 ctkTransferFunctionNativeItem::ctkTransferFunctionNativeItem(QGraphicsItem* parentGraphicsItem)
-  :ctkTransferFunctionItem(parentGraphicsItem)
+  :ctkTransferFunctionItem(parentGraphicsItem), d_ptr(new ctkTransferFunctionNativeItemPrivate)
 {
-  CTK_INIT_PRIVATE(ctkTransferFunctionNativeItem);
 }
 
 //-----------------------------------------------------------------------------
 ctkTransferFunctionNativeItem::ctkTransferFunctionNativeItem(
   ctkTransferFunction* transferFunction, QGraphicsItem* parentItem)
-  :ctkTransferFunctionItem(transferFunction, parentItem)
+  :ctkTransferFunctionItem(transferFunction, parentItem), 
+  d_ptr(new ctkTransferFunctionNativeItemPrivate)
 {
-  CTK_INIT_PRIVATE(ctkTransferFunctionNativeItem);
 }
 
 //-----------------------------------------------------------------------------
@@ -95,7 +96,7 @@ ctkTransferFunctionNativeItem::~ctkTransferFunctionNativeItem()
 void ctkTransferFunctionNativeItem::paint(
   QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
 {
-  CTK_D(ctkTransferFunctionNativeItem);
+  Q_D(ctkTransferFunctionNativeItem);
   painter->beginNativePainting();
 
   if (d->Texture[0] == GL_INVALID_VALUE)

Libs/Widgets/ctkTransferFunctionNativeItem.h

@@ -27,7 +27,6 @@
 
 /// CTK includes
 #include "CTKWidgetsExport.h"
-#include "ctkPimpl.h"
 #include "ctkTransferFunctionItem.h"
 
 class ctkTransferFunctionNativeItemPrivate;
@@ -45,8 +44,12 @@ public:
 
   virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0);
 
+protected:
+  QScopedPointer<ctkTransferFunctionNativeItemPrivate> d_ptr;
+
 private:
-  CTK_DECLARE_PRIVATE(ctkTransferFunctionNativeItem);
+  Q_DECLARE_PRIVATE(ctkTransferFunctionNativeItem);
+  Q_DISABLE_COPY(ctkTransferFunctionNativeItem);
 };
 
 #endif