From 4c0156e3d51b389db8eccc3fa3da4b8f248f9b13 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Wed, 2 Sep 2015 20:52:34 -0300 Subject: [PATCH] Move all core-functionality to subsurface-core And adapt a new CMakeLists.txt file for it. On the way I've also found out that we where double-compilling a few files. I've also set the subsurface-core as a include_path but that was just to reduce the noise on this commit, since I plan to remove it from the include path to make it obligatory to specify something like include "subsurface-core/dive.h" for the header files. Since the app is growing quite a bit we ended up having a few different files with almost same name that did similar things, I want to kill that (for instance Dive.h, dive.h, PrintDive.h and such). Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 81 +++---------------- qt-models/models.h | 6 +- qt-ui/CMakeLists.txt | 4 + qt-ui/configuredivecomputerdialog.h | 2 +- qt-ui/divelogimportdialog.h | 4 +- qt-ui/graphicsview-common.h | 2 +- subsurface-core/CMakeLists.txt | 81 +++++++++++++++++++ android.cpp => subsurface-core/android.cpp | 0 .../checkcloudconnection.cpp | 0 .../checkcloudconnection.h | 0 cochran.c => subsurface-core/cochran.c | 0 cochran.h => subsurface-core/cochran.h | 0 color.h => subsurface-core/color.h | 0 .../configuredivecomputer.cpp | 0 .../configuredivecomputer.h | 0 .../configuredivecomputerthreads.cpp | 0 .../configuredivecomputerthreads.h | 0 datatrak.c => subsurface-core/datatrak.c | 0 datatrak.h => subsurface-core/datatrak.h | 0 deco.c => subsurface-core/deco.c | 0 deco.h => subsurface-core/deco.h | 0 device.c => subsurface-core/device.c | 0 device.h => subsurface-core/device.h | 0 .../devicedetails.cpp | 0 .../devicedetails.h | 0 display.h => subsurface-core/display.h | 0 dive.c => subsurface-core/dive.c | 0 dive.h => subsurface-core/dive.h | 0 .../divecomputer.cpp | 0 .../divecomputer.h | 0 divelist.c => subsurface-core/divelist.c | 0 divelist.h => subsurface-core/divelist.h | 0 .../divelogexportlogic.cpp | 0 .../divelogexportlogic.h | 0 divesite.c => subsurface-core/divesite.c | 0 divesite.cpp => subsurface-core/divesite.cpp | 0 divesite.h => subsurface-core/divesite.h | 0 .../divesitehelpers.cpp | 0 .../divesitehelpers.h | 0 equipment.c => subsurface-core/equipment.c | 0 exif.cpp => subsurface-core/exif.cpp | 0 exif.h => subsurface-core/exif.h | 0 file.c => subsurface-core/file.c | 0 file.h => subsurface-core/file.h | 0 .../gaspressures.c | 0 .../gaspressures.h | 0 gettext.h => subsurface-core/gettext.h | 0 .../gettextfromc.cpp | 0 .../gettextfromc.h | 0 git-access.c => subsurface-core/git-access.c | 0 git-access.h => subsurface-core/git-access.h | 0 helpers.h => subsurface-core/helpers.h | 0 .../libdivecomputer.c | 0 .../libdivecomputer.h | 0 linux.c => subsurface-core/linux.c | 0 .../liquivision.c | 0 load-git.c => subsurface-core/load-git.c | 0 macos.c => subsurface-core/macos.c | 0 membuffer.c => subsurface-core/membuffer.c | 0 membuffer.h => subsurface-core/membuffer.h | 0 ostctools.c => subsurface-core/ostctools.c | 0 parse-xml.c => subsurface-core/parse-xml.c | 0 planner.c => subsurface-core/planner.c | 0 planner.h => subsurface-core/planner.h | 0 pref.h => subsurface-core/pref.h | 0 .../prefs-macros.h | 0 profile.c => subsurface-core/profile.c | 0 profile.h => subsurface-core/profile.h | 0 qt-gui.h => subsurface-core/qt-gui.h | 0 qt-init.cpp => subsurface-core/qt-init.cpp | 0 qthelper.cpp => subsurface-core/qthelper.cpp | 0 qthelper.h => subsurface-core/qthelper.h | 0 .../qthelperfromc.h | 0 .../qtserialbluetooth.cpp | 0 save-git.c => subsurface-core/save-git.c | 0 save-html.c => subsurface-core/save-html.c | 0 save-html.h => subsurface-core/save-html.h | 0 save-xml.c => subsurface-core/save-xml.c | 0 .../serial_ftdi.c | 0 sha1.c => subsurface-core/sha1.c | 0 sha1.h => subsurface-core/sha1.h | 0 statistics.c => subsurface-core/statistics.c | 0 statistics.h => subsurface-core/statistics.h | 0 strndup.h => subsurface-core/strndup.h | 0 strtod.c => subsurface-core/strtod.c | 0 .../subsurfacestartup.c | 0 .../subsurfacestartup.h | 0 .../subsurfacesysinfo.cpp | 0 .../subsurfacesysinfo.h | 0 taxonomy.c => subsurface-core/taxonomy.c | 0 taxonomy.h => subsurface-core/taxonomy.h | 0 time.c => subsurface-core/time.c | 0 .../uemis-downloader.c | 0 uemis.c => subsurface-core/uemis.c | 0 uemis.h => subsurface-core/uemis.h | 0 units.h => subsurface-core/units.h | 0 version.c => subsurface-core/version.c | 0 version.h => subsurface-core/version.h | 0 webservice.h => subsurface-core/webservice.h | 0 windows.c => subsurface-core/windows.c | 0 .../windowtitleupdate.cpp | 0 .../windowtitleupdate.h | 0 .../worldmap-options.h | 0 .../worldmap-save.c | 0 .../worldmap-save.h | 0 105 files changed, 102 insertions(+), 78 deletions(-) create mode 100644 subsurface-core/CMakeLists.txt rename android.cpp => subsurface-core/android.cpp (100%) rename checkcloudconnection.cpp => subsurface-core/checkcloudconnection.cpp (100%) rename checkcloudconnection.h => subsurface-core/checkcloudconnection.h (100%) rename cochran.c => subsurface-core/cochran.c (100%) rename cochran.h => subsurface-core/cochran.h (100%) rename color.h => subsurface-core/color.h (100%) rename configuredivecomputer.cpp => subsurface-core/configuredivecomputer.cpp (100%) rename configuredivecomputer.h => subsurface-core/configuredivecomputer.h (100%) rename configuredivecomputerthreads.cpp => subsurface-core/configuredivecomputerthreads.cpp (100%) rename configuredivecomputerthreads.h => subsurface-core/configuredivecomputerthreads.h (100%) rename datatrak.c => subsurface-core/datatrak.c (100%) rename datatrak.h => subsurface-core/datatrak.h (100%) rename deco.c => subsurface-core/deco.c (100%) rename deco.h => subsurface-core/deco.h (100%) rename device.c => subsurface-core/device.c (100%) rename device.h => subsurface-core/device.h (100%) rename devicedetails.cpp => subsurface-core/devicedetails.cpp (100%) rename devicedetails.h => subsurface-core/devicedetails.h (100%) rename display.h => subsurface-core/display.h (100%) rename dive.c => subsurface-core/dive.c (100%) rename dive.h => subsurface-core/dive.h (100%) rename divecomputer.cpp => subsurface-core/divecomputer.cpp (100%) rename divecomputer.h => subsurface-core/divecomputer.h (100%) rename divelist.c => subsurface-core/divelist.c (100%) rename divelist.h => subsurface-core/divelist.h (100%) rename divelogexportlogic.cpp => subsurface-core/divelogexportlogic.cpp (100%) rename divelogexportlogic.h => subsurface-core/divelogexportlogic.h (100%) rename divesite.c => subsurface-core/divesite.c (100%) rename divesite.cpp => subsurface-core/divesite.cpp (100%) rename divesite.h => subsurface-core/divesite.h (100%) rename divesitehelpers.cpp => subsurface-core/divesitehelpers.cpp (100%) rename divesitehelpers.h => subsurface-core/divesitehelpers.h (100%) rename equipment.c => subsurface-core/equipment.c (100%) rename exif.cpp => subsurface-core/exif.cpp (100%) rename exif.h => subsurface-core/exif.h (100%) rename file.c => subsurface-core/file.c (100%) rename file.h => subsurface-core/file.h (100%) rename gaspressures.c => subsurface-core/gaspressures.c (100%) rename gaspressures.h => subsurface-core/gaspressures.h (100%) rename gettext.h => subsurface-core/gettext.h (100%) rename gettextfromc.cpp => subsurface-core/gettextfromc.cpp (100%) rename gettextfromc.h => subsurface-core/gettextfromc.h (100%) rename git-access.c => subsurface-core/git-access.c (100%) rename git-access.h => subsurface-core/git-access.h (100%) rename helpers.h => subsurface-core/helpers.h (100%) rename libdivecomputer.c => subsurface-core/libdivecomputer.c (100%) rename libdivecomputer.h => subsurface-core/libdivecomputer.h (100%) rename linux.c => subsurface-core/linux.c (100%) rename liquivision.c => subsurface-core/liquivision.c (100%) rename load-git.c => subsurface-core/load-git.c (100%) rename macos.c => subsurface-core/macos.c (100%) rename membuffer.c => subsurface-core/membuffer.c (100%) rename membuffer.h => subsurface-core/membuffer.h (100%) rename ostctools.c => subsurface-core/ostctools.c (100%) rename parse-xml.c => subsurface-core/parse-xml.c (100%) rename planner.c => subsurface-core/planner.c (100%) rename planner.h => subsurface-core/planner.h (100%) rename pref.h => subsurface-core/pref.h (100%) rename prefs-macros.h => subsurface-core/prefs-macros.h (100%) rename profile.c => subsurface-core/profile.c (100%) rename profile.h => subsurface-core/profile.h (100%) rename qt-gui.h => subsurface-core/qt-gui.h (100%) rename qt-init.cpp => subsurface-core/qt-init.cpp (100%) rename qthelper.cpp => subsurface-core/qthelper.cpp (100%) rename qthelper.h => subsurface-core/qthelper.h (100%) rename qthelperfromc.h => subsurface-core/qthelperfromc.h (100%) rename qtserialbluetooth.cpp => subsurface-core/qtserialbluetooth.cpp (100%) rename save-git.c => subsurface-core/save-git.c (100%) rename save-html.c => subsurface-core/save-html.c (100%) rename save-html.h => subsurface-core/save-html.h (100%) rename save-xml.c => subsurface-core/save-xml.c (100%) rename serial_ftdi.c => subsurface-core/serial_ftdi.c (100%) rename sha1.c => subsurface-core/sha1.c (100%) rename sha1.h => subsurface-core/sha1.h (100%) rename statistics.c => subsurface-core/statistics.c (100%) rename statistics.h => subsurface-core/statistics.h (100%) rename strndup.h => subsurface-core/strndup.h (100%) rename strtod.c => subsurface-core/strtod.c (100%) rename subsurfacestartup.c => subsurface-core/subsurfacestartup.c (100%) rename subsurfacestartup.h => subsurface-core/subsurfacestartup.h (100%) rename subsurfacesysinfo.cpp => subsurface-core/subsurfacesysinfo.cpp (100%) rename subsurfacesysinfo.h => subsurface-core/subsurfacesysinfo.h (100%) rename taxonomy.c => subsurface-core/taxonomy.c (100%) rename taxonomy.h => subsurface-core/taxonomy.h (100%) rename time.c => subsurface-core/time.c (100%) rename uemis-downloader.c => subsurface-core/uemis-downloader.c (100%) rename uemis.c => subsurface-core/uemis.c (100%) rename uemis.h => subsurface-core/uemis.h (100%) rename units.h => subsurface-core/units.h (100%) rename version.c => subsurface-core/version.c (100%) rename version.h => subsurface-core/version.h (100%) rename webservice.h => subsurface-core/webservice.h (100%) rename windows.c => subsurface-core/windows.c (100%) rename windowtitleupdate.cpp => subsurface-core/windowtitleupdate.cpp (100%) rename windowtitleupdate.h => subsurface-core/windowtitleupdate.h (100%) rename worldmap-options.h => subsurface-core/worldmap-options.h (100%) rename worldmap-save.c => subsurface-core/worldmap-save.c (100%) rename worldmap-save.h => subsurface-core/worldmap-save.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba6544210..0a14db6de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,12 @@ option(FBSUPPORT "allow posting to Facebook" ON) option(BTSUPPORT "enable support for QtBluetooth (requires Qt5.4 or newer)" ON) option(FTDISUPPORT "enable support for libftdi based serial" OFF) +add_definitions(-DSUBSURFACE_SOURCE="${CMAKE_SOURCE_DIR}") + +if(BTSUPPORT) + add_definitions(-DBT_SUPPORT) +endif() + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${${PROJECT_NAME}_SOURCE_DIR}/cmake/Modules @@ -34,6 +40,7 @@ include_directories(. qt-ui qt-models qt-ui/profile + subsurface-core/ ) # get the version string -- this is only used for Mac Bundle at this point @@ -268,19 +275,16 @@ add_custom_target( set(PLATFORM_SRC unknown_platform.c) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(SUBSURFACE_TARGET subsurface) - set(PLATFORM_SRC linux.c) # in some builds we appear to be missing libz for some strange reason... set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lz) endif() if(ANDROID) - set(PLATFORM_SRC android.cpp) set(SUBSURFACE_TARGET subsurface) # To allow us to debug log to logcat set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -llog) endif() if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(SUBSURFACE_TARGET Subsurface) - set(PLATFORM_SRC macos.c) find_library(APP_SERVICES_LIBRARY ApplicationServices) find_library(HID_LIB HidApi) set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${HID_LIB}) @@ -299,7 +303,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") endif() if(CMAKE_SYSTEM_NAME STREQUAL "Windows") set(SUBSURFACE_TARGET subsurface) - set(PLATFORM_SRC windows.c) set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lwsock32 -lws2_32) remove_definitions(-DUNICODE) add_definitions(-mwindows -D_WIN32) @@ -307,68 +310,7 @@ endif() # include translations add_subdirectory(translations) - -if(BTSUPPORT) - add_definitions(-DBT_SUPPORT) - set(BT_SRC_FILES qt-ui/btdeviceselectiondialog.cpp) - set(BT_CORE_SRC_FILES qtserialbluetooth.cpp) -endif() - -# compile the core library, in C. -set(SUBSURFACE_CORE_LIB_SRCS - cochran.c - datatrak.c - deco.c - device.c - dive.c - divesite.c - divesite.cpp # some new stuff that is not c code but belongs to divesite. - divelist.c - equipment.c - file.c - git-access.c - libdivecomputer.c - liquivision.c - load-git.c - membuffer.c - ostctools.c - parse-xml.c - planner.c - profile.c - gaspressures.c - worldmap-save.c - save-git.c - save-xml.c - save-html.c - sha1.c - statistics.c - strtod.c - subsurfacestartup.c - time.c - uemis.c - uemis-downloader.c - version.c - # gettextfrommoc should be added because we are using it on the c-code. - gettextfromc.cpp - # dirk ported some core functionality to c++. - qthelper.cpp - divecomputer.cpp - exif.cpp - subsurfacesysinfo.cpp - devicedetails.cpp - configuredivecomputer.cpp - configuredivecomputerthreads.cpp - divesitehelpers.cpp - taxonomy.c - checkcloudconnection.cpp - windowtitleupdate.cpp - divelogexportlogic.cpp - qt-init.cpp - ${BT_CORE_SRC_FILES} - ${SERIAL_FTDI} - ${PLATFORM_SRC} -) -source_group("Subsurface Core" FILES ${SUBSURFACE_CORE_LIB_SRCS}) +add_subdirectory(subsurface-core) if(FBSUPPORT) add_definitions(-DFBSUPPORT) @@ -406,12 +348,9 @@ source_group("Subsurface Models" FILES ${SUBSURFACE_MODELS}) set(SUBSURFACE_APP main.cpp qt-gui.cpp - qthelper.cpp ) source_group("Subsurface App" FILES ${SUBSURFACE_APP}) -add_library(subsurface_corelib STATIC ${SUBSURFACE_CORE_LIB_SRCS} ) -target_link_libraries(subsurface_corelib ${QT_LIBRARIES}) add_library(subsurface_models STATIC ${SUBSURFACE_MODELS_LIB_SRCS}) target_link_libraries(subsurface_models ${QT_LIBRARIES}) @@ -483,7 +422,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") endif() # build an automated html exporter -add_executable(export-html EXCLUDE_FROM_ALL export-html.cpp qt-init.cpp qthelper.cpp ${SUBSURFACE_RESOURCES}) +add_executable(export-html EXCLUDE_FROM_ALL export-html.cpp ${SUBSURFACE_RESOURCES}) target_link_libraries(export-html subsurface_corelib ${SUBSURFACE_LINK_LIBRARIES}) # QTest based tests @@ -495,7 +434,7 @@ macro(TEST NAME FILE) set_tests_properties(${NAME}_run PROPERTIES DEPENDS ${NAME}_build) endmacro() -add_definitions(-DSUBSURFACE_SOURCE="${CMAKE_SOURCE_DIR}") + add_definitions(-g) if(NOT NO_TESTS) enable_testing() diff --git a/qt-models/models.h b/qt-models/models.h index c9212195e..f152af469 100644 --- a/qt-models/models.h +++ b/qt-models/models.h @@ -15,9 +15,9 @@ #include "metrics.h" -#include "../dive.h" -#include "../divelist.h" -#include "../divecomputer.h" +#include "subsurface-core/dive.h" +#include "subsurface-core/divelist.h" +#include "subsurface-core/divecomputer.h" #include "cleanertablemodel.h" #include "treemodel.h" diff --git a/qt-ui/CMakeLists.txt b/qt-ui/CMakeLists.txt index 9def39ff3..a860faed5 100644 --- a/qt-ui/CMakeLists.txt +++ b/qt-ui/CMakeLists.txt @@ -4,6 +4,10 @@ qt5_wrap_ui(SUBSURFACE_UI_HDRS ${SUBSURFACE_UI}) qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc) source_group("Subsurface Interface Files" FILES ${SUBSURFACE_UI}) +if(BTSUPPORT) + set(BT_SRC_FILES btdeviceselectiondialog.cpp) +endif() + # the interface, in C++ set(SUBSURFACE_INTERFACE updatemanager.cpp diff --git a/qt-ui/configuredivecomputerdialog.h b/qt-ui/configuredivecomputerdialog.h index be76644a9..9ad30ac67 100644 --- a/qt-ui/configuredivecomputerdialog.h +++ b/qt-ui/configuredivecomputerdialog.h @@ -4,7 +4,7 @@ #include #include #include "ui_configuredivecomputerdialog.h" -#include "../libdivecomputer.h" +#include "subsurface-core/libdivecomputer.h" #include "configuredivecomputer.h" #include #include diff --git a/qt-ui/divelogimportdialog.h b/qt-ui/divelogimportdialog.h index 03bb14029..2d12c7cac 100644 --- a/qt-ui/divelogimportdialog.h +++ b/qt-ui/divelogimportdialog.h @@ -9,8 +9,8 @@ #include #include -#include "../dive.h" -#include "../divelist.h" +#include "subsurface-core/dive.h" +#include "subsurface-core/divelist.h" namespace Ui { class DiveLogImportDialog; diff --git a/qt-ui/graphicsview-common.h b/qt-ui/graphicsview-common.h index 3c1cb75a0..2a757b2ae 100644 --- a/qt-ui/graphicsview-common.h +++ b/qt-ui/graphicsview-common.h @@ -1,7 +1,7 @@ #ifndef GRAPHICSVIEW_COMMON_H #define GRAPHICSVIEW_COMMON_H -#include "../color.h" +#include "subsurface-core/color.h" #include #include #include diff --git a/subsurface-core/CMakeLists.txt b/subsurface-core/CMakeLists.txt new file mode 100644 index 000000000..e7f531527 --- /dev/null +++ b/subsurface-core/CMakeLists.txt @@ -0,0 +1,81 @@ +set(PLATFORM_SRC unknown_platform.c) +if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(PLATFORM_SRC linux.c) +elseif(ANDROID) + set(PLATFORM_SRC android.cpp) +elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(PLATFORM_SRC macos.c) +elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + set(PLATFORM_SRC windows.c) +endif() + +if(FTDISUPPORT) + set(SERIAL_FTDI serial_ftdi.c) +endif() + +if(BTSUPPORT) + add_definitions(-DBT_SUPPORT) + set(BT_SRC_FILES qt-ui/btdeviceselectiondialog.cpp) + set(BT_CORE_SRC_FILES qtserialbluetooth.cpp) +endif() + +# compile the core library, in C. +set(SUBSURFACE_CORE_LIB_SRCS + cochran.c + datatrak.c + deco.c + device.c + dive.c + divesite.c + divesite.cpp + divelist.c + equipment.c + file.c + git-access.c + libdivecomputer.c + liquivision.c + load-git.c + membuffer.c + ostctools.c + parse-xml.c + planner.c + profile.c + gaspressures.c + worldmap-save.c + save-git.c + save-xml.c + save-html.c + sha1.c + statistics.c + strtod.c + subsurfacestartup.c + time.c + uemis.c + uemis-downloader.c + version.c + # gettextfrommoc should be added because we are using it on the c-code. + gettextfromc.cpp + # dirk ported some core functionality to c++. + qthelper.cpp + divecomputer.cpp + exif.cpp + subsurfacesysinfo.cpp + devicedetails.cpp + configuredivecomputer.cpp + configuredivecomputerthreads.cpp + divesitehelpers.cpp + taxonomy.c + checkcloudconnection.cpp + windowtitleupdate.cpp + divelogexportlogic.cpp + qt-init.cpp + qtserialbluetooth.cpp + ${SERIAL_FTDI} + ${PLATFORM_SRC} + ${BT_CORE_SRC_FILES} +) +source_group("Subsurface Core" FILES ${SUBSURFACE_CORE_LIB_SRCS}) + +add_library(subsurface_corelib STATIC ${SUBSURFACE_CORE_LIB_SRCS} ) +target_link_libraries(subsurface_corelib ${QT_LIBRARIES}) + diff --git a/android.cpp b/subsurface-core/android.cpp similarity index 100% rename from android.cpp rename to subsurface-core/android.cpp diff --git a/checkcloudconnection.cpp b/subsurface-core/checkcloudconnection.cpp similarity index 100% rename from checkcloudconnection.cpp rename to subsurface-core/checkcloudconnection.cpp diff --git a/checkcloudconnection.h b/subsurface-core/checkcloudconnection.h similarity index 100% rename from checkcloudconnection.h rename to subsurface-core/checkcloudconnection.h diff --git a/cochran.c b/subsurface-core/cochran.c similarity index 100% rename from cochran.c rename to subsurface-core/cochran.c diff --git a/cochran.h b/subsurface-core/cochran.h similarity index 100% rename from cochran.h rename to subsurface-core/cochran.h diff --git a/color.h b/subsurface-core/color.h similarity index 100% rename from color.h rename to subsurface-core/color.h diff --git a/configuredivecomputer.cpp b/subsurface-core/configuredivecomputer.cpp similarity index 100% rename from configuredivecomputer.cpp rename to subsurface-core/configuredivecomputer.cpp diff --git a/configuredivecomputer.h b/subsurface-core/configuredivecomputer.h similarity index 100% rename from configuredivecomputer.h rename to subsurface-core/configuredivecomputer.h diff --git a/configuredivecomputerthreads.cpp b/subsurface-core/configuredivecomputerthreads.cpp similarity index 100% rename from configuredivecomputerthreads.cpp rename to subsurface-core/configuredivecomputerthreads.cpp diff --git a/configuredivecomputerthreads.h b/subsurface-core/configuredivecomputerthreads.h similarity index 100% rename from configuredivecomputerthreads.h rename to subsurface-core/configuredivecomputerthreads.h diff --git a/datatrak.c b/subsurface-core/datatrak.c similarity index 100% rename from datatrak.c rename to subsurface-core/datatrak.c diff --git a/datatrak.h b/subsurface-core/datatrak.h similarity index 100% rename from datatrak.h rename to subsurface-core/datatrak.h diff --git a/deco.c b/subsurface-core/deco.c similarity index 100% rename from deco.c rename to subsurface-core/deco.c diff --git a/deco.h b/subsurface-core/deco.h similarity index 100% rename from deco.h rename to subsurface-core/deco.h diff --git a/device.c b/subsurface-core/device.c similarity index 100% rename from device.c rename to subsurface-core/device.c diff --git a/device.h b/subsurface-core/device.h similarity index 100% rename from device.h rename to subsurface-core/device.h diff --git a/devicedetails.cpp b/subsurface-core/devicedetails.cpp similarity index 100% rename from devicedetails.cpp rename to subsurface-core/devicedetails.cpp diff --git a/devicedetails.h b/subsurface-core/devicedetails.h similarity index 100% rename from devicedetails.h rename to subsurface-core/devicedetails.h diff --git a/display.h b/subsurface-core/display.h similarity index 100% rename from display.h rename to subsurface-core/display.h diff --git a/dive.c b/subsurface-core/dive.c similarity index 100% rename from dive.c rename to subsurface-core/dive.c diff --git a/dive.h b/subsurface-core/dive.h similarity index 100% rename from dive.h rename to subsurface-core/dive.h diff --git a/divecomputer.cpp b/subsurface-core/divecomputer.cpp similarity index 100% rename from divecomputer.cpp rename to subsurface-core/divecomputer.cpp diff --git a/divecomputer.h b/subsurface-core/divecomputer.h similarity index 100% rename from divecomputer.h rename to subsurface-core/divecomputer.h diff --git a/divelist.c b/subsurface-core/divelist.c similarity index 100% rename from divelist.c rename to subsurface-core/divelist.c diff --git a/divelist.h b/subsurface-core/divelist.h similarity index 100% rename from divelist.h rename to subsurface-core/divelist.h diff --git a/divelogexportlogic.cpp b/subsurface-core/divelogexportlogic.cpp similarity index 100% rename from divelogexportlogic.cpp rename to subsurface-core/divelogexportlogic.cpp diff --git a/divelogexportlogic.h b/subsurface-core/divelogexportlogic.h similarity index 100% rename from divelogexportlogic.h rename to subsurface-core/divelogexportlogic.h diff --git a/divesite.c b/subsurface-core/divesite.c similarity index 100% rename from divesite.c rename to subsurface-core/divesite.c diff --git a/divesite.cpp b/subsurface-core/divesite.cpp similarity index 100% rename from divesite.cpp rename to subsurface-core/divesite.cpp diff --git a/divesite.h b/subsurface-core/divesite.h similarity index 100% rename from divesite.h rename to subsurface-core/divesite.h diff --git a/divesitehelpers.cpp b/subsurface-core/divesitehelpers.cpp similarity index 100% rename from divesitehelpers.cpp rename to subsurface-core/divesitehelpers.cpp diff --git a/divesitehelpers.h b/subsurface-core/divesitehelpers.h similarity index 100% rename from divesitehelpers.h rename to subsurface-core/divesitehelpers.h diff --git a/equipment.c b/subsurface-core/equipment.c similarity index 100% rename from equipment.c rename to subsurface-core/equipment.c diff --git a/exif.cpp b/subsurface-core/exif.cpp similarity index 100% rename from exif.cpp rename to subsurface-core/exif.cpp diff --git a/exif.h b/subsurface-core/exif.h similarity index 100% rename from exif.h rename to subsurface-core/exif.h diff --git a/file.c b/subsurface-core/file.c similarity index 100% rename from file.c rename to subsurface-core/file.c diff --git a/file.h b/subsurface-core/file.h similarity index 100% rename from file.h rename to subsurface-core/file.h diff --git a/gaspressures.c b/subsurface-core/gaspressures.c similarity index 100% rename from gaspressures.c rename to subsurface-core/gaspressures.c diff --git a/gaspressures.h b/subsurface-core/gaspressures.h similarity index 100% rename from gaspressures.h rename to subsurface-core/gaspressures.h diff --git a/gettext.h b/subsurface-core/gettext.h similarity index 100% rename from gettext.h rename to subsurface-core/gettext.h diff --git a/gettextfromc.cpp b/subsurface-core/gettextfromc.cpp similarity index 100% rename from gettextfromc.cpp rename to subsurface-core/gettextfromc.cpp diff --git a/gettextfromc.h b/subsurface-core/gettextfromc.h similarity index 100% rename from gettextfromc.h rename to subsurface-core/gettextfromc.h diff --git a/git-access.c b/subsurface-core/git-access.c similarity index 100% rename from git-access.c rename to subsurface-core/git-access.c diff --git a/git-access.h b/subsurface-core/git-access.h similarity index 100% rename from git-access.h rename to subsurface-core/git-access.h diff --git a/helpers.h b/subsurface-core/helpers.h similarity index 100% rename from helpers.h rename to subsurface-core/helpers.h diff --git a/libdivecomputer.c b/subsurface-core/libdivecomputer.c similarity index 100% rename from libdivecomputer.c rename to subsurface-core/libdivecomputer.c diff --git a/libdivecomputer.h b/subsurface-core/libdivecomputer.h similarity index 100% rename from libdivecomputer.h rename to subsurface-core/libdivecomputer.h diff --git a/linux.c b/subsurface-core/linux.c similarity index 100% rename from linux.c rename to subsurface-core/linux.c diff --git a/liquivision.c b/subsurface-core/liquivision.c similarity index 100% rename from liquivision.c rename to subsurface-core/liquivision.c diff --git a/load-git.c b/subsurface-core/load-git.c similarity index 100% rename from load-git.c rename to subsurface-core/load-git.c diff --git a/macos.c b/subsurface-core/macos.c similarity index 100% rename from macos.c rename to subsurface-core/macos.c diff --git a/membuffer.c b/subsurface-core/membuffer.c similarity index 100% rename from membuffer.c rename to subsurface-core/membuffer.c diff --git a/membuffer.h b/subsurface-core/membuffer.h similarity index 100% rename from membuffer.h rename to subsurface-core/membuffer.h diff --git a/ostctools.c b/subsurface-core/ostctools.c similarity index 100% rename from ostctools.c rename to subsurface-core/ostctools.c diff --git a/parse-xml.c b/subsurface-core/parse-xml.c similarity index 100% rename from parse-xml.c rename to subsurface-core/parse-xml.c diff --git a/planner.c b/subsurface-core/planner.c similarity index 100% rename from planner.c rename to subsurface-core/planner.c diff --git a/planner.h b/subsurface-core/planner.h similarity index 100% rename from planner.h rename to subsurface-core/planner.h diff --git a/pref.h b/subsurface-core/pref.h similarity index 100% rename from pref.h rename to subsurface-core/pref.h diff --git a/prefs-macros.h b/subsurface-core/prefs-macros.h similarity index 100% rename from prefs-macros.h rename to subsurface-core/prefs-macros.h diff --git a/profile.c b/subsurface-core/profile.c similarity index 100% rename from profile.c rename to subsurface-core/profile.c diff --git a/profile.h b/subsurface-core/profile.h similarity index 100% rename from profile.h rename to subsurface-core/profile.h diff --git a/qt-gui.h b/subsurface-core/qt-gui.h similarity index 100% rename from qt-gui.h rename to subsurface-core/qt-gui.h diff --git a/qt-init.cpp b/subsurface-core/qt-init.cpp similarity index 100% rename from qt-init.cpp rename to subsurface-core/qt-init.cpp diff --git a/qthelper.cpp b/subsurface-core/qthelper.cpp similarity index 100% rename from qthelper.cpp rename to subsurface-core/qthelper.cpp diff --git a/qthelper.h b/subsurface-core/qthelper.h similarity index 100% rename from qthelper.h rename to subsurface-core/qthelper.h diff --git a/qthelperfromc.h b/subsurface-core/qthelperfromc.h similarity index 100% rename from qthelperfromc.h rename to subsurface-core/qthelperfromc.h diff --git a/qtserialbluetooth.cpp b/subsurface-core/qtserialbluetooth.cpp similarity index 100% rename from qtserialbluetooth.cpp rename to subsurface-core/qtserialbluetooth.cpp diff --git a/save-git.c b/subsurface-core/save-git.c similarity index 100% rename from save-git.c rename to subsurface-core/save-git.c diff --git a/save-html.c b/subsurface-core/save-html.c similarity index 100% rename from save-html.c rename to subsurface-core/save-html.c diff --git a/save-html.h b/subsurface-core/save-html.h similarity index 100% rename from save-html.h rename to subsurface-core/save-html.h diff --git a/save-xml.c b/subsurface-core/save-xml.c similarity index 100% rename from save-xml.c rename to subsurface-core/save-xml.c diff --git a/serial_ftdi.c b/subsurface-core/serial_ftdi.c similarity index 100% rename from serial_ftdi.c rename to subsurface-core/serial_ftdi.c diff --git a/sha1.c b/subsurface-core/sha1.c similarity index 100% rename from sha1.c rename to subsurface-core/sha1.c diff --git a/sha1.h b/subsurface-core/sha1.h similarity index 100% rename from sha1.h rename to subsurface-core/sha1.h diff --git a/statistics.c b/subsurface-core/statistics.c similarity index 100% rename from statistics.c rename to subsurface-core/statistics.c diff --git a/statistics.h b/subsurface-core/statistics.h similarity index 100% rename from statistics.h rename to subsurface-core/statistics.h diff --git a/strndup.h b/subsurface-core/strndup.h similarity index 100% rename from strndup.h rename to subsurface-core/strndup.h diff --git a/strtod.c b/subsurface-core/strtod.c similarity index 100% rename from strtod.c rename to subsurface-core/strtod.c diff --git a/subsurfacestartup.c b/subsurface-core/subsurfacestartup.c similarity index 100% rename from subsurfacestartup.c rename to subsurface-core/subsurfacestartup.c diff --git a/subsurfacestartup.h b/subsurface-core/subsurfacestartup.h similarity index 100% rename from subsurfacestartup.h rename to subsurface-core/subsurfacestartup.h diff --git a/subsurfacesysinfo.cpp b/subsurface-core/subsurfacesysinfo.cpp similarity index 100% rename from subsurfacesysinfo.cpp rename to subsurface-core/subsurfacesysinfo.cpp diff --git a/subsurfacesysinfo.h b/subsurface-core/subsurfacesysinfo.h similarity index 100% rename from subsurfacesysinfo.h rename to subsurface-core/subsurfacesysinfo.h diff --git a/taxonomy.c b/subsurface-core/taxonomy.c similarity index 100% rename from taxonomy.c rename to subsurface-core/taxonomy.c diff --git a/taxonomy.h b/subsurface-core/taxonomy.h similarity index 100% rename from taxonomy.h rename to subsurface-core/taxonomy.h diff --git a/time.c b/subsurface-core/time.c similarity index 100% rename from time.c rename to subsurface-core/time.c diff --git a/uemis-downloader.c b/subsurface-core/uemis-downloader.c similarity index 100% rename from uemis-downloader.c rename to subsurface-core/uemis-downloader.c diff --git a/uemis.c b/subsurface-core/uemis.c similarity index 100% rename from uemis.c rename to subsurface-core/uemis.c diff --git a/uemis.h b/subsurface-core/uemis.h similarity index 100% rename from uemis.h rename to subsurface-core/uemis.h diff --git a/units.h b/subsurface-core/units.h similarity index 100% rename from units.h rename to subsurface-core/units.h diff --git a/version.c b/subsurface-core/version.c similarity index 100% rename from version.c rename to subsurface-core/version.c diff --git a/version.h b/subsurface-core/version.h similarity index 100% rename from version.h rename to subsurface-core/version.h diff --git a/webservice.h b/subsurface-core/webservice.h similarity index 100% rename from webservice.h rename to subsurface-core/webservice.h diff --git a/windows.c b/subsurface-core/windows.c similarity index 100% rename from windows.c rename to subsurface-core/windows.c diff --git a/windowtitleupdate.cpp b/subsurface-core/windowtitleupdate.cpp similarity index 100% rename from windowtitleupdate.cpp rename to subsurface-core/windowtitleupdate.cpp diff --git a/windowtitleupdate.h b/subsurface-core/windowtitleupdate.h similarity index 100% rename from windowtitleupdate.h rename to subsurface-core/windowtitleupdate.h diff --git a/worldmap-options.h b/subsurface-core/worldmap-options.h similarity index 100% rename from worldmap-options.h rename to subsurface-core/worldmap-options.h diff --git a/worldmap-save.c b/subsurface-core/worldmap-save.c similarity index 100% rename from worldmap-save.c rename to subsurface-core/worldmap-save.c diff --git a/worldmap-save.h b/subsurface-core/worldmap-save.h similarity index 100% rename from worldmap-save.h rename to subsurface-core/worldmap-save.h