Forráskód Böngészése

COMP: Fix funky destructor in qCTKDCMTK. Rename variables/includes due to directory renaming

Julien Finet 15 éve
szülő
commit
ccfae4ce6d

+ 4 - 4
Libs/DICOM/Core/Testing/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(KIT qCTKDICOMBaseTesting)
+SET(KIT CTKDICOMCore)
 
 CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
   qCTKDCMTKModelTest1.cxx
@@ -12,9 +12,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
 
-SET( qCTKDICOMBaseTesting_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
+SET( CTKDICOMCore_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
 IF(WIN32)
-  SET(qCTKDICOMBaseTesting_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
+  SET(CTKDICOMCore_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
 ENDIF(WIN32)
 
-ADD_TEST( qCTKDCMTKModelTest1 ${qCTKDICOMBaseTesting_TESTS} qCTKDCMTKModelTest1 ../../Resources/dicom-sample.sql)
+ADD_TEST( qCTKDCMTKModelTest1 ${CTKDICOMCore_TESTS} qCTKDCMTKModelTest1 ../../Resources/dicom-sample.sql)

+ 0 - 1
Libs/DICOM/Core/qCTKDCMTK.cxx

@@ -32,7 +32,6 @@ qCTKDCMTK::qCTKDCMTK(QObject* _parent): Superclass(_parent)
 }
 
 //----------------------------------------------------------------------------
-qCTKDCMTK::
 qCTKDCMTK::~qCTKDCMTK()
 {
 }

+ 2 - 2
Libs/DICOM/Core/qCTKDCMTKModel.h

@@ -7,10 +7,10 @@
 // qCTK includes
 #include <qCTKPimpl.h>
 
-#include "qCTKDMCTKExport.h"
+#include "CTKDICOMCoreExport.h"
 
 class qCTKDCMTKModelPrivate;
-class Q_CTKDMCTK_EXPORT qCTKDCMTKModel : public QAbstractItemModel
+class Q_CTK_DICOM_CORE_EXPORT qCTKDCMTKModel : public QAbstractItemModel
 {
   Q_OBJECT
 public: