STYLE: In Libs/DICOM/Core/qCTKDCMTK*.cxx and in the corresponding app, to improve code readability, add separator between function.

Also reorganize headers. QT headers should be first, STD headers should be last.

Applications/ctkDICOMIndexer/ctkDICOMIndexer.cxx

@@ -3,12 +3,13 @@
 #include <QApplication>
 #include <QPushButton>
 #include <QTextStream>
-// STD includes
-//#include <cstdlib>
 
+// CTKDICOM includes
 #include <qCTKDCMTKIndexer.h>
 #include <qCTKDCMTK.h>
 
+// STD includes
+#include <cstdlib>
 
 int main(int argc, char** argv)
 {

Libs/DICOM/Core/qCTKDCMTK.cxx

@@ -1,7 +1,4 @@
 
-// qCTKDCMTK includes
-#include "qCTKDCMTK.h"
-
 // Qt includes
 #include <QDebug>
 #include <QSqlDatabase>
@@ -10,6 +7,10 @@
 #include <QFile>
 #include <QStringList>
 
+// qCTKDCMTK includes
+#include "qCTKDCMTK.h"
+
+// STD includes
 #include <iostream>
 
 //----------------------------------------------------------------------------
@@ -26,6 +27,8 @@ public:
 
 //----------------------------------------------------------------------------
 // qCTKDCMTKPrivate methods
+
+//------------------------------------------------------------------------------
 qCTKDCMTKPrivate::qCTKDCMTKPrivate() 
 {
 }
@@ -33,6 +36,7 @@ qCTKDCMTKPrivate::qCTKDCMTKPrivate()
 //----------------------------------------------------------------------------
 // qCTKDCMTKWidget methods
 
+//------------------------------------------------------------------------------
 qCTKDCMTK::qCTKDCMTK(QObject* _parent): Superclass(_parent)
 {
   QCTK_INIT_PRIVATE(qCTKDCMTK);
@@ -60,15 +64,20 @@ bool qCTKDCMTK::openDatabase(const QString& databaseFileName)
     }
   return true;
 }
+
+//------------------------------------------------------------------------------
 const QString& qCTKDCMTK::GetLastError() const {
   QCTK_D(const qCTKDCMTK);
   return d->LastError; 
 }
+
+//------------------------------------------------------------------------------
 const QSqlDatabase& qCTKDCMTK::database() const {
   QCTK_D(const qCTKDCMTK);
   return d->Database;
 }
 
+//------------------------------------------------------------------------------
 bool qCTKDCMTKPrivate::executeScript(const QString& script) {
   QFile scriptFile(script);
   scriptFile.open(QIODevice::ReadOnly);
@@ -102,12 +111,14 @@ bool qCTKDCMTKPrivate::executeScript(const QString& script) {
   return true;
 }
 
+//------------------------------------------------------------------------------
 bool qCTKDCMTK::initializeDatabase(const char* sqlFileName) 
 {
   QCTK_D(qCTKDCMTK);
   return d->executeScript(sqlFileName);
 }
-  
+
+//------------------------------------------------------------------------------
 void qCTKDCMTK::closeDatabase()
 {
   QCTK_D(qCTKDCMTK);

Libs/DICOM/Core/qCTKDCMTKIndexer.cxx

@@ -1,19 +1,4 @@
-#include "qCTKDCMTKIndexer.h"
-
-///
-/// DCMTK includes
-#ifndef WIN32
-  #define HAVE_CONFIG_H 
-#endif
-#include "dcmtk/dcmdata/dcfilefo.h"
-#include "dcmtk/dcmdata/dcdeftag.h"
-#include "dcmtk/dcmdata/dcdatset.h"
-#include "dcmtk/ofstd/ofcond.h"
-#include "dcmtk/ofstd/ofstring.h"
-
-#include "dcmtk/ofstd/ofstd.h"        /* for class OFStandard */
-#include "dcmtk/dcmdata/dcddirif.h"     /* for class DicomDirInterface */
-
+// Qt includes
 #include <QSqlQuery>
 #include <QSqlRecord>
 #include <QVariant>
@@ -25,9 +10,26 @@
 #include <QFileInfo>
 #include <QDebug>
 
+// CTKDCMTK includes
+#include "qCTKDCMTKIndexer.h"
+
+// DCMTK includes
+#ifndef WIN32
+  #define HAVE_CONFIG_H 
+#endif
+#include <dcmtk/dcmdata/dcfilefo.h>
+#include <dcmtk/dcmdata/dcfilefo.h>
+#include <dcmtk/dcmdata/dcdeftag.h>
+#include <dcmtk/dcmdata/dcdatset.h>
+#include <dcmtk/ofstd/ofcond.h>
+#include <dcmtk/ofstd/ofstring.h>
+#include <dcmtk/ofstd/ofstd.h>        /* for class OFStandard */
+#include <dcmtk/dcmdata/dcddirif.h>   /* for class DicomDirInterface */
+
 #define MITK_ERROR std::cout
 #define MITK_INFO std::cout
 
+//------------------------------------------------------------------------------
 class qCTKDCMTKIndexerPrivate: public qCTKPrivate<qCTKDCMTKIndexer>
 {
 public:
@@ -36,22 +38,33 @@ public:
 
 };
 
+//------------------------------------------------------------------------------
+// qCTKDCMTKIndexerPrivate methods
+
+//------------------------------------------------------------------------------
 qCTKDCMTKIndexerPrivate::qCTKDCMTKIndexerPrivate()
 {
 }
 
+//------------------------------------------------------------------------------
 qCTKDCMTKIndexerPrivate::~qCTKDCMTKIndexerPrivate()
 {
 }
 
+//------------------------------------------------------------------------------
+// qCTKDCMTKIndexer methods
+
+//------------------------------------------------------------------------------
 qCTKDCMTKIndexer::qCTKDCMTKIndexer()
 {
 }
 
+//------------------------------------------------------------------------------
 qCTKDCMTKIndexer::~qCTKDCMTKIndexer()
 {
 }
 
+//------------------------------------------------------------------------------
 void qCTKDCMTKIndexer::addDirectory(QSqlDatabase database, const QString& directoryName,const QString& destinationDirectoryName)  
 {
   QSqlDatabase db = database;
@@ -366,6 +379,7 @@ void qCTKDCMTKIndexer::addDirectory(QSqlDatabase database, const QString& direct
 
 }
 
+//------------------------------------------------------------------------------
 void qCTKDCMTKIndexer::refreshDatabase(QSqlDatabase database, const QString& directoryName)
 {
   /// get all filenames from the database

Libs/DICOM/Core/qCTKDCMTKModel.cxx

@@ -12,6 +12,7 @@
 
 struct Node;
 
+//------------------------------------------------------------------------------
 class qCTKDCMTKModelPrivate:public qCTKPrivate<qCTKDCMTKModel>
 {
 public:
@@ -40,6 +41,7 @@ public:
   QString      Sort;
 };
 
+//------------------------------------------------------------------------------
 struct Node
 {
   ~Node()
@@ -62,17 +64,20 @@ struct Node
   bool      Fetching;
 };
 
+//------------------------------------------------------------------------------
 qCTKDCMTKModelPrivate::qCTKDCMTKModelPrivate()
 {
   this->RootNode     = 0;
 }
 
+//------------------------------------------------------------------------------
 qCTKDCMTKModelPrivate::~qCTKDCMTKModelPrivate()
 {
   delete this->RootNode;
   this->RootNode = 0;
 }
 
+//------------------------------------------------------------------------------
 void qCTKDCMTKModelPrivate::init()
 {
   QCTK_P(qCTKDCMTKModel);
@@ -80,11 +85,13 @@ void qCTKDCMTKModelPrivate::init()
                   << "Number" << "Institution" << "Referrer" << "Performer";
 }
 
+//------------------------------------------------------------------------------
 Node* qCTKDCMTKModelPrivate::nodeFromIndex(const QModelIndex& index)const
 {
   return index.isValid() ? reinterpret_cast<Node*>(index.internalPointer()) : this->RootNode;
 }
 
+//------------------------------------------------------------------------------
 Node* qCTKDCMTKModelPrivate::createNode(int row, int column, const QModelIndex& parent)const
 {
   QCTK_P(const qCTKDCMTKModel);
@@ -120,6 +127,7 @@ Node* qCTKDCMTKModelPrivate::createNode(int row, int column, const QModelIndex&
   return node;
 }
 
+//------------------------------------------------------------------------------
 QVariant qCTKDCMTKModelPrivate::value(const QModelIndex& parent, int row, int column) const
 {
   Node* node = this->nodeFromIndex(parent);
@@ -136,6 +144,7 @@ QVariant qCTKDCMTKModelPrivate::value(const QModelIndex& parent, int row, int co
   return node->Query.value(column);
 }
 
+//------------------------------------------------------------------------------
 QString qCTKDCMTKModelPrivate::generateQuery(const QString& fields, const QString& table, const QString& conditions)const
 {
   QString res = QString("SELECT ") + fields + QString(" FROM ") + table;
@@ -150,6 +159,7 @@ QString qCTKDCMTKModelPrivate::generateQuery(const QString& fields, const QStrin
   return res;
 }
 
+//------------------------------------------------------------------------------
 void qCTKDCMTKModelPrivate::updateQueries(Node* node)const
 {
   // are you kidding me, it should be virtualized here :-)
@@ -185,6 +195,7 @@ void qCTKDCMTKModelPrivate::updateQueries(Node* node)const
     }
 }
 
+//------------------------------------------------------------------------------
 void qCTKDCMTKModelPrivate::fetch(const QModelIndex& index, int limit)
 {
   QCTK_P(qCTKDCMTKModel);
@@ -234,16 +245,19 @@ void qCTKDCMTKModelPrivate::fetch(const QModelIndex& index, int limit)
     }
 }
 
+//------------------------------------------------------------------------------
 qCTKDCMTKModel::qCTKDCMTKModel(QObject* parent)
 {
   QCTK_INIT_PRIVATE(qCTKDCMTKModel);
   qctk_d()->init();
 }
 
+//------------------------------------------------------------------------------
 qCTKDCMTKModel::~qCTKDCMTKModel()
 {
 }
 
+//------------------------------------------------------------------------------
 bool qCTKDCMTKModel::canFetchMore ( const QModelIndex & parent ) const
 {
   QCTK_D(const qCTKDCMTKModel);
@@ -251,6 +265,7 @@ bool qCTKDCMTKModel::canFetchMore ( const QModelIndex & parent ) const
   return !node->End;
 }
 
+//------------------------------------------------------------------------------
 int qCTKDCMTKModel::columnCount ( const QModelIndex & _parent ) const
 {
   QCTK_D(const qCTKDCMTKModel);
@@ -258,6 +273,7 @@ int qCTKDCMTKModel::columnCount ( const QModelIndex & _parent ) const
   return d->Headers.size();
 }
 
+//------------------------------------------------------------------------------
 QVariant qCTKDCMTKModel::data ( const QModelIndex & index, int role ) const
 {
   QCTK_D(const qCTKDCMTKModel);
@@ -288,6 +304,7 @@ QVariant qCTKDCMTKModel::data ( const QModelIndex & index, int role ) const
   //return node->Query.value(field);
 }
 
+//------------------------------------------------------------------------------
 void qCTKDCMTKModel::fetchMore ( const QModelIndex & parent )
 {
   QCTK_D(qCTKDCMTKModel);
@@ -295,11 +312,13 @@ void qCTKDCMTKModel::fetchMore ( const QModelIndex & parent )
   d->fetch(parent, qMax(node->RowCount, 0) + 256);
 }
 
+//------------------------------------------------------------------------------
 Qt::ItemFlags qCTKDCMTKModel::flags ( const QModelIndex & index ) const
 {
   return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
 }
 
+//------------------------------------------------------------------------------
 bool qCTKDCMTKModel::hasChildren ( const QModelIndex & parent ) const
 {
   QCTK_D(const qCTKDCMTKModel);
@@ -307,6 +326,7 @@ bool qCTKDCMTKModel::hasChildren ( const QModelIndex & parent ) const
   return node->RowCount > 0 || (!node->End && node->Query.seek(0));
 }
 
+//------------------------------------------------------------------------------
 QVariant qCTKDCMTKModel::headerData(int section, Qt::Orientation orientation, int role)const
 {
   QCTK_D(const qCTKDCMTKModel);
@@ -323,6 +343,7 @@ QVariant qCTKDCMTKModel::headerData(int section, Qt::Orientation orientation, in
   return d->Headers[section];
 }
 
+//------------------------------------------------------------------------------
 QModelIndex qCTKDCMTKModel::index ( int row, int column, const QModelIndex & parent ) const
 {
   QCTK_D(const qCTKDCMTKModel);
@@ -344,6 +365,7 @@ QModelIndex qCTKDCMTKModel::index ( int row, int column, const QModelIndex & par
   return this->createIndex(row, column, node);
 }
 
+//------------------------------------------------------------------------------
 QModelIndex qCTKDCMTKModel::parent ( const QModelIndex & index ) const
 {
   QCTK_D(const qCTKDCMTKModel);
@@ -355,6 +377,7 @@ QModelIndex qCTKDCMTKModel::parent ( const QModelIndex & index ) const
   return this->createIndex(node->Parent->Row, node->Parent->Column, node->Parent);
 }
 
+//------------------------------------------------------------------------------
 int qCTKDCMTKModel::rowCount ( const QModelIndex & parent ) const
 {
   QCTK_D(const qCTKDCMTKModel);
@@ -366,6 +389,7 @@ int qCTKDCMTKModel::rowCount ( const QModelIndex & parent ) const
   return node->RowCount;
 }
 
+//------------------------------------------------------------------------------
 void qCTKDCMTKModel::setDatabase(const QSqlDatabase &db)
 {
   QCTK_D(qCTKDCMTKModel);
@@ -402,6 +426,7 @@ void qCTKDCMTKModel::setDatabase(const QSqlDatabase &db)
   d->fetch(QModelIndex(), 256);
 }
 
+//------------------------------------------------------------------------------
 void qCTKDCMTKModel::sort(int column, Qt::SortOrder order)
 {
   QCTK_D(qCTKDCMTKModel);
@@ -413,6 +438,7 @@ void qCTKDCMTKModel::sort(int column, Qt::SortOrder order)
   emit layoutChanged();
 }
 
+//------------------------------------------------------------------------------
 bool qCTKDCMTKModel::setHeaderData ( int section, Qt::Orientation orientation, const QVariant & value, int role)
 {
   QCTK_D(qCTKDCMTKModel);