FIX: dah rm useless files + corrects build issues

Applications/cktExampleHost2/CMakeLists.txt

@@ -1,64 +0,0 @@
-PROJECT(ctkExampleHost)
-
-#
-# See CTK/CMake/ctkMacroBuildApp.cmake for details
-#
-
-SET(KIT_SRCS
-  ctkExampleHostMain.cpp
-)
-
-SET(SRCS_2
-  ctkExampleHostMain2.cpp
-)
-# Headers that should run through moc
-SET(KIT_MOC_SRCS
-
-)
-
-# UI files
-SET(KIT_UI_FORMS
-  
-)
-
-# Resources
-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)
-
-# Additional directories to include - Note that CTK_INCLUDE_LIBRARIES is already included
-SET(KIT_include_directories
-)
-
-# Fix this after having discussed include dependencies with Jc
-FOREACH(_dep ${${PROJECT_NAME}_DEPENDENCIES})
-  INCLUDE_DIRECTORIES(${${_dep}_SOURCE_DIR} ${${_dep}_BINARY_DIR})
-ENDFOREACH()
-
-ctkMacroBuildApp(
-  NAME ${PROJECT_NAME}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
-  SRCS ${KIT_SRCS}
-  MOC_SRCS ${KIT_MOC_SRCS}
-  UI_FORMS ${KIT_UI_FORMS}
-  TARGET_LIBRARIES ${KIT_target_libraries}
-  RESOURCES ${KIT_resources}
-  )
-ctkMacroBuildApp(
-  NAME ${PROJECT_NAME}2
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
-  SRCS ${SRCS_2}
-  MOC_SRCS ${KIT_MOC_SRCS}
-  UI_FORMS ${KIT_UI_FORMS}
-  TARGET_LIBRARIES ${KIT_target_libraries}
-  RESOURCES ${KIT_resources}
-  )
-
-# Testing
-IF(BUILD_TESTING)
-#   ADD_SUBDIRECTORY(Testing)
-ENDIF(BUILD_TESTING)

Applications/cktExampleHost2/ctkExampleHostMain.cpp

@@ -1,89 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) 2010 German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-#include <ctkPluginFrameworkFactory.h>
-#include <ctkPluginFramework.h>
-#include <ctkPluginException.h>
-
-#include <QApplication>
-#include <QString>
-#include <QStringList>
-#include <QDirIterator>
-#include <QWidget>
-#include <QUrl>
-
-int main(int argv, char** argc)
-{
-  QApplication app(argv, argc);
-
-  qApp->setOrganizationName("CTK");
-  qApp->setOrganizationDomain("commontk.org");
-  qApp->setApplicationName("ctkExampleHost");
-
-  ctkPluginFrameworkFactory fwFactory;
-  ctkPluginFramework* framework = fwFactory.getFramework();
-
-  try {
-    framework->init();
-  }
-  catch (const ctkPluginException& exc)
-  {
-    qCritical() << "Failed to initialize the plug-in framework:" << exc;
-    exit(1);
-  }
-
-#ifdef CMAKE_INTDIR
-  QString pluginPath = qApp->applicationDirPath() + "/../plugins/" CMAKE_INTDIR "/";
-#else
-  QString pluginPath = qApp->applicationDirPath() + "/plugins/";
-#endif
-
-  qApp->addLibraryPath(pluginPath);
-
-  QStringList libFilter;
-  libFilter << "*.dll" << "*.so" << "*.dylib";
-  QDirIterator dirIter(pluginPath, libFilter, QDir::Files);
-  while(dirIter.hasNext())
-  {
-    try
-    {
-      QString fileLocation = dirIter.next();
-      if (fileLocation.contains("org_commontk_dicom_wg23")
-          && !fileLocation.contains("app"))
-      {
-        ctkPlugin* plugin = framework->getPluginContext()->installPlugin(QUrl::fromLocalFile(fileLocation));
-        plugin->start(ctkPlugin::START_TRANSIENT);
-      }
-    }
-    catch (const ctkPluginException& e)
-    {
-      qCritical() << e.what();
-    }
-  }
-
-  framework->start();
-
-  QWidget placeholder;
-  placeholder.show();
-
-  return app.exec();
-
-}

Applications/cktExampleHost2/ctkExampleHostMain2.cpp

@@ -1,45 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) 2010 German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-
-#include <QApplication>
-#include <QString>
-#include <QStringList>
-#include <QDirIterator>
-#include <QWidget>
-#include <QUrl>
-
-int main(int argv, char** argc)
-{
-  QApplication app(argv, argc);
-
-  qApp->setOrganizationName("CTK");
-  qApp->setOrganizationDomain("commontk.org");
-  qApp->setApplicationName("ctkExampleHost");
-
-
-  
-  QWidget placeholder;
-  placeholder.show();
-
-  return app.exec();
-
-}

Applications/cktExampleHost2/target_libraries.cmake

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

Plugins/org.commontk.example.dicomapp/ctkExampleDicomAppLogic_p.h

@@ -26,6 +26,7 @@
 #include <ctkPluginActivator.h>
 #include <ctkDicomAppInterface.h>
 #include <ctkDicomHostInterface.h>
+#include <stdexcept>
 
 template <class TServiceType>
 class ServiceAccessor {

Plugins/org.commontk.example.dicomapp/ctkExampleDicomAppPlugin.cpp

@@ -23,13 +23,13 @@
 #include "ctkExampleDicomAppPlugin_p.h"
 #include "ctkExampleDicomAppLogic_p.h"
 #include <QtPlugin>
-#include <QStringList.h>
-#include <QString.h>
+#include <QStringList>
+#include <QString>
 
 ctkExampleDicomAppPlugin* ctkExampleDicomAppPlugin::instance = 0;
 
 ctkExampleDicomAppPlugin::ctkExampleDicomAppPlugin()
-  : context(0), appLogic(0)
+  : appLogic(0), context(0)
 {
 }