Merge branch 'master' into plugin-framework

Applications/ctkDICOM/CMakeLists.txt

@@ -21,9 +21,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Additional target libraries - Note that CTK_BASE_LIBRARIES is already included
-SET(KIT_target_libraries
-  )
+# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# The following macro will read the target libraries from the file 'target_libraries.cmake'
+ctkMacroGetTargetLibraries(KIT_target_libraries)
 
 # Additional directories to include - Not that CTK_INCLUDE_LIBRARIES is already included
 SET(KIT_include_directories

Applications/ctkDICOM/ctkDICOM.cxx

@@ -2,14 +2,14 @@
 // QT includes
 #include <QApplication>
 
-// ctk includes
-#include "qCTKDCMTKQueryRetrieveWidget.h"
+// ctkDICOM includes
+#include <ctkDICOMQueryRetrieveWidget.h>
 
 int main(int argc, char** argv)
 {
   QApplication app(argc, argv);
   
-  qCTKDCMTKQueryRetrieveWidget queryRetrieve;
+  ctkDICOMQueryRetrieveWidget queryRetrieve;
   queryRetrieve.show();
   return app.exec();
 }

Applications/ctkDICOM/target_libraries.cmake

@@ -0,0 +1,10 @@
+#
+# See CMake/ctkMacroGetTargetLibraries.cmake
+# 
+# This file should list the libraries required to build the current CTK application.
+# 
+
+SET(target_libraries
+  ${QT_LIBRARIES}
+  CTKDICOMWidgets
+  )

Applications/ctkDICOMIndexer/CMakeLists.txt

@@ -21,9 +21,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Additional target libraries - Note that CTK_BASE_LIBRARIES is already included
-SET(KIT_target_libraries
-  )
+# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# The following macro will read the target libraries from the file 'target_libraries.cmake'
+ctkMacroGetTargetLibraries(KIT_target_libraries)
 
 # Additional directories to include - Not that CTK_INCLUDE_LIBRARIES is already included
 SET(KIT_include_directories

Applications/ctkDICOMIndexer/ctkDICOMIndexer.cxx

@@ -3,21 +3,31 @@
 #include <QApplication>
 #include <QPushButton>
 #include <QTextStream>
-// STD includes
-//#include <cstdlib>
 
-#include <qCTKDCMTKIndexer.h>
-#include <qCTKDCMTK.h>
+// ctkDICOM includes
+#include <ctkDICOMIndexer.h>
+#include <ctkDICOM.h>
 
+// STD includes
+#include <cstdlib>
+#include <iostream>
+#include <fstream>
 
 int main(int argc, char** argv)
 {
+
+  if (argc < 2)
+    {
+    std::cerr << "Usage: ctkDICOMIndexer <database.db> <sourceDir> [destDir]\n";
+    return EXIT_FAILURE;
+    }
+
   QApplication app(argc, argv);
   QTextStream out(stdout);
 
-  qCTKDCMTKIndexer idx;
+  ctkDICOMIndexer idx;
 
-  qCTKDCMTK myCTK;
+  ctkDICOM myCTK;
   if ( myCTK.openDatabase( argv[1]) )
     {
     out << "open db success\n";
@@ -41,6 +51,7 @@ int main(int argc, char** argv)
     { 
     out << "ERROR: " ;
     out << myCTK.GetLastError();
+    out << "\n" ;
     }
   return EXIT_SUCCESS;
 }

Applications/ctkDICOMIndexer/ctkDicomIndex.cxx

@@ -1,39 +0,0 @@
-
-// QT includes
-#include <QApplication>
-#include <QPushButton>
-#include <QTextStream>
-// STD includes
-//#include <cstdlib>
-
-#include <qCTKDCMTKIndexer.h>
-#include <qCTKDCMTK.h>
-
-
-int main(int argc, char** argv)
-{
-  QApplication app(argc, argv);
-  QTextStream out(stdout);
-
-  qCTKDCMTKIndexer idx;
-
-  qCTKDCMTK myCTK;
-  if ( myCTK.openDatabase( argv[1]) )
-    {
-    out << "open db success\n";
-    /// make sure it is empty and properly initialized
-    myCTK.initializeDatabase();
-    out << "init db done\n";
-    idx.AddDirectory(myCTK.database(),argv[2]);
-    out << "add db done\n";
-    idx.refreshDatabase(myCTK.database(),argv[2]);
-    out << "refresh db done\n";
-    myCTK.closeDatabase();
-    }
-  else
-    { 
-    out << "ERROR: " ;
-    out << myCTK.GetLastError();
-    }
-  return EXIT_SUCCESS;
-}

Applications/ctkDICOMIndexer/target_libraries.cmake

@@ -0,0 +1,10 @@
+#
+# See CMake/ctkMacroGetTargetLibraries.cmake
+# 
+# This file should list the libraries required to build the current CTK application.
+# 
+
+SET(target_libraries
+  ${QT_LIBRARIES}
+  CTKDICOMCore
+  )

CMake/ctkMacroApplyPatches.cmake

@@ -0,0 +1,21 @@
+#
+#
+#
+
+MACRO(ctkMacroApplyPatches PATCH_EXE SRC_DIR PATCH_FILES)
+  
+  # Make sure patch executable exists
+  IF(NOT EXISTS ${PATCH_EXE})
+    MESSAGE(FATAL_ERROR "ERROR: Program [${PATCH_EXE}] doesn't exist !")
+  ENDIF()
+
+  # Apply patches
+  FOREACH(patch_file ${PATCH_FILES})
+    MESSAGE("Applying patch: ${patch_file}")
+    EXECUTE_PROCESS(COMMAND ${PATCH_EXE} -p0 -i "${patch_file}" -d "${SRC_DIR}" RESULT_VARIABLE result_var)
+    IF(result_var)
+      MESSAGE("ERROR: ${result_var}")
+    ENDIF(result_var)
+  ENDFOREACH()
+  
+ENDMACRO()

CMake/ctkMacroBuildQtApp.cmake

@@ -1,7 +1,9 @@
 
 #
+# Depends on:
+#  CTK/CMake/ctkMacroParseArguments.cmake
 #
-#
+
 MACRO(CtkMacroBuildQtApp)
   ctkMacroParseArguments(MY
     "NAME;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES"
@@ -12,13 +14,13 @@ MACRO(CtkMacroBuildQtApp)
   # Sanity checks
   IF(NOT DEFINED MY_NAME)
     MESSAGE(SEND_ERROR "NAME is mandatory")
-  ENDIF(NOT DEFINED MY_NAME)
+  ENDIF()
 #   IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
 #     MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
-#   ENDIF(NOT DEFINED MY_EXPORT_DIRECTIVE)
+#   ENDIF()
 #   IF(NOT DEFINED MY_LIBRARY_TYPE)
 #     SET(MY_LIBRARY_TYPE "SHARED")
-#   ENDIF(NOT DEFINED MY_LIBRARY_TYPE)
+#   ENDIF()
 
   # Define library name
   SET(proj_name ${MY_NAME})
@@ -50,7 +52,7 @@ MACRO(CtkMacroBuildQtApp)
   SET(MY_QRC_SRCS "")
   IF(DEFINED MY_RESOURCES)
     QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
-  ENDIF(DEFINED MY_RESOURCES)
+  ENDIF()
 
   SOURCE_GROUP("Resources" FILES
     ${MY_RESOURCES}
@@ -81,10 +83,9 @@ MACRO(CtkMacroBuildQtApp)
       RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
       LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
       ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
-  ENDIF(CTK_BUILD_SHARED_LIBS)
-  
+  ENDIF()
+
   SET(my_libs
-    ${CTK_BASE_LIBRARIES}
     ${MY_TARGET_LIBRARIES}
     )
   TARGET_LINK_LIBRARIES(${proj_name} ${my_libs})

CMake/ctkMacroBuildQtLib.cmake

@@ -1,7 +1,9 @@
 
 #
+# Depends on:
+#  CTK/CMake/ctkMacroParseArguments.cmake
 #
-#
+
 MACRO(CtkMacroBuildQtLib)
   ctkMacroParseArguments(MY
     "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
@@ -12,13 +14,13 @@ MACRO(CtkMacroBuildQtLib)
   # Sanity checks
   IF(NOT DEFINED MY_NAME)
     MESSAGE(SEND_ERROR "NAME is mandatory")
-  ENDIF(NOT DEFINED MY_NAME)
+  ENDIF()
   IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
     MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
-  ENDIF(NOT DEFINED MY_EXPORT_DIRECTIVE)
+  ENDIF()
   IF(NOT DEFINED MY_LIBRARY_TYPE)
     SET(MY_LIBRARY_TYPE "SHARED")
-  ENDIF(NOT DEFINED MY_LIBRARY_TYPE)
+  ENDIF()
 
   # Define library name
   SET(lib_name ${MY_NAME})
@@ -50,7 +52,7 @@ MACRO(CtkMacroBuildQtLib)
   SET(MY_QRC_SRCS "")
   IF(DEFINED MY_RESOURCES)
     QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
-  ENDIF(DEFINED MY_RESOURCES)
+  ENDIF()
 
   SOURCE_GROUP("Resources" FILES
     ${MY_RESOURCES}
@@ -75,7 +77,7 @@ MACRO(CtkMacroBuildQtLib)
       RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
       LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
       ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
-  ENDIF(CTK_BUILD_SHARED_LIBS)
+  ENDIF()
   
   SET(my_libs
     ${MY_TARGET_LIBRARIES}

CMake/ctkMacroBuildQtPlugin.cmake

@@ -1,7 +1,9 @@
 
 #
+# Depends on:
+#  CTK/CMake/ctkMacroParseArguments.cmake
 #
-#
+
 MACRO(ctkMacroBuildQtPlugin)
   CtkMacroParseArguments(MY
     "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;UI_RESOURCES;QRC_FILES;LIBRARY_TYPE"
@@ -12,13 +14,13 @@ MACRO(ctkMacroBuildQtPlugin)
   # Sanity checks
   IF(NOT DEFINED MY_NAME)
     MESSAGE(SEND_ERROR "NAME is mandatory")
-  ENDIF(NOT DEFINED MY_NAME)
+  ENDIF()
   IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
     MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
-  ENDIF(NOT DEFINED MY_EXPORT_DIRECTIVE)
+  ENDIF()
   IF(NOT DEFINED MY_LIBRARY_TYPE)
     SET(MY_LIBRARY_TYPE "SHARED")
-  ENDIF(NOT DEFINED MY_LIBRARY_TYPE)
+  ENDIF()
 
   # Define library name
   SET(lib_name ${MY_NAME})
@@ -51,7 +53,7 @@ MACRO(ctkMacroBuildQtPlugin)
   SET(MY_QRC_SRCS "")
   IF(DEFINED MY_QRC_FILES)
     QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_QRC_FILES})
-  ENDIF(DEFINED MY_QRC_FILES)
+  ENDIF()
 
   SOURCE_GROUP("Resources" FILES
     ${MY_UI_RESOURCES}
@@ -77,7 +79,7 @@ MACRO(ctkMacroBuildQtPlugin)
 #       RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
 #       LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
 #       ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
-#   ENDIF(CTK_BUILD_SHARED_LIBS)
+#   ENDIF()
   
   SET(my_libs
     ${CTK_BASE_LIBRARIES}

CMake/ctkMacroGetTargetLibraries.cmake

@@ -1,4 +1,8 @@
 
+#
+#
+#
+
 MACRO(ctkMacroGetTargetLibraries varname)
 
   SET(target_libraries_path ${CMAKE_CURRENT_SOURCE_DIR}/target_libraries.cmake)

CMake/ctkMacroSetupQt.cmake

@@ -1,9 +1,7 @@
+
+#
 #
-#  Check if VTK was configured with QT, 
-#  if so, use it, 
-#  otherwise, complain. 
 #
-
 
 MACRO(ctkMacroSetupQt)
 

CMakeLists.txt

@@ -55,6 +55,14 @@ INCLUDE(CMake/ctkMacroSetupQt.cmake)
 INCLUDE(CMake/ctkMacroGetTargetLibraries.cmake)
 
 #-----------------------------------------------------------------------------
+# Patch program
+#
+FIND_PROGRAM(CTK_PATCH_EXECUTABLE patch
+  "C:/Program Files/GnuWin32/bin"
+  "C:/Program Files (x86)/GnuWin32/bin")
+MARK_AS_ADVANCED(CTK_PATCH_EXECUTABLE)
+
+#-----------------------------------------------------------------------------
 # Testing
 #
 OPTION(BUILD_TESTING "Test the project" ON)
@@ -118,7 +126,7 @@ SET(ctk_plugins
 SET(ctk_applications
   ctkCLIPluginExplorer
   ctkDICOM
-  #ctkDICOMIndexer
+  ctkDICOMIndexer
   )
   
 #-----------------------------------------------------------------------------

Libs/Core/CMakeLists.txt

@@ -26,7 +26,7 @@ ENDIF()
 # See CTK/CMake/ctkMacroBuildQtLib.cmake for details
 #
 
-SET(KIT_export_directive "Q_CTK_CORE_EXPORT")
+SET(KIT_export_directive "CTK_CORE_EXPORT")
 
 # Additional directories to include
 SET(KIT_include_directories

Libs/Core/ctkUtils.h

@@ -23,7 +23,7 @@
 
 #include "CTKCoreExport.h"
 
-class Q_CTK_CORE_EXPORT ctkUtils
+class CTK_CORE_EXPORT ctkUtils
 {
   
 public:

Libs/DICOM/Applications/Main.cxx

@@ -1,15 +0,0 @@
-
-// QT includes
-#include <QApplication>
-#include <QPushButton>
-// STD includes
-//#include <cstdlib>
-
-int main(int argc, char** argv)
-{
-  QApplication app(argc, argv);
-  
-  QPushButton b("Hello world");
-  b.show();
-  return app.exec();
-}

Libs/DICOM/CMakeLists.txt

@@ -1,6 +0,0 @@
-
-
-ADD_SUBDIRECTORY(Core)
-# ADD_SUBDIRECTORY(Widgets)
-ADD_SUBDIRECTORY(Applications)
-

Libs/DICOM/Core/CMakeLists.txt

@@ -13,7 +13,7 @@ ENDIF()
 # See CTK/CMake/ctkMacroBuildQtLib.cmake for details
 #
 
-SET(KIT_export_directive "Q_CTK_DICOM_CORE_EXPORT")
+SET(KIT_export_directive "CTK_DICOM_CORE_EXPORT")
 
 # Additional directories to include
 SET(KIT_include_directories
@@ -22,18 +22,18 @@ SET(KIT_include_directories
   
 # Source files
 SET(KIT_SRCS
-  qCTKDCMTK.cxx
-  qCTKDCMTK.h
-  #qCTKDCMTKIndexer.cxx
-  #qCTKDCMTKIndexer.h
-  qCTKDCMTKModel.cxx
-  qCTKDCMTKModel.h
+  ctkDICOM.cxx
+  ctkDICOM.h
+  ctkDICOMIndexer.cxx
+  ctkDICOMIndexer.h
+  ctkDICOMModel.cxx
+  ctkDICOMModel.h
   )
 
 # Headers that should run through moc
 SET(KIT_MOC_SRCS
-  qCTKDCMTK.h
-  qCTKDCMTKModel.h
+  ctkDICOM.h
+  ctkDICOMModel.h
   )
 
 # UI files

Libs/DICOM/Core/Testing/CMakeLists.txt

@@ -1,8 +1,8 @@
 SET(KIT CTKDICOMCore)
 
 CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
-  qCTKDCMTKModelTest1.cxx
-  qCTKDCMTKTest1.cxx
+  ctkDICOMModelTest1.cxx
+  ctkDICOMTest1.cxx
   )
 
 SET (TestsToRun ${Tests})
@@ -18,5 +18,18 @@ IF(WIN32)
   SET(CTKDICOMCore_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
 ENDIF(WIN32)
 
-ADD_TEST( qCTKDCMTKModelTest1 ${CTKDICOMCore_TESTS} qCTKDCMTKModelTest1 ${CMAKE_CURRENT_BINARY_DIR}/dicom.db ${CMAKE_CURRENT_SOURCE_DIR}/../Resources/dicom-sample.sql)
-ADD_TEST( qCTKDCMTKTest1 ${CTKDICOMCore_TESTS} qCTKDCMTKTest1 ${CMAKE_CURRENT_BINARY_DIR}/dicom.db ${CMAKE_CURRENT_SOURCE_DIR}/../Resources/dicom-sample.sql)
+MACRO( SIMPLE_TEST  TESTNAME )
+  ADD_TEST( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
+ENDMACRO( SIMPLE_TEST  )
+
+#
+# Add Tests
+#
+
+ADD_TEST( ctkDICOMModelTest1 ${CTKDICOMCore_TESTS}
+          ctkDICOMModelTest1 ${CMAKE_CURRENT_BINARY_DIR}/dicom.db
+                             ${CMAKE_CURRENT_SOURCE_DIR}/../Resources/dicom-sample.sql)
+
+ADD_TEST( ctkDICOMTest1 ${CTKDICOMCore_TESTS}
+          ctkDICOMTest1 ${CMAKE_CURRENT_BINARY_DIR}/dicom.db
+                        ${CMAKE_CURRENT_SOURCE_DIR}/../Resources/dicom-sample.sql)

Libs/DICOM/Core/Testing/qCTKDCMTKModelTest1.cxx

@@ -1,20 +1,24 @@
+
+// QT includes
 #include <QApplication>
 #include <QDebug>
 #include <QFileInfo>
 #include <QTreeView>
 #include <QSqlQuery>
 
-#include "qCTKDCMTK.h"
-#include "qCTKDCMTKModel.h"
+// ctkDICOMCore includes
+#include "ctkDICOM.h"
+#include "ctkDICOMModel.h"
 
+// STD includes
 #include <iostream>
 
 
 /* Test from build directory:
- ./CTK-build/bin/CTKDICOMCoreCxxTests qCTKDCMTKModelTest1 ../CTK/Libs/DICOM/Core/Resources/dicom-sample.sql
+ ./CTK-build/bin/CTKDICOMCoreCxxTests ctkDICOMModelTest1 ../CTK/Libs/DICOM/Core/Resources/dicom-sample.sql
 */
 
-int qCTKDCMTKModelTest1( int argc, char * argv [] )
+int ctkDICOMModelTest1( int argc, char * argv [] )
 {
   QApplication app(argc, argv);
   
@@ -24,7 +28,7 @@ int qCTKDCMTKModelTest1( int argc, char * argv [] )
     return EXIT_FAILURE;
     }
   
-  qCTKDCMTK myCTK;
+  ctkDICOM myCTK;
   myCTK.openDatabase( argv[1] );
   myCTK.initializeDatabase(argv[2]);
     /*
@@ -41,7 +45,7 @@ int qCTKDCMTKModelTest1( int argc, char * argv [] )
   qDebug() << "tutu: " << tutu.seek(0) << myCTK.GetLastError();
   */
 
-  qCTKDCMTKModel model(0);
+  ctkDICOMModel model(0);
   model.setDatabase(myCTK.database());
 
   QTreeView viewer(0);

Libs/DICOM/Core/Testing/qCTKDCMTKTest1.cxx

@@ -1,16 +1,20 @@
+
+// QT includes
 #include <QTextStream>
 #include <QApplication>
 
-#include "qCTKDCMTK.h"
+// ctkDICOMCore includes
+#include "ctkDICOM.h"
 
+// STD includes
 #include <iostream>
 #include <cstdlib>
 
-int qCTKDCMTKTest1(int argc, char * argv []) {
+int ctkDICOMTest1(int argc, char * argv []) {
   
   QApplication app(argc, argv);
   QTextStream out(stdout);
-  qCTKDCMTK myCTK;
+  ctkDICOM myCTK;
   if ( myCTK.openDatabase( argv[1]) )
     {
     out << "open db success\n";

Libs/DICOM/Core/qCTKDCMTK.cxx

@@ -1,7 +1,4 @@
 
-// qCTKDCMTK includes
-#include "qCTKDCMTK.h"
-
 // Qt includes
 #include <QDebug>
 #include <QSqlDatabase>
@@ -10,13 +7,17 @@
 #include <QFile>
 #include <QStringList>
 
+// ctkDICOM includes
+#include "ctkDICOM.h"
+
+// STD includes
 #include <iostream>
 
 //----------------------------------------------------------------------------
-class qCTKDCMTKPrivate: public qCTKPrivate<qCTKDCMTK>
+class ctkDICOMPrivate: public qCTKPrivate<ctkDICOM>
 {
 public:
-  qCTKDCMTKPrivate(); 
+  ctkDICOMPrivate(); 
   bool executeScript(const QString& script);
 
   QSqlDatabase  Database;
@@ -25,28 +26,31 @@ public:
 };
 
 //----------------------------------------------------------------------------
-// qCTKDCMTKPrivate methods
-qCTKDCMTKPrivate::qCTKDCMTKPrivate() 
+// ctkDICOMPrivate methods
+
+//------------------------------------------------------------------------------
+ctkDICOMPrivate::ctkDICOMPrivate()
 {
 }
 
 //----------------------------------------------------------------------------
-// qCTKDCMTKWidget methods
+// ctkDICOMWidget methods
 
-qCTKDCMTK::qCTKDCMTK(QObject* _parent): Superclass(_parent)
+//------------------------------------------------------------------------------
+ctkDICOM::ctkDICOM(QObject* _parent): Superclass(_parent)
 {
-  QCTK_INIT_PRIVATE(qCTKDCMTK);
+  QCTK_INIT_PRIVATE(ctkDICOM);
 }
 
 //----------------------------------------------------------------------------
-qCTKDCMTK::~qCTKDCMTK()
+ctkDICOM::~ctkDICOM()
 {
 }
 
 //----------------------------------------------------------------------------
-bool qCTKDCMTK::openDatabase(const QString& databaseFileName) 
+bool ctkDICOM::openDatabase(const QString& databaseFileName)
 {
-  QCTK_D(qCTKDCMTK);
+  QCTK_D(ctkDICOM);
   d->Database = QSqlDatabase::addDatabase("QSQLITE","DICOM-DB");
   d->Database.setDatabaseName(databaseFileName);
   if ( ! (d->Database.open()) )
@@ -60,16 +64,21 @@ bool qCTKDCMTK::openDatabase(const QString& databaseFileName)
     }
   return true;
 }
-const QString& qCTKDCMTK::GetLastError() const {
-  QCTK_D(const qCTKDCMTK);
+
+//------------------------------------------------------------------------------
+const QString& ctkDICOM::GetLastError() const {
+  QCTK_D(const ctkDICOM);
   return d->LastError; 
 }
-const QSqlDatabase& qCTKDCMTK::database() const {
-  QCTK_D(const qCTKDCMTK);
+
+//------------------------------------------------------------------------------
+const QSqlDatabase& ctkDICOM::database() const {
+  QCTK_D(const ctkDICOM);
   return d->Database;
 }
 
-bool qCTKDCMTKPrivate::executeScript(const QString& script) {
+//------------------------------------------------------------------------------
+bool ctkDICOMPrivate::executeScript(const QString& script) {
   QFile scriptFile(script);
   scriptFile.open(QIODevice::ReadOnly);
   if  ( !scriptFile.isOpen() )
@@ -102,14 +111,16 @@ bool qCTKDCMTKPrivate::executeScript(const QString& script) {
   return true;
 }
 
-bool qCTKDCMTK::initializeDatabase(const char* sqlFileName) 
+//------------------------------------------------------------------------------
+bool ctkDICOM::initializeDatabase(const char* sqlFileName)
 {
-  QCTK_D(qCTKDCMTK);
+  QCTK_D(ctkDICOM);
   return d->executeScript(sqlFileName);
 }
-  
-void qCTKDCMTK::closeDatabase()
+
+//------------------------------------------------------------------------------
+void ctkDICOM::closeDatabase()
 {
-  QCTK_D(qCTKDCMTK);
+  QCTK_D(ctkDICOM);
   d->Database.close();
 }

Libs/DICOM/Core/qCTKDCMTK.h

@@ -1,5 +1,5 @@
-#ifndef __qCTKDCMTK_h
-#define __qCTKDCMTK_h
+#ifndef __ctkDICOM_h
+#define __ctkDICOM_h
 
 // QT includes 
 #include <QObject>
@@ -10,14 +10,14 @@
 
 #include "CTKDICOMCoreExport.h"
 
-class qCTKDCMTKPrivate;
-class Q_CTK_DICOM_CORE_EXPORT qCTKDCMTK : public QObject
+class ctkDICOMPrivate;
+class CTK_DICOM_CORE_EXPORT ctkDICOM : public QObject
 {
   Q_OBJECT
 public:
   typedef QObject Superclass;
-  explicit qCTKDCMTK(QObject* parent = 0);
-  virtual ~qCTKDCMTK();
+  explicit ctkDICOM(QObject* parent = 0);
+  virtual ~ctkDICOM();
   
   ///
   /// open the SQLite database in @param file. If the file does not
@@ -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(qCTKDCMTK);
+  QCTK_DECLARE_PRIVATE(ctkDICOM);
 };
 
 #endif

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,34 +10,62 @@
 #include <QFileInfo>
 #include <QDebug>
 
+// ctkDICOM includes
+#include "ctkDICOMIndexer.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>
+//------------------------------------------------------------------------------
+class ctkDICOMIndexerPrivate: public qCTKPrivate<ctkDICOMIndexer>
 {
 public:
-  qCTKDCMTKIndexerPrivate();
-  ~qCTKDCMTKIndexerPrivate();
+  ctkDICOMIndexerPrivate();
+  ~ctkDICOMIndexerPrivate();
 
 };
 
-qCTKDCMTKIndexerPrivate::qCTKDCMTKIndexerPrivate()
+//------------------------------------------------------------------------------
+// ctkDICOMIndexerPrivate methods
+
+//------------------------------------------------------------------------------
+ctkDICOMIndexerPrivate::ctkDICOMIndexerPrivate()
 {
 }
 
-qCTKDCMTKIndexerPrivate::~qCTKDCMTKIndexerPrivate()
+//------------------------------------------------------------------------------
+ctkDICOMIndexerPrivate::~ctkDICOMIndexerPrivate()
 {
 }
 
-qCTKDCMTKIndexer::qCTKDCMTKIndexer()
+//------------------------------------------------------------------------------
+// ctkDICOMIndexer methods
+
+//------------------------------------------------------------------------------
+ctkDICOMIndexer::ctkDICOMIndexer()
 {
 }
 
-qCTKDCMTKIndexer::~qCTKDCMTKIndexer()
+//------------------------------------------------------------------------------
+ctkDICOMIndexer::~ctkDICOMIndexer()
 {
 }
 
-void qCTKDCMTKIndexer::addDirectory(QSqlDatabase database, const QString& directoryName,const QString& destinationDirectoryName)  
+//------------------------------------------------------------------------------
+void ctkDICOMIndexer::addDirectory(QSqlDatabase database, const QString& directoryName,const QString& destinationDirectoryName)
 {
   QSqlDatabase db = database;
   const std::string src_directory(directoryName.toStdString());
@@ -366,7 +379,8 @@ void qCTKDCMTKIndexer::addDirectory(QSqlDatabase database, const QString& direct
 
 }
 
-void qCTKDCMTKIndexer::refreshDatabase(QSqlDatabase database, const QString& directoryName)
+//------------------------------------------------------------------------------
+void ctkDICOMIndexer::refreshDatabase(QSqlDatabase database, const QString& directoryName)
 {
   /// get all filenames from the database
   QSqlQuery allFilesQuery(database);

Libs/DICOM/Core/qCTKDCMTKIndexer.h

@@ -1,5 +1,5 @@
-#ifndef __qCTKDCMTKIndexer_h
-#define __qCTKDCMTKIndexer_h
+#ifndef __ctkDICOMIndexer_h
+#define __ctkDICOMIndexer_h
 
 // QT includes 
 #include <QSqlDatabase>
@@ -9,18 +9,18 @@
 
 #include "CTKDICOMCoreExport.h"
 
-class qCTKDCMTKIndexerPrivate;
-class Q_CTK_DICOM_CORE_EXPORT qCTKDCMTKIndexer  
+class ctkDICOMIndexerPrivate;
+class CTK_DICOM_CORE_EXPORT ctkDICOMIndexer
 {
 public:
-  explicit qCTKDCMTKIndexer();
-  virtual ~qCTKDCMTKIndexer();
+  explicit ctkDICOMIndexer();
+  virtual ~ctkDICOMIndexer();
   /// add directory to database and optionally copy files to destinationDirectory
   void addDirectory(QSqlDatabase database, const QString& directoryName, const QString& destinationDirectoryName = "");
   void refreshDatabase(QSqlDatabase database, const QString& directoryName);
 
 private:
-  QCTK_DECLARE_PRIVATE(qCTKDCMTKIndexer);
+  QCTK_DECLARE_PRIVATE(ctkDICOMIndexer);
 };
 
 #endif

Libs/DICOM/Core/qCTKDCMTKModel.cxx

@@ -1,3 +1,5 @@
+
+// Qt includes
 #include <QStringList>
 #include <QSqlDriver>
 #include <QSqlError>
@@ -8,15 +10,17 @@
 #include <QTime>
 #include <QDebug>
 
-#include "qCTKDCMTKModel.h"
+// ctkDICOM includes
+#include "ctkDICOMModel.h"
 
 struct Node;
 
-class qCTKDCMTKModelPrivate:public qCTKPrivate<qCTKDCMTKModel>
+//------------------------------------------------------------------------------
+class ctkDICOMModelPrivate:public qCTKPrivate<ctkDICOMModel>
 {
 public:
-  qCTKDCMTKModelPrivate();
-  ~qCTKDCMTKModelPrivate();
+  ctkDICOMModelPrivate();
+  ~ctkDICOMModelPrivate();
   void init();
 
   enum IndexType{
@@ -40,6 +44,7 @@ public:
   QString      Sort;
 };
 
+//------------------------------------------------------------------------------
 struct Node
 {
   ~Node()
@@ -50,7 +55,7 @@ struct Node
       }
     this->Children.clear();
     }
-  qCTKDCMTKModelPrivate::IndexType Type;
+  ctkDICOMModelPrivate::IndexType Type;
   Node*     Parent;
   QVector<Node*> Children;
   int       Row;
@@ -62,38 +67,43 @@ struct Node
   bool      Fetching;
 };
 
-qCTKDCMTKModelPrivate::qCTKDCMTKModelPrivate()
+//------------------------------------------------------------------------------
+ctkDICOMModelPrivate::ctkDICOMModelPrivate()
 {
   this->RootNode     = 0;
 }
 
-qCTKDCMTKModelPrivate::~qCTKDCMTKModelPrivate()
+//------------------------------------------------------------------------------
+ctkDICOMModelPrivate::~ctkDICOMModelPrivate()
 {
   delete this->RootNode;
   this->RootNode = 0;
 }
 
-void qCTKDCMTKModelPrivate::init()
+//------------------------------------------------------------------------------
+void ctkDICOMModelPrivate::init()
 {
-  QCTK_P(qCTKDCMTKModel);
+  QCTK_P(ctkDICOMModel);
   this->Headers = QStringList() << "Name" << "Age" << "Scan" << "Date" << "Subject ID"
                   << "Number" << "Institution" << "Referrer" << "Performer";
 }
 
-Node* qCTKDCMTKModelPrivate::nodeFromIndex(const QModelIndex& index)const
+//------------------------------------------------------------------------------
+Node* ctkDICOMModelPrivate::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
+//------------------------------------------------------------------------------
+Node* ctkDICOMModelPrivate::createNode(int row, int column, const QModelIndex& parent)const
 {
-  QCTK_P(const qCTKDCMTKModel);
+  QCTK_P(const ctkDICOMModel);
   
   Node* node = new Node;
   Node* nodeParent = 0;
   if (row == -1 || column == -1)
     {// root node
-    node->Type = qCTKDCMTKModelPrivate::RootType;
+    node->Type = ctkDICOMModelPrivate::RootType;
     node->Parent = 0;
     }
   else
@@ -101,11 +111,11 @@ Node* qCTKDCMTKModelPrivate::createNode(int row, int column, const QModelIndex&
     nodeParent = this->nodeFromIndex(parent); 
     nodeParent->Children.push_back(node);
     node->Parent = (nodeParent == this->RootNode ? 0: nodeParent);
-    node->Type = qCTKDCMTKModelPrivate::IndexType(nodeParent->Type + 1);
+    node->Type = ctkDICOMModelPrivate::IndexType(nodeParent->Type + 1);
     }
   node->Row = row;
   node->Column = column;
-  if (node->Type != qCTKDCMTKModelPrivate::RootType)
+  if (node->Type != ctkDICOMModelPrivate::RootType)
     {
     int field = nodeParent->Query.record().indexOf("UID");
     node->UID = this->value(parent, row, field).toString();
@@ -120,12 +130,13 @@ Node* qCTKDCMTKModelPrivate::createNode(int row, int column, const QModelIndex&
   return node;
 }
 
-QVariant qCTKDCMTKModelPrivate::value(const QModelIndex& parent, int row, int column) const
+//------------------------------------------------------------------------------
+QVariant ctkDICOMModelPrivate::value(const QModelIndex& parent, int row, int column) const
 {
   Node* node = this->nodeFromIndex(parent);
   if (row >= node->RowCount)
     {      
-    const_cast<qCTKDCMTKModelPrivate *>(this)->fetch(parent, row + 256);
+    const_cast<ctkDICOMModelPrivate *>(this)->fetch(parent, row + 256);
     }
 
   if (!node->Query.seek(row)) 
@@ -136,7 +147,8 @@ 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 ctkDICOMModelPrivate::generateQuery(const QString& fields, const QString& table, const QString& conditions)const
 {
   QString res = QString("SELECT ") + fields + QString(" FROM ") + table;
   if (!conditions.isEmpty())
@@ -150,32 +162,33 @@ QString qCTKDCMTKModelPrivate::generateQuery(const QString& fields, const QStrin
   return res;
 }
 
-void qCTKDCMTKModelPrivate::updateQueries(Node* node)const
+//------------------------------------------------------------------------------
+void ctkDICOMModelPrivate::updateQueries(Node* node)const
 {
   // are you kidding me, it should be virtualized here :-)
   QString query;
   switch(node->Type)
     {
     default:
-      Q_ASSERT(node->Type == qCTKDCMTKModelPrivate::RootType);
+      Q_ASSERT(node->Type == ctkDICOMModelPrivate::RootType);
       break;
-    case qCTKDCMTKModelPrivate::RootType:
+    case ctkDICOMModelPrivate::RootType:
       //query = QString("SELECT  FROM ");
       query = this->generateQuery("UID as UID, PatientsName as Name, PatientsAge as Age, PatientsBirthDate as Date, PatientID as \"Subject ID\"","Patients");
       break;
-    case qCTKDCMTKModelPrivate::PatientType:
+    case ctkDICOMModelPrivate::PatientType:
       //query = QString("SELECT  FROM Studies WHERE PatientsUID='%1'").arg(node->UID);
       query = this->generateQuery("StudyInstanceUID as UID, StudyDescription as Name, ModalitiesInStudy as Scan, StudyDate as Date, AccessionNumber as Number, ReferringPhysician as Institution, ReferringPhysician as Referrer, PerformingPysiciansName as Performer", "Studies",QString("PatientsUID='%1'").arg(node->UID));
       break;
-    case qCTKDCMTKModelPrivate::StudyType:
+    case ctkDICOMModelPrivate::StudyType:
       //query = QString("SELECT SeriesInstanceUID as UID, SeriesDescription as Name, BodyPartExamined as Scan, SeriesDate as Date, AcquisitionNumber as Number FROM Series WHERE StudyInstanceUID='%1'").arg(node->UID);
       query = this->generateQuery("SeriesInstanceUID as UID, SeriesDescription as Name, BodyPartExamined as Scan, SeriesDate as Date, AcquisitionNumber as Number","Series",QString("StudyInstanceUID='%1'").arg(node->UID));
       break;
-    case qCTKDCMTKModelPrivate::SeriesType:
+    case ctkDICOMModelPrivate::SeriesType:
       //query = QString("SELECT Filename as UID, Filename as Name, SeriesInstanceUID as Date FROM Images WHERE SeriesInstanceUID='%1'").arg(node->UID);
       query = this->generateQuery("Filename as UID, Filename as Name, SeriesInstanceUID as Date", "Images", QString("SeriesInstanceUID='%1'").arg(node->UID));
       break;
-    case qCTKDCMTKModelPrivate::ImageType:
+    case ctkDICOMModelPrivate::ImageType:
       break;
     }
   node->Query = QSqlQuery(query, this->DataBase);
@@ -185,9 +198,10 @@ void qCTKDCMTKModelPrivate::updateQueries(Node* node)const
     }
 }
 
-void qCTKDCMTKModelPrivate::fetch(const QModelIndex& index, int limit)
+//------------------------------------------------------------------------------
+void ctkDICOMModelPrivate::fetch(const QModelIndex& index, int limit)
 {
-  QCTK_P(qCTKDCMTKModel);
+  QCTK_P(ctkDICOMModel);
   Node* node = this->nodeFromIndex(index);
   if (node->End || limit <= node->RowCount || node->Fetching/*|| bottom.column() == -1*/)
     {
@@ -234,33 +248,38 @@ void qCTKDCMTKModelPrivate::fetch(const QModelIndex& index, int limit)
     }
 }
 
-qCTKDCMTKModel::qCTKDCMTKModel(QObject* parent)
+//------------------------------------------------------------------------------
+ctkDICOMModel::ctkDICOMModel(QObject* parent)
 {
-  QCTK_INIT_PRIVATE(qCTKDCMTKModel);
+  QCTK_INIT_PRIVATE(ctkDICOMModel);
   qctk_d()->init();
 }
 
-qCTKDCMTKModel::~qCTKDCMTKModel()
+//------------------------------------------------------------------------------
+ctkDICOMModel::~ctkDICOMModel()
 {
 }
 
-bool qCTKDCMTKModel::canFetchMore ( const QModelIndex & parent ) const
+//------------------------------------------------------------------------------
+bool ctkDICOMModel::canFetchMore ( const QModelIndex & parent ) const
 {
-  QCTK_D(const qCTKDCMTKModel);
+  QCTK_D(const ctkDICOMModel);
   Node* node = d->nodeFromIndex(parent);
   return !node->End;
 }
 
-int qCTKDCMTKModel::columnCount ( const QModelIndex & _parent ) const
+//------------------------------------------------------------------------------
+int ctkDICOMModel::columnCount ( const QModelIndex & _parent ) const
 {
-  QCTK_D(const qCTKDCMTKModel);
+  QCTK_D(const ctkDICOMModel);
   Q_UNUSED(_parent);
   return d->Headers.size();
 }
 
-QVariant qCTKDCMTKModel::data ( const QModelIndex & index, int role ) const
+//------------------------------------------------------------------------------
+QVariant ctkDICOMModel::data ( const QModelIndex & index, int role ) const
 {
-  QCTK_D(const qCTKDCMTKModel);
+  QCTK_D(const ctkDICOMModel);
   if (role & ~(Qt::DisplayRole | Qt::EditRole))
     {
     return QVariant();
@@ -270,7 +289,7 @@ QVariant qCTKDCMTKModel::data ( const QModelIndex & index, int role ) const
   Q_ASSERT(node->Row == indexParent.row());
   if (index.row() >= node->RowCount)
     {      
-    const_cast<qCTKDCMTKModelPrivate *>(d)->fetch(index, index.row());
+    const_cast<ctkDICOMModelPrivate *>(d)->fetch(index, index.row());
     }
 /*
   if (!node->Query.seek(index.row())) 
@@ -288,28 +307,32 @@ QVariant qCTKDCMTKModel::data ( const QModelIndex & index, int role ) const
   //return node->Query.value(field);
 }
 
-void qCTKDCMTKModel::fetchMore ( const QModelIndex & parent )
+//------------------------------------------------------------------------------
+void ctkDICOMModel::fetchMore ( const QModelIndex & parent )
 {
-  QCTK_D(qCTKDCMTKModel);
+  QCTK_D(ctkDICOMModel);
   Node* node = d->nodeFromIndex(parent);
   d->fetch(parent, qMax(node->RowCount, 0) + 256);
 }
 
-Qt::ItemFlags qCTKDCMTKModel::flags ( const QModelIndex & index ) const
+//------------------------------------------------------------------------------
+Qt::ItemFlags ctkDICOMModel::flags ( const QModelIndex & index ) const
 {
   return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
 }
 
-bool qCTKDCMTKModel::hasChildren ( const QModelIndex & parent ) const
+//------------------------------------------------------------------------------
+bool ctkDICOMModel::hasChildren ( const QModelIndex & parent ) const
 {
-  QCTK_D(const qCTKDCMTKModel);
+  QCTK_D(const ctkDICOMModel);
   Node* node = d->nodeFromIndex(parent);
   return node->RowCount > 0 || (!node->End && node->Query.seek(0));
 }
 
-QVariant qCTKDCMTKModel::headerData(int section, Qt::Orientation orientation, int role)const
+//------------------------------------------------------------------------------
+QVariant ctkDICOMModel::headerData(int section, Qt::Orientation orientation, int role)const
 {
-  QCTK_D(const qCTKDCMTKModel);
+  QCTK_D(const ctkDICOMModel);
   if (role & ~(Qt::DisplayRole | Qt::EditRole))
     {
     return QVariant();
@@ -323,9 +346,10 @@ QVariant qCTKDCMTKModel::headerData(int section, Qt::Orientation orientation, in
   return d->Headers[section];
 }
 
-QModelIndex qCTKDCMTKModel::index ( int row, int column, const QModelIndex & parent ) const
+//------------------------------------------------------------------------------
+QModelIndex ctkDICOMModel::index ( int row, int column, const QModelIndex & parent ) const
 {
-  QCTK_D(const qCTKDCMTKModel);
+  QCTK_D(const ctkDICOMModel);
   Node* parentNode = d->nodeFromIndex(parent);
   Node* node = 0;
   foreach(Node* tmpNode, parentNode->Children)
@@ -344,9 +368,10 @@ QModelIndex qCTKDCMTKModel::index ( int row, int column, const QModelIndex & par
   return this->createIndex(row, column, node);
 }
 
-QModelIndex qCTKDCMTKModel::parent ( const QModelIndex & index ) const
+//------------------------------------------------------------------------------
+QModelIndex ctkDICOMModel::parent ( const QModelIndex & index ) const
 {
-  QCTK_D(const qCTKDCMTKModel);
+  QCTK_D(const ctkDICOMModel);
   Node* node = d->nodeFromIndex(index);
   if (node == 0 || node->Parent == 0)
     {
@@ -355,20 +380,22 @@ 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
+//------------------------------------------------------------------------------
+int ctkDICOMModel::rowCount ( const QModelIndex & parent ) const
 {
-  QCTK_D(const qCTKDCMTKModel);
+  QCTK_D(const ctkDICOMModel);
   Node* node = d->nodeFromIndex(parent);
   if (node->RowCount == 0 && node->End)
     {
-    const_cast<qCTKDCMTKModelPrivate*>(d)->fetch(parent, 256);
+    const_cast<ctkDICOMModelPrivate*>(d)->fetch(parent, 256);
     }
   return node->RowCount;
 }
 
-void qCTKDCMTKModel::setDatabase(const QSqlDatabase &db)
+//------------------------------------------------------------------------------
+void ctkDICOMModel::setDatabase(const QSqlDatabase &db)
 {
-  QCTK_D(qCTKDCMTKModel);
+  QCTK_D(ctkDICOMModel);
 
   this->beginResetModel();
   d->DataBase = db;
@@ -402,9 +429,10 @@ void qCTKDCMTKModel::setDatabase(const QSqlDatabase &db)
   d->fetch(QModelIndex(), 256);
 }
 
-void qCTKDCMTKModel::sort(int column, Qt::SortOrder order)
+//------------------------------------------------------------------------------
+void ctkDICOMModel::sort(int column, Qt::SortOrder order)
 {
-  QCTK_D(qCTKDCMTKModel);
+  QCTK_D(ctkDICOMModel);
   emit layoutAboutToBeChanged();
   d->Sort = QString("\"%1\" %2")
     .arg(d->Headers[column])
@@ -413,9 +441,10 @@ void qCTKDCMTKModel::sort(int column, Qt::SortOrder order)
   emit layoutChanged();
 }
 
-bool qCTKDCMTKModel::setHeaderData ( int section, Qt::Orientation orientation, const QVariant & value, int role)
+//------------------------------------------------------------------------------
+bool ctkDICOMModel::setHeaderData ( int section, Qt::Orientation orientation, const QVariant & value, int role)
 {
-  QCTK_D(qCTKDCMTKModel);
+  QCTK_D(ctkDICOMModel);
   if (role & ~(Qt::DisplayRole | Qt::EditRole))
     {
     return false;

Libs/DICOM/Core/qCTKDCMTKModel.h

@@ -1,5 +1,5 @@
-#ifndef __qCTKDCMTKModel_h
-#define __qCTKDCMTKModel_h
+#ifndef __ctkDICOMModel_h
+#define __ctkDICOMModel_h
 
 // QT includes 
 #include <QAbstractItemModel>
@@ -10,13 +10,13 @@
 
 #include "CTKDICOMCoreExport.h"
 
-class qCTKDCMTKModelPrivate;
-class Q_CTK_DICOM_CORE_EXPORT qCTKDCMTKModel : public QAbstractItemModel
+class ctkDICOMModelPrivate;
+class CTK_DICOM_CORE_EXPORT ctkDICOMModel : public QAbstractItemModel
 {
   Q_OBJECT
 public:
-  explicit qCTKDCMTKModel(QObject* parent = 0);
-  virtual ~qCTKDCMTKModel();
+  explicit ctkDICOMModel(QObject* parent = 0);
+  virtual ~ctkDICOMModel();
 
   void setDatabase(const QSqlDatabase& dataBase);
 
@@ -34,7 +34,7 @@ public:
   virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
 
 private:
-  QCTK_DECLARE_PRIVATE(qCTKDCMTKModel);
+  QCTK_DECLARE_PRIVATE(ctkDICOMModel);
 };
 
 #endif

Libs/DICOM/Widgets/CMakeLists.txt

@@ -4,7 +4,7 @@ PROJECT(CTKDICOMWidgets)
 # See CTK/CMake/ctkMacroBuildQtLib.cmake for details
 #
 
-SET(KIT_export_directive "Q_CTK_DICOM_WIDGETS_EXPORT")
+SET(KIT_export_directive "CTK_DICOM_WIDGETS_EXPORT")
 
 # Additional directories to include
 SET(KIT_include_directories
@@ -12,18 +12,18 @@ SET(KIT_include_directories
   
 # Source files
 SET(KIT_SRCS
-  qCTKDCMTKListenerWidget.cxx
-  qCTKDCMTKListenerWidget.h
-  qCTKDCMTKLocationWidget.cxx
-  qCTKDCMTKLocationWidget.h
-  qCTKDCMTKQueryRetrieveWidget.cxx
-  qCTKDCMTKQueryRetrieveWidget.h
-  qCTKDCMTKServerNodeWidget.cxx
-  qCTKDCMTKServerNodeWidget.h
-  qCTKDCMTKQueryWidget.cxx
-  qCTKDCMTKQueryWidget.h
-  qCTKDCMTKCommandWidget.cxx
-  qCTKDCMTKCommandWidget.h
+  ctkDICOMListenerWidget.cxx
+  ctkDICOMListenerWidget.h
+  ctkDICOMLocationWidget.cxx
+  ctkDICOMLocationWidget.h
+  ctkDICOMQueryRetrieveWidget.cxx
+  ctkDICOMQueryRetrieveWidget.h
+  ctkDICOMServerNodeWidget.cxx
+  ctkDICOMServerNodeWidget.h
+  ctkDICOMQueryWidget.cxx
+  ctkDICOMQueryWidget.h
+  ctkDICOMCommandWidget.cxx
+  ctkDICOMCommandWidget.h
   )
 
 # Headers that should run through moc
@@ -32,12 +32,12 @@ SET(KIT_MOC_SRCS
 
 # UI files - includes new widgets
 SET(KIT_UI_FORMS
-  Resources/UI/qCTKDCMTKLocationWidget.ui
-  Resources/UI/qCTKDCMTKListenerWidget.ui
-  Resources/UI/qCTKDCMTKQueryRetrieveWidget.ui
-  Resources/UI/qCTKDCMTKServerNodeWidget.ui
-  Resources/UI/qCTKDCMTKQueryWidget.ui
-  Resources/UI/qCTKDCMTKCommandWidget.ui
+  Resources/UI/ctkDICOMLocationWidget.ui
+  Resources/UI/ctkDICOMListenerWidget.ui
+  Resources/UI/ctkDICOMQueryRetrieveWidget.ui
+  Resources/UI/ctkDICOMServerNodeWidget.ui
+  Resources/UI/ctkDICOMQueryWidget.ui
+  Resources/UI/ctkDICOMCommandWidget.ui
 )
 
 # Resources
@@ -47,7 +47,7 @@ SET(KIT_resources
 # Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
-  
+
 ctkMacroBuildQtLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}

Libs/DICOM/Widgets/Resources/UI/qCTKDCMTKCommandWidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>qCTKDCMTKCommandWidget</class>
- <widget class="QWidget" name="qCTKDCMTKCommandWidget">
+ <class>ctkDICOMCommandWidget</class>
+ <widget class="QWidget" name="ctkDICOMCommandWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

Libs/DICOM/Widgets/Resources/UI/qCTKDCMTKListenerWidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>qCTKDCMTKListenerWidget</class>
- <widget class="QWidget" name="qCTKDCMTKListenerWidget">
+ <class>ctkDICOMListenerWidget</class>
+ <widget class="QWidget" name="ctkDICOMListenerWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

Libs/DICOM/Widgets/Resources/UI/qCTKDCMTKLocationWidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>qCTKDCMTKLocationWidget</class>
- <widget class="QWidget" name="qCTKDCMTKLocationWidget">
+ <class>ctkDICOMLocationWidget</class>
+ <widget class="QWidget" name="ctkDICOMLocationWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

Libs/DICOM/Widgets/Resources/UI/qCTKDCMTKQueryRetrieveWidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>qCTKDCMTKQueryRetrieveWidget</class>
- <widget class="QWidget" name="qCTKDCMTKQueryRetrieveWidget">
+ <class>ctkDICOMQueryRetrieveWidget</class>
+ <widget class="QWidget" name="ctkDICOMQueryRetrieveWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -24,7 +24,7 @@
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
-       <widget class="qCTKDCMTKServerNodeWidget" name="locationWidget" native="true">
+       <widget class="ctkDICOMServerNodeWidget" name="locationWidget" native="true">
         <property name="minimumSize">
          <size>
           <width>300</width>
@@ -34,13 +34,13 @@
        </widget>
       </item>
       <item>
-       <widget class="qCTKDCMTKQueryWidget" name="queryWidget" native="true"/>
+       <widget class="ctkDICOMQueryWidget" name="queryWidget" native="true"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="qCTKDCMTKCommandWidget" name="widget" native="true"/>
+    <widget class="ctkDICOMCommandWidget" name="widget" native="true"/>
    </item>
    <item>
     <widget class="QTreeWidget" name="treeWidget">
@@ -55,21 +55,21 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>qCTKDCMTKQueryWidget</class>
+   <class>ctkDICOMQueryWidget</class>
    <extends>QWidget</extends>
-   <header>qCTKDCMTKQueryWidget.h</header>
+   <header>ctkDICOMQueryWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>qCTKDCMTKServerNodeWidget</class>
+   <class>ctkDICOMServerNodeWidget</class>
    <extends>QWidget</extends>
-   <header>qCTKDCMTKServerNodeWidget.h</header>
+   <header>ctkDICOMServerNodeWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>qCTKDCMTKCommandWidget</class>
+   <class>ctkDICOMCommandWidget</class>
    <extends>QWidget</extends>
-   <header>qCTKDCMTKCommandWidget.h</header>
+   <header>ctkDICOMCommandWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

Libs/DICOM/Widgets/Resources/UI/qCTKDCMTKQueryWidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>qCTKDCMTKQueryWidget</class>
- <widget class="QWidget" name="qCTKDCMTKQueryWidget">
+ <class>ctkDICOMQueryWidget</class>
+ <widget class="QWidget" name="ctkDICOMQueryWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

Libs/DICOM/Widgets/Resources/UI/qCTKDCMTKServerNodeWidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>qCTKDCMTKServerNodeWidget</class>
- <widget class="QWidget" name="qCTKDCMTKServerNodeWidget">
+ <class>ctkDICOMServerNodeWidget</class>
+ <widget class="QWidget" name="ctkDICOMServerNodeWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

Libs/DICOM/Widgets/ctkDICOMCommandWidget.cxx

@@ -0,0 +1,35 @@
+
+// ctkDICOMWidgets includes
+#include "ctkDICOMCommandWidget.h"
+#include "ui_ctkDICOMCommandWidget.h"
+
+//----------------------------------------------------------------------------
+class ctkDICOMCommandWidgetPrivate: public qCTKPrivate<ctkDICOMCommandWidget>,
+                                    public Ui_ctkDICOMCommandWidget
+{
+public:
+  ctkDICOMCommandWidgetPrivate(){}
+};
+
+//----------------------------------------------------------------------------
+// ctkDICOMCommandWidgetPrivate methods
+
+
+//----------------------------------------------------------------------------
+// ctkDICOMCommandWidget methods
+
+//----------------------------------------------------------------------------
+ctkDICOMCommandWidget::ctkDICOMCommandWidget(QWidget* _parent):Superclass(_parent)
+{
+  QCTK_INIT_PRIVATE(ctkDICOMCommandWidget);
+  QCTK_D(ctkDICOMCommandWidget);
+  
+  d->setupUi(this);
+}
+
+//----------------------------------------------------------------------------
+ctkDICOMCommandWidget::~ctkDICOMCommandWidget()
+{
+}
+
+

Libs/DICOM/Widgets/ctkDICOMCommandWidget.h

@@ -0,0 +1,25 @@
+#ifndef __ctkDICOMCommandWidget_h
+#define __ctkDICOMCommandWidget_h
+
+// QT includes 
+#include <QWidget>
+
+// qCTK includes
+#include <ctkPimpl.h>
+
+#include "CTKDICOMWidgetsExport.h"
+
+class ctkDICOMCommandWidgetPrivate; 
+
+class CTK_DICOM_WIDGETS_EXPORT ctkDICOMCommandWidget : public QWidget
+{
+public:
+  typedef QWidget Superclass;
+  explicit ctkDICOMCommandWidget(QWidget* parent=0);
+  virtual ~ctkDICOMCommandWidget();
+
+private:
+  QCTK_DECLARE_PRIVATE(ctkDICOMCommandWidget);
+};
+
+#endif

Libs/DICOM/Widgets/qCTKDCMTKDICOMItemTreeModel.cxx

@@ -1,73 +1,74 @@
 
-// qCTKDCMTK includes
-#include "qCTKDCMTKDICOMItemTreeModel.h"
+// ctkDICOMWidgets includes
+#include "ctkDICOMItemTreeModel.h"
 
 //----------------------------------------------------------------------------
-class qCTKDCMTKDICOMItemTreeModelPrivate: public qCTKPrivate<qCTKDCMTKDICOMItemTreeModel>
+class ctkDICOMItemTreeModelPrivate: public qCTKPrivate<ctkDICOMItemTreeModel>
 {
 public:
-  qCTKDCMTKDICOMItemTreeModelPrivate(){}
+  ctkDICOMItemTreeModelPrivate(){}
 };
 
 //----------------------------------------------------------------------------
-// qCTKDCMTKDICOMItemTreeModelPrivate methods
+// ctkDICOMItemTreeModelPrivate methods
 
 
 //----------------------------------------------------------------------------
-// qCTKDCMTKDICOMItemTreeModel methods
+// ctkDICOMItemTreeModel methods
 
-qCTKDCMTKDICOMItemTreeModel::qCTKDCMTKDICOMItemTreeModel(QObject* _parent):Superclass(_parent)
+//----------------------------------------------------------------------------
+ctkDICOMItemTreeModel::ctkDICOMItemTreeModel(QObject* _parent):Superclass(_parent)
 {
-  QCTK_INIT_PRIVATE(qCTKDCMTKDICOMItemTreeModel);
-  QCTK_D(qCTKDCMTKDICOMItemTreeModel);
+  QCTK_INIT_PRIVATE(ctkDICOMItemTreeModel);
+  QCTK_D(ctkDICOMItemTreeModel);
 
 }
 
 //----------------------------------------------------------------------------
-qCTKDCMTKDICOMItemTreeModel::~qCTKDCMTKDICOMItemTreeModel()
+ctkDICOMItemTreeModel::~ctkDICOMItemTreeModel()
 {
 }
 
 //----------------------------------------------------------------------------
-QModelIndex qCTKDCMTKDICOMItemTreeModel::index(int row, int column,
+QModelIndex ctkDICOMItemTreeModel::index(int row, int column,
                             const QModelIndex &parent) const
 {
   return QModelIndex();
 }
 
 //----------------------------------------------------------------------------
-QModelIndex qCTKDCMTKDICOMItemTreeModel::parent(const QModelIndex &child) const
+QModelIndex ctkDICOMItemTreeModel::parent(const QModelIndex &child) const
 {
   return QModelIndex();
 }
 
 //----------------------------------------------------------------------------
-Qt::ItemFlags qCTKDCMTKDICOMItemTreeModel::flags(const QModelIndex &index) const
+Qt::ItemFlags ctkDICOMItemTreeModel::flags(const QModelIndex &index) const
 {
   return 0;
 }
 
 //----------------------------------------------------------------------------
-QVariant qCTKDCMTKDICOMItemTreeModel::data(const QModelIndex &index, int role) const
+QVariant ctkDICOMItemTreeModel::data(const QModelIndex &index, int role) const
 {
   return QVariant();
 }
 
 //----------------------------------------------------------------------------
-QVariant qCTKDCMTKDICOMItemTreeModel::headerData(int section, Qt::Orientation orientation,
+QVariant ctkDICOMItemTreeModel::headerData(int section, Qt::Orientation orientation,
                                                  int role) const
 {
   return QVariant();
 }
 
 //----------------------------------------------------------------------------
-int qCTKDCMTKDICOMItemTreeModel::rowCount(const QModelIndex &parent) const
+int ctkDICOMItemTreeModel::rowCount(const QModelIndex &parent) const
 {
   return -1;
 }
 
 //----------------------------------------------------------------------------
-int qCTKDCMTKDICOMItemTreeModel::columnCount(const QModelIndex &parent) const
+int ctkDICOMItemTreeModel::columnCount(const QModelIndex &parent) const
 {
   return -1;
 }

Libs/DICOM/Widgets/qCTKDCMTKDICOMItemTreeModel.h

@@ -1,5 +1,5 @@
-#ifndef __qCTKDCMTKDICOMItemTreeModel_h
-#define __qCTKDCMTKDICOMItemTreeModel_h
+#ifndef __ctkDICOMItemTreeModel_h
+#define __ctkDICOMItemTreeModel_h
 
 // QT includes 
 #include <QAbstractItemModel>
@@ -10,14 +10,14 @@
 
 #include "CTKDICOMWidgetsExport.h"
 
-class qCTKDCMTKDICOMItemTreeModelPrivate;
+class ctkDICOMItemTreeModelPrivate;
 
-class Q_CTK_DICOM_WIDGETS_EXPORT qCTKDCMTKDICOMItemTreeModel : public QAbstractItemModel
+class CTK_DICOM_WIDGETS_EXPORT ctkDICOMItemTreeModel : public QAbstractItemModel
 {
 public:
   typedef QAbstractItemModel Superclass;
-  explicit qCTKDCMTKDICOMItemTreeModel(QObject* parent=0);
-  virtual ~qCTKDCMTKDICOMItemTreeModel();
+  explicit ctkDICOMItemTreeModel(QObject* parent=0);
+  virtual ~ctkDICOMItemTreeModel();
 
   virtual QModelIndex index(int row, int column,
                             const QModelIndex &parent = QModelIndex()) const;
@@ -35,7 +35,7 @@ public:
   virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
 
 private:
-  QCTK_DECLARE_PRIVATE(qCTKDCMTKDICOMItemTreeModel);
+  QCTK_DECLARE_PRIVATE(ctkDICOMItemTreeModel);
 };
 
 #endif

Libs/DICOM/Widgets/ctkDICOMListenerWidget.cxx

@@ -0,0 +1,35 @@
+
+// ctkDICOMWidgets includes
+#include "ctkDICOMListenerWidget.h"
+#include "ui_ctkDICOMListenerWidget.h"
+
+//----------------------------------------------------------------------------
+class ctkDICOMListenerWidgetPrivate: public qCTKPrivate<ctkDICOMListenerWidget>,
+                                     public Ui_ctkDICOMListenerWidget
+{
+public:
+  ctkDICOMListenerWidgetPrivate(){}
+};
+
+//----------------------------------------------------------------------------
+// ctkDICOMListenerWidgetPrivate methods
+
+
+//----------------------------------------------------------------------------
+// ctkDICOMListenerWidget methods
+
+//----------------------------------------------------------------------------
+ctkDICOMListenerWidget::ctkDICOMListenerWidget(QWidget* _parent):Superclass(_parent)
+{
+  QCTK_INIT_PRIVATE(ctkDICOMListenerWidget);
+  QCTK_D(ctkDICOMListenerWidget);
+  
+  d->setupUi(this);
+}
+
+//----------------------------------------------------------------------------
+ctkDICOMListenerWidget::~ctkDICOMListenerWidget()
+{
+}
+
+

Libs/DICOM/Widgets/ctkDICOMListenerWidget.h

@@ -0,0 +1,25 @@
+#ifndef __ctkDICOMListenerWidget_h
+#define __ctkDICOMListenerWidget_h
+
+// QT includes 
+#include <QWidget>
+
+// qCTK includes
+#include <ctkPimpl.h>
+
+#include "CTKDICOMWidgetsExport.h"
+
+class ctkDICOMListenerWidgetPrivate;
+
+class CTK_DICOM_WIDGETS_EXPORT ctkDICOMListenerWidget : public QWidget
+{
+public:
+  typedef QWidget Superclass;
+  explicit ctkDICOMListenerWidget(QWidget* parent=0);
+  virtual ~ctkDICOMListenerWidget();
+
+private:
+  QCTK_DECLARE_PRIVATE(ctkDICOMListenerWidget);
+};
+
+#endif

Libs/DICOM/Widgets/ctkDICOMLocationWidget.cxx

@@ -0,0 +1,35 @@
+
+// ctkDICOMWidgets includes
+#include "ctkDICOMLocationWidget.h"
+#include "ui_ctkDICOMLocationWidget.h"
+
+//----------------------------------------------------------------------------
+class ctkDICOMLocationWidgetPrivate: public qCTKPrivate<ctkDICOMLocationWidget>,
+                                      public Ui_ctkDICOMLocationWidget
+{
+public:
+  ctkDICOMLocationWidgetPrivate(){}
+};
+
+//----------------------------------------------------------------------------
+// ctkDICOMLocationWidgetPrivate methods
+
+
+//----------------------------------------------------------------------------
+// ctkDICOMLocationWidget methods
+
+//----------------------------------------------------------------------------
+ctkDICOMLocationWidget::ctkDICOMLocationWidget(QWidget* _parent):Superclass(_parent)
+{
+  QCTK_INIT_PRIVATE(ctkDICOMLocationWidget);
+  QCTK_D(ctkDICOMLocationWidget);
+  
+  d->setupUi(this);
+}
+
+//----------------------------------------------------------------------------
+ctkDICOMLocationWidget::~ctkDICOMLocationWidget()
+{
+}
+
+

Libs/DICOM/Widgets/ctkDICOMLocationWidget.h

@@ -0,0 +1,25 @@
+#ifndef __ctkDICOMLocationWidget_h
+#define __ctkDICOMLocationWidget_h
+
+// QT includes 
+#include <QWidget>
+
+// qCTK includes
+#include <ctkPimpl.h>
+
+#include "CTKDICOMWidgetsExport.h"
+
+class ctkDICOMLocationWidgetPrivate;
+
+class CTK_DICOM_WIDGETS_EXPORT ctkDICOMLocationWidget : public QWidget
+{
+public:
+  typedef QWidget Superclass;
+  explicit ctkDICOMLocationWidget(QWidget* parent=0);
+  virtual ~ctkDICOMLocationWidget();
+
+private:
+  QCTK_DECLARE_PRIVATE(ctkDICOMLocationWidget);
+};
+
+#endif

Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.cxx

@@ -0,0 +1,35 @@
+
+// ctkDICOMWidgets includes
+#include "ctkDICOMQueryRetrieveWidget.h"
+#include "ui_ctkDICOMQueryRetrieveWidget.h"
+
+//----------------------------------------------------------------------------
+class ctkDICOMQueryRetrieveWidgetPrivate: public qCTKPrivate<ctkDICOMQueryRetrieveWidget>,
+                                      public Ui_ctkDICOMQueryRetrieveWidget
+{
+public:
+  ctkDICOMQueryRetrieveWidgetPrivate(){}
+};
+
+//----------------------------------------------------------------------------
+// ctkDICOMQueryRetrieveWidgetPrivate methods
+
+
+//----------------------------------------------------------------------------
+// ctkDICOMQueryRetrieveWidget methods
+
+//----------------------------------------------------------------------------
+ctkDICOMQueryRetrieveWidget::ctkDICOMQueryRetrieveWidget(QWidget* _parent):Superclass(_parent)
+{
+  QCTK_INIT_PRIVATE(ctkDICOMQueryRetrieveWidget);
+  QCTK_D(ctkDICOMQueryRetrieveWidget);
+  
+  d->setupUi(this);
+}
+
+//----------------------------------------------------------------------------
+ctkDICOMQueryRetrieveWidget::~ctkDICOMQueryRetrieveWidget()
+{
+}
+
+

Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.h

@@ -0,0 +1,25 @@
+#ifndef __ctkDICOMQueryRetrieveWidget_h
+#define __ctkDICOMQueryRetrieveWidget_h
+
+// QT includes 
+#include <QWidget>
+
+// qCTK includes
+#include <ctkPimpl.h>
+
+#include "CTKDICOMWidgetsExport.h"
+
+class ctkDICOMQueryRetrieveWidgetPrivate;
+
+class CTK_DICOM_WIDGETS_EXPORT ctkDICOMQueryRetrieveWidget : public QWidget
+{
+public:
+  typedef QWidget Superclass;
+  explicit ctkDICOMQueryRetrieveWidget(QWidget* parent=0);
+  virtual ~ctkDICOMQueryRetrieveWidget();
+
+private:
+  QCTK_DECLARE_PRIVATE(ctkDICOMQueryRetrieveWidget);
+};
+
+#endif

Libs/DICOM/Widgets/ctkDICOMQueryWidget.cxx

@@ -0,0 +1,35 @@
+
+// ctkDICOMWidgets includes
+#include "ctkDICOMQueryWidget.h"
+#include "ui_ctkDICOMQueryWidget.h"
+
+//----------------------------------------------------------------------------
+class ctkDICOMQueryWidgetPrivate: public qCTKPrivate<ctkDICOMQueryWidget>,
+                                       public Ui_ctkDICOMQueryWidget
+{
+public:
+  ctkDICOMQueryWidgetPrivate(){}
+};
+
+//----------------------------------------------------------------------------
+// ctkDICOMQueryWidgetPrivate methods
+
+
+//----------------------------------------------------------------------------
+// ctkDICOMQueryWidget methods
+
+//----------------------------------------------------------------------------
+ctkDICOMQueryWidget::ctkDICOMQueryWidget(QWidget* _parent):Superclass(_parent)
+{
+  QCTK_INIT_PRIVATE(ctkDICOMQueryWidget);
+  QCTK_D(ctkDICOMQueryWidget);
+  
+  d->setupUi(this);
+}
+
+//----------------------------------------------------------------------------
+ctkDICOMQueryWidget::~ctkDICOMQueryWidget()
+{
+}
+
+

Libs/DICOM/Widgets/ctkDICOMQueryWidget.h

@@ -0,0 +1,25 @@
+#ifndef __ctkDICOMQueryWidget_h
+#define __ctkDICOMQueryWidget_h
+
+// QT includes 
+#include <QWidget>
+
+// qCTK includes
+#include <ctkPimpl.h>
+
+#include "CTKDICOMWidgetsExport.h"
+
+class ctkDICOMQueryWidgetPrivate;
+
+class CTK_DICOM_WIDGETS_EXPORT ctkDICOMQueryWidget : public QWidget
+{
+public:
+  typedef QWidget Superclass;
+  explicit ctkDICOMQueryWidget(QWidget* parent=0);
+  virtual ~ctkDICOMQueryWidget();
+
+private:
+  QCTK_DECLARE_PRIVATE(ctkDICOMQueryWidget);
+};
+
+#endif

Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.cxx

@@ -0,0 +1,35 @@
+
+// ctkDICOMWidgets includes
+#include "ctkDICOMServerNodeWidget.h"
+#include "ui_ctkDICOMServerNodeWidget.h"
+
+//----------------------------------------------------------------------------
+class ctkDICOMServerNodeWidgetPrivate: public qCTKPrivate<ctkDICOMServerNodeWidget>,
+                                       public Ui_ctkDICOMServerNodeWidget
+{
+public:
+  ctkDICOMServerNodeWidgetPrivate(){}
+};
+
+//----------------------------------------------------------------------------
+// ctkDICOMServerNodeWidgetPrivate methods
+
+
+//----------------------------------------------------------------------------
+// ctkDICOMServerNodeWidget methods
+
+//----------------------------------------------------------------------------
+ctkDICOMServerNodeWidget::ctkDICOMServerNodeWidget(QWidget* _parent):Superclass(_parent)
+{
+  QCTK_INIT_PRIVATE(ctkDICOMServerNodeWidget);
+  QCTK_D(ctkDICOMServerNodeWidget);
+  
+  d->setupUi(this);
+}
+
+//----------------------------------------------------------------------------
+ctkDICOMServerNodeWidget::~ctkDICOMServerNodeWidget()
+{
+}
+
+

Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.h

@@ -0,0 +1,25 @@
+#ifndef __ctkDICOMServerNodeWidget_h
+#define __ctkDICOMServerNodeWidget_h
+
+// QT includes 
+#include <QWidget>
+
+// qCTK includes
+#include <ctkPimpl.h>
+
+#include "CTKDICOMWidgetsExport.h"
+
+class ctkDICOMServerNodeWidgetPrivate;
+
+class CTK_DICOM_WIDGETS_EXPORT ctkDICOMServerNodeWidget : public QWidget
+{
+public:
+  typedef QWidget Superclass;
+  explicit ctkDICOMServerNodeWidget(QWidget* parent=0);
+  virtual ~ctkDICOMServerNodeWidget();
+
+private:
+  QCTK_DECLARE_PRIVATE(ctkDICOMServerNodeWidget);
+};
+
+#endif

Libs/DICOM/Widgets/qCTKDCMTKCommandWidget.cxx

@@ -1,34 +0,0 @@
-
-// qCTKDCMTK includes
-#include "qCTKDCMTKCommandWidget.h"
-#include "ui_qCTKDCMTKCommandWidget.h"
-
-//----------------------------------------------------------------------------
-class qCTKDCMTKCommandWidgetPrivate: public qCTKPrivate<qCTKDCMTKCommandWidget>, 
-                                       public Ui_qCTKDCMTKCommandWidget
-{
-public:
-  qCTKDCMTKCommandWidgetPrivate(){}
-};
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKCommandWidgetPrivate methods
-
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKCommandWidget methods
-
-qCTKDCMTKCommandWidget::qCTKDCMTKCommandWidget(QWidget* _parent):Superclass(_parent)
-{
-  QCTK_INIT_PRIVATE(qCTKDCMTKCommandWidget);
-  QCTK_D(qCTKDCMTKCommandWidget);
-  
-  d->setupUi(this);
-}
-
-//----------------------------------------------------------------------------
-qCTKDCMTKCommandWidget::~qCTKDCMTKCommandWidget()
-{
-}
-
-

Libs/DICOM/Widgets/qCTKDCMTKCommandWidget.h

@@ -1,25 +0,0 @@
-#ifndef __qCTKDCMTKCommandWidget_h
-#define __qCTKDCMTKCommandWidget_h
-
-// QT includes 
-#include <QWidget>
-
-// qCTK includes
-#include <ctkPimpl.h>
-
-#include "CTKDICOMWidgetsExport.h"
-
-class qCTKDCMTKCommandWidgetPrivate; 
-
-class Q_CTK_DICOM_WIDGETS_EXPORT qCTKDCMTKCommandWidget : public QWidget
-{
-public:
-  typedef QWidget Superclass;
-  explicit qCTKDCMTKCommandWidget(QWidget* parent=0);
-  virtual ~qCTKDCMTKCommandWidget();
-
-private:
-  QCTK_DECLARE_PRIVATE(qCTKDCMTKCommandWidget);
-};
-
-#endif

Libs/DICOM/Widgets/qCTKDCMTKListenerWidget.cxx

@@ -1,34 +0,0 @@
-
-// qCTKDCMTK includes
-#include "qCTKDCMTKListenerWidget.h"
-#include "ui_qCTKDCMTKListenerWidget.h"
-
-//----------------------------------------------------------------------------
-class qCTKDCMTKListenerWidgetPrivate: public qCTKPrivate<qCTKDCMTKListenerWidget>, 
-                                       public Ui_qCTKDCMTKListenerWidget
-{
-public:
-  qCTKDCMTKListenerWidgetPrivate(){}
-};
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKListenerWidgetPrivate methods
-
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKListenerWidget methods
-
-qCTKDCMTKListenerWidget::qCTKDCMTKListenerWidget(QWidget* _parent):Superclass(_parent)
-{
-  QCTK_INIT_PRIVATE(qCTKDCMTKListenerWidget);
-  QCTK_D(qCTKDCMTKListenerWidget);
-  
-  d->setupUi(this);
-}
-
-//----------------------------------------------------------------------------
-qCTKDCMTKListenerWidget::~qCTKDCMTKListenerWidget()
-{
-}
-
-

Libs/DICOM/Widgets/qCTKDCMTKListenerWidget.h

@@ -1,25 +0,0 @@
-#ifndef __qCTKDCMTKListenerWidget_h
-#define __qCTKDCMTKListenerWidget_h
-
-// QT includes 
-#include <QWidget>
-
-// qCTK includes
-#include <ctkPimpl.h>
-
-#include "CTKDICOMWidgetsExport.h"
-
-class qCTKDCMTKListenerWidgetPrivate; 
-
-class Q_CTK_DICOM_WIDGETS_EXPORT qCTKDCMTKListenerWidget : public QWidget
-{
-public:
-  typedef QWidget Superclass;
-  explicit qCTKDCMTKListenerWidget(QWidget* parent=0);
-  virtual ~qCTKDCMTKListenerWidget();
-
-private:
-  QCTK_DECLARE_PRIVATE(qCTKDCMTKListenerWidget);
-};
-
-#endif

Libs/DICOM/Widgets/qCTKDCMTKLocationWidget.cxx

@@ -1,34 +0,0 @@
-
-// qCTKDCMTK includes
-#include "qCTKDCMTKLocationWidget.h"
-#include "ui_qCTKDCMTKLocationWidget.h"
-
-//----------------------------------------------------------------------------
-class qCTKDCMTKLocationWidgetPrivate: public qCTKPrivate<qCTKDCMTKLocationWidget>, 
-                                      public Ui_qCTKDCMTKLocationWidget
-{
-public:
-  qCTKDCMTKLocationWidgetPrivate(){}
-};
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKLocationWidgetPrivate methods
-
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKLocationWidget methods
-
-qCTKDCMTKLocationWidget::qCTKDCMTKLocationWidget(QWidget* _parent):Superclass(_parent)
-{
-  QCTK_INIT_PRIVATE(qCTKDCMTKLocationWidget);
-  QCTK_D(qCTKDCMTKLocationWidget);
-  
-  d->setupUi(this);
-}
-
-//----------------------------------------------------------------------------
-qCTKDCMTKLocationWidget::~qCTKDCMTKLocationWidget()
-{
-}
-
-

Libs/DICOM/Widgets/qCTKDCMTKLocationWidget.h

@@ -1,25 +0,0 @@
-#ifndef __qCTKDCMTKLocationWidget_h
-#define __qCTKDCMTKLocationWidget_h
-
-// QT includes 
-#include <QWidget>
-
-// qCTK includes
-#include <ctkPimpl.h>
-
-#include "CTKDICOMWidgetsExport.h"
-
-class qCTKDCMTKLocationWidgetPrivate; 
-
-class Q_CTK_DICOM_WIDGETS_EXPORT qCTKDCMTKLocationWidget : public QWidget
-{
-public:
-  typedef QWidget Superclass;
-  explicit qCTKDCMTKLocationWidget(QWidget* parent=0);
-  virtual ~qCTKDCMTKLocationWidget();
-
-private:
-  QCTK_DECLARE_PRIVATE(qCTKDCMTKLocationWidget);
-};
-
-#endif

Libs/DICOM/Widgets/qCTKDCMTKQueryRetrieveWidget.cxx

@@ -1,34 +0,0 @@
-
-// qCTKDCMTK includes
-#include "qCTKDCMTKQueryRetrieveWidget.h"
-#include "ui_qCTKDCMTKQueryRetrieveWidget.h"
-
-//----------------------------------------------------------------------------
-class qCTKDCMTKQueryRetrieveWidgetPrivate: public qCTKPrivate<qCTKDCMTKQueryRetrieveWidget>, 
-                                      public Ui_qCTKDCMTKQueryRetrieveWidget
-{
-public:
-  qCTKDCMTKQueryRetrieveWidgetPrivate(){}
-};
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKQueryRetrieveWidgetPrivate methods
-
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKQueryRetrieveWidget methods
-
-qCTKDCMTKQueryRetrieveWidget::qCTKDCMTKQueryRetrieveWidget(QWidget* _parent):Superclass(_parent)
-{
-  QCTK_INIT_PRIVATE(qCTKDCMTKQueryRetrieveWidget);
-  QCTK_D(qCTKDCMTKQueryRetrieveWidget);
-  
-  d->setupUi(this);
-}
-
-//----------------------------------------------------------------------------
-qCTKDCMTKQueryRetrieveWidget::~qCTKDCMTKQueryRetrieveWidget()
-{
-}
-
-

Libs/DICOM/Widgets/qCTKDCMTKQueryRetrieveWidget.h

@@ -1,25 +0,0 @@
-#ifndef __qCTKDCMTKQueryRetrieveWidget_h
-#define __qCTKDCMTKQueryRetrieveWidget_h
-
-// QT includes 
-#include <QWidget>
-
-// qCTK includes
-#include <ctkPimpl.h>
-
-#include "CTKDICOMWidgetsExport.h"
-
-class qCTKDCMTKQueryRetrieveWidgetPrivate; 
-
-class Q_CTK_DICOM_WIDGETS_EXPORT qCTKDCMTKQueryRetrieveWidget : public QWidget
-{
-public:
-  typedef QWidget Superclass;
-  explicit qCTKDCMTKQueryRetrieveWidget(QWidget* parent=0);
-  virtual ~qCTKDCMTKQueryRetrieveWidget();
-
-private:
-  QCTK_DECLARE_PRIVATE(qCTKDCMTKQueryRetrieveWidget);
-};
-
-#endif

Libs/DICOM/Widgets/qCTKDCMTKQueryWidget.cxx

@@ -1,34 +0,0 @@
-
-// qCTKDCMTK includes
-#include "qCTKDCMTKQueryWidget.h"
-#include "ui_qCTKDCMTKQueryWidget.h"
-
-//----------------------------------------------------------------------------
-class qCTKDCMTKQueryWidgetPrivate: public qCTKPrivate<qCTKDCMTKQueryWidget>, 
-                                       public Ui_qCTKDCMTKQueryWidget
-{
-public:
-  qCTKDCMTKQueryWidgetPrivate(){}
-};
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKQueryWidgetPrivate methods
-
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKQueryWidget methods
-
-qCTKDCMTKQueryWidget::qCTKDCMTKQueryWidget(QWidget* _parent):Superclass(_parent)
-{
-  QCTK_INIT_PRIVATE(qCTKDCMTKQueryWidget);
-  QCTK_D(qCTKDCMTKQueryWidget);
-  
-  d->setupUi(this);
-}
-
-//----------------------------------------------------------------------------
-qCTKDCMTKQueryWidget::~qCTKDCMTKQueryWidget()
-{
-}
-
-

Libs/DICOM/Widgets/qCTKDCMTKQueryWidget.h

@@ -1,25 +0,0 @@
-#ifndef __qCTKDCMTKQueryWidget_h
-#define __qCTKDCMTKQueryWidget_h
-
-// QT includes 
-#include <QWidget>
-
-// qCTK includes
-#include <ctkPimpl.h>
-
-#include "CTKDICOMWidgetsExport.h"
-
-class qCTKDCMTKQueryWidgetPrivate; 
-
-class Q_CTK_DICOM_WIDGETS_EXPORT qCTKDCMTKQueryWidget : public QWidget
-{
-public:
-  typedef QWidget Superclass;
-  explicit qCTKDCMTKQueryWidget(QWidget* parent=0);
-  virtual ~qCTKDCMTKQueryWidget();
-
-private:
-  QCTK_DECLARE_PRIVATE(qCTKDCMTKQueryWidget);
-};
-
-#endif

Libs/DICOM/Widgets/qCTKDCMTKServerNodeWidget.cxx

@@ -1,34 +0,0 @@
-
-// qCTKDCMTK includes
-#include "qCTKDCMTKServerNodeWidget.h"
-#include "ui_qCTKDCMTKServerNodeWidget.h"
-
-//----------------------------------------------------------------------------
-class qCTKDCMTKServerNodeWidgetPrivate: public qCTKPrivate<qCTKDCMTKServerNodeWidget>, 
-                                       public Ui_qCTKDCMTKServerNodeWidget
-{
-public:
-  qCTKDCMTKServerNodeWidgetPrivate(){}
-};
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKServerNodeWidgetPrivate methods
-
-
-//----------------------------------------------------------------------------
-// qCTKDCMTKServerNodeWidget methods
-
-qCTKDCMTKServerNodeWidget::qCTKDCMTKServerNodeWidget(QWidget* _parent):Superclass(_parent)
-{
-  QCTK_INIT_PRIVATE(qCTKDCMTKServerNodeWidget);
-  QCTK_D(qCTKDCMTKServerNodeWidget);
-  
-  d->setupUi(this);
-}
-
-//----------------------------------------------------------------------------
-qCTKDCMTKServerNodeWidget::~qCTKDCMTKServerNodeWidget()
-{
-}
-
-

Libs/DICOM/Widgets/qCTKDCMTKServerNodeWidget.h

@@ -1,25 +0,0 @@
-#ifndef __qCTKDCMTKServerNodeWidget_h
-#define __qCTKDCMTKServerNodeWidget_h
-
-// QT includes 
-#include <QWidget>
-
-// qCTK includes
-#include <ctkPimpl.h>
-
-#include "CTKDICOMWidgetsExport.h"
-
-class qCTKDCMTKServerNodeWidgetPrivate; 
-
-class Q_CTK_DICOM_WIDGETS_EXPORT qCTKDCMTKServerNodeWidget : public QWidget
-{
-public:
-  typedef QWidget Superclass;
-  explicit qCTKDCMTKServerNodeWidget(QWidget* parent=0);
-  virtual ~qCTKDCMTKServerNodeWidget();
-
-private:
-  QCTK_DECLARE_PRIVATE(qCTKDCMTKServerNodeWidget);
-};
-
-#endif

Libs/Widgets/CMakeLists.txt

@@ -4,7 +4,7 @@ PROJECT(CTKWidgets)
 # See CTK/CMake/ctkMacroBuildQtLib.cmake for details
 #
 
-SET(KIT_export_directive "Q_CTK_WIDGETS_EXPORT")
+SET(KIT_export_directive "CTK_WIDGETS_EXPORT")
 
 # Additional directories to include
 SET(KIT_include_directories

Libs/Widgets/ctkSettings.h

@@ -58,7 +58,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 class QDialog;
 class QMainWindow;
 
-class Q_CTK_WIDGETS_EXPORT ctkSettings : public QSettings
+class CTK_WIDGETS_EXPORT ctkSettings : public QSettings
 {
   Q_OBJECT
 

SuperBuild.cmake

@@ -121,29 +121,35 @@ ExternalProject_Add(${proj}
 #-----------------------------------------------------------------------------
 # QtMobility
 #
-#SET(qtmobility_modules "serviceframework")
-#SET(qtmobility_build_type "release")
-#IF(UNIX)
-#  IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-#    SET(qtmobility_build_type "debug")
-#  ENDIF()
-#ELSEIF(NOT ${CMAKE_CFG_INTDIR} STREQUAL "Release")
-#  SET(qtmobility_build_type "debug")
-#ENDIf()
-#
-#SET(qtmobility_patchcmd )
-#IF(UNIX)
-#  SET(qtmobility_patchcmd patch -p0 < ${CTK_SOURCE_DIR}/Utilities/QtMobility/QtMobilityBeta1-Linux.patch)
-#ENDIF(UNIX)
-#
-#SET(proj QtMobility)
-#ExternalProject_Add(${proj}
-#    URL "http://get.qt.nokia.com/qt/solutions/qt-mobility-src-1.0.0-beta1.tar.gz"
-#    CONFIGURE_COMMAND <SOURCE_DIR>/configure -${qtmobility_build_type} -libdir ${CMAKE_BINARY_DIR}/CTK-build/bin -no-docs -modules ${qtmobility_modules}
-#    PATCH_COMMAND ${qtmobility_patchcmd}
-#    BUILD_IN_SOURCE 1
-#    )
-    
+SET(proj QtMobility)
+
+# Configure patch script
+SET(qtmobility_src_dir ${ep_source_dir}/${proj})
+SET(qtmobility_patch_dir ${CTK_SOURCE_DIR}/Utilities/QtMobility/)
+SET(qtmobility_configured_patch_dir ${CTK_BINARY_DIR}/Utilities/QtMobility/)
+SET(qtmobility_patchscript
+  ${CTK_BINARY_DIR}/Utilities/QtMobility/QtMobilityBeta1-patch.cmake)
+CONFIGURE_FILE(
+  ${CTK_SOURCE_DIR}/Utilities/QtMobility/QtMobilityBeta1-patch.cmake.in
+  ${qtmobility_patchscript} @ONLY)
+
+# Define configure options
+SET(qtmobility_modules "serviceframework")
+SET(qtmobility_build_type "release")
+IF(UNIX)
+ IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+   SET(qtmobility_build_type "debug")
+ ENDIF()
+ELSEIF(NOT ${CMAKE_CFG_INTDIR} STREQUAL "Release")
+ SET(qtmobility_build_type "debug")
+ENDIf()
+
+ExternalProject_Add(${proj}
+   URL "http://get.qt.nokia.com/qt/solutions/qt-mobility-src-1.0.0-beta1.tar.gz"
+   CONFIGURE_COMMAND <SOURCE_DIR>/configure -${qtmobility_build_type} -libdir ${CMAKE_BINARY_DIR}/CTK-build/bin -no-docs -modules ${qtmobility_modules}
+   PATCH_COMMAND ${CMAKE_COMMAND} -P ${qtmobility_patchscript}
+   BUILD_IN_SOURCE 1
+   )
 
 #-----------------------------------------------------------------------------
 # Utilities/OpenIGTLink
@@ -185,10 +191,10 @@ ExternalProject_Add(${proj}
     ${kwstyle_DEPENDS}
     ${DCMTK_DEPENDS}
     ${PythonQt_DEPENDS}
-    "ZMQ"
-    "OpenIGTLink"
-#     "XIP"
-#    "QtMobility"
+    ZMQ
+    OpenIGTLink
+#     XIP
+    QtMobility
 )
 
 #-----------------------------------------------------------------------------

Utilities/QtMobility/QtMobilityBeta1-Linux.patch

@@ -1,13 +0,0 @@
-*** common.pri	2010-02-12 07:12:31.000000000 +0100
---- common-n.pri	2010-03-10 20:52:32.000000000 +0100
-***************
-*** 104,109 ****
---- 104,111 ----
-      QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
-  }
-  
-+ contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
-+ 
-  maemo6 {
-      DEFINES+= Q_WS_MAEMO_6
-  }

Utilities/QtMobility/QtMobilityBeta1-patch.cmake.in

@@ -0,0 +1,28 @@
+INCLUDE(@CTK_SOURCE_DIR@/CMake/ctkMacroApplyPatches.cmake)
+
+SET(patch_dir @qtmobility_patch_dir@)
+SET(configured_patch_dir @qtmobility_configured_patch_dir@)
+
+# Variable required to properly configured the patch files
+SET(QT_BINARY_DIR @QT_BINARY_DIR@)
+
+SET(patch_files
+)
+
+IF(WIN32)
+  CONFIGURE_FILE(${patch_dir}/QtMobilityBeta1-win32.patch.in
+    ${configured_patch_dir}/QtMobilityBeta1-win32.patch @ONLY)
+  LIST(APPEND patch_files
+    ${configured_patch_dir}/QtMobilityBeta1-win32.patch
+    )
+ENDIF()
+
+IF(UNIX)
+  CONFIGURE_FILE(${patch_dir}/QtMobilityBeta1-unix.patch.in
+    ${configured_patch_dir}/QtMobilityBeta1-unix.patch @ONLY)
+  LIST(APPEND patch_files
+    ${configured_patch_dir}/QtMobilityBeta1-unix.patch)
+ENDIF()
+
+# Apply patches
+ctkMacroApplyPatches(@CTK_PATCH_EXECUTABLE@ @qtmobility_src_dir@ ${patch_files})

Utilities/QtMobility/QtMobilityBeta1-unix.patch.in

@@ -0,0 +1,28 @@
+diff -crB ../qt-mobility-src-1.0.0-beta1/common.pri common.pri
+*** ./qt-mobility-src-1.0.0-beta1/common.pri	2010-02-12 03:54:11.000000000 -0500
+--- common.pri	2010-03-11 16:04:39.000000000 -0500
+***************
+*** 104,109 ****
+--- 104,111 ----
+      QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
+  }
+  
++ contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
++ 
+  maemo6 {
+      DEFINES+= Q_WS_MAEMO_6
+  }
+diff -crB ../qt-mobility-src-1.0.0-beta1/configure configure
+*** ./qt-mobility-src-1.0.0-beta1/configure	2010-02-12 03:54:12.000000000 -0500
+--- configure	2010-03-18 13:19:38.000000000 -0400
+***************
+*** 40,45 ****
+--- 40,47 ----
+  ##
+  #############################################################################
+  
++ PATH=@QT_BINARY_DIR@:$PATH
++ 
+  # the current directory (shadow build dir)
+  shadowpath=`/bin/pwd`
+  # the name of this script

Utilities/QtMobility/QtMobilityBeta1-win32.patch.in

@@ -0,0 +1,20 @@
+diff -crB ../qt-mobility-src-1.0.0-beta1/configure.bat configure.bat
+*** ./qt-mobility-src-1.0.0-beta1/configure.bat	2010-02-12 03:54:12.000000000 -0500
+--- configure.bat	2010-03-18 13:19:42.000000000 -0400
+***************
+*** 59,65 ****
+  set MOBILITY_MODULES=bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors
+  set MOBILITY_MODULES_UNPARSED=
+  set VC_TEMPLATE_OPTION=
+! set QT_PATH=
+  set QMAKE_CACHE=%BUILD_PATH%\.qmake.cache
+  
+  if exist "%QMAKE_CACHE%" del %QMAKE_CACHE%
+--- 59,65 ----
+  set MOBILITY_MODULES=bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors
+  set MOBILITY_MODULES_UNPARSED=
+  set VC_TEMPLATE_OPTION=
+! set QT_PATH=@QT_BINARY_DIR@
+  set QMAKE_CACHE=%BUILD_PATH%\.qmake.cache
+  
+  if exist "%QMAKE_CACHE%" del %QMAKE_CACHE%