Move subsurface-core to core and qt-mobile to mobile-widgets

Having subsurface-core as a directory name really messes with
autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an
autocomplete conflict and also was inconsistent with the desktop-widget
name for the directory containing the "other" UI.

And while cleaning up the resulting change in the path name for include
files, I decided to clean up those even more to make them consistent
overall.

This could have been handled in more commits, but since this requires a
make clean before the build, it seemed more sensible to do it all in one.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

.gitignore

@@ -33,4 +33,4 @@ Subsurface.app
 .DS_Store
 !android/**/*.xml
 build*
-qt-mobile/qml/mobilecomponents
+mobile-widgets/qml/kirigami

CMakeLists.txt

@@ -115,10 +115,6 @@ include_directories(.
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_BINARY_DIR}
 	${CMAKE_BINARY_DIR}/desktop-widgets
-	desktop-widgets/
-	qt-models
-	desktop-widgets/profile
-	subsurface-core/
 )
 
 # Project Target specific configuration should go here,
@@ -212,7 +208,7 @@ qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc)
 
 # include translations
 add_subdirectory(translations)
-add_subdirectory(subsurface-core)
+add_subdirectory(core)
 add_subdirectory(qt-models)
 add_subdirectory(profile-widget)
 
@@ -227,12 +223,12 @@ endif()
 # create the executables
 if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
 	set(MOBILE_SRC
-		qt-mobile/qmlmanager.cpp
+		mobile-widgets/qmlmanager.cpp
-		qt-mobile/qmlprofile.cpp
+		mobile-widgets/qmlprofile.cpp
 		subsurface-mobile-main.cpp
 		subsurface-mobile-helper.cpp
 	)
-	qt5_add_resources(MOBILE_RESOURCES qt-mobile/qml/mobile-resources.qrc)
+	qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc)
 	# When building the mobile application in Android, link it and Qt will do the rest, when doing the mobile application on Desktop, create an executable.
 	if(ANDROID)
 		add_library(${SUBSURFACE_TARGET} SHARED ${SUBSURFACE_PKG} ${MOBILE_SRC} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES})

core/deco.c

@@ -19,7 +19,7 @@
 #include <string.h>
 #include "dive.h"
 #include <assert.h>
-#include <planner.h>
+#include "core/planner.h"
 
 #define cube(x) (x * x * x)
 

core/gettextfromc.cpp

@@ -1,6 +1,6 @@
 #include <QCoreApplication>
 #include <QString>
-#include <gettextfromc.h>
+#include "gettextfromc.h"
 
 const char *gettextFromC::trGettext(const char *text)
 {

core/gpslocation.cpp

@@ -1,8 +1,8 @@
-#include "gpslocation.h"
+#include "core/gpslocation.h"
-#include "gpslistmodel.h"
+#include "qt-models/gpslistmodel.h"
-#include "pref.h"
+#include "core/pref.h"
-#include "dive.h"
+#include "core/dive.h"
-#include "helpers.h"
+#include "core/helpers.h"
 #include <time.h>
 #include <unistd.h>
 #include <QDebug>

core/imagedownloader.cpp

@@ -69,7 +69,7 @@ void ImageDownloader::saveImage(QNetworkReply *reply)
 	reply->manager()->deleteLater();
 	reply->deleteLater();
 	// This should be called to make the picture actually show.
-	// Problem is DivePictureModel is not in subsurface-core.
+	// Problem is DivePictureModel is not in core.
 	// Nevertheless, the image shows when the dive is selected the next time.
 	// DivePictureModel::instance()->updateDivePictures();
 

core/qthelper.cpp

@@ -9,7 +9,7 @@
 #include "time.h"
 #include "gettextfromc.h"
 #include <sys/time.h>
-#include <exif.h>
+#include "exif.h"
 #include "file.h"
 #include "prefs-macros.h"
 #include <QFile>