diff --git a/hurricane/cmake_modules/FindHURRICANE.cmake b/hurricane/cmake_modules/FindHURRICANE.cmake index 8c1fc418..e7620a95 100644 --- a/hurricane/cmake_modules/FindHURRICANE.cmake +++ b/hurricane/cmake_modules/FindHURRICANE.cmake @@ -38,7 +38,7 @@ IF(UNIX) ) FIND_PATH(HURRICANE_VIEWER_INCLUDE_PATH - NAMES hurricane/viewer/CellViewer.h hurricane/inspector/HInspectorWidget.h + NAMES hurricane/viewer/CellViewer.h hurricane/viewer/HInspectorWidget.h PATHS ${HURRICANE_DIR_SEARCH} PATH_SUFFIXES include # Help the user find it if we cannot. @@ -53,14 +53,6 @@ IF(UNIX) DOC "The ${HURRICANE_INCLUDE_PATH_DESCRIPTION}" ) - FIND_LIBRARY(HURRICANE_INSPECTOR_LIBRARY_PATH - NAMES hinspector - PATHS ${HURRICANE_DIR_SEARCH} - PATH_SUFFIXES lib - # Help the user find it if we cannot. - DOC "The ${HURRICANE_INCLUDE_PATH_DESCRIPTION}" - ) - # Assume we didn't find it. SET(HURRICANE_FOUND 0) SET(HURRICANE_GRAPHICAL_FOUND 0) @@ -89,10 +81,6 @@ IF(UNIX) ENDIF(HURRICANE_VIEWER_LIBRARY_PATH) ENDIF(HURRICANE_VIEWER_INCLUDE_PATH) - IF (HURRICANE_INSPECTOR_LIBRARY_PATH) - SET(HURRICANE_GRAPHICAL_LIBRARIES ${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_INSPECTOR_LIBRARY_PATH}) - ENDIF(HURRICANE_INSPECTOR_LIBRARY_PATH) - IF(HURRICANE_FOUND) IF(NOT HURRICANE_FIND_QUIETLY) MESSAGE(STATUS "Found HURRICANE : ${HURRICANE_LIBRARIES}") @@ -108,7 +96,6 @@ IF(UNIX) HURRICANE_LIBRARY_PATH HURRICANE_GRAPHICAL_INCLUDE_PATH HURRICANE_VIEWER_LIBRARY_PATH - HURRICANE_INSPECTOR_LIBRARY_PATH ) ENDIF(UNIX) diff --git a/hurricane/src/CMakeLists.txt b/hurricane/src/CMakeLists.txt index 756fd73c..da10f998 100644 --- a/hurricane/src/CMakeLists.txt +++ b/hurricane/src/CMakeLists.txt @@ -1,4 +1,3 @@ add_subdirectory(hurricane) -add_subdirectory(hinspector) add_subdirectory(hviewer) add_subdirectory(isobar) diff --git a/hurricane/src/hinspector/CMakeLists.txt b/hurricane/src/hinspector/CMakeLists.txt deleted file mode 100644 index 4d8cfaee..00000000 --- a/hurricane/src/hinspector/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ - - include ( ${QT_USE_FILE} ) - - include_directories ( ${HURRICANE_SOURCE_DIR}/src/hurricane - ${HURRICANE_SOURCE_DIR}/src/hviewer - ${HURRICANE_SOURCE_DIR}/src/hinspector - ) - - set ( mocincludes hurricane/inspector/RecordModel.h - hurricane/inspector/HInspectorWidget.h - ) - set ( cpps RecordModel.cpp - HInspectorWidget.cpp - ) - - qt4_wrap_cpp ( MOC_SRCS ${mocincludes} ) - - add_library ( hinspector SHARED ${cpps} ${MOC_SRCS} ) - target_link_libraries ( hinspector ${QT_LIBRARIES} hurricane ) - - install ( FILES hurricane/inspector/HInspectorWidget.h - DESTINATION /include/hurricane/inspector ) - install ( TARGETS hinspector DESTINATION /lib ) diff --git a/hurricane/src/hviewer/CMakeLists.txt b/hurricane/src/hviewer/CMakeLists.txt index fe53c898..b417fa24 100644 --- a/hurricane/src/hviewer/CMakeLists.txt +++ b/hurricane/src/hviewer/CMakeLists.txt @@ -2,13 +2,12 @@ include ( ${QT_USE_FILE} ) include_directories ( ${HURRICANE_SOURCE_DIR}/src/hurricane - ${HURRICANE_SOURCE_DIR}/src/hinspector - ${HURRICANE_SOURCE_DIR}/src/hviewer - ) + ${HURRICANE_SOURCE_DIR}/src/hviewer ) set ( includes hurricane/viewer/ScreenUtilities.h hurricane/viewer/DisplayStyle.h hurricane/viewer/Graphics.h + hurricane/viewer/HInspectorWidget.h ) set ( mocincludes hurricane/viewer/PaletteEntry.h hurricane/viewer/LayerPaletteEntry.h @@ -17,6 +16,8 @@ hurricane/viewer/Palette.h hurricane/viewer/CellWidget.h hurricane/viewer/CellViewer.h + hurricane/viewer/RecordModel.h + hurricane/viewer/HInspectorWidget.h ) set ( exports hurricane/viewer/ScreenUtilities.h hurricane/viewer/PaletteEntry.h @@ -35,6 +36,8 @@ Palette.cpp CellWidget.cpp CellViewer.cpp + RecordModel.cpp + HInspectorWidget.cpp ) qt4_wrap_cpp ( MOC_SRCS ${mocincludes} ) diff --git a/hurricane/src/hviewer/CellViewer.cpp b/hurricane/src/hviewer/CellViewer.cpp index 1d074985..fb7e54a0 100644 --- a/hurricane/src/hviewer/CellViewer.cpp +++ b/hurricane/src/hviewer/CellViewer.cpp @@ -15,7 +15,7 @@ #include "hurricane/viewer/Palette.h" #include "hurricane/viewer/CellWidget.h" #include "hurricane/viewer/CellViewer.h" -#include "hurricane/inspector/HInspectorWidget.h" +#include "hurricane/viewer/HInspectorWidget.h" namespace Hurricane { diff --git a/hurricane/src/hinspector/HInspectorWidget.cpp b/hurricane/src/hviewer/HInspectorWidget.cpp similarity index 98% rename from hurricane/src/hinspector/HInspectorWidget.cpp rename to hurricane/src/hviewer/HInspectorWidget.cpp index afdcd1e9..cba47ae5 100644 --- a/hurricane/src/hinspector/HInspectorWidget.cpp +++ b/hurricane/src/hviewer/HInspectorWidget.cpp @@ -12,8 +12,8 @@ #include #include "hurricane/viewer/Graphics.h" -#include "hurricane/inspector/RecordModel.h" -#include "hurricane/inspector/HInspectorWidget.h" +#include "hurricane/viewer/RecordModel.h" +#include "hurricane/viewer/HInspectorWidget.h" #include "hurricane/Slot.h" diff --git a/hurricane/src/hinspector/RecordModel.cpp b/hurricane/src/hviewer/RecordModel.cpp similarity index 98% rename from hurricane/src/hinspector/RecordModel.cpp rename to hurricane/src/hviewer/RecordModel.cpp index 822439b0..60316b6d 100644 --- a/hurricane/src/hinspector/RecordModel.cpp +++ b/hurricane/src/hviewer/RecordModel.cpp @@ -4,7 +4,7 @@ #include "hurricane/Name.h" #include "hurricane/viewer/Graphics.h" -#include "hurricane/inspector/RecordModel.h" +#include "hurricane/viewer/RecordModel.h" namespace Hurricane { diff --git a/hurricane/src/hinspector/hurricane/inspector/HInspectorWidget.h b/hurricane/src/hviewer/hurricane/viewer/HInspectorWidget.h similarity index 100% rename from hurricane/src/hinspector/hurricane/inspector/HInspectorWidget.h rename to hurricane/src/hviewer/hurricane/viewer/HInspectorWidget.h diff --git a/hurricane/src/hinspector/hurricane/inspector/RecordModel.h b/hurricane/src/hviewer/hurricane/viewer/RecordModel.h similarity index 100% rename from hurricane/src/hinspector/hurricane/inspector/RecordModel.h rename to hurricane/src/hviewer/hurricane/viewer/RecordModel.h