Class rename: ctkDICOMIndexerBase -> ctkDICOMDatabase

Libs/DICOM/Core/CMakeLists.txt

@@ -13,8 +13,8 @@ SET(KIT_SRCS
   ctkDICOM.h
   ctkDICOMIndexer.cpp
   ctkDICOMIndexer.h
-  ctkDICOMIndexerBase.cpp
-  ctkDICOMIndexerBase.h
+  ctkDICOMDatabase.cpp
+  ctkDICOMDatabase.h
   ctkDICOMModel.cpp
   ctkDICOMModel.h
   ctkDICOMQuery.cpp
@@ -26,7 +26,7 @@ SET(KIT_SRCS
 # Headers that should run through moc
 SET(KIT_MOC_SRCS
   ctkDICOM.h
-  ctkDICOMIndexerBase.h
+  ctkDICOMDatabase.h
   ctkDICOMModel.h
   ctkDICOMQuery.h
   ctkDICOMRetrieve.h

Libs/DICOM/Core/ctkDICOMIndexerBase.cpp

@@ -32,7 +32,7 @@
 #include <QDebug>
 
 // ctkDICOM includes
-#include "ctkDICOMIndexerBase.h"
+#include "ctkDICOMDatabase.h"
 
 #include "ctkLogger.h"
 
@@ -50,66 +50,66 @@
 #include <dcmtk/dcmdata/dcddirif.h>   /* for class DicomDirInterface */
 
 //------------------------------------------------------------------------------
-static ctkLogger logger("org.commontk.dicom.DICOMIndexerBase" );
+static ctkLogger logger("org.commontk.dicom.DICOMDatabase" );
 //------------------------------------------------------------------------------
 
 //------------------------------------------------------------------------------
-class ctkDICOMIndexerBasePrivate
+class ctkDICOMDatabasePrivate
 {
 public:
-  ctkDICOMIndexerBasePrivate();
-  ~ctkDICOMIndexerBasePrivate();
+  ctkDICOMDatabasePrivate();
+  ~ctkDICOMDatabasePrivate();
   QSqlDatabase db;
 
 };
 
 //------------------------------------------------------------------------------
-// ctkDICOMIndexerBasePrivate methods
+// ctkDICOMDatabasePrivate methods
 
 //------------------------------------------------------------------------------
-ctkDICOMIndexerBasePrivate::ctkDICOMIndexerBasePrivate()
+ctkDICOMDatabasePrivate::ctkDICOMDatabasePrivate()
 {
 }
 
 //------------------------------------------------------------------------------
-ctkDICOMIndexerBasePrivate::~ctkDICOMIndexerBasePrivate()
+ctkDICOMDatabasePrivate::~ctkDICOMDatabasePrivate()
 {
 }
 
 //------------------------------------------------------------------------------
-// ctkDICOMIndexerBase methods
+// ctkDICOMDatabase methods
 
 //------------------------------------------------------------------------------
-ctkDICOMIndexerBase::ctkDICOMIndexerBase()
-   : d_ptr(new ctkDICOMIndexerBasePrivate)
+ctkDICOMDatabase::ctkDICOMDatabase()
+   : d_ptr(new ctkDICOMDatabasePrivate)
 {
 }
 
 //------------------------------------------------------------------------------
-ctkDICOMIndexerBase::~ctkDICOMIndexerBase()
+ctkDICOMDatabase::~ctkDICOMDatabase()
 {
 }
 
 //------------------------------------------------------------------------------
-void ctkDICOMIndexerBase::setDatabase ( QSqlDatabase database ) {
-  Q_D(ctkDICOMIndexerBase);
+void ctkDICOMDatabase::setDatabase ( QSqlDatabase database ) {
+  Q_D(ctkDICOMDatabase);
   d->db = database;
 }
 
 //------------------------------------------------------------------------------
-const QSqlDatabase& ctkDICOMIndexerBase::database () const {
-  Q_D(const ctkDICOMIndexerBase);
+const QSqlDatabase& ctkDICOMDatabase::database () const {
+  Q_D(const ctkDICOMDatabase);
   return d->db;
 }
 
 //------------------------------------------------------------------------------
-void ctkDICOMIndexerBase::insert ( DcmDataset *dataset ) {
+void ctkDICOMDatabase::insert ( DcmDataset *dataset ) {
   this->insert ( dataset, QString() );
 }
 
 //------------------------------------------------------------------------------
-void ctkDICOMIndexerBase::insert ( DcmDataset *dataset, QString filename ) {
-  Q_D(ctkDICOMIndexerBase);
+void ctkDICOMDatabase::insert ( DcmDataset *dataset, QString filename ) {
+  Q_D(ctkDICOMDatabase);
 
   // Check to see if the file has already been loaded
   QSqlQuery fileExists ( d->db );

Libs/DICOM/Core/ctkDICOMIndexerBase.h

@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef __ctkDICOMIndexerBase_h
-#define __ctkDICOMIndexerBase_h
+#ifndef __ctkDICOMDatabase_h
+#define __ctkDICOMDatabase_h
 
 // Qt includes 
 #include <QObject>
@@ -27,15 +27,15 @@
 
 #include "ctkDICOMCoreExport.h"
 
-class ctkDICOMIndexerBasePrivate;
+class ctkDICOMDatabasePrivate;
 class DcmDataset;
 
-class CTK_DICOM_CORE_EXPORT ctkDICOMIndexerBase : public QObject
+class CTK_DICOM_CORE_EXPORT ctkDICOMDatabase : public QObject
 {
   Q_OBJECT
 public:
-  explicit ctkDICOMIndexerBase();
-  virtual ~ctkDICOMIndexerBase();
+  explicit ctkDICOMDatabase();
+  virtual ~ctkDICOMDatabase();
   void setDatabase ( QSqlDatabase database );
   const QSqlDatabase& database() const;
 
@@ -49,11 +49,11 @@ public:
   void insert ( DcmDataset *dataset );
 
 protected:
-  QScopedPointer<ctkDICOMIndexerBasePrivate> d_ptr;
+  QScopedPointer<ctkDICOMDatabasePrivate> d_ptr;
   
 private:
-  Q_DECLARE_PRIVATE(ctkDICOMIndexerBase);
-  Q_DISABLE_COPY(ctkDICOMIndexerBase);
+  Q_DECLARE_PRIVATE(ctkDICOMDatabase);
+  Q_DISABLE_COPY(ctkDICOMDatabase);
 };
 
 #endif

Libs/DICOM/Core/ctkDICOMQuery.cpp

@@ -153,7 +153,7 @@ int ctkDICOMQuery::port()
 //------------------------------------------------------------------------------
 void ctkDICOMQuery::query(QSqlDatabase database )
 {
-  ctkDICOMIndexerBase::setDatabase ( database );
+  ctkDICOMDatabase::setDatabase ( database );
   Q_D(ctkDICOMQuery);
   if ( this->database().isOpen() )
     {

Libs/DICOM/Core/ctkDICOMQuery.h

@@ -29,10 +29,10 @@
 #include <ctkPimpl.h>
 
 #include "ctkDICOMCoreExport.h"
-#include "ctkDICOMIndexerBase.h"
+#include "ctkDICOMDatabase.h"
 
 class ctkDICOMQueryPrivate;
-class CTK_DICOM_CORE_EXPORT ctkDICOMQuery : public ctkDICOMIndexerBase
+class CTK_DICOM_CORE_EXPORT ctkDICOMQuery : public ctkDICOMDatabase
 {
   Q_OBJECT
   Q_PROPERTY(QString callingAETitle READ callingAETitle WRITE setCallingAETitle);