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 <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

105 files changed, 102 insertions, 78 deletions

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 <QDialog>
 #include <QStringListModel>
 #include "ui_configuredivecomputerdialog.h"
-#include "../libdivecomputer.h"
+#include "subsurface-core/libdivecomputer.h"
 #include "configuredivecomputer.h"
 #include <QStyledItemDelegate>
 #include <QNetworkAccessManager>
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 <QAbstractTableModel>
 #include <QStyledItemDelegate>
 
-#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 <QMap>
 #include <QVector>
 #include <QColor>
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
index 3e14bec02..3e14bec02 100644
--- a/android.cpp
+++ b/subsurface-core/android.cpp
diff --git a/checkcloudconnection.cpp b/subsurface-core/checkcloudconnection.cpp
index be2a2fa18..be2a2fa18 100644
--- a/checkcloudconnection.cpp
+++ b/subsurface-core/checkcloudconnection.cpp
diff --git a/checkcloudconnection.h b/subsurface-core/checkcloudconnection.h
index 58a412797..58a412797 100644
--- a/checkcloudconnection.h
+++ b/subsurface-core/checkcloudconnection.h
diff --git a/cochran.c b/subsurface-core/cochran.c
index 267fe2b4a..267fe2b4a 100644
--- a/cochran.c
+++ b/subsurface-core/cochran.c
diff --git a/cochran.h b/subsurface-core/cochran.h
index 97d4361c8..97d4361c8 100644
--- a/cochran.h
+++ b/subsurface-core/cochran.h
diff --git a/color.h b/subsurface-core/color.h
index 7938e59a6..7938e59a6 100644
--- a/color.h
+++ b/subsurface-core/color.h
diff --git a/configuredivecomputer.cpp b/subsurface-core/configuredivecomputer.cpp
index 2457ffe82..2457ffe82 100644
--- a/configuredivecomputer.cpp
+++ b/subsurface-core/configuredivecomputer.cpp
diff --git a/configuredivecomputer.h b/subsurface-core/configuredivecomputer.h
index f14eeeca3..f14eeeca3 100644
--- a/configuredivecomputer.h
+++ b/subsurface-core/configuredivecomputer.h
diff --git a/configuredivecomputerthreads.cpp b/subsurface-core/configuredivecomputerthreads.cpp
index 78edcb37c..78edcb37c 100644
--- a/configuredivecomputerthreads.cpp
+++ b/subsurface-core/configuredivecomputerthreads.cpp
diff --git a/configuredivecomputerthreads.h b/subsurface-core/configuredivecomputerthreads.h
index 1d7a36f9b..1d7a36f9b 100644
--- a/configuredivecomputerthreads.h
+++ b/subsurface-core/configuredivecomputerthreads.h
diff --git a/datatrak.c b/subsurface-core/datatrak.c
index 03fa71a50..03fa71a50 100644
--- a/datatrak.c
+++ b/subsurface-core/datatrak.c
diff --git a/datatrak.h b/subsurface-core/datatrak.h
index 3a37e0465..3a37e0465 100644
--- a/datatrak.h
+++ b/subsurface-core/datatrak.h
diff --git a/deco.c b/subsurface-core/deco.c
index 86acc0351..86acc0351 100644
--- a/deco.c
+++ b/subsurface-core/deco.c
diff --git a/deco.h b/subsurface-core/deco.h
index 08ff93422..08ff93422 100644
--- a/deco.h
+++ b/subsurface-core/deco.h
diff --git a/device.c b/subsurface-core/device.c
index c952c84be..c952c84be 100644
--- a/device.c
+++ b/subsurface-core/device.c
diff --git a/device.h b/subsurface-core/device.h
index 9ff2ce23a..9ff2ce23a 100644
--- a/device.h
+++ b/subsurface-core/device.h
diff --git a/devicedetails.cpp b/subsurface-core/devicedetails.cpp
index 1ac56375d..1ac56375d 100644
--- a/devicedetails.cpp
+++ b/subsurface-core/devicedetails.cpp
diff --git a/devicedetails.h b/subsurface-core/devicedetails.h
index 1ed9914ef..1ed9914ef 100644
--- a/devicedetails.h
+++ b/subsurface-core/devicedetails.h
diff --git a/display.h b/subsurface-core/display.h
index 9e3e1d159..9e3e1d159 100644
--- a/display.h
+++ b/subsurface-core/display.h
diff --git a/dive.c b/subsurface-core/dive.c
index 2ae84ca1e..2ae84ca1e 100644
--- a/dive.c
+++ b/subsurface-core/dive.c
diff --git a/dive.h b/subsurface-core/dive.h
index cef1106fd..cef1106fd 100644
--- a/dive.h
+++ b/subsurface-core/dive.h
diff --git a/divecomputer.cpp b/subsurface-core/divecomputer.cpp
index e4081e1cd..e4081e1cd 100644
--- a/divecomputer.cpp
+++ b/subsurface-core/divecomputer.cpp
diff --git a/divecomputer.h b/subsurface-core/divecomputer.h
index 98d12ab8b..98d12ab8b 100644
--- a/divecomputer.h
+++ b/subsurface-core/divecomputer.h
diff --git a/divelist.c b/subsurface-core/divelist.c
index a14fabf88..a14fabf88 100644
--- a/divelist.c
+++ b/subsurface-core/divelist.c
diff --git a/divelist.h b/subsurface-core/divelist.h
index 5bae09cff..5bae09cff 100644
--- a/divelist.h
+++ b/subsurface-core/divelist.h
diff --git a/divelogexportlogic.cpp b/subsurface-core/divelogexportlogic.cpp
index af5157f4a..af5157f4a 100644
--- a/divelogexportlogic.cpp
+++ b/subsurface-core/divelogexportlogic.cpp
diff --git a/divelogexportlogic.h b/subsurface-core/divelogexportlogic.h
index 84f09c362..84f09c362 100644
--- a/divelogexportlogic.h
+++ b/subsurface-core/divelogexportlogic.h
diff --git a/divesite.c b/subsurface-core/divesite.c
index e9eed2a07..e9eed2a07 100644
--- a/divesite.c
+++ b/subsurface-core/divesite.c
diff --git a/divesite.cpp b/subsurface-core/divesite.cpp
index ae102a14b..ae102a14b 100644
--- a/divesite.cpp
+++ b/subsurface-core/divesite.cpp
diff --git a/divesite.h b/subsurface-core/divesite.h
index f18b2e8e8..f18b2e8e8 100644
--- a/divesite.h
+++ b/subsurface-core/divesite.h
diff --git a/divesitehelpers.cpp b/subsurface-core/divesitehelpers.cpp
index 3542f96fa..3542f96fa 100644
--- a/divesitehelpers.cpp
+++ b/subsurface-core/divesitehelpers.cpp
diff --git a/divesitehelpers.h b/subsurface-core/divesitehelpers.h
index a08069bc0..a08069bc0 100644
--- a/divesitehelpers.h
+++ b/subsurface-core/divesitehelpers.h
diff --git a/equipment.c b/subsurface-core/equipment.c
index 47c439735..47c439735 100644
--- a/equipment.c
+++ b/subsurface-core/equipment.c
diff --git a/exif.cpp b/subsurface-core/exif.cpp
index 0b1cda2bc..0b1cda2bc 100644
--- a/exif.cpp
+++ b/subsurface-core/exif.cpp
diff --git a/exif.h b/subsurface-core/exif.h
index 0fb3a7d4a..0fb3a7d4a 100644
--- a/exif.h
+++ b/subsurface-core/exif.h
diff --git a/file.c b/subsurface-core/file.c
index c4032c1f2..c4032c1f2 100644
--- a/file.c
+++ b/subsurface-core/file.c
diff --git a/file.h b/subsurface-core/file.h
index 855109960..855109960 100644
--- a/file.h
+++ b/subsurface-core/file.h
diff --git a/gaspressures.c b/subsurface-core/gaspressures.c
index 5f46d6080..5f46d6080 100644
--- a/gaspressures.c
+++ b/subsurface-core/gaspressures.c
diff --git a/gaspressures.h b/subsurface-core/gaspressures.h
index 420c117a2..420c117a2 100644
--- a/gaspressures.h
+++ b/subsurface-core/gaspressures.h
diff --git a/gettext.h b/subsurface-core/gettext.h
index 43ff023c7..43ff023c7 100644
--- a/gettext.h
+++ b/subsurface-core/gettext.h
diff --git a/gettextfromc.cpp b/subsurface-core/gettextfromc.cpp
index c579e3c3c..c579e3c3c 100644
--- a/gettextfromc.cpp
+++ b/subsurface-core/gettextfromc.cpp
diff --git a/gettextfromc.h b/subsurface-core/gettextfromc.h
index 53df18365..53df18365 100644
--- a/gettextfromc.h
+++ b/subsurface-core/gettextfromc.h
diff --git a/git-access.c b/subsurface-core/git-access.c
index 607789f98..607789f98 100644
--- a/git-access.c
+++ b/subsurface-core/git-access.c
diff --git a/git-access.h b/subsurface-core/git-access.h
index a2a9ba3ae..a2a9ba3ae 100644
--- a/git-access.h
+++ b/subsurface-core/git-access.h
diff --git a/helpers.h b/subsurface-core/helpers.h
index 5f2f2f2c5..5f2f2f2c5 100644
--- a/helpers.h
+++ b/subsurface-core/helpers.h
diff --git a/libdivecomputer.c b/subsurface-core/libdivecomputer.c
index ca8378379..ca8378379 100644
--- a/libdivecomputer.c
+++ b/subsurface-core/libdivecomputer.c
diff --git a/libdivecomputer.h b/subsurface-core/libdivecomputer.h
index 79817e509..79817e509 100644
--- a/libdivecomputer.h
+++ b/subsurface-core/libdivecomputer.h
diff --git a/linux.c b/subsurface-core/linux.c
index d4131c7ea..d4131c7ea 100644
--- a/linux.c
+++ b/subsurface-core/linux.c
diff --git a/liquivision.c b/subsurface-core/liquivision.c
index 295287c15..295287c15 100644
--- a/liquivision.c
+++ b/subsurface-core/liquivision.c
diff --git a/load-git.c b/subsurface-core/load-git.c
index 39dab4367..39dab4367 100644
--- a/load-git.c
+++ b/subsurface-core/load-git.c
diff --git a/macos.c b/subsurface-core/macos.c
index aa2be4b3b..aa2be4b3b 100644
--- a/macos.c
+++ b/subsurface-core/macos.c
diff --git a/membuffer.c b/subsurface-core/membuffer.c
index 2889a0cdc..2889a0cdc 100644
--- a/membuffer.c
+++ b/subsurface-core/membuffer.c
diff --git a/membuffer.h b/subsurface-core/membuffer.h
index 434b34c71..434b34c71 100644
--- a/membuffer.h
+++ b/subsurface-core/membuffer.h
diff --git a/ostctools.c b/subsurface-core/ostctools.c
index 4b4cff241..4b4cff241 100644
--- a/ostctools.c
+++ b/subsurface-core/ostctools.c
diff --git a/parse-xml.c b/subsurface-core/parse-xml.c
index 3d86222b9..3d86222b9 100644
--- a/parse-xml.c
+++ b/subsurface-core/parse-xml.c
diff --git a/planner.c b/subsurface-core/planner.c
index 22d37165a..22d37165a 100644
--- a/planner.c
+++ b/subsurface-core/planner.c
diff --git a/planner.h b/subsurface-core/planner.h
index a675989e0..a675989e0 100644
--- a/planner.h
+++ b/subsurface-core/planner.h
diff --git a/pref.h b/subsurface-core/pref.h
index 84975aaaa..84975aaaa 100644
--- a/pref.h
+++ b/subsurface-core/pref.h
diff --git a/prefs-macros.h b/subsurface-core/prefs-macros.h
index fe459d3da..fe459d3da 100644
--- a/prefs-macros.h
+++ b/subsurface-core/prefs-macros.h
diff --git a/profile.c b/subsurface-core/profile.c
index d39133c21..d39133c21 100644
--- a/profile.c
+++ b/subsurface-core/profile.c
diff --git a/profile.h b/subsurface-core/profile.h
index a6dbfcf5f..a6dbfcf5f 100644
--- a/profile.h
+++ b/subsurface-core/profile.h
diff --git a/qt-gui.h b/subsurface-core/qt-gui.h
index ca038b145..ca038b145 100644
--- a/qt-gui.h
+++ b/subsurface-core/qt-gui.h
diff --git a/qt-init.cpp b/subsurface-core/qt-init.cpp
index b52dfd970..b52dfd970 100644
--- a/qt-init.cpp
+++ b/subsurface-core/qt-init.cpp
diff --git a/qthelper.cpp b/subsurface-core/qthelper.cpp
index a12d25333..a12d25333 100644
--- a/qthelper.cpp
+++ b/subsurface-core/qthelper.cpp
diff --git a/qthelper.h b/subsurface-core/qthelper.h
index a2b7b6c39..a2b7b6c39 100644
--- a/qthelper.h
+++ b/subsurface-core/qthelper.h
diff --git a/qthelperfromc.h b/subsurface-core/qthelperfromc.h
index d2e80144c..d2e80144c 100644
--- a/qthelperfromc.h
+++ b/subsurface-core/qthelperfromc.h
diff --git a/qtserialbluetooth.cpp b/subsurface-core/qtserialbluetooth.cpp
index 025ab8c34..025ab8c34 100644
--- a/qtserialbluetooth.cpp
+++ b/subsurface-core/qtserialbluetooth.cpp
diff --git a/save-git.c b/subsurface-core/save-git.c
index 69ad0726d..69ad0726d 100644
--- a/save-git.c
+++ b/subsurface-core/save-git.c
diff --git a/save-html.c b/subsurface-core/save-html.c
index 64ce94f66..64ce94f66 100644
--- a/save-html.c
+++ b/subsurface-core/save-html.c
diff --git a/save-html.h b/subsurface-core/save-html.h
index 20743e90a..20743e90a 100644
--- a/save-html.h
+++ b/subsurface-core/save-html.h
diff --git a/save-xml.c b/subsurface-core/save-xml.c
index 166885861..166885861 100644
--- a/save-xml.c
+++ b/subsurface-core/save-xml.c
diff --git a/serial_ftdi.c b/subsurface-core/serial_ftdi.c
index cbac026cf..cbac026cf 100644
--- a/serial_ftdi.c
+++ b/subsurface-core/serial_ftdi.c
diff --git a/sha1.c b/subsurface-core/sha1.c
index acf8c5d9f..acf8c5d9f 100644
--- a/sha1.c
+++ b/subsurface-core/sha1.c
diff --git a/sha1.h b/subsurface-core/sha1.h
index cab6ff77d..cab6ff77d 100644
--- a/sha1.h
+++ b/subsurface-core/sha1.h
diff --git a/statistics.c b/subsurface-core/statistics.c
index 19fd350eb..19fd350eb 100644
--- a/statistics.c
+++ b/subsurface-core/statistics.c
diff --git a/statistics.h b/subsurface-core/statistics.h
index dbab25761..dbab25761 100644
--- a/statistics.h
+++ b/subsurface-core/statistics.h
diff --git a/strndup.h b/subsurface-core/strndup.h
index 84e18b60f..84e18b60f 100644
--- a/strndup.h
+++ b/subsurface-core/strndup.h
diff --git a/strtod.c b/subsurface-core/strtod.c
index 81e5d42d1..81e5d42d1 100644
--- a/strtod.c
+++ b/subsurface-core/strtod.c
diff --git a/subsurfacestartup.c b/subsurface-core/subsurfacestartup.c
index 1286885ee..1286885ee 100644
--- a/subsurfacestartup.c
+++ b/subsurface-core/subsurfacestartup.c
diff --git a/subsurfacestartup.h b/subsurface-core/subsurfacestartup.h
index 3ccc24aa4..3ccc24aa4 100644
--- a/subsurfacestartup.h
+++ b/subsurface-core/subsurfacestartup.h
diff --git a/subsurfacesysinfo.cpp b/subsurface-core/subsurfacesysinfo.cpp
index a7173b169..a7173b169 100644
--- a/subsurfacesysinfo.cpp
+++ b/subsurface-core/subsurfacesysinfo.cpp
diff --git a/subsurfacesysinfo.h b/subsurface-core/subsurfacesysinfo.h
index b2c267b83..b2c267b83 100644
--- a/subsurfacesysinfo.h
+++ b/subsurface-core/subsurfacesysinfo.h
diff --git a/taxonomy.c b/subsurface-core/taxonomy.c
index 670d85ad0..670d85ad0 100644
--- a/taxonomy.c
+++ b/subsurface-core/taxonomy.c
diff --git a/taxonomy.h b/subsurface-core/taxonomy.h
index 51245d562..51245d562 100644
--- a/taxonomy.h
+++ b/subsurface-core/taxonomy.h
diff --git a/time.c b/subsurface-core/time.c
index b658954bc..b658954bc 100644
--- a/time.c
+++ b/subsurface-core/time.c
diff --git a/uemis-downloader.c b/subsurface-core/uemis-downloader.c
index 2a6e5178c..2a6e5178c 100644
--- a/uemis-downloader.c
+++ b/subsurface-core/uemis-downloader.c
diff --git a/uemis.c b/subsurface-core/uemis.c
index 4135e0cfe..4135e0cfe 100644
--- a/uemis.c
+++ b/subsurface-core/uemis.c
diff --git a/uemis.h b/subsurface-core/uemis.h
index 5f32fe76c..5f32fe76c 100644
--- a/uemis.h
+++ b/subsurface-core/uemis.h
diff --git a/units.h b/subsurface-core/units.h
index 1273bd9bb..1273bd9bb 100644
--- a/units.h
+++ b/subsurface-core/units.h
diff --git a/version.c b/subsurface-core/version.c
index 5b54bf4c7..5b54bf4c7 100644
--- a/version.c
+++ b/subsurface-core/version.c
diff --git a/version.h b/subsurface-core/version.h
index bc0aac00d..bc0aac00d 100644
--- a/version.h
+++ b/subsurface-core/version.h
diff --git a/webservice.h b/subsurface-core/webservice.h
index 052b8aae7..052b8aae7 100644
--- a/webservice.h
+++ b/subsurface-core/webservice.h
diff --git a/windows.c b/subsurface-core/windows.c
index a2386fd83..a2386fd83 100644
--- a/windows.c
+++ b/subsurface-core/windows.c
diff --git a/windowtitleupdate.cpp b/subsurface-core/windowtitleupdate.cpp
index eec324c68..eec324c68 100644
--- a/windowtitleupdate.cpp
+++ b/subsurface-core/windowtitleupdate.cpp
diff --git a/windowtitleupdate.h b/subsurface-core/windowtitleupdate.h
index 8650e5868..8650e5868 100644
--- a/windowtitleupdate.h
+++ b/subsurface-core/windowtitleupdate.h
diff --git a/worldmap-options.h b/subsurface-core/worldmap-options.h
index 177443563..177443563 100644
--- a/worldmap-options.h
+++ b/subsurface-core/worldmap-options.h
diff --git a/worldmap-save.c b/subsurface-core/worldmap-save.c
index 25c5ee33f..25c5ee33f 100644
--- a/worldmap-save.c
+++ b/subsurface-core/worldmap-save.c
diff --git a/worldmap-save.h b/subsurface-core/worldmap-save.h
index 102ea40e5..102ea40e5 100644
--- a/worldmap-save.h
+++ b/subsurface-core/worldmap-save.h