ENH: In ctkPimpl, remove 'Q' prefix from macro and function.

Libs/Core/CMakeLists.txt

@@ -53,6 +53,7 @@ SET(KIT_SRCS
   ctkDependencyGraph.h
   ctkModelTester.cpp
   ctkModelTester.h
+  ctkPimpl.h
   ctkUtils.cpp
   ctkUtils.h
   )

Libs/Core/ctkAbstractFactory.h

@@ -15,6 +15,7 @@
 #ifndef __ctkAbstractFactory_h
 #define __ctkAbstractFactory_h
 
+// QT includes
 #include <QString>
 #include <QHash>
 #include <QSharedPointer>

Libs/Core/ctkAbstractFactory.tpp

@@ -15,9 +15,12 @@
 #ifndef __ctkAbstractFactory_tpp
 #define __ctkAbstractFactory_tpp
 
-#include "ctkAbstractFactory.h"
+// QT includes
 #include <QDebug>
 
+// CTK includes
+#include "ctkAbstractFactory.h"
+
 //----------------------------------------------------------------------------
 template<typename BaseClassType>
 ctkAbstractFactoryItem<BaseClassType>::ctkAbstractFactoryItem(const QString& _key)

Libs/Core/ctkAbstractLibraryFactory.h

@@ -15,12 +15,14 @@
 #ifndef __ctkAbstractLibraryFactory_h
 #define __ctkAbstractLibraryFactory_h
 
-#include "ctkAbstractFactory.h"
-
+// QT includes
 #include <QFileInfo>
 #include <QLibrary>
 #include <QStringList>
 
+// CTK includes
+#include "ctkAbstractFactory.h"
+
 //----------------------------------------------------------------------------
 template<typename BaseClassType>
 class ctkFactoryLibraryItem : public ctkAbstractFactoryItem<BaseClassType>

Libs/Core/ctkAbstractObjectFactory.h

@@ -15,10 +15,12 @@
 #ifndef __ctkAbstractObjectFactory_h
 #define __ctkAbstractObjectFactory_h
 
-#include "ctkAbstractFactory.h"
-
+// QT includes
 #include <QDebug>
 
+// CTK includes
+#include "ctkAbstractFactory.h"
+
 //----------------------------------------------------------------------------
 namespace{
   /// 

Libs/Core/ctkAbstractPluginFactory.h

@@ -15,11 +15,13 @@
 #ifndef __ctkAbstractPluginFactory_h
 #define __ctkAbstractPluginFactory_h
 
-#include "ctkAbstractFactory.h"
-
+// QT includes
 #include <QPluginLoader>
 #include <QFileInfo>
 
+// CTK includes
+#include "ctkAbstractFactory.h"
+
 //----------------------------------------------------------------------------
 template<typename BaseClassType>
 class ctkFactoryPluginItem : public ctkAbstractFactoryItem<BaseClassType>

Libs/Core/ctkAbstractQObjectFactory.h

@@ -15,10 +15,12 @@
 #ifndef __ctkAbstractQObjectFactory_h
 #define __ctkAbstractQObjectFactory_h
 
-#include "ctkAbstractObjectFactory.h"
-
+// QT includes
 #include <QDebug>
 
+// CTK includes
+#include "ctkAbstractObjectFactory.h"
+
 //----------------------------------------------------------------------------
 template<typename BaseClassType>
 class ctkAbstractQObjectFactory : public ctkAbstractObjectFactory<BaseClassType>

Libs/Core/ctkAbstractQObjectFactory.tpp

@@ -15,12 +15,12 @@
 #ifndef __ctkAbstractQObjectFactory_tpp
 #define __ctkAbstractQObjectFactory_tpp
 
-// CTK includes
-#include "ctkAbstractObjectFactory.h"
-
 // QT includes
 #include <QDebug>
 
+// CTK includes
+#include "ctkAbstractObjectFactory.h"
+
 //----------------------------------------------------------------------------
 template<typename BaseClassType>
 ctkAbstractQObjectFactory<BaseClassType>::ctkAbstractQObjectFactory()

Libs/Core/ctkDependencyGraph.h

@@ -5,7 +5,7 @@
 #include <QString>
 #include <QList>
 
-/// CTK includes
+// CTK includes
 #include "CTKCoreExport.h"
 
 class CTK_CORE_EXPORT ctkDependencyGraph

Libs/Core/ctkModelTester.cpp

@@ -12,13 +12,15 @@
 
 =========================================================================*/
 
-#include "ctkModelTester.h"
-
+// QT includes
 #include <QDebug>
 #include <QStack>
 
+// CTK includes
+#include "ctkModelTester.h"
+
 //-----------------------------------------------------------------------------
-class ctkModelTesterPrivate: public qCTKPrivate<ctkModelTester>
+class ctkModelTesterPrivate: public ctkPrivate<ctkModelTester>
 {
 public:
   ctkModelTesterPrivate();
@@ -54,14 +56,14 @@ ctkModelTesterPrivate::ctkModelTesterPrivate()
 ctkModelTester::ctkModelTester(QAbstractItemModel *_model, QObject *_parent)
   :QObject(_parent)
 {
-  QCTK_INIT_PRIVATE(ctkModelTester);
+  CTK_INIT_PRIVATE(ctkModelTester);
   this->setModel(_model);
 }
 
 //-----------------------------------------------------------------------------
 void ctkModelTester::setModel(QAbstractItemModel *_model)
 {
-  QCTK_D(ctkModelTester);
+  CTK_D(ctkModelTester);
   if (d->Model)
     {
     // disconnect
@@ -102,31 +104,31 @@ void ctkModelTester::setModel(QAbstractItemModel *_model)
 //-----------------------------------------------------------------------------
 QAbstractItemModel* ctkModelTester::model()const
 {
-  return qctk_d()->Model;
+  return ctk_d()->Model;
 }
 
 //-----------------------------------------------------------------------------
 void ctkModelTester::setThrowOnError(bool throwException)
 {
-  qctk_d()->ThrowOnError = throwException;
+  ctk_d()->ThrowOnError = throwException;
 }
 
 //-----------------------------------------------------------------------------
 bool ctkModelTester::throwOnError()const
 {
-  return qctk_d()->ThrowOnError;
+  return ctk_d()->ThrowOnError;
 }
 
 //-----------------------------------------------------------------------------
 void ctkModelTester::setNestedInserts( bool nestedInsertsValue )
 {
-  qctk_d()->NestedInserts = nestedInsertsValue;
+  ctk_d()->NestedInserts = nestedInsertsValue;
 }
 
 //-----------------------------------------------------------------------------
 bool ctkModelTester::nestedInserts()const
 {
-  return qctk_d()->NestedInserts;
+  return ctk_d()->NestedInserts;
 }
 
 //-----------------------------------------------------------------------------
@@ -146,7 +148,7 @@ void  ctkModelTester::test(bool result, const QString& errorString)const
 //-----------------------------------------------------------------------------
 void ctkModelTester::testModelIndex(const QModelIndex& index)const
 {
-  QCTK_D(const ctkModelTester);
+  CTK_D(const ctkModelTester);
   if (!index.isValid())
     {// invalid index
     this->test(index.model() == 0, "An invalid index can't have a valid model.");
@@ -191,7 +193,7 @@ void ctkModelTester::testData(const QModelIndex& index)const
 //-----------------------------------------------------------------------------
 void ctkModelTester::testParent(const QModelIndex& vparent)const
 {
-  QCTK_D(const ctkModelTester);
+  CTK_D(const ctkModelTester);
   if (!d->Model->hasChildren(vparent))
     {
     // it's asking a lot :-)
@@ -223,7 +225,7 @@ void ctkModelTester::testParent(const QModelIndex& vparent)const
 //-----------------------------------------------------------------------------
 void ctkModelTester::testPersistentModelIndex(const QPersistentModelIndex& index)const
 {
-  QCTK_D(const ctkModelTester);
+  CTK_D(const ctkModelTester);
   //qDebug() << "Test persistent Index: " << index ;
   this->test(index.isValid(), "Persistent model index can't be invalid");
   // did you forget to call QAbstractItemModel::changePersistentIndex() between 
@@ -236,7 +238,7 @@ void ctkModelTester::testPersistentModelIndex(const QPersistentModelIndex& index
 //-----------------------------------------------------------------------------
 void ctkModelTester::testModel()const
 {
-  QCTK_D(const ctkModelTester);
+  CTK_D(const ctkModelTester);
   if (d->Model == 0)
     {
     return;
@@ -302,7 +304,7 @@ void ctkModelTester::onDataChanged(const QModelIndex & topLeft, const QModelInde
 //-----------------------------------------------------------------------------
 void ctkModelTester::onHeaderDataChanged(Qt::Orientation orientation, int first, int last)
 {
-  QCTK_D(ctkModelTester);
+  CTK_D(ctkModelTester);
   this->test(first <= last, "Changed headers have wrong indexes");
   switch (orientation)
     {
@@ -322,7 +324,7 @@ void ctkModelTester::onHeaderDataChanged(Qt::Orientation orientation, int first,
 //-----------------------------------------------------------------------------
 QList<QPersistentModelIndex> ctkModelTester::persistentModelIndexes(const QModelIndex& index)const
 {
-  QCTK_D(const ctkModelTester);
+  CTK_D(const ctkModelTester);
   QList<QPersistentModelIndex> list;
   for (int i = 0; i < d->Model->rowCount(index); ++i)
     {
@@ -339,7 +341,7 @@ QList<QPersistentModelIndex> ctkModelTester::persistentModelIndexes(const QModel
 //-----------------------------------------------------------------------------
 void ctkModelTester::onLayoutAboutToBeChanged()
 {
-  QCTK_D(ctkModelTester);
+  CTK_D(ctkModelTester);
 
   d->LayoutAboutToBeChanged = this->persistentModelIndexes(QModelIndex());
   this->testModel();
@@ -348,7 +350,7 @@ void ctkModelTester::onLayoutAboutToBeChanged()
 //-----------------------------------------------------------------------------
 void ctkModelTester::onLayoutChanged()
 {
-  QCTK_D(ctkModelTester);
+  CTK_D(ctkModelTester);
   foreach (const QPersistentModelIndex& index, d->LayoutAboutToBeChanged)
     {
     this->testPersistentModelIndex(index);
@@ -400,7 +402,7 @@ void ctkModelTester::onRowsRemoved(const QModelIndex & vparent, int start, int e
 //-----------------------------------------------------------------------------
 void ctkModelTester::onItemsAboutToBeInserted(const QModelIndex &vparent, Qt::Orientation orientation, int start, int end)
 {
-  QCTK_D(ctkModelTester);
+  CTK_D(ctkModelTester);
   this->test(start <= end, "Start can't be higher than end");
   //Not sure about that
   if (!d->NestedInserts)
@@ -425,7 +427,7 @@ void ctkModelTester::onItemsAboutToBeInserted(const QModelIndex &vparent, Qt::Or
 //-----------------------------------------------------------------------------
 void ctkModelTester::onItemsAboutToBeRemoved(const QModelIndex &vparent, Qt::Orientation orientation, int start, int end)
 {
-  QCTK_D(ctkModelTester);
+  CTK_D(ctkModelTester);
   this->test(start <= end, "Start can't be higher than end");
   //Not sure about that
   this->test(d->AboutToBeInserted.size() == 0, "While inserting items, you can't remove other items.");
@@ -465,7 +467,7 @@ void ctkModelTester::onItemsAboutToBeRemoved(const QModelIndex &vparent, Qt::Ori
 //-----------------------------------------------------------------------------
 void ctkModelTester::onItemsInserted(const QModelIndex & vparent, Qt::Orientation orientation, int start, int end)
 {
-  QCTK_D(ctkModelTester);
+  CTK_D(ctkModelTester);
   this->test(start <= end, "Start can't be higher end");
   this->test(d->AboutToBeInserted.size() != 0, "rowsInserted() has been emitted, but not rowsAboutToBeInserted.");
   //Not sure about that
@@ -491,7 +493,7 @@ void ctkModelTester::onItemsInserted(const QModelIndex & vparent, Qt::Orientatio
 //-----------------------------------------------------------------------------
 void ctkModelTester::onItemsRemoved(const QModelIndex & vparent, Qt::Orientation orientation, int start, int end)
 { 
-  QCTK_D(ctkModelTester);
+  CTK_D(ctkModelTester);
   this->test(start <= end, "Start can't be higher end");
   this->test(d->AboutToBeRemoved.size() != 0, "rowsRemoved() has been emitted, but not rowsAboutToBeRemoved.");
   //Not sure about that

Libs/Core/ctkModelTester.h

@@ -65,6 +65,7 @@ protected slots:
   void onRowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
   void onRowsInserted(const QModelIndex & parent, int start, int end);
   void onRowsRemoved(const QModelIndex & parent, int start, int end);
+  
 protected:
   virtual void onItemsAboutToBeInserted(const QModelIndex& parent, Qt::Orientation, int start, int end);
   virtual void onItemsAboutToBeRemoved(const QModelIndex& parent, Qt::Orientation, int start, int end);
@@ -72,8 +73,9 @@ protected:
   virtual void onItemsRemoved(const QModelIndex& parent, Qt::Orientation, int start, int end);
   QList<QPersistentModelIndex> persistentModelIndexes(const QModelIndex& index)const;
   virtual void test(bool result, const QString& errorString)const;
+  
 private:
-  QCTK_DECLARE_PRIVATE(ctkModelTester);
+  CTK_DECLARE_PRIVATE(ctkModelTester);
 };
 
 #endif

Libs/Core/ctkPimpl.h

@@ -48,6 +48,7 @@ function (this one's actually a function).
 #ifndef __ctkPimpl_h
 #define __ctkPimpl_h
 
+// QT includes
 #include <QtGlobal>
 
 /*! \relates ctkPimpl
@@ -55,10 +56,10 @@ function (this one's actually a function).
  *
  * Also make sure the Pimpl is initalized
  */
-#define QCTK_CONSTRUCTOR_NO_ARG_CXX(PUB) \
+#define CTK_CONSTRUCTOR_NO_ARG_CXX(PUB)  \
   PUB::PUB()                             \
     {                                    \
-    QCTK_INIT_PRIVATE(PUB);              \
+    CTK_INIT_PRIVATE(PUB);               \
     }
 
 /*! \relates ctkPimpl
@@ -66,11 +67,11 @@ function (this one's actually a function).
  *
  * Also make sure the Pimpl is initalized
  */
-#define QCTK_CONSTRUCTOR_1_ARG_CXX(PUB, _ARG1)  \
+#define CTK_CONSTRUCTOR_1_ARG_CXX(PUB, _ARG1)   \
   PUB::PUB(_ARG1 _parent) :                     \
     Superclass( _parent )                       \
     {                                           \
-    QCTK_INIT_PRIVATE(PUB);                     \
+    CTK_INIT_PRIVATE(PUB);                      \
     }
     
 /*! \relates ctkPimpl
@@ -80,10 +81,10 @@ function (this one's actually a function).
  * the name of the public class (PUB), the type of the argument to return (_TYPE),
  * the name of the getter(_NAME) and the name of the variable in the Private class(_VARNAME).
  */
-#define QCTK_SET_CXX(PUB, _TYPE, _NAME, _VARNAME)   \
+#define CTK_SET_CXX(PUB, _TYPE, _NAME, _VARNAME)    \
   void PUB::_NAME(_TYPE var)                        \
   {                                                 \
-    qctk_d.ref()._VARNAME =  var;                   \
+    ctk_d.ref()._VARNAME =  var;                    \
   }
 
 /*! \relates ctkPimpl
@@ -93,10 +94,10 @@ function (this one's actually a function).
  * the name of the public class (PUB), the type of the argument to return (_TYPE),
  * the name of the setter(_NAME) and the name of the variable in the Private class(_VARNAME).
  */
-#define QCTK_GET_CXX(PUB, _TYPE, _NAME, _VARNAME)  \
+#define CTK_GET_CXX(PUB, _TYPE, _NAME, _VARNAME)   \
   _TYPE PUB::_NAME()const                          \
   {                                                \
-    return qctk_d.ref()._VARNAME;                  \
+    return ctk_d.ref()._VARNAME;                   \
   }
 
 /*! \relates ctkPimpl
@@ -105,8 +106,8 @@ function (this one's actually a function).
  * This should be put in the private section of the public class. The parameter is the name of the public class.
  * For convenience, this macro also add 'typedef PUB Self;'
  */
-#define QCTK_DECLARE_PRIVATE(PUB)                                          \
-friend class PUB##Private; qCTKPrivateInterface<PUB, PUB##Private> qctk_d; \
+#define CTK_DECLARE_PRIVATE(PUB)                                          \
+friend class PUB##Private; ctkPrivateInterface<PUB, PUB##Private> ctk_d;  \
 typedef PUB Self;
 
 /*! \relates ctkPimpl
@@ -114,111 +115,111 @@ typedef PUB Self;
  *
  * This may be put anywhere in the declaration of the private class. The parameter is the name of the public class.
  */
-#define QCTK_DECLARE_PUBLIC(PUB) friend class PUB;
+#define CTK_DECLARE_PUBLIC(PUB) friend class PUB;
 /*! \relates ctkPimpl
  * Initializes resources owned by the private class.
  *
  * This should be called from the public class's constructor,
  * before qctk_d() is used for the first time. The parameter is the name of the public class.
  */
-#define QCTK_INIT_PRIVATE(PUB) qctk_d.setPublic(this)
+#define CTK_INIT_PRIVATE(PUB) ctk_d.setPublic(this)
 /*! \relates ctkPimpl
  * Returns a pointer (or reference) in the current scope named "d" to the private class.
  *
  * This function is only available in a class using \a QCTK_DECLARE_PRIVATE.
  */
-#define QCTK_D(PUB) PUB##Private* d = qctk_d()
-#define QCTK_D_REF(PUB) PUB##Private& d = qctk_d.ref()
+#define CTK_D(PUB) PUB##Private* d = ctk_d()
+#define CTK_D_REF(PUB) PUB##Private& d = ctk_d.ref()
 /*! \relates ctkPimpl
  * Creates a pointer ( or reference) in the current scope named "q" to the public class.
  *
- * This macro only works in a class using \a QCTK_DECLARE_PUBLIC.
+ * This macro only works in a class using \a CTK_DECLARE_PUBLIC.
  */
-#define QCTK_P(PUB) PUB* p = qctk_p()
-#define QCTK_P_REF(PUB) PUB& p = qctk_p_ref()
+#define CTK_P(PUB) PUB* p = ctk_p()
+#define CTK_P_REF(PUB) PUB& p = ctk_p_ref()
 
-#ifdef QCTK_DOXYGEN_RUN
+#ifdef CTK_DOXYGEN_RUN
 /*! \relates ctkPimpl
  * Returns a pointer to the private class.
  *
- * This function is only available in a class using \a QCTK_DECLARE_PRIVATE.
+ * This function is only available in a class using \a CTK_DECLARE_PRIVATE.
  */
-qCTKPrivate<PUB>* qctk_d();
+ctkPrivate<PUB>* ctk_d();
 
 /*! \relates ctkPimpl
  * Returns a const pointer to the private class.
  *
- * This function is only available in a class using \a QCTK_DECLARE_PRIVATE.
+ * This function is only available in a class using \a CTK_DECLARE_PRIVATE.
  * This overload will be automatically used in const functions.
  */
-const qCTKPrivate<PUB>* qctk_d();
+const ctkPrivate<PUB>* ctk_d();
 
 /*! \relates ctkPimpl
  * Returns a reference or pointer to the public class.
  *
- * This function is only available in a class using \a QCTK_DECLARE_PUBLIC.
+ * This function is only available in a class using \a CTK_DECLARE_PUBLIC.
  */
-PUB& qctk_p_ref();
-PUB* qctk_p();
+PUB& ctk_p_ref();
+PUB* ctk_p();
 
 /*! \relates ctkPimpl
  * Returns a const reference or pointer to the public class.
  *
- * This function is only available in a class using \a QCTK_DECLARE_PUBLIC.
+ * This function is only available in a class using \a CTK_DECLARE_PUBLIC.
  * This overload will be automatically used in const functions.
  */
-const PUB& qctk_p_ref();
-const PUB* qctk_p();
+const PUB& ctk_p_ref();
+const PUB* ctk_p();
 #endif
 
 template <typename PUB>
-class qCTKPrivate
+class ctkPrivate
 {
 public:
-  virtual ~qCTKPrivate(){}
-  inline void QCTK_setPublic(PUB* pub)
+  virtual ~ctkPrivate(){}
+  inline void CTK_setPublic(PUB* pub)
     {
     Q_ASSERT(pub);
-    qctk_p_ptr = pub;
+    ctk_p_ptr = pub;
     }
 
 protected:
-  inline PUB& qctk_p_ref()
+  inline PUB& ctk_p_ref()
     {
-    Q_ASSERT(this->qctk_p_ptr);
-    return *this->qctk_p_ptr;
+    Q_ASSERT(this->ctk_p_ptr);
+    return *this->ctk_p_ptr;
     }
-  inline const PUB& qctk_p_ref() const
+  inline const PUB& ctk_p_ref() const
     {
-    Q_ASSERT(this->qctk_p_ptr);
-    return *this->qctk_p_ptr;
+    Q_ASSERT(this->ctk_p_ptr);
+    return *this->ctk_p_ptr;
     }
 
-  inline PUB* qctk_p()
+  inline PUB* ctk_p()
     {
-    Q_ASSERT(this->qctk_p_ptr);
-    return this->qctk_p_ptr;
+    Q_ASSERT(this->ctk_p_ptr);
+    return this->ctk_p_ptr;
     }
-  inline const PUB* qctk_p() const
+  inline const PUB* ctk_p() const
     {
-    Q_ASSERT(this->qctk_p_ptr);
-    return this->qctk_p_ptr;
+    Q_ASSERT(this->ctk_p_ptr);
+    return this->ctk_p_ptr;
     }
 
 private:
-  PUB* qctk_p_ptr;
+  PUB* ctk_p_ptr;
 };
 
 template <typename PUB, typename PVT>
-class qCTKPrivateInterface
+class ctkPrivateInterface
 {
-  friend class qCTKPrivate<PUB>;
+  friend class ctkPrivate<PUB>;
 public:
-  qCTKPrivateInterface()
+  ctkPrivateInterface()
     {
     this->pvt = new PVT;
     }
-  ~qCTKPrivateInterface()
+  ~ctkPrivateInterface()
     {
     delete this->pvt;
     }
@@ -226,7 +227,7 @@ public:
   inline void setPublic(PUB* pub)
     {
     Q_ASSERT(pub);
-    this->pvt->QCTK_setPublic(pub);
+    this->pvt->CTK_setPublic(pub);
     }
   inline PVT& ref()
     {
@@ -245,7 +246,7 @@ public:
     return static_cast<PVT*>(this->pvt);
     }
 private:
-  qCTKPrivate<PUB>* pvt;
+  ctkPrivate<PUB>* pvt;
 };
 
 #endif

Libs/DICOM/Core/ctkDICOM.cpp

@@ -14,7 +14,7 @@
 #include <iostream>
 
 //----------------------------------------------------------------------------
-class ctkDICOMPrivate: public qCTKPrivate<ctkDICOM>
+class ctkDICOMPrivate: public ctkPrivate<ctkDICOM>
 {
 public:
   ctkDICOMPrivate(); 
@@ -39,7 +39,7 @@ ctkDICOMPrivate::ctkDICOMPrivate()
 //------------------------------------------------------------------------------
 ctkDICOM::ctkDICOM(QObject* _parent): Superclass(_parent)
 {
-  QCTK_INIT_PRIVATE(ctkDICOM);
+  CTK_INIT_PRIVATE(ctkDICOM);
 }
 
 //----------------------------------------------------------------------------
@@ -50,7 +50,7 @@ ctkDICOM::~ctkDICOM()
 //----------------------------------------------------------------------------
 bool ctkDICOM::openDatabase(const QString& databaseFileName)
 {
-  QCTK_D(ctkDICOM);
+  CTK_D(ctkDICOM);
   d->Database = QSqlDatabase::addDatabase("QSQLITE","DICOM-DB");
   d->Database.setDatabaseName(databaseFileName);
   if ( ! (d->Database.open()) )
@@ -67,13 +67,13 @@ bool ctkDICOM::openDatabase(const QString& databaseFileName)
 
 //------------------------------------------------------------------------------
 const QString& ctkDICOM::GetLastError() const {
-  QCTK_D(const ctkDICOM);
+  CTK_D(const ctkDICOM);
   return d->LastError; 
 }
 
 //------------------------------------------------------------------------------
 const QSqlDatabase& ctkDICOM::database() const {
-  QCTK_D(const ctkDICOM);
+  CTK_D(const ctkDICOM);
   return d->Database;
 }
 
@@ -114,13 +114,13 @@ bool ctkDICOMPrivate::executeScript(const QString& script) {
 //------------------------------------------------------------------------------
 bool ctkDICOM::initializeDatabase(const char* sqlFileName)
 {
-  QCTK_D(ctkDICOM);
+  CTK_D(ctkDICOM);
   return d->executeScript(sqlFileName);
 }
 
 //------------------------------------------------------------------------------
 void ctkDICOM::closeDatabase()
 {
-  QCTK_D(ctkDICOM);
+  CTK_D(ctkDICOM);
   d->Database.close();
 }

Libs/DICOM/Core/ctkDICOM.h

@@ -5,7 +5,7 @@
 #include <QObject>
 #include <QSqlDatabase>
 
-// qCTK includes
+// CTK includes
 #include <ctkPimpl.h>
 
 #include "CTKDICOMCoreExport.h"
@@ -35,7 +35,7 @@ public:
   /// delete all data and reinitialize the database.
   bool initializeDatabase(const char* schemaFile = ":/dicom/dicom-schema.sql");
 private:
-  QCTK_DECLARE_PRIVATE(ctkDICOM);
+  CTK_DECLARE_PRIVATE(ctkDICOM);
 };
 
 #endif

Libs/DICOM/Core/ctkDICOMIndexer.cpp

@@ -1,4 +1,4 @@
-// Qt includes
+// QT includes
 #include <QSqlQuery>
 #include <QSqlRecord>
 #include <QVariant>
@@ -30,7 +30,7 @@
 #define MITK_INFO std::cout
 
 //------------------------------------------------------------------------------
-class ctkDICOMIndexerPrivate: public qCTKPrivate<ctkDICOMIndexer>
+class ctkDICOMIndexerPrivate: public ctkPrivate<ctkDICOMIndexer>
 {
 public:
   ctkDICOMIndexerPrivate();

Libs/DICOM/Core/ctkDICOMIndexer.h

@@ -4,7 +4,7 @@
 // QT includes 
 #include <QSqlDatabase>
 
-// qCTK includes
+// CTK includes
 #include <ctkPimpl.h>
 
 #include "CTKDICOMCoreExport.h"
@@ -20,7 +20,7 @@ public:
   void refreshDatabase(QSqlDatabase database, const QString& directoryName);
 
 private:
-  QCTK_DECLARE_PRIVATE(ctkDICOMIndexer);
+  CTK_DECLARE_PRIVATE(ctkDICOMIndexer);
 };
 
 #endif

Libs/DICOM/Core/ctkDICOMModel.cpp

@@ -1,5 +1,5 @@
 
-// Qt includes
+// QT includes
 #include <QStringList>
 #include <QSqlDriver>
 #include <QSqlError>
@@ -16,7 +16,7 @@
 struct Node;
 
 //------------------------------------------------------------------------------
-class ctkDICOMModelPrivate:public qCTKPrivate<ctkDICOMModel>
+class ctkDICOMModelPrivate:public ctkPrivate<ctkDICOMModel>
 {
 public:
   ctkDICOMModelPrivate();
@@ -102,7 +102,7 @@ Node* ctkDICOMModelPrivate::nodeFromIndex(const QModelIndex& indexValue)const
 //------------------------------------------------------------------------------
 QModelIndexList ctkDICOMModelPrivate::indexListFromNode(const Node* node)const
 {
-  QCTK_P(const ctkDICOMModel);
+  CTK_P(const ctkDICOMModel);
   Q_ASSERT(node);
   QModelIndexList indexList;
   
@@ -281,7 +281,7 @@ void ctkDICOMModelPrivate::updateQueries(Node* node)const
 //------------------------------------------------------------------------------
 void ctkDICOMModelPrivate::fetch(const QModelIndex& indexValue, int limit)
 {
-  QCTK_P(ctkDICOMModel);
+  CTK_P(ctkDICOMModel);
   Node* node = this->nodeFromIndex(indexValue);
   if (node->AtEnd || limit <= node->RowCount || node->Fetching/*|| bottom.column() == -1*/)
     {
@@ -331,8 +331,8 @@ void ctkDICOMModelPrivate::fetch(const QModelIndex& indexValue, int limit)
 //------------------------------------------------------------------------------
 ctkDICOMModel::ctkDICOMModel(QObject* parentValue)
 {
-  QCTK_INIT_PRIVATE(ctkDICOMModel);
-  qctk_d()->init();
+  CTK_INIT_PRIVATE(ctkDICOMModel);
+  ctk_d()->init();
 }
 
 //------------------------------------------------------------------------------
@@ -343,7 +343,7 @@ ctkDICOMModel::~ctkDICOMModel()
 //------------------------------------------------------------------------------
 bool ctkDICOMModel::canFetchMore ( const QModelIndex & parentValue ) const
 {
-  QCTK_D(const ctkDICOMModel);
+  CTK_D(const ctkDICOMModel);
   Node* node = d->nodeFromIndex(parentValue);
   return !node->AtEnd;
 }
@@ -351,7 +351,7 @@ bool ctkDICOMModel::canFetchMore ( const QModelIndex & parentValue ) const
 //------------------------------------------------------------------------------
 int ctkDICOMModel::columnCount ( const QModelIndex & _parent ) const
 {
-  QCTK_D(const ctkDICOMModel);
+  CTK_D(const ctkDICOMModel);
   Q_UNUSED(_parent);
   return d->RootNode != 0 ? d->Headers.size() : 0;
 }
@@ -359,7 +359,7 @@ int ctkDICOMModel::columnCount ( const QModelIndex & _parent ) const
 //------------------------------------------------------------------------------
 QVariant ctkDICOMModel::data ( const QModelIndex & indexValue, int role ) const
 {
-  QCTK_D(const ctkDICOMModel);
+  CTK_D(const ctkDICOMModel);
   if (role & ~(Qt::DisplayRole | Qt::EditRole))
     {
     return QVariant();
@@ -389,7 +389,7 @@ QVariant ctkDICOMModel::data ( const QModelIndex & indexValue, int role ) const
 //------------------------------------------------------------------------------
 void ctkDICOMModel::fetchMore ( const QModelIndex & parentValue )
 {
-  QCTK_D(ctkDICOMModel);
+  CTK_D(ctkDICOMModel);
   Node* node = d->nodeFromIndex(parentValue);
   d->fetch(parentValue, qMax(node->RowCount, 0) + 256);
 }
@@ -403,7 +403,7 @@ Qt::ItemFlags ctkDICOMModel::flags ( const QModelIndex & indexValue ) const
 //------------------------------------------------------------------------------
 bool ctkDICOMModel::hasChildren ( const QModelIndex & parentValue ) const
 {
-  QCTK_D(const ctkDICOMModel);
+  CTK_D(const ctkDICOMModel);
   if (parentValue.column() > 0)
     {
     return false;
@@ -424,7 +424,7 @@ bool ctkDICOMModel::hasChildren ( const QModelIndex & parentValue ) const
 //------------------------------------------------------------------------------
 QVariant ctkDICOMModel::headerData(int section, Qt::Orientation orientation, int role)const
 {
-  QCTK_D(const ctkDICOMModel);
+  CTK_D(const ctkDICOMModel);
   if (role & ~(Qt::DisplayRole | Qt::EditRole))
     {
     return QVariant();
@@ -441,7 +441,7 @@ QVariant ctkDICOMModel::headerData(int section, Qt::Orientation orientation, int
 //------------------------------------------------------------------------------
 QModelIndex ctkDICOMModel::index ( int row, int column, const QModelIndex & parentValue ) const
 {
-  QCTK_D(const ctkDICOMModel);
+  CTK_D(const ctkDICOMModel);
   if (d->RootNode == 0 || parentValue.column() > 0)
     {
     return QModelIndex();
@@ -468,7 +468,7 @@ QModelIndex ctkDICOMModel::index ( int row, int column, const QModelIndex & pare
 //------------------------------------------------------------------------------
 QModelIndex ctkDICOMModel::parent ( const QModelIndex & indexValue ) const
 {
-  QCTK_D(const ctkDICOMModel);
+  CTK_D(const ctkDICOMModel);
   Node* node = d->nodeFromIndex(indexValue);
   Q_ASSERT(node);
   Node* parentNode = node->Parent;
@@ -501,7 +501,7 @@ QModelIndex ctkDICOMModel::parent ( const QModelIndex & indexValue ) const
 //------------------------------------------------------------------------------
 int ctkDICOMModel::rowCount ( const QModelIndex & parentValue ) const
 {
-  QCTK_D(const ctkDICOMModel);
+  CTK_D(const ctkDICOMModel);
   if (d->RootNode == 0 || parentValue.column() > 0)
     {
     return 0;
@@ -518,7 +518,7 @@ int ctkDICOMModel::rowCount ( const QModelIndex & parentValue ) const
 //------------------------------------------------------------------------------
 void ctkDICOMModel::setDatabase(const QSqlDatabase &db)
 {
-  QCTK_D(ctkDICOMModel);
+  CTK_D(ctkDICOMModel);
 
   this->beginResetModel();
   d->DataBase = db;
@@ -553,7 +553,7 @@ void ctkDICOMModel::setDatabase(const QSqlDatabase &db)
 //------------------------------------------------------------------------------
 void ctkDICOMModel::sort(int column, Qt::SortOrder order)
 {
-  QCTK_D(ctkDICOMModel);
+  CTK_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
@@ -583,7 +583,7 @@ void ctkDICOMModel::sort(int column, Qt::SortOrder order)
 //------------------------------------------------------------------------------
 bool ctkDICOMModel::setHeaderData ( int section, Qt::Orientation orientation, const QVariant & value, int role)
 {
-  QCTK_D(ctkDICOMModel);
+  CTK_D(ctkDICOMModel);
   if (role & ~(Qt::DisplayRole | Qt::EditRole))
     {
     return false;

Libs/DICOM/Core/ctkDICOMModel.h

@@ -5,7 +5,7 @@
 #include <QAbstractItemModel>
 #include <QSqlDatabase>
 
-// qCTK includes
+// CTK includes
 #include <ctkPimpl.h>
 
 #include "CTKDICOMCoreExport.h"
@@ -37,7 +37,7 @@ public:
   virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
 
 private:
-  QCTK_DECLARE_PRIVATE(ctkDICOMModel);
+  CTK_DECLARE_PRIVATE(ctkDICOMModel);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMCommandWidget.cpp

@@ -4,7 +4,7 @@
 #include "ui_ctkDICOMCommandWidget.h"
 
 //----------------------------------------------------------------------------
-class ctkDICOMCommandWidgetPrivate: public qCTKPrivate<ctkDICOMCommandWidget>,
+class ctkDICOMCommandWidgetPrivate: public ctkPrivate<ctkDICOMCommandWidget>,
                                     public Ui_ctkDICOMCommandWidget
 {
 public:
@@ -21,8 +21,8 @@ public:
 //----------------------------------------------------------------------------
 ctkDICOMCommandWidget::ctkDICOMCommandWidget(QWidget* _parent):Superclass(_parent)
 {
-  QCTK_INIT_PRIVATE(ctkDICOMCommandWidget);
-  QCTK_D(ctkDICOMCommandWidget);
+  CTK_INIT_PRIVATE(ctkDICOMCommandWidget);
+  CTK_D(ctkDICOMCommandWidget);
   
   d->setupUi(this);
 }

Libs/DICOM/Widgets/ctkDICOMCommandWidget.h

@@ -4,7 +4,7 @@
 // QT includes 
 #include <QWidget>
 
-// qCTK includes
+// CTK includes
 #include <ctkPimpl.h>
 
 #include "CTKDICOMWidgetsExport.h"
@@ -19,7 +19,7 @@ public:
   virtual ~ctkDICOMCommandWidget();
 
 private:
-  QCTK_DECLARE_PRIVATE(ctkDICOMCommandWidget);
+  CTK_DECLARE_PRIVATE(ctkDICOMCommandWidget);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMItemTreeModel.cpp

@@ -3,7 +3,7 @@
 #include "ctkDICOMItemTreeModel.h"
 
 //----------------------------------------------------------------------------
-class ctkDICOMItemTreeModelPrivate: public qCTKPrivate<ctkDICOMItemTreeModel>
+class ctkDICOMItemTreeModelPrivate: public ctkPrivate<ctkDICOMItemTreeModel>
 {
 public:
   ctkDICOMItemTreeModelPrivate(){}
@@ -19,8 +19,8 @@ public:
 //----------------------------------------------------------------------------
 ctkDICOMItemTreeModel::ctkDICOMItemTreeModel(QObject* _parent):Superclass(_parent)
 {
-  QCTK_INIT_PRIVATE(ctkDICOMItemTreeModel);
-  QCTK_D(ctkDICOMItemTreeModel);
+  CTK_INIT_PRIVATE(ctkDICOMItemTreeModel);
+  //CTK_D(ctkDICOMItemTreeModel);
 
 }
 

Libs/DICOM/Widgets/ctkDICOMItemTreeModel.h

@@ -5,7 +5,7 @@
 #include <QAbstractItemModel>
 #include <QModelIndex>
 
-// qCTK includes
+// CTK includes
 #include <ctkPimpl.h>
 
 #include "CTKDICOMWidgetsExport.h"
@@ -35,7 +35,7 @@ public:
   virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
 
 private:
-  QCTK_DECLARE_PRIVATE(ctkDICOMItemTreeModel);
+  CTK_DECLARE_PRIVATE(ctkDICOMItemTreeModel);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMListenerWidget.cpp

@@ -4,7 +4,7 @@
 #include "ui_ctkDICOMListenerWidget.h"
 
 //----------------------------------------------------------------------------
-class ctkDICOMListenerWidgetPrivate: public qCTKPrivate<ctkDICOMListenerWidget>,
+class ctkDICOMListenerWidgetPrivate: public ctkPrivate<ctkDICOMListenerWidget>,
                                      public Ui_ctkDICOMListenerWidget
 {
 public:
@@ -21,8 +21,8 @@ public:
 //----------------------------------------------------------------------------
 ctkDICOMListenerWidget::ctkDICOMListenerWidget(QWidget* _parent):Superclass(_parent)
 {
-  QCTK_INIT_PRIVATE(ctkDICOMListenerWidget);
-  QCTK_D(ctkDICOMListenerWidget);
+  CTK_INIT_PRIVATE(ctkDICOMListenerWidget);
+  CTK_D(ctkDICOMListenerWidget);
   
   d->setupUi(this);
 }

Libs/DICOM/Widgets/ctkDICOMListenerWidget.h

@@ -4,7 +4,7 @@
 // QT includes 
 #include <QWidget>
 
-// qCTK includes
+// CTK includes
 #include <ctkPimpl.h>
 
 #include "CTKDICOMWidgetsExport.h"
@@ -19,7 +19,7 @@ public:
   virtual ~ctkDICOMListenerWidget();
 
 private:
-  QCTK_DECLARE_PRIVATE(ctkDICOMListenerWidget);
+  CTK_DECLARE_PRIVATE(ctkDICOMListenerWidget);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMLocationWidget.cpp

@@ -4,8 +4,8 @@
 #include "ui_ctkDICOMLocationWidget.h"
 
 //----------------------------------------------------------------------------
-class ctkDICOMLocationWidgetPrivate: public qCTKPrivate<ctkDICOMLocationWidget>,
-                                      public Ui_ctkDICOMLocationWidget
+class ctkDICOMLocationWidgetPrivate: public ctkPrivate<ctkDICOMLocationWidget>,
+                                    public Ui_ctkDICOMLocationWidget
 {
 public:
   ctkDICOMLocationWidgetPrivate(){}
@@ -21,8 +21,8 @@ public:
 //----------------------------------------------------------------------------
 ctkDICOMLocationWidget::ctkDICOMLocationWidget(QWidget* _parent):Superclass(_parent)
 {
-  QCTK_INIT_PRIVATE(ctkDICOMLocationWidget);
-  QCTK_D(ctkDICOMLocationWidget);
+  CTK_INIT_PRIVATE(ctkDICOMLocationWidget);
+  CTK_D(ctkDICOMLocationWidget);
   
   d->setupUi(this);
 }

Libs/DICOM/Widgets/ctkDICOMLocationWidget.h

@@ -4,7 +4,7 @@
 // QT includes 
 #include <QWidget>
 
-// qCTK includes
+// CTK includes
 #include <ctkPimpl.h>
 
 #include "CTKDICOMWidgetsExport.h"
@@ -19,7 +19,7 @@ public:
   virtual ~ctkDICOMLocationWidget();
 
 private:
-  QCTK_DECLARE_PRIVATE(ctkDICOMLocationWidget);
+  CTK_DECLARE_PRIVATE(ctkDICOMLocationWidget);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.cpp

@@ -4,8 +4,8 @@
 #include "ui_ctkDICOMQueryRetrieveWidget.h"
 
 //----------------------------------------------------------------------------
-class ctkDICOMQueryRetrieveWidgetPrivate: public qCTKPrivate<ctkDICOMQueryRetrieveWidget>,
-                                      public Ui_ctkDICOMQueryRetrieveWidget
+class ctkDICOMQueryRetrieveWidgetPrivate: public ctkPrivate<ctkDICOMQueryRetrieveWidget>,
+                                          public Ui_ctkDICOMQueryRetrieveWidget
 {
 public:
   ctkDICOMQueryRetrieveWidgetPrivate(){}
@@ -21,8 +21,8 @@ public:
 //----------------------------------------------------------------------------
 ctkDICOMQueryRetrieveWidget::ctkDICOMQueryRetrieveWidget(QWidget* _parent):Superclass(_parent)
 {
-  QCTK_INIT_PRIVATE(ctkDICOMQueryRetrieveWidget);
-  QCTK_D(ctkDICOMQueryRetrieveWidget);
+  CTK_INIT_PRIVATE(ctkDICOMQueryRetrieveWidget);
+  CTK_D(ctkDICOMQueryRetrieveWidget);
   
   d->setupUi(this);
 }

Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.h

@@ -4,7 +4,7 @@
 // QT includes 
 #include <QWidget>
 
-// qCTK includes
+// CTK includes
 #include <ctkPimpl.h>
 
 #include "CTKDICOMWidgetsExport.h"
@@ -19,7 +19,7 @@ public:
   virtual ~ctkDICOMQueryRetrieveWidget();
 
 private:
-  QCTK_DECLARE_PRIVATE(ctkDICOMQueryRetrieveWidget);
+  CTK_DECLARE_PRIVATE(ctkDICOMQueryRetrieveWidget);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMQueryWidget.cpp

@@ -4,8 +4,8 @@
 #include "ui_ctkDICOMQueryWidget.h"
 
 //----------------------------------------------------------------------------
-class ctkDICOMQueryWidgetPrivate: public qCTKPrivate<ctkDICOMQueryWidget>,
-                                       public Ui_ctkDICOMQueryWidget
+class ctkDICOMQueryWidgetPrivate: public ctkPrivate<ctkDICOMQueryWidget>,
+                                  public Ui_ctkDICOMQueryWidget
 {
 public:
   ctkDICOMQueryWidgetPrivate(){}
@@ -21,8 +21,8 @@ public:
 //----------------------------------------------------------------------------
 ctkDICOMQueryWidget::ctkDICOMQueryWidget(QWidget* _parent):Superclass(_parent)
 {
-  QCTK_INIT_PRIVATE(ctkDICOMQueryWidget);
-  QCTK_D(ctkDICOMQueryWidget);
+  CTK_INIT_PRIVATE(ctkDICOMQueryWidget);
+  CTK_D(ctkDICOMQueryWidget);
   
   d->setupUi(this);
 }

Libs/DICOM/Widgets/ctkDICOMQueryWidget.h

@@ -4,7 +4,7 @@
 // QT includes 
 #include <QWidget>
 
-// qCTK includes
+// CTK includes
 #include <ctkPimpl.h>
 
 #include "CTKDICOMWidgetsExport.h"
@@ -19,7 +19,7 @@ public:
   virtual ~ctkDICOMQueryWidget();
 
 private:
-  QCTK_DECLARE_PRIVATE(ctkDICOMQueryWidget);
+  CTK_DECLARE_PRIVATE(ctkDICOMQueryWidget);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.cpp

@@ -4,7 +4,7 @@
 #include "ui_ctkDICOMServerNodeWidget.h"
 
 //----------------------------------------------------------------------------
-class ctkDICOMServerNodeWidgetPrivate: public qCTKPrivate<ctkDICOMServerNodeWidget>,
+class ctkDICOMServerNodeWidgetPrivate: public ctkPrivate<ctkDICOMServerNodeWidget>,
                                        public Ui_ctkDICOMServerNodeWidget
 {
 public:
@@ -21,8 +21,8 @@ public:
 //----------------------------------------------------------------------------
 ctkDICOMServerNodeWidget::ctkDICOMServerNodeWidget(QWidget* _parent):Superclass(_parent)
 {
-  QCTK_INIT_PRIVATE(ctkDICOMServerNodeWidget);
-  QCTK_D(ctkDICOMServerNodeWidget);
+  CTK_INIT_PRIVATE(ctkDICOMServerNodeWidget);
+  CTK_D(ctkDICOMServerNodeWidget);
   
   d->setupUi(this);
 }

Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.h

@@ -4,7 +4,7 @@
 // QT includes 
 #include <QWidget>
 
-// qCTK includes
+// CTK includes
 #include <ctkPimpl.h>
 
 #include "CTKDICOMWidgetsExport.h"
@@ -19,7 +19,7 @@ public:
   virtual ~ctkDICOMServerNodeWidget();
 
 private:
-  QCTK_DECLARE_PRIVATE(ctkDICOMServerNodeWidget);
+  CTK_DECLARE_PRIVATE(ctkDICOMServerNodeWidget);
 };
 
 #endif

Libs/Visualization/XIP/ctkXIPAdaptor.cpp

@@ -6,7 +6,7 @@
 #include "ctkXIPAdaptor.h"
 
 //----------------------------------------------------------------------------
-class ctkXIPAdaptorPrivate: public qCTKPrivate<ctkXIPAdaptor>
+class ctkXIPAdaptorPrivate: public ctkPrivate<ctkXIPAdaptor>
 {
 public:
   ctkXIPAdaptorPrivate();
@@ -26,7 +26,7 @@ ctkXIPAdaptorPrivate::ctkXIPAdaptorPrivate()
 //------------------------------------------------------------------------------
 ctkXIPAdaptor::ctkXIPAdaptor(QObject* _parent): Superclass(_parent)
 {
-  QCTK_INIT_PRIVATE(ctkXIPAdaptor);
+  CTK_INIT_PRIVATE(ctkXIPAdaptor);
 }
 
 //----------------------------------------------------------------------------

Libs/Visualization/XIP/ctkXIPAdaptor.h

@@ -19,7 +19,7 @@ public:
   virtual ~ctkXIPAdaptor();
   
 private:
-  QCTK_DECLARE_PRIVATE(ctkXIPAdaptor);
+  CTK_DECLARE_PRIVATE(ctkXIPAdaptor);
 };
 
 #endif

Libs/Widgets/ctkSettings.h

@@ -53,6 +53,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // QT includes
 #include <QSettings>
 
+// CTK includes
 #include "CTKWidgetsExport.h"
 
 class QDialog;