Moved the XNAT classes into a Core subdirectory.

CMakeLists.txt

@@ -487,8 +487,8 @@ ctk_lib_option(CommandLineModules/Backend/LocalProcess
 ctk_lib_option(CommandLineModules/Backend/FunctionPointer
                "Build the Command Line Module back-end for function pointers" OFF)
 
-ctk_lib_option(XNAT
-               "Build the XNAT library" OFF)
+ctk_lib_option(XNAT/Core
+               "Build the XNAT Core library" OFF)
 
 #ctk_lib_option(Visualization/XIP
 #               "Build the XIP library" OFF)

Libs/XNAT/CMakeLists.txt

@@ -1,10 +1,10 @@
-project(CTKXNAT)
+project(CTKXNATCore)
 
 #
 # See CTK/CMake/ctkMacroBuildLib.cmake for details
 #
 
-set(KIT_export_directive "CTK_XNAT_EXPORT")
+set(KIT_export_directive "CTK_XNAT_CORE_EXPORT")
 
 set(KIT_SRCS
   ctkXnatConnection.cpp

Libs/XNAT/ctkXnatConnection.h

@@ -22,7 +22,7 @@
 #ifndef ctkXnatConnection_h
 #define ctkXnatConnection_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include <QScopedPointer>
 #include <QString>
@@ -50,7 +50,7 @@ class ctkXnatScanResourceFile;
 class ctkXnatServer;
 class ctkXnatSubject;
 
-class CTK_XNAT_EXPORT ctkXnatConnection : public QObject
+class CTK_XNAT_CORE_EXPORT ctkXnatConnection : public QObject
 {
 
   Q_OBJECT

Libs/XNAT/ctkXnatConnectionFactory.h

@@ -22,13 +22,13 @@
 #ifndef ctkXnatConnectionFactory_h
 #define ctkXnatConnectionFactory_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include <QString>
 
 class ctkXnatConnection;
 
-class CTK_XNAT_EXPORT ctkXnatConnectionFactory
+class CTK_XNAT_CORE_EXPORT ctkXnatConnectionFactory
 {
 public:
   static ctkXnatConnectionFactory& instance();

Libs/XNAT/ctkXnatException.h

@@ -22,12 +22,12 @@
 #ifndef ctkXnatException_h
 #define ctkXnatException_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include <exception>
 #include <string>
 
-class CTK_XNAT_EXPORT ctkXnatException : public std::exception
+class CTK_XNAT_CORE_EXPORT ctkXnatException : public std::exception
 {
 public:
   ctkXnatException(const std::string& message);

Libs/XNAT/ctkXnatExperiment.h

@@ -22,7 +22,7 @@
 #ifndef ctkXnatExperiment_h
 #define ctkXnatExperiment_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
@@ -30,7 +30,7 @@ class ctkXnatConnection;
 
 class ctkXnatExperimentPrivate;
 
-class CTK_XNAT_EXPORT ctkXnatExperiment : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatExperiment : public ctkXnatObject
 {
   Q_OBJECT
 

Libs/XNAT/ctkXnatObject.h

@@ -22,7 +22,7 @@
 #ifndef ctkXnatObject_h
 #define ctkXnatObject_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include <QList>
 #include <QObject>
@@ -31,7 +31,7 @@
 class ctkXnatConnection;
 class ctkXnatObjectPrivate;
 
-class CTK_XNAT_EXPORT ctkXnatObject : public QObject
+class CTK_XNAT_CORE_EXPORT ctkXnatObject : public QObject
 {
   Q_OBJECT
 

Libs/XNAT/ctkXnatProject.h

@@ -22,14 +22,14 @@
 #ifndef ctkctkXnatProject_h
 #define ctkctkXnatProject_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
 class ctkXnatConnection;
 class ctkXnatProjectPrivate;
 
-class CTK_XNAT_EXPORT ctkXnatProject : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatProject : public ctkXnatObject
 {
   Q_OBJECT
 

Libs/XNAT/ctkXnatReconstruction.h

@@ -22,14 +22,14 @@
 #ifndef ctkXnatReconstruction_h
 #define ctkXnatReconstruction_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
 class ctkXnatConnection;
 class ctkXnatReconstructionPrivate;
 
-class CTK_XNAT_EXPORT ctkXnatReconstruction : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatReconstruction : public ctkXnatObject
 {
   Q_OBJECT
 

Libs/XNAT/ctkXnatReconstructionFolder.h

@@ -22,13 +22,13 @@
 #ifndef ctkXnatReconstructionFolder_h
 #define ctkXnatReconstructionFolder_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
 class ctkXnatConnection;
 
-class CTK_XNAT_EXPORT ctkXnatReconstructionFolder : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatReconstructionFolder : public ctkXnatObject
 {
 public:
   explicit ctkXnatReconstructionFolder(ctkXnatObject* parent = 0);

Libs/XNAT/ctkXnatReconstructionResource.h

@@ -22,14 +22,14 @@
 #ifndef ctkXnatReconstructionResource_h
 #define ctkXnatReconstructionResource_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
 class ctkXnatConnection;
 class ctkXnatReconstructionResourcePrivate;
 
-class CTK_XNAT_EXPORT ctkXnatReconstructionResource : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatReconstructionResource : public ctkXnatObject
 {
   Q_OBJECT
 

Libs/XNAT/ctkXnatReconstructionResourceFile.h

@@ -22,14 +22,14 @@
 #ifndef ctkXnatReconstructionResourceFile_h
 #define ctkXnatReconstructionResourceFile_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
 class ctkXnatConnection;
 class ctkXnatReconstructionResourceFilePrivate;
 
-class CTK_XNAT_EXPORT ctkXnatReconstructionResourceFile : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatReconstructionResourceFile : public ctkXnatObject
 {
   Q_OBJECT
 

Libs/XNAT/ctkXnatScan.h

@@ -22,14 +22,14 @@
 #ifndef ctkXnatScan_h
 #define ctkXnatScan_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
 class ctkXnatConnection;
 class ctkXnatScanPrivate;
 
-class CTK_XNAT_EXPORT ctkXnatScan : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatScan : public ctkXnatObject
 {
   Q_OBJECT
 

Libs/XNAT/ctkXnatScanFolder.h

@@ -22,13 +22,13 @@
 #ifndef ctkXnatScanFolder_h
 #define ctkXnatScanFolder_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
 class ctkXnatConnection;
 
-class CTK_XNAT_EXPORT ctkXnatScanFolder : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatScanFolder : public ctkXnatObject
 {
 public:
   explicit ctkXnatScanFolder(ctkXnatObject* parent = 0);

Libs/XNAT/ctkXnatScanResource.h

@@ -22,14 +22,14 @@
 #ifndef ctkXnatScanResource_h
 #define ctkXnatScanResource_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
 class ctkXnatConnection;
 class ctkXnatScanResourcePrivate;
 
-class CTK_XNAT_EXPORT ctkXnatScanResource : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatScanResource : public ctkXnatObject
 {
   Q_OBJECT
 

Libs/XNAT/ctkXnatScanResourceFile.h

@@ -22,14 +22,14 @@
 #ifndef ctkXnatScanResourceFile_h
 #define ctkXnatScanResourceFile_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
 class ctkXnatConnection;
 class ctkXnatScanResourceFilePrivate;
 
-class CTK_XNAT_EXPORT ctkXnatScanResourceFile : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatScanResourceFile : public ctkXnatObject
 {
   Q_OBJECT
 

Libs/XNAT/ctkXnatServer.h

@@ -22,13 +22,13 @@
 #ifndef ctkXnatServer_h
 #define ctkXnatServer_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
 class ctkXnatConnection;
 
-class CTK_XNAT_EXPORT ctkXnatServer : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatServer : public ctkXnatObject
 {
 public:
   explicit ctkXnatServer(ctkXnatObject* parent = 0);

Libs/XNAT/ctkXnatSettings.h

@@ -22,14 +22,14 @@
 #ifndef ctkXnatSettings_h
 #define ctkXnatSettings_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include <QMap>
 #include <QString>
 
 class ctkXnatLoginProfile;
 
-class CTK_XNAT_EXPORT ctkXnatSettings
+class CTK_XNAT_CORE_EXPORT ctkXnatSettings
 {
 public:
   virtual QString getDefaultDirectory() const = 0;

Libs/XNAT/ctkXnatSubject.h

@@ -22,7 +22,7 @@
 #ifndef ctkXnatSubject_h
 #define ctkXnatSubject_h
 
-#include "ctkXNATExport.h"
+#include "ctkXNATCoreExport.h"
 
 #include "ctkXnatObject.h"
 
@@ -30,7 +30,7 @@ class ctkXnatConnection;
 
 class ctkXnatSubjectPrivate;
 
-class CTK_XNAT_EXPORT ctkXnatSubject : public ctkXnatObject
+class CTK_XNAT_CORE_EXPORT ctkXnatSubject : public ctkXnatObject
 {
   Q_OBJECT