From 23b275d17d3ebe0437692ebaa75cbd41194416c1 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Sat, 5 Sep 2020 01:22:09 +0300 Subject: [PATCH] refactoring... --- CMakeLists.txt | 52 ++--- cmake/FindCD.cmake | 214 +++++++++--------- libs/CMakeLists.txt | 3 +- libs/cd_utils/CMakeLists.txt | 37 --- libs/core/CMakeLists.txt | 19 ++ libs/{cd_utils => core}/cdtest.h | 0 libs/{cd_utils => core}/cdutils_c.cpp | 0 libs/{cd_utils => core}/cdutils_c.h | 6 +- libs/{cd_utils => core}/cdutils_core.cpp | 0 libs/{cd_utils => core}/cdutils_core.h | 6 +- libs/{cd_utils => core}/cdutils_interface.cpp | 0 libs/{cd_utils => core}/cdutils_interface.h | 4 +- libs/{cd_utils => core}/cdutils_k.cpp | 0 libs/{cd_utils => core}/cdutils_k.h | 6 +- libs/{cd_utils => core}/cdutils_m.cpp | 0 libs/{cd_utils => core}/cdutils_m.h | 6 +- libs/{cd_utils => core}/cdutils_parser.cpp | 0 libs/{cd_utils => core}/cdutils_parser.h | 4 +- libs/{cd_utils => core}/cdutils_protocol.h | 6 +- libs/{cd_utils => core}/cdutils_types.cpp | 0 libs/{cd_utils => core}/cdutils_types.h | 6 +- libs/{cd_utils => core}/cdutils_x.cpp | 0 libs/{cd_utils => core}/cdutils_x.h | 6 +- libs/{cd_utils => core}/cdutilstest.cpp | 0 libs/{cd_utils => core}/k_description.h | 0 libs/qcd_utils/CMakeLists.txt | 1 - libs/qt/CMakeLists.txt | 1 + libs/{qcd_utils => qt}/qcd_core.cpp | 0 libs/{qcd_utils => qt}/qcd_core.h | 6 +- libs/{qcd_utils => qt}/qcd_graphic.cpp | 0 libs/{qcd_utils => qt}/qcd_graphic.h | 4 +- libs/{qcd_utils => qt}/qcd_graphic.ui | 0 libs/{qcd_utils => qt}/qcd_modedialog.cpp | 0 libs/{qcd_utils => qt}/qcd_modedialog.h | 4 +- libs/{qcd_utils => qt}/qcd_modedialog.ui | 0 libs/{qcd_utils => qt}/qcd_model.cpp | 0 libs/{qcd_utils => qt}/qcd_model.h | 8 +- libs/{qcd_utils => qt}/qcd_view.cpp | 0 libs/{qcd_utils => qt}/qcd_view.h | 4 +- utils/CMakeLists.txt | 2 +- utils/{cd_pult => pult}/CMakeLists.txt | 2 +- utils/{cd_pult => pult}/cddirectk.cpp | 0 utils/{cd_pult => pult}/cddirectk.h | 0 utils/{cd_pult => pult}/cddirectk.ui | 0 .../cddirectk_type_dialog.cpp | 0 .../{cd_pult => pult}/cddirectk_type_dialog.h | 0 .../cddirectk_type_dialog.ui | 0 utils/{cd_pult => pult}/cdgraphics.cpp | 0 utils/{cd_pult => pult}/cdgraphics.h | 0 utils/{cd_pult => pult}/cdgraphics.ui | 0 utils/{cd_pult => pult}/cdpult.qrc | 0 utils/{cd_pult => pult}/cdpultwindow.cpp | 0 utils/{cd_pult => pult}/cdpultwindow.h | 0 utils/{cd_pult => pult}/cdpultwindow.ui | 0 utils/{cd_pult => pult}/cdviewwidget.cpp | 0 utils/{cd_pult => pult}/cdviewwidget.h | 0 utils/{cd_pult => pult}/cdviewwidget.ui | 0 .../icons/accessories-calculator.png | Bin .../icons/accessories-text-editor.png | Bin utils/{cd_pult => pult}/icons/db-export.png | Bin utils/{cd_pult => pult}/icons/db-import.png | Bin utils/{cd_pult => pult}/icons/flame.png | Bin utils/{cd_pult => pult}/icons/pult.png | Bin utils/{cd_pult => pult}/icons/timer.png | Bin utils/{cd_pult => pult}/main.cpp | 0 65 files changed, 193 insertions(+), 214 deletions(-) delete mode 100644 libs/cd_utils/CMakeLists.txt create mode 100644 libs/core/CMakeLists.txt rename libs/{cd_utils => core}/cdtest.h (100%) rename libs/{cd_utils => core}/cdutils_c.cpp (100%) rename libs/{cd_utils => core}/cdutils_c.h (89%) rename libs/{cd_utils => core}/cdutils_core.cpp (100%) rename libs/{cd_utils => core}/cdutils_core.h (97%) rename libs/{cd_utils => core}/cdutils_interface.cpp (100%) rename libs/{cd_utils => core}/cdutils_interface.h (96%) rename libs/{cd_utils => core}/cdutils_k.cpp (100%) rename libs/{cd_utils => core}/cdutils_k.h (89%) rename libs/{cd_utils => core}/cdutils_m.cpp (100%) rename libs/{cd_utils => core}/cdutils_m.h (92%) rename libs/{cd_utils => core}/cdutils_parser.cpp (100%) rename libs/{cd_utils => core}/cdutils_parser.h (90%) rename libs/{cd_utils => core}/cdutils_protocol.h (93%) rename libs/{cd_utils => core}/cdutils_types.cpp (100%) rename libs/{cd_utils => core}/cdutils_types.h (98%) rename libs/{cd_utils => core}/cdutils_x.cpp (100%) rename libs/{cd_utils => core}/cdutils_x.h (91%) rename libs/{cd_utils => core}/cdutilstest.cpp (100%) rename libs/{cd_utils => core}/k_description.h (100%) delete mode 100644 libs/qcd_utils/CMakeLists.txt create mode 100644 libs/qt/CMakeLists.txt rename libs/{qcd_utils => qt}/qcd_core.cpp (100%) rename libs/{qcd_utils => qt}/qcd_core.h (94%) rename libs/{qcd_utils => qt}/qcd_graphic.cpp (100%) rename libs/{qcd_utils => qt}/qcd_graphic.h (94%) rename libs/{qcd_utils => qt}/qcd_graphic.ui (100%) rename libs/{qcd_utils => qt}/qcd_modedialog.cpp (100%) rename libs/{qcd_utils => qt}/qcd_modedialog.h (93%) rename libs/{qcd_utils => qt}/qcd_modedialog.ui (100%) rename libs/{qcd_utils => qt}/qcd_model.cpp (100%) rename libs/{qcd_utils => qt}/qcd_model.h (95%) rename libs/{qcd_utils => qt}/qcd_view.cpp (100%) rename libs/{qcd_utils => qt}/qcd_view.h (97%) rename utils/{cd_pult => pult}/CMakeLists.txt (71%) rename utils/{cd_pult => pult}/cddirectk.cpp (100%) rename utils/{cd_pult => pult}/cddirectk.h (100%) rename utils/{cd_pult => pult}/cddirectk.ui (100%) rename utils/{cd_pult => pult}/cddirectk_type_dialog.cpp (100%) rename utils/{cd_pult => pult}/cddirectk_type_dialog.h (100%) rename utils/{cd_pult => pult}/cddirectk_type_dialog.ui (100%) rename utils/{cd_pult => pult}/cdgraphics.cpp (100%) rename utils/{cd_pult => pult}/cdgraphics.h (100%) rename utils/{cd_pult => pult}/cdgraphics.ui (100%) rename utils/{cd_pult => pult}/cdpult.qrc (100%) rename utils/{cd_pult => pult}/cdpultwindow.cpp (100%) rename utils/{cd_pult => pult}/cdpultwindow.h (100%) rename utils/{cd_pult => pult}/cdpultwindow.ui (100%) rename utils/{cd_pult => pult}/cdviewwidget.cpp (100%) rename utils/{cd_pult => pult}/cdviewwidget.h (100%) rename utils/{cd_pult => pult}/cdviewwidget.ui (100%) rename utils/{cd_pult => pult}/icons/accessories-calculator.png (100%) rename utils/{cd_pult => pult}/icons/accessories-text-editor.png (100%) rename utils/{cd_pult => pult}/icons/db-export.png (100%) rename utils/{cd_pult => pult}/icons/db-import.png (100%) rename utils/{cd_pult => pult}/icons/flame.png (100%) rename utils/{cd_pult => pult}/icons/pult.png (100%) rename utils/{cd_pult => pult}/icons/timer.png (100%) rename utils/{cd_pult => pult}/main.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 965866f..610af40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,20 +1,22 @@ cmake_minimum_required(VERSION 3.0) cmake_policy(SET CMP0017 NEW) # need include() with .cmake -project(qad) -set(qad_MAJOR 1) -set(qad_MINOR 9) -set(qad_REVISION 0) -set(qad_SUFFIX ) -set(qad_COMPANY SHS) -set(qad_DOMAIN org.SHS) +project(cd) +set(cd_MAJOR 1) +set(cd_MINOR 0) +set(cd_REVISION 0) +set(cd_SUFFIX ) +set(cd_COMPANY SHS) +set(cd_DOMAIN org.SHS) if ("x${CMAKE_MODULE_PATH}" STREQUAL "x") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") endif() +find_package(PIP REQUIRED) + include(SHSTKMacros) include(QtWraps) -shstk_begin_project(qad QAD) +shstk_begin_project(cd CD) include(SHSTKQtMacros) shstk_qt_founded(QtVersions) @@ -23,43 +25,41 @@ foreach(_v ${_QT_VERSIONS_}) option(Qt${_v} "Build for Qt${_v}" ON) endforeach() -if (NOT DEFINED ANDROID_PLATFORM) - find_package(OpenGL REQUIRED) -endif() -#include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) - option(UTILS "Build various utils" ${_plugins_default_}) -option(DESIGNER_PLUGINS "Build Qt designer plugins" ${_plugins_default_}) -macro(qad_library NAME _MODULES _LIBS) - shstk_qt_project(qad_${NAME} FALSE "qad" "${_MODULES}" "${_LIBS}" ${ARGN}) - shstk_qt_install("qad" FALSE qad_${NAME} "${out_HDR}" "${out_QM}") +macro(cd_library NAME _MODULES _LIBS) + shstk_qt_project(cd_${NAME} FALSE "cd" "${_MODULES}" "${_LIBS}" ${ARGN}) + shstk_qt_install("cd" FALSE cd_${NAME} "${out_HDR}" "${out_QM}") endmacro() -macro(qad_application NAME _MODULES _LIBS) - shstk_qt_project(${NAME} TRUE "qad" "${_MODULES}" "${_LIBS}" ${ARGN}) - shstk_qt_install("qad" TRUE ${NAME} "" "${out_QM}") +macro(cd_application NAME _MODULES _LIBS) + shstk_qt_project(${NAME} TRUE "cd" "${_MODULES}" "${_LIBS}" ${ARGN}) + shstk_qt_install("cd" TRUE ${NAME} "" "${out_QM}") endmacro() -macro(qad_plugin NAME _MODULES _LIBS) - shstk_qt_plugin(qad_${NAME} "${_MODULES}" "qad_${NAME};${_LIBS}") +macro(cd_plugin NAME _MODULES _LIBS) + shstk_qt_plugin(cd_${NAME} "${_MODULES}" "cd_${NAME};${_LIBS}") endmacro() -shstk_install(qad FALSE "" "${QAD_VERSION_FILE}") +shstk_install(cd FALSE "" "${CD_VERSION_FILE}") if (NOT LOCAL) file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in") install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) endif() +set(_qt_libs cd_core) +set(_qt_plugs) +set(_qt_apps ) + add_subdirectory(libs) if (UTILS) add_subdirectory(utils) endif() -message("----------QAD----------") +message("----------CD-----------") message(" Build for ${QtVersions}") -message(" Linkage: ${qad_LIB_TYPE_MSG}") -message(" Type : ${qad_BUILD_TYPE}") +message(" Linkage: ${cd_LIB_TYPE_MSG}") +message(" Type : ${cd_BUILD_TYPE}") message(" Install: \"${CMAKE_INSTALL_PREFIX}\"") message("") print_list("${_qt_libs}" " Libraries:" " * ") diff --git a/cmake/FindCD.cmake b/cmake/FindCD.cmake index fdd53d2..b6a0c41 100644 --- a/cmake/FindCD.cmake +++ b/cmake/FindCD.cmake @@ -1,16 +1,8 @@ #[[ Create imported targets: - * QAD::Utils - * QAD::Widgets - * QAD::Application - * QAD::Blockview - * QAD::Graphic - * QAD::SQLTable - * QAD::TouchWidgets - * QAD::Doc - * QAD::PIQt - * QAD::PIQtUtils + * CD::Core + * CD::Qt These targets include directories and dependencies @@ -18,124 +10,128 @@ These targets include directories and dependencies cmake_policy(SET CMP0011 NEW) # don`t affect includer policies cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain target on Windows -if(NOT BUILDING_qad) - find_package(PIP QUIET) - include(QtWraps) - include(SHSTKMacros) -endif() +find_package(PIP REQUIRED) +find_package(QAD QUIET) +include(QtWraps) +include(SHSTKMacros) shstk_is_parent_exists(hasParent PARENT_DIRECTORY) -set(_SEARCH_DIR) -if(WIN32) - find_package(MinGW REQUIRED) + +shstk_set_find_dirs(cd) +set(_SEARCH_DIR ${cd_LIBDIR}) + +if (NOT BUILDING_cd) + list(APPEND _SEARCH_DIR $ENV{SMSDK_DIR}/lib) + shstk_find_header(cd CD "cd_version.h" "") endif() -shstk_set_find_dirs(qad) - -if (NOT BUILDING_qad) - - find_file(QAD_H_INCLUDE "qad_types.h" HINTS ${PIP_DIR}/include/qad ${qad_INCDIR} $ENV{SMSDK_DIR}/include/qad) - #if (DEFINED ANDROID_PLATFORM) - # set(QAD_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/qad) - #else() - get_filename_component(QAD_INCLUDES ${QAD_H_INCLUDE} PATH) - #endif() - set(_SEARCH_DIR ${qad_LIBDIR} $ENV{SMSDK_DIR}/lib) - shstk_find_header(QAD "qad_version.h" "") - +if(CD_FIND_VERSION VERSION_GREATER CD_VERSION) + message(FATAL_ERROR "CD version ${CD_VERSION} is available, but ${CD_FIND_VERSION} requested!") endif() -if(QAD_FIND_VERSION VERSION_GREATER QAD_VERSION) - message(FATAL_ERROR "QAD version ${QAD_VERSION} is available, but ${QAD_FIND_VERSION} requested!") -endif() -set(__libs "utils;widgets;application;blockview;graphic;sql_table;touch_widgets;doc") -if (PIP_FOUND OR BUILDING_pip) - list(APPEND __libs "piqt;piqt_utils") -endif() +set(__libs "core") -set(__module_utils Utils ) -set(__module_widgets Widgets ) -set(__module_application Application ) -set(__module_blockview Blockview ) -set(__module_graphic Graphic ) -set(__module_sql_table SQLTable ) -set(__module_touch_widgets TouchWidgets ) -set(__module_doc Doc ) -set(__module_piqt PIQt ) -set(__module_piqt_utils PIQtUtils ) +set(__module_core Core) +set( __inc_core "") +set(__libs_core "") +set(__deps_core "PIP") -foreach (_l ${__libs}) - set( __inc_${_l} "") - set(__deps_${_l} "") - set(__libs_${_l} "") -endforeach() +if (BUILDING_cd) -set(__deps_widgets "QAD::Utils") -set(__deps_application "QAD::Widgets") -set(__deps_blockview "QAD::Widgets") -set(__deps_graphic "QAD::Widgets") -set(__deps_sql_table "QAD::Widgets") -set(__deps_piqt "QAD::Widgets;PIP") -set(__deps_piqt_utils "QAD::Blockview;QAD::PIQt") - -#message("find QAD ${BUILDING_qad}") - -if (BUILDING_qad) - - if (NOT SET_TARGETS_qad) - set(SET_TARGETS_qad ON CACHE BOOL "") - #message("create aliases") - foreach(_l ${__libs}) - foreach(_v ${_QT_VERSIONS_}) - set(_m ${__module_${_l}}) - string(REPLACE ":" "_" _m_str "${_m}") - if((NOT TARGET QAD::${_m}${_v}) AND TARGET qad_${_l}${_v}) - #message("alias QAD::${_m}${_v} = qad_${_l}${_v}") - set(MULTILIB_qad_${_l}_SUFFIX_Qt${_v} ${_v} CACHE STRING "") - add_library(QAD::${_m}${_v} ALIAS qad_${_l}${_v}) - endif() - endforeach() - list(APPEND QT_MULTILIB_LIST QAD::${_m}) + if (NOT SET_TARGETS_cd) + message("create aliases") + foreach (_l ${__libs}) + set(_m ${__module_${_l}}) + if((NOT TARGET CD::${_m}) AND TARGET cd_${_l}) + message("alias CD::${_m} = cd_${_l}") + add_library(CD::${_m} ALIAS cd_${_l}) + endif() endforeach() endif() - set(QAD_FOUND ON CACHE BOOL "") - else() - #message("create interfaces") - foreach(_l ${__libs}) - foreach(_v ${_QT_VERSIONS_}) - set(_m ${__module_${_l}}) - string(REPLACE ":" "_" _m_str "${_m}") - find_library(QAD_LIBRARY_${_l}${_v} qad_${_l}${_v} HINTS ${qad_LIBDIR}) - #message("found ${_l}${_v} = ${QAD_LIBRARY_${_l}${_v}}") - if((NOT TARGET QAD::${_m}${_v}) AND QAD_LIBRARY_${_l}${_v}) - #message("imported QAD::${_m}${_v} = ${QAD_LIBRARY_${_l}${_v}}") - set(MULTILIB_qad_${_l}_SUFFIX_Qt${_v} ${_v} CACHE STRING "") - add_library(QAD::${_m}${_v} UNKNOWN IMPORTED) - set(_deps) - foreach (_d ${__deps_${_l}}) - if (${_d} MATCHES "QAD::*") - list(APPEND _deps ${_d}${_v}) - else() - list(APPEND _deps ${_d}) + message("create interfaces") + foreach (_l ${__libs}) + set(_m ${__module_${_l}}) + find_library(CD_LIBRARY_${_l} cd_${_l} HINTS ${_SEARCH_DIR}) + if((NOT TARGET CD::${_m}) AND CD_LIBRARY_${_l}) + add_library(CD::${_m} UNKNOWN IMPORTED) + set_target_properties(CD::${_m} PROPERTIES + IMPORTED_LOCATION "${CD_LIBRARY_${_l}}" + INTERFACE_INCLUDE_DIRECTORIES "${cd_INCLUDES};${__inc_${_l}}" + INTERFACE_LINK_LIBRARIES "${__deps_${_l}};${__libs_${_l}}") + message("imported CD::${_m} = ${CD_LIBRARY_${_l}} ${__deps_${_l}} ${__libs_${_l}} ${__inc_${_l}}") + endif() + endforeach() + +endif() + + +if (QAD_FOUND OR BUILDING_qad) + + set(__libs "qt") + + set(__module_qt Qt) + set( __inc_qt "") + set(__libs_qt "") + set(__deps_qt "QAD::PIQt;QAD::Graphic;CD::Core") + + if (BUILDING_cd) + + if (NOT SET_TARGETS_cd) + set(SET_TARGETS_cd ON CACHE BOOL "") + message("create aliases") + foreach(_l ${__libs}) + foreach(_v ${_QT_VERSIONS_}) + set(_m ${__module_${_l}}) + if((NOT TARGET CD::${_m}${_v}) AND TARGET cd_${_l}${_v}) + message("alias CD::${_m}${_v} = cd_${_l}${_v}") + set(MULTILIB_CD__${_m}_SUFFIX_Qt${_v} ${_v} CACHE STRING "") + add_library(CD::${_m}${_v} ALIAS cd_${_l}${_v}) endif() endforeach() - set_target_properties(QAD::${_m}${_v} PROPERTIES - IMPORTED_LOCATION "${QAD_LIBRARY_${_l}${_v}}" - INTERFACE_INCLUDE_DIRECTORIES "${QAD_INCLUDES}" - INTERFACE_LINK_LIBRARIES "${_deps}") - endif() + list(APPEND QT_MULTILIB_LIST CD::${_m}) + endforeach() + endif() + + else() + + message("create interfaces") + foreach(_l ${__libs}) + foreach(_v ${_QT_VERSIONS_}) + set(_m ${__module_${_l}}) + find_library(CD_LIBRARY_${_l}${_v} cd_${_l}${_v} HINTS ${cd_LIBDIR}) + #message("found ${_l}${_v} = ${CD_LIBRARY_${_l}${_v}}") + if((NOT TARGET CD::${_m}${_v}) AND CD_LIBRARY_${_l}${_v}) + message("imported CD::${_m}${_v} = ${CD_LIBRARY_${_l}${_v}}") + set(MULTILIB_CD__${_m}_SUFFIX_Qt${_v} ${_v} CACHE STRING "") + add_library(CD::${_m}${_v} UNKNOWN IMPORTED) + set(_deps) + foreach (_d ${__deps_${_l}}) + if (${_d} MATCHES "CD::*") + list(APPEND _deps ${_d}${_v}) + else() + list(APPEND _deps ${_d}) + endif() + endforeach() + set_target_properties(CD::${_m}${_v} PROPERTIES + IMPORTED_LOCATION "${CD_LIBRARY_${_l}${_v}}" + INTERFACE_INCLUDE_DIRECTORIES "${cd_INCLUDES}" + INTERFACE_LINK_LIBRARIES "${_deps}") + endif() + endforeach() + list(APPEND QT_MULTILIB_LIST CD::${_m}) endforeach() - list(APPEND QT_MULTILIB_LIST QAD::${_m}) - endforeach() + + endif() + + if(hasParent) + set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE) + endif() endif() -if(hasParent) - set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE) -endif() -set(QAD_FOUND ON CACHE BOOL "") +set(CD_FOUND ON CACHE BOOL "") diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index 0d911f8..73bec28 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -1 +1,2 @@ -add_directories_with_include("qad_") +list(APPEND QT_MULTILIB_LIST cd_qt) +shstk_add_directories_with_include(FALSE "cd_") diff --git a/libs/cd_utils/CMakeLists.txt b/libs/cd_utils/CMakeLists.txt deleted file mode 100644 index e399d88..0000000 --- a/libs/cd_utils/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(cd_utils) -find_package(MinGW REQUIRED) -include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES}) -file(GLOB CPPS_UTILS "cdutils_*.cpp") -file(GLOB HDRS_UTILS "cdutils_*.h") -add_library(${PROJECT_NAME} SHARED ${CPPS_UTILS} ${HDRS_UTILS}) -target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY}) -generate_export_header(${PROJECT_NAME}) -list(APPEND HDRS_UTILS "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h") - -add_executable(cdutilstest "cdutilstest.cpp" "cdtest.h") -target_link_libraries(cdutilstest ${PIP_LIBRARY} ${PROJECT_NAME}) -message(STATUS "Building ${PROJECT_NAME}") - -if(LIB) - list(APPEND _ALL_TARGETS ${PROJECT_NAME}) - set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE) - if(WIN32) - install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE}) - install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${MINGW_LIB}) - install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${MINGW_BIN}) - else() - install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) - install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - endif() - #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") -else() - if(WIN32) - install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) - install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib) - else() - install(TARGETS ${PROJECT_NAME} DESTINATION lib) - endif() - install(FILES ${HDRS_UTILS} DESTINATION include) - #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") -endif() diff --git a/libs/core/CMakeLists.txt b/libs/core/CMakeLists.txt new file mode 100644 index 0000000..7582cba --- /dev/null +++ b/libs/core/CMakeLists.txt @@ -0,0 +1,19 @@ +cmake_minimum_required(VERSION 3.0) +project(cd_core) +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES}) +file(GLOB CPPS "cdutils_*.cpp") +file(GLOB HDRS "cdutils_*.h") + +import_version(${PROJECT_NAME} cd) +set_deploy_property(${PROJECT_NAME} ${cd_LIB_TYPE} + LABEL "Core CD library" + FULLNAME "${cd_DOMAIN}.${PROJECT_NAME}" + COMPANY "${cd_COMPANY}" + INFO "Control & Debug library") +make_rc(${PROJECT_NAME} _RC) +add_library(${PROJECT_NAME} ${cd_LIB_TYPE} ${CPPS} ${HDRS} ${_RC}) +target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +target_link_libraries(${PROJECT_NAME} PIP) +generate_export_header(${PROJECT_NAME}) +list(APPEND HDRS "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h") +shstk_install("qad" FALSE ${PROJECT_NAME} "${HDRS}") diff --git a/libs/cd_utils/cdtest.h b/libs/core/cdtest.h similarity index 100% rename from libs/cd_utils/cdtest.h rename to libs/core/cdtest.h diff --git a/libs/cd_utils/cdutils_c.cpp b/libs/core/cdutils_c.cpp similarity index 100% rename from libs/cd_utils/cdutils_c.cpp rename to libs/core/cdutils_c.cpp diff --git a/libs/cd_utils/cdutils_c.h b/libs/core/cdutils_c.h similarity index 89% rename from libs/cd_utils/cdutils_c.h rename to libs/core/cdutils_c.h index 80082f9..6492e22 100644 --- a/libs/cd_utils/cdutils_c.h +++ b/libs/core/cdutils_c.h @@ -21,13 +21,13 @@ #define CDUTILS_C_H #include "cdutils_interface.h" -#include "cd_utils_export.h" +#include "cd_core_export.h" namespace CDUtils { -class CD_UTILS_EXPORT CInterface: public Interface +class CD_CORE_EXPORT CInterface: public Interface { PIOBJECT_SUBCLASS(CInterface, Interface) public: @@ -41,6 +41,6 @@ public: } -extern CD_UTILS_EXPORT CDUtils::CInterface C; +extern CD_CORE_EXPORT CDUtils::CInterface C; #endif // CDUTILS_C_H diff --git a/libs/cd_utils/cdutils_core.cpp b/libs/core/cdutils_core.cpp similarity index 100% rename from libs/cd_utils/cdutils_core.cpp rename to libs/core/cdutils_core.cpp diff --git a/libs/cd_utils/cdutils_core.h b/libs/core/cdutils_core.h similarity index 97% rename from libs/cd_utils/cdutils_core.h rename to libs/core/cdutils_core.h index d7c357f..93e7f7f 100644 --- a/libs/cd_utils/cdutils_core.h +++ b/libs/core/cdutils_core.h @@ -24,7 +24,7 @@ #include "cdutils_protocol.h" #include "piconnection.h" #include "pidatatransfer.h" -#include "cd_utils_export.h" +#include "cd_core_export.h" namespace CDUtils { @@ -32,7 +32,7 @@ namespace CDUtils { class CDCore; -class CD_UTILS_EXPORT __Core_Initializer__ { +class CD_CORE_EXPORT __Core_Initializer__ { public: __Core_Initializer__(); ~__Core_Initializer__(); @@ -41,7 +41,7 @@ public: }; -class CD_UTILS_EXPORT CDCore: public PIObject +class CD_CORE_EXPORT CDCore: public PIObject { PIOBJECT(CDUtils::CDCore) friend class __Core_Initializer__; diff --git a/libs/cd_utils/cdutils_interface.cpp b/libs/core/cdutils_interface.cpp similarity index 100% rename from libs/cd_utils/cdutils_interface.cpp rename to libs/core/cdutils_interface.cpp diff --git a/libs/cd_utils/cdutils_interface.h b/libs/core/cdutils_interface.h similarity index 96% rename from libs/cd_utils/cdutils_interface.h rename to libs/core/cdutils_interface.h index 79f0aa1..7a7b5b9 100644 --- a/libs/cd_utils/cdutils_interface.h +++ b/libs/core/cdutils_interface.h @@ -22,7 +22,7 @@ #include "cdutils_types.h" #include "piobject.h" -#include "cd_utils_export.h" +#include "cd_core_export.h" namespace CDUtils { @@ -30,7 +30,7 @@ namespace CDUtils { class CDCore; -class CD_UTILS_EXPORT Interface: public PIObject +class CD_CORE_EXPORT Interface: public PIObject { PIOBJECT(CDUtils::Interface) public: diff --git a/libs/cd_utils/cdutils_k.cpp b/libs/core/cdutils_k.cpp similarity index 100% rename from libs/cd_utils/cdutils_k.cpp rename to libs/core/cdutils_k.cpp diff --git a/libs/cd_utils/cdutils_k.h b/libs/core/cdutils_k.h similarity index 89% rename from libs/cd_utils/cdutils_k.h rename to libs/core/cdutils_k.h index e699f07..11499ff 100644 --- a/libs/cd_utils/cdutils_k.h +++ b/libs/core/cdutils_k.h @@ -21,13 +21,13 @@ #define CDUTILS_K_H #include "cdutils_interface.h" -#include "cd_utils_export.h" +#include "cd_core_export.h" namespace CDUtils { -class CD_UTILS_EXPORT KInterface: public Interface +class CD_CORE_EXPORT KInterface: public Interface { PIOBJECT_SUBCLASS(KInterface, Interface) public: @@ -42,6 +42,6 @@ public: } -extern CD_UTILS_EXPORT CDUtils::KInterface K; +extern CD_CORE_EXPORT CDUtils::KInterface K; #endif // CDUTILS_K_H diff --git a/libs/cd_utils/cdutils_m.cpp b/libs/core/cdutils_m.cpp similarity index 100% rename from libs/cd_utils/cdutils_m.cpp rename to libs/core/cdutils_m.cpp diff --git a/libs/cd_utils/cdutils_m.h b/libs/core/cdutils_m.h similarity index 92% rename from libs/cd_utils/cdutils_m.h rename to libs/core/cdutils_m.h index 9d9a00c..171747f 100644 --- a/libs/cd_utils/cdutils_m.h +++ b/libs/core/cdutils_m.h @@ -21,13 +21,13 @@ #define CDUTILS_M_H #include "cdutils_interface.h" -#include "cd_utils_export.h" +#include "cd_core_export.h" namespace CDUtils { -class CD_UTILS_EXPORT MInterface: public Interface +class CD_CORE_EXPORT MInterface: public Interface { PIOBJECT_SUBCLASS(MInterface, Interface) public: @@ -51,6 +51,6 @@ private: } -extern CD_UTILS_EXPORT CDUtils::MInterface M; +extern CD_CORE_EXPORT CDUtils::MInterface M; #endif // CDUTILS_M_H diff --git a/libs/cd_utils/cdutils_parser.cpp b/libs/core/cdutils_parser.cpp similarity index 100% rename from libs/cd_utils/cdutils_parser.cpp rename to libs/core/cdutils_parser.cpp diff --git a/libs/cd_utils/cdutils_parser.h b/libs/core/cdutils_parser.h similarity index 90% rename from libs/cd_utils/cdutils_parser.h rename to libs/core/cdutils_parser.h index d85d609..7a1092f 100644 --- a/libs/cd_utils/cdutils_parser.h +++ b/libs/core/cdutils_parser.h @@ -20,7 +20,7 @@ #ifndef CDUTILS_PARSER_H #define CDUTILS_PARSER_H -#include "cd_utils_export.h" +#include "cd_core_export.h" class PIIODevice; @@ -30,7 +30,7 @@ class CDSection; namespace CDParser { -CD_UTILS_EXPORT CDSection parse(PIIODevice * d, int cdsection_type); +CD_CORE_EXPORT CDSection parse(PIIODevice * d, int cdsection_type); } diff --git a/libs/cd_utils/cdutils_protocol.h b/libs/core/cdutils_protocol.h similarity index 93% rename from libs/cd_utils/cdutils_protocol.h rename to libs/core/cdutils_protocol.h index 18b9164..b6385b2 100644 --- a/libs/cd_utils/cdutils_protocol.h +++ b/libs/core/cdutils_protocol.h @@ -21,7 +21,7 @@ #define CDUTILS_PROTOCOL_H #include "pistring.h" -#include "cd_utils_export.h" +#include "cd_core_export.h" namespace CDUtils { @@ -49,12 +49,12 @@ namespace CDUtils { # pragma pack(push,1) - struct CD_UTILS_EXPORT PacketHeader { + struct CD_CORE_EXPORT PacketHeader { int type; // CDPacketType int session_id; }; - struct CD_UTILS_EXPORT PacketKDirectChange { + struct CD_CORE_EXPORT PacketKDirectChange { PIDeque path; PIString value; }; diff --git a/libs/cd_utils/cdutils_types.cpp b/libs/core/cdutils_types.cpp similarity index 100% rename from libs/cd_utils/cdutils_types.cpp rename to libs/core/cdutils_types.cpp diff --git a/libs/cd_utils/cdutils_types.h b/libs/core/cdutils_types.h similarity index 98% rename from libs/cd_utils/cdutils_types.h rename to libs/core/cdutils_types.h index f2fd7fe..d0daa6e 100644 --- a/libs/cd_utils/cdutils_types.h +++ b/libs/core/cdutils_types.h @@ -23,7 +23,7 @@ #include "pistring.h" #include "pimap.h" #include "pivariant.h" -#include "cd_utils_export.h" +#include "cd_core_export.h" class PIIODevice; class PIEvaluator; @@ -48,7 +48,7 @@ enum MessageType { typedef PIFlags UpdateModeFlags; -class CD_UTILS_EXPORT CDType { +class CD_CORE_EXPORT CDType { friend class CDSection; friend class CDCore; friend class Interface; @@ -113,7 +113,7 @@ protected: }; -class CD_UTILS_EXPORT CDSection { +class CD_CORE_EXPORT CDSection { friend class CDCore; friend class Interface; friend class XInterface; diff --git a/libs/cd_utils/cdutils_x.cpp b/libs/core/cdutils_x.cpp similarity index 100% rename from libs/cd_utils/cdutils_x.cpp rename to libs/core/cdutils_x.cpp diff --git a/libs/cd_utils/cdutils_x.h b/libs/core/cdutils_x.h similarity index 91% rename from libs/cd_utils/cdutils_x.h rename to libs/core/cdutils_x.h index 72e9974..5d832e3 100644 --- a/libs/cd_utils/cdutils_x.h +++ b/libs/core/cdutils_x.h @@ -21,13 +21,13 @@ #define CDUTILS_X_H #include "cdutils_interface.h" -#include "cd_utils_export.h" +#include "cd_core_export.h" namespace CDUtils { -class CD_UTILS_EXPORT XInterface: public Interface +class CD_CORE_EXPORT XInterface: public Interface { PIOBJECT_SUBCLASS(XInterface, Interface) public: @@ -52,6 +52,6 @@ public: } -extern CD_UTILS_EXPORT CDUtils::XInterface X; +extern CD_CORE_EXPORT CDUtils::XInterface X; #endif // CDUTILS_X_H diff --git a/libs/cd_utils/cdutilstest.cpp b/libs/core/cdutilstest.cpp similarity index 100% rename from libs/cd_utils/cdutilstest.cpp rename to libs/core/cdutilstest.cpp diff --git a/libs/cd_utils/k_description.h b/libs/core/k_description.h similarity index 100% rename from libs/cd_utils/k_description.h rename to libs/core/k_description.h diff --git a/libs/qcd_utils/CMakeLists.txt b/libs/qcd_utils/CMakeLists.txt deleted file mode 100644 index f3e84e8..0000000 --- a/libs/qcd_utils/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -piqt_library(qcd_utils "Gui" "pip;qad_utils;qad_widgets;qad_graphic;cd_utils;piqt") diff --git a/libs/qt/CMakeLists.txt b/libs/qt/CMakeLists.txt new file mode 100644 index 0000000..cea3712 --- /dev/null +++ b/libs/qt/CMakeLists.txt @@ -0,0 +1 @@ +cd_library(qt "Gui;Widgets" "cd_core;QAD::PIQt;QAD::Graphic") diff --git a/libs/qcd_utils/qcd_core.cpp b/libs/qt/qcd_core.cpp similarity index 100% rename from libs/qcd_utils/qcd_core.cpp rename to libs/qt/qcd_core.cpp diff --git a/libs/qcd_utils/qcd_core.h b/libs/qt/qcd_core.h similarity index 94% rename from libs/qcd_utils/qcd_core.h rename to libs/qt/qcd_core.h index 64695ff..82ec374 100644 --- a/libs/qcd_utils/qcd_core.h +++ b/libs/qt/qcd_core.h @@ -25,13 +25,13 @@ #include #include "piobject.h" #include "cdutils_types.h" -#include "qcd_utils_export.h" +#include "cd_qt_export.h" class QCDCore; -class QCD_UTILS_EXPORT __QCore_Initializer__ { +class CD_QT_EXPORT __QCore_Initializer__ { public: __QCore_Initializer__(); ~__QCore_Initializer__(); @@ -40,7 +40,7 @@ public: }; -class QCD_UTILS_EXPORT QCDCore: public QObject, public PIObject +class CD_QT_EXPORT QCDCore: public QObject, public PIObject { Q_OBJECT PIOBJECT(QCDCore) diff --git a/libs/qcd_utils/qcd_graphic.cpp b/libs/qt/qcd_graphic.cpp similarity index 100% rename from libs/qcd_utils/qcd_graphic.cpp rename to libs/qt/qcd_graphic.cpp diff --git a/libs/qcd_utils/qcd_graphic.h b/libs/qt/qcd_graphic.h similarity index 94% rename from libs/qcd_utils/qcd_graphic.h rename to libs/qt/qcd_graphic.h index 68b7fd8..a543691 100644 --- a/libs/qcd_utils/qcd_graphic.h +++ b/libs/qt/qcd_graphic.h @@ -23,7 +23,7 @@ #include #include #include -#include "qcd_utils_export.h" +#include "cd_qt_export.h" namespace CDUtils { class CDType; @@ -38,7 +38,7 @@ class Graphic; class Graphic; -class QCD_UTILS_EXPORT CDGraphicWidget: public QWidget { +class CD_QT_EXPORT CDGraphicWidget: public QWidget { Q_OBJECT friend class CDGraphics; friend class GDockWidget; diff --git a/libs/qcd_utils/qcd_graphic.ui b/libs/qt/qcd_graphic.ui similarity index 100% rename from libs/qcd_utils/qcd_graphic.ui rename to libs/qt/qcd_graphic.ui diff --git a/libs/qcd_utils/qcd_modedialog.cpp b/libs/qt/qcd_modedialog.cpp similarity index 100% rename from libs/qcd_utils/qcd_modedialog.cpp rename to libs/qt/qcd_modedialog.cpp diff --git a/libs/qcd_utils/qcd_modedialog.h b/libs/qt/qcd_modedialog.h similarity index 93% rename from libs/qcd_utils/qcd_modedialog.h rename to libs/qt/qcd_modedialog.h index dc57713..26b314c 100644 --- a/libs/qcd_utils/qcd_modedialog.h +++ b/libs/qt/qcd_modedialog.h @@ -22,13 +22,13 @@ #include #include -#include "qcd_utils_export.h" +#include "cd_qt_export.h" namespace Ui { class QCDModeDialog; } -class QCD_UTILS_EXPORT QCDModeDialog: public QDialog +class CD_QT_EXPORT QCDModeDialog: public QDialog { Q_OBJECT public: diff --git a/libs/qcd_utils/qcd_modedialog.ui b/libs/qt/qcd_modedialog.ui similarity index 100% rename from libs/qcd_utils/qcd_modedialog.ui rename to libs/qt/qcd_modedialog.ui diff --git a/libs/qcd_utils/qcd_model.cpp b/libs/qt/qcd_model.cpp similarity index 100% rename from libs/qcd_utils/qcd_model.cpp rename to libs/qt/qcd_model.cpp diff --git a/libs/qcd_utils/qcd_model.h b/libs/qt/qcd_model.h similarity index 95% rename from libs/qcd_utils/qcd_model.h rename to libs/qt/qcd_model.h index 506f0f0..047c02a 100644 --- a/libs/qcd_utils/qcd_model.h +++ b/libs/qt/qcd_model.h @@ -24,7 +24,7 @@ #include #include #include "pistring.h" -#include "qcd_utils_export.h" +#include "cd_qt_export.h" namespace CDUtils { class CDType; @@ -51,7 +51,7 @@ namespace QAD { class CDItemModel; -class QCD_UTILS_EXPORT CDItem { +class CD_QT_EXPORT CDItem { friend class CDItemModel; friend class CDView; public: @@ -79,7 +79,7 @@ private: }; -class QCD_UTILS_EXPORT CDDelegate : public QStyledItemDelegate +class CD_QT_EXPORT CDDelegate : public QStyledItemDelegate { Q_OBJECT public: @@ -95,7 +95,7 @@ public: }; -class QCD_UTILS_EXPORT CDItemModel : public QAbstractItemModel { +class CD_QT_EXPORT CDItemModel : public QAbstractItemModel { Q_OBJECT friend class CDView; public: diff --git a/libs/qcd_utils/qcd_view.cpp b/libs/qt/qcd_view.cpp similarity index 100% rename from libs/qcd_utils/qcd_view.cpp rename to libs/qt/qcd_view.cpp diff --git a/libs/qcd_utils/qcd_view.h b/libs/qt/qcd_view.h similarity index 97% rename from libs/qcd_utils/qcd_view.h rename to libs/qt/qcd_view.h index ff3d68a..69aa541 100644 --- a/libs/qcd_utils/qcd_view.h +++ b/libs/qt/qcd_view.h @@ -22,7 +22,7 @@ #include #include "piobject.h" -#include "qcd_utils_export.h" +#include "cd_qt_export.h" namespace CDUtils { class CDType; @@ -32,7 +32,7 @@ namespace CDUtils { class CDItemModel; class QSortFilterProxyModel; -class QCD_UTILS_EXPORT CDView: public QTreeView, public PIObject +class CD_QT_EXPORT CDView: public QTreeView, public PIObject { Q_OBJECT PIOBJECT(CDView) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index dc9a712..dddb781 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1 +1 @@ -add_directories("qad_") +shstk_add_directories("cd_") diff --git a/utils/cd_pult/CMakeLists.txt b/utils/pult/CMakeLists.txt similarity index 71% rename from utils/cd_pult/CMakeLists.txt rename to utils/pult/CMakeLists.txt index 1ffaae3..9d636dd 100644 --- a/utils/cd_pult/CMakeLists.txt +++ b/utils/pult/CMakeLists.txt @@ -7,7 +7,7 @@ else() set(APP_ICON "") endif() set(APP_INFO "CD Pult") -piqt_application(${PROJECT_NAME} "Gui;Widgets" "qad_utils;qad_widgets;qad_graphic;qad_application;qcd_utils;piqt_utils") +cd_application(${PROJECT_NAME} "Gui;Widgets" "cd_qt;QAD::Application;QAD::PIQtUtils") if (Qt5_FOUND) import_version(${PROJ_NAME}5 ${PROJECT_NAME}) deploy_target(${PROJECT_NAME}5 DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${ROOT_DIR}/release) diff --git a/utils/cd_pult/cddirectk.cpp b/utils/pult/cddirectk.cpp similarity index 100% rename from utils/cd_pult/cddirectk.cpp rename to utils/pult/cddirectk.cpp diff --git a/utils/cd_pult/cddirectk.h b/utils/pult/cddirectk.h similarity index 100% rename from utils/cd_pult/cddirectk.h rename to utils/pult/cddirectk.h diff --git a/utils/cd_pult/cddirectk.ui b/utils/pult/cddirectk.ui similarity index 100% rename from utils/cd_pult/cddirectk.ui rename to utils/pult/cddirectk.ui diff --git a/utils/cd_pult/cddirectk_type_dialog.cpp b/utils/pult/cddirectk_type_dialog.cpp similarity index 100% rename from utils/cd_pult/cddirectk_type_dialog.cpp rename to utils/pult/cddirectk_type_dialog.cpp diff --git a/utils/cd_pult/cddirectk_type_dialog.h b/utils/pult/cddirectk_type_dialog.h similarity index 100% rename from utils/cd_pult/cddirectk_type_dialog.h rename to utils/pult/cddirectk_type_dialog.h diff --git a/utils/cd_pult/cddirectk_type_dialog.ui b/utils/pult/cddirectk_type_dialog.ui similarity index 100% rename from utils/cd_pult/cddirectk_type_dialog.ui rename to utils/pult/cddirectk_type_dialog.ui diff --git a/utils/cd_pult/cdgraphics.cpp b/utils/pult/cdgraphics.cpp similarity index 100% rename from utils/cd_pult/cdgraphics.cpp rename to utils/pult/cdgraphics.cpp diff --git a/utils/cd_pult/cdgraphics.h b/utils/pult/cdgraphics.h similarity index 100% rename from utils/cd_pult/cdgraphics.h rename to utils/pult/cdgraphics.h diff --git a/utils/cd_pult/cdgraphics.ui b/utils/pult/cdgraphics.ui similarity index 100% rename from utils/cd_pult/cdgraphics.ui rename to utils/pult/cdgraphics.ui diff --git a/utils/cd_pult/cdpult.qrc b/utils/pult/cdpult.qrc similarity index 100% rename from utils/cd_pult/cdpult.qrc rename to utils/pult/cdpult.qrc diff --git a/utils/cd_pult/cdpultwindow.cpp b/utils/pult/cdpultwindow.cpp similarity index 100% rename from utils/cd_pult/cdpultwindow.cpp rename to utils/pult/cdpultwindow.cpp diff --git a/utils/cd_pult/cdpultwindow.h b/utils/pult/cdpultwindow.h similarity index 100% rename from utils/cd_pult/cdpultwindow.h rename to utils/pult/cdpultwindow.h diff --git a/utils/cd_pult/cdpultwindow.ui b/utils/pult/cdpultwindow.ui similarity index 100% rename from utils/cd_pult/cdpultwindow.ui rename to utils/pult/cdpultwindow.ui diff --git a/utils/cd_pult/cdviewwidget.cpp b/utils/pult/cdviewwidget.cpp similarity index 100% rename from utils/cd_pult/cdviewwidget.cpp rename to utils/pult/cdviewwidget.cpp diff --git a/utils/cd_pult/cdviewwidget.h b/utils/pult/cdviewwidget.h similarity index 100% rename from utils/cd_pult/cdviewwidget.h rename to utils/pult/cdviewwidget.h diff --git a/utils/cd_pult/cdviewwidget.ui b/utils/pult/cdviewwidget.ui similarity index 100% rename from utils/cd_pult/cdviewwidget.ui rename to utils/pult/cdviewwidget.ui diff --git a/utils/cd_pult/icons/accessories-calculator.png b/utils/pult/icons/accessories-calculator.png similarity index 100% rename from utils/cd_pult/icons/accessories-calculator.png rename to utils/pult/icons/accessories-calculator.png diff --git a/utils/cd_pult/icons/accessories-text-editor.png b/utils/pult/icons/accessories-text-editor.png similarity index 100% rename from utils/cd_pult/icons/accessories-text-editor.png rename to utils/pult/icons/accessories-text-editor.png diff --git a/utils/cd_pult/icons/db-export.png b/utils/pult/icons/db-export.png similarity index 100% rename from utils/cd_pult/icons/db-export.png rename to utils/pult/icons/db-export.png diff --git a/utils/cd_pult/icons/db-import.png b/utils/pult/icons/db-import.png similarity index 100% rename from utils/cd_pult/icons/db-import.png rename to utils/pult/icons/db-import.png diff --git a/utils/cd_pult/icons/flame.png b/utils/pult/icons/flame.png similarity index 100% rename from utils/cd_pult/icons/flame.png rename to utils/pult/icons/flame.png diff --git a/utils/cd_pult/icons/pult.png b/utils/pult/icons/pult.png similarity index 100% rename from utils/cd_pult/icons/pult.png rename to utils/pult/icons/pult.png diff --git a/utils/cd_pult/icons/timer.png b/utils/pult/icons/timer.png similarity index 100% rename from utils/cd_pult/icons/timer.png rename to utils/pult/icons/timer.png diff --git a/utils/cd_pult/main.cpp b/utils/pult/main.cpp similarity index 100% rename from utils/cd_pult/main.cpp rename to utils/pult/main.cpp