From d4b3eed55fa43ce19835c871981f19f55433ec04 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Tue, 4 Apr 2017 14:49:15 +0200 Subject: [PATCH] Move the launcher core library into its own folder too Now we have one target per folder, which makes it a lot easier to reason about dependencies here. --- app/main.cpp | 4 +- launcher/CMakeLists.txt | 99 +------------------ launcher/app/main.cpp | 7 +- launcher/cli/main.cpp | 19 ++-- launcher/core/CMakeLists.txt | 91 +++++++++++++++++ launcher/{ => core}/clientlauncher.cpp | 0 launcher/{ => core}/clientlauncher.h | 0 launcher/{ => core}/injector/CMakeLists.txt | 0 .../{ => core}/injector/abstractinjector.cpp | 0 .../{ => core}/injector/abstractinjector.h | 2 +- .../{ => core}/injector/debuggerinjector.cpp | 0 .../{ => core}/injector/debuggerinjector.h | 0 launcher/{ => core}/injector/gdbinjector.cpp | 0 launcher/{ => core}/injector/gdbinjector.h | 0 .../{ => core}/injector/injectorfactory.cpp | 2 +- .../{ => core}/injector/injectorfactory.h | 0 .../{ => core}/injector/injectorstyle.json | 0 .../injector/injectorstyleplugin.cpp | 0 .../{ => core}/injector/injectorstyleplugin.h | 0 launcher/{ => core}/injector/lldbinjector.cpp | 0 launcher/{ => core}/injector/lldbinjector.h | 0 launcher/{ => core}/injector/preloadcheck.cpp | 0 launcher/{ => core}/injector/preloadcheck.h | 0 .../{ => core}/injector/preloadcheck_mips.cpp | 0 .../{ => core}/injector/preloadinjector.cpp | 0 .../{ => core}/injector/preloadinjector.h | 0 .../{ => core}/injector/processinjector.cpp | 0 .../{ => core}/injector/processinjector.h | 0 .../{ => core}/injector/styleinjector.cpp | 0 launcher/{ => core}/injector/styleinjector.h | 0 .../{ => core}/injector/windllinjector.cpp | 0 launcher/{ => core}/injector/windllinjector.h | 0 launcher/{ => core}/launcher.cpp | 0 launcher/{ => core}/launcher.h | 0 launcher/{ => core}/launcherfinder.cpp | 0 launcher/{ => core}/launcherfinder.h | 0 launcher/{ => core}/launchoptions.cpp | 0 launcher/{ => core}/launchoptions.h | 0 launcher/{ => core}/libraryutil.cpp | 0 launcher/{ => core}/libraryutil.h | 0 launcher/{ => core}/networkdiscoverymodel.cpp | 0 launcher/{ => core}/networkdiscoverymodel.h | 0 launcher/{ => core}/pefile.cpp | 0 launcher/{ => core}/pefile.h | 0 launcher/{ => core}/probeabi.cpp | 0 launcher/{ => core}/probeabi.h | 0 launcher/{ => core}/probeabidetector.cpp | 0 launcher/{ => core}/probeabidetector.h | 0 .../{ => core}/probeabidetector_dummy.cpp | 0 launcher/{ => core}/probeabidetector_elf.cpp | 0 launcher/{ => core}/probeabidetector_mac.cpp | 0 launcher/{ => core}/probeabidetector_win.cpp | 0 launcher/{ => core}/probefinder.cpp | 0 launcher/{ => core}/probefinder.h | 0 launcher/{ => core}/selftest.cpp | 0 launcher/{ => core}/selftest.h | 0 launcher/ui/attachdialog.cpp | 4 +- launcher/ui/connectpage.cpp | 5 +- launcher/ui/launcherwindow.cpp | 3 +- launcher/ui/launchpage.cpp | 5 +- launcher/ui/launchpage.h | 2 +- launcher/ui/probeabimodel.cpp | 2 +- launcher/ui/probeabimodel.h | 2 +- launcher/ui/processlist.h | 2 +- launcher/ui/processlist_unix.cpp | 2 +- launcher/ui/processlist_win.cpp | 2 +- launcher/ui/processmodel.cpp | 2 +- launcher/ui/processmodel.h | 2 +- launcher/ui/selftestpage.cpp | 4 +- tests/earlyexittest.cpp | 10 +- tests/launchertest.cpp | 12 +-- tests/probeabidetectortest.cpp | 4 +- tests/probeabitest.cpp | 2 +- tests/probesettingstest.cpp | 4 +- tests/selftesttest.cpp | 2 +- 75 files changed, 147 insertions(+), 148 deletions(-) create mode 100644 launcher/core/CMakeLists.txt rename launcher/{ => core}/clientlauncher.cpp (100%) rename launcher/{ => core}/clientlauncher.h (100%) rename launcher/{ => core}/injector/CMakeLists.txt (100%) rename launcher/{ => core}/injector/abstractinjector.cpp (100%) rename launcher/{ => core}/injector/abstractinjector.h (99%) rename launcher/{ => core}/injector/debuggerinjector.cpp (100%) rename launcher/{ => core}/injector/debuggerinjector.h (100%) rename launcher/{ => core}/injector/gdbinjector.cpp (100%) rename launcher/{ => core}/injector/gdbinjector.h (100%) rename launcher/{ => core}/injector/injectorfactory.cpp (99%) rename launcher/{ => core}/injector/injectorfactory.h (100%) rename launcher/{ => core}/injector/injectorstyle.json (100%) rename launcher/{ => core}/injector/injectorstyleplugin.cpp (100%) rename launcher/{ => core}/injector/injectorstyleplugin.h (100%) rename launcher/{ => core}/injector/lldbinjector.cpp (100%) rename launcher/{ => core}/injector/lldbinjector.h (100%) rename launcher/{ => core}/injector/preloadcheck.cpp (100%) rename launcher/{ => core}/injector/preloadcheck.h (100%) rename launcher/{ => core}/injector/preloadcheck_mips.cpp (100%) rename launcher/{ => core}/injector/preloadinjector.cpp (100%) rename launcher/{ => core}/injector/preloadinjector.h (100%) rename launcher/{ => core}/injector/processinjector.cpp (100%) rename launcher/{ => core}/injector/processinjector.h (100%) rename launcher/{ => core}/injector/styleinjector.cpp (100%) rename launcher/{ => core}/injector/styleinjector.h (100%) rename launcher/{ => core}/injector/windllinjector.cpp (100%) rename launcher/{ => core}/injector/windllinjector.h (100%) rename launcher/{ => core}/launcher.cpp (100%) rename launcher/{ => core}/launcher.h (100%) rename launcher/{ => core}/launcherfinder.cpp (100%) rename launcher/{ => core}/launcherfinder.h (100%) rename launcher/{ => core}/launchoptions.cpp (100%) rename launcher/{ => core}/launchoptions.h (100%) rename launcher/{ => core}/libraryutil.cpp (100%) rename launcher/{ => core}/libraryutil.h (100%) rename launcher/{ => core}/networkdiscoverymodel.cpp (100%) rename launcher/{ => core}/networkdiscoverymodel.h (100%) rename launcher/{ => core}/pefile.cpp (100%) rename launcher/{ => core}/pefile.h (100%) rename launcher/{ => core}/probeabi.cpp (100%) rename launcher/{ => core}/probeabi.h (100%) rename launcher/{ => core}/probeabidetector.cpp (100%) rename launcher/{ => core}/probeabidetector.h (100%) rename launcher/{ => core}/probeabidetector_dummy.cpp (100%) rename launcher/{ => core}/probeabidetector_elf.cpp (100%) rename launcher/{ => core}/probeabidetector_mac.cpp (100%) rename launcher/{ => core}/probeabidetector_win.cpp (100%) rename launcher/{ => core}/probefinder.cpp (100%) rename launcher/{ => core}/probefinder.h (100%) rename launcher/{ => core}/selftest.cpp (100%) rename launcher/{ => core}/selftest.h (100%) diff --git a/app/main.cpp b/app/main.cpp index 1992c7097c..7d993f4318 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -30,8 +30,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 4deb2da844..a3d9b63653 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -1,103 +1,6 @@ -add_subdirectory(injector) - if(NOT GAMMARAY_PROBE_ONLY_BUILD) -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} -) - -# shared launcher code -set(gammaray_launcher_shared_srcs - injector/abstractinjector.cpp - injector/processinjector.cpp - injector/injectorfactory.cpp - injector/styleinjector.cpp - - libraryutil.cpp - probeabi.cpp - probeabidetector.cpp - probefinder.cpp - launchoptions.cpp - networkdiscoverymodel.cpp - clientlauncher.cpp - launcherfinder.cpp - launcher.cpp - selftest.cpp -) - -if(WIN32) - list(APPEND gammaray_launcher_shared_srcs - probeabidetector_win.cpp - pefile.cpp - injector/windllinjector.cpp - ) -else() - list(APPEND gammaray_launcher_shared_srcs - injector/debuggerinjector.cpp - injector/gdbinjector.cpp - injector/lldbinjector.cpp - injector/preloadcheck.cpp - injector/preloadinjector.cpp - ) - if(APPLE) - list(APPEND gammaray_launcher_shared_srcs probeabidetector_mac.cpp) - elseif(UNIX) - list(APPEND gammaray_launcher_shared_srcs probeabidetector_elf.cpp) - else() - list(APPEND gammaray_launcher_shared_srcs probeabidetector_dummy.cpp) - endif() -endif() - -add_library(gammaray_launcher SHARED ${gammaray_launcher_shared_srcs}) -generate_export_header(gammaray_launcher) -set_target_properties(gammaray_launcher PROPERTIES - ${GAMMARAY_DEFAULT_LIBRARY_PROPERTIES} -) - -gammaray_target_relocatable_interfaces(gammaray_launcher_ipaths) -target_include_directories(gammaray_launcher PUBLIC $ $) -target_link_libraries(gammaray_launcher LINK_PUBLIC ${QT_QTCORE_LIBRARIES} LINK_PRIVATE gammaray_common ${QT_QTNETWORK_LIBRARIES}) -if(HAVE_QT_WIDGETS) - target_link_libraries(gammaray_launcher LINK_PRIVATE ${QT_QTGUI_LIBRARIES}) -endif() -if(WIN32) - target_link_libraries(gammaray_launcher LINK_PRIVATE version) -elseif(APPLE) - target_link_libraries(gammaray_launcher LINK_PRIVATE "-framework CoreFoundation") -endif() -if(UNIX AND NOT APPLE AND NOT QNXNTO) - target_link_libraries(gammaray_launcher LINK_PRIVATE dl) # for preload check -endif() - -if(NOT GAMMARAY_PROBE_ONLY_BUILD) - install(TARGETS gammaray_launcher EXPORT GammaRayTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) - - gammaray_install_headers( - ${CMAKE_CURRENT_BINARY_DIR}/gammaray_launcher_export.h - launcher.h - launchoptions.h - probeabi.h - probeabidetector.h - probefinder.h - networkdiscoverymodel.h - ) - - ecm_generate_pri_file(BASE_NAME GammaRayLauncher - LIB_NAME gammaray_launcher - DEPS "core gui GammaRayCommon" - FILENAME_VAR PRI_FILENAME - INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR} - ) - - install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) -else() - install(TARGETS gammaray_launcher ${INSTALL_TARGETS_DEFAULT_ARGS}) -endif() -if(MSVC) - install(FILES "$/$" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug RelWithDebInfo) -endif() - +add_subdirectory(core) add_subdirectory(cli) -# UI launcher if(HAVE_QT_CONCURRENT AND GAMMARAY_BUILD_UI) add_subdirectory(ui) add_subdirectory(app) diff --git a/launcher/app/main.cpp b/launcher/app/main.cpp index 7c4e0db1b5..28bd312f0a 100644 --- a/launcher/app/main.cpp +++ b/launcher/app/main.cpp @@ -27,9 +27,10 @@ */ #include -#include "launcherwindow.h" -#include "launchoptions.h" -#include "launcherfinder.h" + +#include +#include +#include #include #include diff --git a/launcher/cli/main.cpp b/launcher/cli/main.cpp index e7bc92a41f..7b2f064f1b 100644 --- a/launcher/cli/main.cpp +++ b/launcher/cli/main.cpp @@ -28,18 +28,19 @@ #include #include "config-gammaray-version.h" -#include "injector/injectorfactory.h" -#include "clientlauncher.h" -#include "launchoptions.h" -#include "launcherfinder.h" -#include "launcher.h" -#include "probefinder.h" -#include "selftest.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include #ifdef HAVE_QT_WIDGETS #include diff --git a/launcher/core/CMakeLists.txt b/launcher/core/CMakeLists.txt new file mode 100644 index 0000000000..0de4159038 --- /dev/null +++ b/launcher/core/CMakeLists.txt @@ -0,0 +1,91 @@ +add_subdirectory(injector) + +set(gammaray_launcher_shared_srcs + injector/abstractinjector.cpp + injector/processinjector.cpp + injector/injectorfactory.cpp + injector/styleinjector.cpp + + libraryutil.cpp + probeabi.cpp + probeabidetector.cpp + probefinder.cpp + launchoptions.cpp + networkdiscoverymodel.cpp + clientlauncher.cpp + launcherfinder.cpp + launcher.cpp + selftest.cpp +) + +if(WIN32) + list(APPEND gammaray_launcher_shared_srcs + probeabidetector_win.cpp + pefile.cpp + injector/windllinjector.cpp + ) +else() + list(APPEND gammaray_launcher_shared_srcs + injector/debuggerinjector.cpp + injector/gdbinjector.cpp + injector/lldbinjector.cpp + injector/preloadcheck.cpp + injector/preloadinjector.cpp + ) + if(APPLE) + list(APPEND gammaray_launcher_shared_srcs probeabidetector_mac.cpp) + elseif(UNIX) + list(APPEND gammaray_launcher_shared_srcs probeabidetector_elf.cpp) + else() + list(APPEND gammaray_launcher_shared_srcs probeabidetector_dummy.cpp) + endif() +endif() + +add_library(gammaray_launcher SHARED ${gammaray_launcher_shared_srcs}) +generate_export_header(gammaray_launcher) +set_target_properties(gammaray_launcher PROPERTIES + ${GAMMARAY_DEFAULT_LIBRARY_PROPERTIES} +) + +gammaray_target_relocatable_interfaces(gammaray_launcher_ipaths) +target_include_directories(gammaray_launcher PUBLIC $ $) +target_link_libraries(gammaray_launcher LINK_PUBLIC ${QT_QTCORE_LIBRARIES} LINK_PRIVATE gammaray_common ${QT_QTNETWORK_LIBRARIES}) +if(HAVE_QT_WIDGETS) + target_link_libraries(gammaray_launcher LINK_PRIVATE ${QT_QTGUI_LIBRARIES}) +endif() +if(WIN32) + target_link_libraries(gammaray_launcher LINK_PRIVATE version) +elseif(APPLE) + target_link_libraries(gammaray_launcher LINK_PRIVATE "-framework CoreFoundation") +endif() +if(UNIX AND NOT APPLE AND NOT QNXNTO) + target_link_libraries(gammaray_launcher LINK_PRIVATE dl) # for preload check +endif() + +if(NOT GAMMARAY_PROBE_ONLY_BUILD) + install(TARGETS gammaray_launcher EXPORT GammaRayTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) + + gammaray_install_headers(DESTINATION launcher + ${CMAKE_CURRENT_BINARY_DIR}/gammaray_launcher_export.h + launcher.h + launchoptions.h + probeabi.h + probeabidetector.h + probefinder.h + networkdiscoverymodel.h + ) + + ecm_generate_pri_file(BASE_NAME GammaRayLauncher + LIB_NAME gammaray_launcher + DEPS "core gui GammaRayCommon" + FILENAME_VAR PRI_FILENAME + INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR} + ) + + install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) +else() + install(TARGETS gammaray_launcher ${INSTALL_TARGETS_DEFAULT_ARGS}) +endif() +if(MSVC) + install(FILES "$/$" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug RelWithDebInfo) +endif() diff --git a/launcher/clientlauncher.cpp b/launcher/core/clientlauncher.cpp similarity index 100% rename from launcher/clientlauncher.cpp rename to launcher/core/clientlauncher.cpp diff --git a/launcher/clientlauncher.h b/launcher/core/clientlauncher.h similarity index 100% rename from launcher/clientlauncher.h rename to launcher/core/clientlauncher.h diff --git a/launcher/injector/CMakeLists.txt b/launcher/core/injector/CMakeLists.txt similarity index 100% rename from launcher/injector/CMakeLists.txt rename to launcher/core/injector/CMakeLists.txt diff --git a/launcher/injector/abstractinjector.cpp b/launcher/core/injector/abstractinjector.cpp similarity index 100% rename from launcher/injector/abstractinjector.cpp rename to launcher/core/injector/abstractinjector.cpp diff --git a/launcher/injector/abstractinjector.h b/launcher/core/injector/abstractinjector.h similarity index 99% rename from launcher/injector/abstractinjector.h rename to launcher/core/injector/abstractinjector.h index f44566bcfd..7f85e6a1b9 100644 --- a/launcher/injector/abstractinjector.h +++ b/launcher/core/injector/abstractinjector.h @@ -29,7 +29,7 @@ #ifndef GAMMARAY_ABSTRACTINJECTOR_H #define GAMMARAY_ABSTRACTINJECTOR_H -#include +#include #include #include diff --git a/launcher/injector/debuggerinjector.cpp b/launcher/core/injector/debuggerinjector.cpp similarity index 100% rename from launcher/injector/debuggerinjector.cpp rename to launcher/core/injector/debuggerinjector.cpp diff --git a/launcher/injector/debuggerinjector.h b/launcher/core/injector/debuggerinjector.h similarity index 100% rename from launcher/injector/debuggerinjector.h rename to launcher/core/injector/debuggerinjector.h diff --git a/launcher/injector/gdbinjector.cpp b/launcher/core/injector/gdbinjector.cpp similarity index 100% rename from launcher/injector/gdbinjector.cpp rename to launcher/core/injector/gdbinjector.cpp diff --git a/launcher/injector/gdbinjector.h b/launcher/core/injector/gdbinjector.h similarity index 100% rename from launcher/injector/gdbinjector.h rename to launcher/core/injector/gdbinjector.h diff --git a/launcher/injector/injectorfactory.cpp b/launcher/core/injector/injectorfactory.cpp similarity index 99% rename from launcher/injector/injectorfactory.cpp rename to launcher/core/injector/injectorfactory.cpp index f7085d8470..5cee9fdd6d 100644 --- a/launcher/injector/injectorfactory.cpp +++ b/launcher/core/injector/injectorfactory.cpp @@ -37,7 +37,7 @@ #include "preloadinjector.h" #endif -#include +#include #include diff --git a/launcher/injector/injectorfactory.h b/launcher/core/injector/injectorfactory.h similarity index 100% rename from launcher/injector/injectorfactory.h rename to launcher/core/injector/injectorfactory.h diff --git a/launcher/injector/injectorstyle.json b/launcher/core/injector/injectorstyle.json similarity index 100% rename from launcher/injector/injectorstyle.json rename to launcher/core/injector/injectorstyle.json diff --git a/launcher/injector/injectorstyleplugin.cpp b/launcher/core/injector/injectorstyleplugin.cpp similarity index 100% rename from launcher/injector/injectorstyleplugin.cpp rename to launcher/core/injector/injectorstyleplugin.cpp diff --git a/launcher/injector/injectorstyleplugin.h b/launcher/core/injector/injectorstyleplugin.h similarity index 100% rename from launcher/injector/injectorstyleplugin.h rename to launcher/core/injector/injectorstyleplugin.h diff --git a/launcher/injector/lldbinjector.cpp b/launcher/core/injector/lldbinjector.cpp similarity index 100% rename from launcher/injector/lldbinjector.cpp rename to launcher/core/injector/lldbinjector.cpp diff --git a/launcher/injector/lldbinjector.h b/launcher/core/injector/lldbinjector.h similarity index 100% rename from launcher/injector/lldbinjector.h rename to launcher/core/injector/lldbinjector.h diff --git a/launcher/injector/preloadcheck.cpp b/launcher/core/injector/preloadcheck.cpp similarity index 100% rename from launcher/injector/preloadcheck.cpp rename to launcher/core/injector/preloadcheck.cpp diff --git a/launcher/injector/preloadcheck.h b/launcher/core/injector/preloadcheck.h similarity index 100% rename from launcher/injector/preloadcheck.h rename to launcher/core/injector/preloadcheck.h diff --git a/launcher/injector/preloadcheck_mips.cpp b/launcher/core/injector/preloadcheck_mips.cpp similarity index 100% rename from launcher/injector/preloadcheck_mips.cpp rename to launcher/core/injector/preloadcheck_mips.cpp diff --git a/launcher/injector/preloadinjector.cpp b/launcher/core/injector/preloadinjector.cpp similarity index 100% rename from launcher/injector/preloadinjector.cpp rename to launcher/core/injector/preloadinjector.cpp diff --git a/launcher/injector/preloadinjector.h b/launcher/core/injector/preloadinjector.h similarity index 100% rename from launcher/injector/preloadinjector.h rename to launcher/core/injector/preloadinjector.h diff --git a/launcher/injector/processinjector.cpp b/launcher/core/injector/processinjector.cpp similarity index 100% rename from launcher/injector/processinjector.cpp rename to launcher/core/injector/processinjector.cpp diff --git a/launcher/injector/processinjector.h b/launcher/core/injector/processinjector.h similarity index 100% rename from launcher/injector/processinjector.h rename to launcher/core/injector/processinjector.h diff --git a/launcher/injector/styleinjector.cpp b/launcher/core/injector/styleinjector.cpp similarity index 100% rename from launcher/injector/styleinjector.cpp rename to launcher/core/injector/styleinjector.cpp diff --git a/launcher/injector/styleinjector.h b/launcher/core/injector/styleinjector.h similarity index 100% rename from launcher/injector/styleinjector.h rename to launcher/core/injector/styleinjector.h diff --git a/launcher/injector/windllinjector.cpp b/launcher/core/injector/windllinjector.cpp similarity index 100% rename from launcher/injector/windllinjector.cpp rename to launcher/core/injector/windllinjector.cpp diff --git a/launcher/injector/windllinjector.h b/launcher/core/injector/windllinjector.h similarity index 100% rename from launcher/injector/windllinjector.h rename to launcher/core/injector/windllinjector.h diff --git a/launcher/launcher.cpp b/launcher/core/launcher.cpp similarity index 100% rename from launcher/launcher.cpp rename to launcher/core/launcher.cpp diff --git a/launcher/launcher.h b/launcher/core/launcher.h similarity index 100% rename from launcher/launcher.h rename to launcher/core/launcher.h diff --git a/launcher/launcherfinder.cpp b/launcher/core/launcherfinder.cpp similarity index 100% rename from launcher/launcherfinder.cpp rename to launcher/core/launcherfinder.cpp diff --git a/launcher/launcherfinder.h b/launcher/core/launcherfinder.h similarity index 100% rename from launcher/launcherfinder.h rename to launcher/core/launcherfinder.h diff --git a/launcher/launchoptions.cpp b/launcher/core/launchoptions.cpp similarity index 100% rename from launcher/launchoptions.cpp rename to launcher/core/launchoptions.cpp diff --git a/launcher/launchoptions.h b/launcher/core/launchoptions.h similarity index 100% rename from launcher/launchoptions.h rename to launcher/core/launchoptions.h diff --git a/launcher/libraryutil.cpp b/launcher/core/libraryutil.cpp similarity index 100% rename from launcher/libraryutil.cpp rename to launcher/core/libraryutil.cpp diff --git a/launcher/libraryutil.h b/launcher/core/libraryutil.h similarity index 100% rename from launcher/libraryutil.h rename to launcher/core/libraryutil.h diff --git a/launcher/networkdiscoverymodel.cpp b/launcher/core/networkdiscoverymodel.cpp similarity index 100% rename from launcher/networkdiscoverymodel.cpp rename to launcher/core/networkdiscoverymodel.cpp diff --git a/launcher/networkdiscoverymodel.h b/launcher/core/networkdiscoverymodel.h similarity index 100% rename from launcher/networkdiscoverymodel.h rename to launcher/core/networkdiscoverymodel.h diff --git a/launcher/pefile.cpp b/launcher/core/pefile.cpp similarity index 100% rename from launcher/pefile.cpp rename to launcher/core/pefile.cpp diff --git a/launcher/pefile.h b/launcher/core/pefile.h similarity index 100% rename from launcher/pefile.h rename to launcher/core/pefile.h diff --git a/launcher/probeabi.cpp b/launcher/core/probeabi.cpp similarity index 100% rename from launcher/probeabi.cpp rename to launcher/core/probeabi.cpp diff --git a/launcher/probeabi.h b/launcher/core/probeabi.h similarity index 100% rename from launcher/probeabi.h rename to launcher/core/probeabi.h diff --git a/launcher/probeabidetector.cpp b/launcher/core/probeabidetector.cpp similarity index 100% rename from launcher/probeabidetector.cpp rename to launcher/core/probeabidetector.cpp diff --git a/launcher/probeabidetector.h b/launcher/core/probeabidetector.h similarity index 100% rename from launcher/probeabidetector.h rename to launcher/core/probeabidetector.h diff --git a/launcher/probeabidetector_dummy.cpp b/launcher/core/probeabidetector_dummy.cpp similarity index 100% rename from launcher/probeabidetector_dummy.cpp rename to launcher/core/probeabidetector_dummy.cpp diff --git a/launcher/probeabidetector_elf.cpp b/launcher/core/probeabidetector_elf.cpp similarity index 100% rename from launcher/probeabidetector_elf.cpp rename to launcher/core/probeabidetector_elf.cpp diff --git a/launcher/probeabidetector_mac.cpp b/launcher/core/probeabidetector_mac.cpp similarity index 100% rename from launcher/probeabidetector_mac.cpp rename to launcher/core/probeabidetector_mac.cpp diff --git a/launcher/probeabidetector_win.cpp b/launcher/core/probeabidetector_win.cpp similarity index 100% rename from launcher/probeabidetector_win.cpp rename to launcher/core/probeabidetector_win.cpp diff --git a/launcher/probefinder.cpp b/launcher/core/probefinder.cpp similarity index 100% rename from launcher/probefinder.cpp rename to launcher/core/probefinder.cpp diff --git a/launcher/probefinder.h b/launcher/core/probefinder.h similarity index 100% rename from launcher/probefinder.h rename to launcher/core/probefinder.h diff --git a/launcher/selftest.cpp b/launcher/core/selftest.cpp similarity index 100% rename from launcher/selftest.cpp rename to launcher/core/selftest.cpp diff --git a/launcher/selftest.h b/launcher/core/selftest.h similarity index 100% rename from launcher/selftest.h rename to launcher/core/selftest.h diff --git a/launcher/ui/attachdialog.cpp b/launcher/ui/attachdialog.cpp index 779e357f6d..21dc83986e 100644 --- a/launcher/ui/attachdialog.cpp +++ b/launcher/ui/attachdialog.cpp @@ -28,12 +28,12 @@ #include #include "attachdialog.h" - -#include "launchoptions.h" #include "processfiltermodel.h" #include "processmodel.h" #include "probeabimodel.h" +#include + #include #include diff --git a/launcher/ui/connectpage.cpp b/launcher/ui/connectpage.cpp index 499b158830..64379003c0 100644 --- a/launcher/ui/connectpage.cpp +++ b/launcher/ui/connectpage.cpp @@ -28,8 +28,9 @@ #include "connectpage.h" #include "ui_connectpage.h" -#include "networkdiscoverymodel.h" -#include "clientlauncher.h" + +#include +#include #include diff --git a/launcher/ui/launcherwindow.cpp b/launcher/ui/launcherwindow.cpp index 91bc04c0c7..a9869009ab 100644 --- a/launcher/ui/launcherwindow.cpp +++ b/launcher/ui/launcherwindow.cpp @@ -28,7 +28,8 @@ #include "launcherwindow.h" #include "ui_launcherwindow.h" -#include "launchoptions.h" + +#include #include #include diff --git a/launcher/ui/launchpage.cpp b/launcher/ui/launchpage.cpp index ff06e14a61..3bf02f1ace 100644 --- a/launcher/ui/launchpage.cpp +++ b/launcher/ui/launchpage.cpp @@ -29,10 +29,11 @@ #include #include "launchpage.h" #include "ui_launchpage.h" -#include "launchoptions.h" -#include "probefinder.h" #include "probeabimodel.h" +#include +#include + #include #include #include diff --git a/launcher/ui/launchpage.h b/launcher/ui/launchpage.h index d0ac6a34a5..1d102a35c9 100644 --- a/launcher/ui/launchpage.h +++ b/launcher/ui/launchpage.h @@ -29,7 +29,7 @@ #ifndef GAMMARAY_LAUNCHPAGE_H #define GAMMARAY_LAUNCHPAGE_H -#include +#include #include diff --git a/launcher/ui/probeabimodel.cpp b/launcher/ui/probeabimodel.cpp index 1159b324af..f54fa76c5d 100644 --- a/launcher/ui/probeabimodel.cpp +++ b/launcher/ui/probeabimodel.cpp @@ -28,7 +28,7 @@ #include "probeabimodel.h" -#include +#include using namespace GammaRay; diff --git a/launcher/ui/probeabimodel.h b/launcher/ui/probeabimodel.h index bbfcc009a8..fea3e5a1f0 100644 --- a/launcher/ui/probeabimodel.h +++ b/launcher/ui/probeabimodel.h @@ -29,7 +29,7 @@ #ifndef GAMMARAY_PROBEABIMODEL_H #define GAMMARAY_PROBEABIMODEL_H -#include +#include #include #include diff --git a/launcher/ui/processlist.h b/launcher/ui/processlist.h index aea9f5e998..d569a561c1 100644 --- a/launcher/ui/processlist.h +++ b/launcher/ui/processlist.h @@ -33,7 +33,7 @@ #ifndef GAMMARAY_PROCESSLIST_H #define GAMMARAY_PROCESSLIST_H -#include +#include #include #include diff --git a/launcher/ui/processlist_unix.cpp b/launcher/ui/processlist_unix.cpp index 9b0aa7471f..65e88b5020 100644 --- a/launcher/ui/processlist_unix.cpp +++ b/launcher/ui/processlist_unix.cpp @@ -32,7 +32,7 @@ #include "processlist.h" -#include +#include #include #include diff --git a/launcher/ui/processlist_win.cpp b/launcher/ui/processlist_win.cpp index f6192a5350..5a48f65279 100644 --- a/launcher/ui/processlist_win.cpp +++ b/launcher/ui/processlist_win.cpp @@ -32,7 +32,7 @@ #include "processlist.h" -#include +#include #include diff --git a/launcher/ui/processmodel.cpp b/launcher/ui/processmodel.cpp index bb845f0b8a..700d0f29dc 100644 --- a/launcher/ui/processmodel.cpp +++ b/launcher/ui/processmodel.cpp @@ -29,7 +29,7 @@ #include "processmodel.h" #include "probeabimodel.h" -#include +#include #include diff --git a/launcher/ui/processmodel.h b/launcher/ui/processmodel.h index 7bbe09b8d5..179a50a851 100644 --- a/launcher/ui/processmodel.h +++ b/launcher/ui/processmodel.h @@ -29,7 +29,7 @@ #ifndef GAMMARAY_PROCESSMODEL_H #define GAMMARAY_PROCESSMODEL_H -#include +#include #include #include diff --git a/launcher/ui/selftestpage.cpp b/launcher/ui/selftestpage.cpp index c62bf98bc1..5edb72d8e9 100644 --- a/launcher/ui/selftestpage.cpp +++ b/launcher/ui/selftestpage.cpp @@ -29,10 +29,10 @@ #include #include "selftestpage.h" -#include "probefinder.h" #include "ui_selftestpage.h" -#include +#include +#include #include diff --git a/tests/earlyexittest.cpp b/tests/earlyexittest.cpp index cfdb0f972d..61ce333083 100644 --- a/tests/earlyexittest.cpp +++ b/tests/earlyexittest.cpp @@ -28,11 +28,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/launchertest.cpp b/tests/launchertest.cpp index 760fe100c2..20564c927e 100644 --- a/tests/launchertest.cpp +++ b/tests/launchertest.cpp @@ -29,12 +29,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/probeabidetectortest.cpp b/tests/probeabidetectortest.cpp index 9f0e66704d..e31e184426 100644 --- a/tests/probeabidetectortest.cpp +++ b/tests/probeabidetectortest.cpp @@ -28,8 +28,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/tests/probeabitest.cpp b/tests/probeabitest.cpp index 88e8f4cbc2..23df753aa0 100644 --- a/tests/probeabitest.cpp +++ b/tests/probeabitest.cpp @@ -26,7 +26,7 @@ along with this program. If not, see . */ -#include +#include #include #include diff --git a/tests/probesettingstest.cpp b/tests/probesettingstest.cpp index 65d65153f6..da4405659a 100644 --- a/tests/probesettingstest.cpp +++ b/tests/probesettingstest.cpp @@ -28,8 +28,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/tests/selftesttest.cpp b/tests/selftesttest.cpp index d1c8206731..d5bcd4668b 100644 --- a/tests/selftesttest.cpp +++ b/tests/selftesttest.cpp @@ -26,7 +26,7 @@ #include -#include +#include #include #include