REFAC: mvdApplicationsToolBox should be in Gui library

Code/Common/ApplicationsWrapper/CMakeLists.txt

@@ -4,7 +4,6 @@
 # Package GUI (files ordered by lexicographical order i.e. ease of search).
 set( Common_ApplicationsWrapper_SOURCES
   mvdApplicationsBrowser.cxx
-  mvdApplicationsToolBox.cxx
   mvdApplicationLauncher.cxx  
 )
 
@@ -14,19 +13,10 @@ set( Common_ApplicationsWrapper_SOURCES
 # Package GUI (files ordered by lexicographical order i.e. ease of search).
 set( Common_ApplicationsWrapper_HEADERS_MOC
   mvdApplicationsBrowser.h
-  mvdApplicationsToolBox.h
   mvdApplicationLauncher.h
 )
 
 #############################################################################
-# Qt designer UI files
-set( Common_ApplicationsWrapper_FORMS
-  mvdApplicationsToolBox.ui
-)
-
-# Qt resources
-set( Common_ApplicationsWrapper_RESOURCES
-)
 
 include_directories(
   ${Monteverdi2_BINARY_DIR}
@@ -34,15 +24,11 @@ include_directories(
   ${Monteverdi2_SOURCE_DIR}/Code/Common
   #
   ${Monteverdi2_BINARY_DIR}/Code/Common
-  #
-  ${OTB_SOURCE_DIR}/Code/Wrappers/QtWidget
 )
 
 #############################################################################
 # Qt4 wrapped files.
 qt4_wrap_cpp( Common_ApplicationsWrapper_SRC_MOC ${Common_ApplicationsWrapper_HEADERS_MOC} )
-qt4_wrap_ui( Common_ApplicationsWrapper_FORMS_HEADERS ${Common_ApplicationsWrapper_FORMS}  )
-qt4_add_resources( Common_ApplicationsWrapper_RESOURCES_RCC ${Common_ApplicationsWrapper_RESOURCES} )
 
 ########################################################################
 # Qt4 translations.

Code/Common/Gui/CMakeLists.txt

@@ -21,6 +21,7 @@ set( Common_Gui_SOURCES
   mvdMyWidget.cxx
   mvdQuicklookViewManipulator.cxx
   mvdStatusBarWidget.cxx
+  mvdApplicationsToolBox.cxx
 )
 
 #############################################################################
@@ -46,6 +47,7 @@ set( Common_Gui_HEADERS_MOC
   mvdMyWidget.h
   mvdQuicklookViewManipulator.h
   mvdStatusBarWidget.h
+  mvdApplicationsToolBox.h
 )
 
 #############################################################################
@@ -59,6 +61,7 @@ set( Common_Gui_FORMS
   mvdMyWidget.ui
   mvdStatusBarWidget.ui
   mvdVideoColorToolBox.ui
+  mvdApplicationsToolBox.ui
 )
 
 # Qt resources

Code/Common/ApplicationsWrapper/mvdApplicationsToolBox.cxx → Code/Common/Gui/mvdApplicationsToolBox.cxx

@@ -16,8 +16,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "ApplicationsWrapper/mvdApplicationsToolBox.h"
-#include "ApplicationsWrapper/ui_mvdApplicationsToolBox.h"
+#include "Gui/mvdApplicationsToolBox.h"
+#include "Gui/ui_mvdApplicationsToolBox.h"
 
 
 /*****************************************************************************/

Testing/Common/CMakeLists.txt

@@ -53,14 +53,12 @@ endif()
 
 add_executable(mvdCommonTests mvdCommonTests.cxx ${Common_SRCS})
 target_link_libraries(mvdCommonTests 
-  Monteverdi2_Gui 
-  Monteverdi2_Core 
+  Monteverdi2_Gui    
   OTBTesting)
 
 if (OTB_USE_QT)
   add_executable(mvdCommonTests1 mvdCommonTests1.cxx ${Common_SRCS1})
   target_link_libraries(mvdCommonTests1 
-    Monteverdi2_Core
     Monteverdi2_Gui
     Monteverdi2_ApplicationsWrapper
     OTBTesting)