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>

9 files changed, 17 insertions, 17 deletions

diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp
index 45888ebec..62bb3bcb2 100644
--- a/desktop-widgets/preferences/preferences_defaults.cpp
+++ b/desktop-widgets/preferences/preferences_defaults.cpp
@@ -1,7 +1,7 @@
 #include "preferences_defaults.h"
 #include "ui_preferences_defaults.h"
-#include "dive.h"
-#include "subsurface-core/prefs-macros.h"
+#include "core/dive.h"
+#include "core/prefs-macros.h"
 
 #include <QSettings>
 #include <QFileDialog>
diff --git a/desktop-widgets/preferences/preferences_defaults.h b/desktop-widgets/preferences/preferences_defaults.h
index c72be31a6..eb588c097 100644
--- a/desktop-widgets/preferences/preferences_defaults.h
+++ b/desktop-widgets/preferences/preferences_defaults.h
@@ -2,7 +2,7 @@
 #define PREFERENCES_DEFAULTS_H
 
 #include "abstractpreferenceswidget.h"
-#include "subsurface-core/pref.h"
+#include "core/pref.h"
 
 namespace Ui {
 	class PreferencesDefaults;
@@ -25,4 +25,4 @@ private:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/desktop-widgets/preferences/preferences_georeference.cpp b/desktop-widgets/preferences/preferences_georeference.cpp
index 7e8ccec9d..8446d0e9a 100644
--- a/desktop-widgets/preferences/preferences_georeference.cpp
+++ b/desktop-widgets/preferences/preferences_georeference.cpp
@@ -1,7 +1,7 @@
 #include "preferences_georeference.h"
 #include "ui_prefs_georeference.h"
-#include "prefs-macros.h"
-#include "qthelper.h"
+#include "core/prefs-macros.h"
+#include "core/qthelper.h"
 #include "qt-models/divelocationmodel.h"
 
 #include <ctime>
@@ -42,4 +42,4 @@ void PreferencesGeoreference::syncSettings()
 	s.setValue("cat1", ui->second_item->currentIndex());
 	s.setValue("cat2", ui->third_item->currentIndex());
 	s.endGroup();
-}
\ No newline at end of file
+}
diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp
index 327557692..3d8d8f685 100644
--- a/desktop-widgets/preferences/preferences_graph.cpp
+++ b/desktop-widgets/preferences/preferences_graph.cpp
@@ -1,6 +1,6 @@
 #include "preferences_graph.h"
 #include "ui_preferences_graph.h"
-#include "subsurface-core/prefs-macros.h"
+#include "core/prefs-macros.h"
 
 #include <QSettings>
 #include <QMessageBox>
@@ -74,4 +74,4 @@ void PreferencesGraph::on_gfhigh_valueChanged(int gf)
 {
 	ui->gfhigh->setStyleSheet(DANGER_GF);
 }
-#undef DANGER_GF
\ No newline at end of file
+#undef DANGER_GF
diff --git a/desktop-widgets/preferences/preferences_language.cpp b/desktop-widgets/preferences/preferences_language.cpp
index 31bbd1c20..264e2a1a5 100644
--- a/desktop-widgets/preferences/preferences_language.cpp
+++ b/desktop-widgets/preferences/preferences_language.cpp
@@ -1,6 +1,6 @@
 #include "preferences_language.h"
 #include "ui_prefs_language.h"
-#include "subsurface-core/helpers.h"
+#include "core/helpers.h"
 
 #include <QApplication>
 #include <QSettings>
diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp
index 818a16f1b..7d89d4496 100644
--- a/desktop-widgets/preferences/preferences_network.cpp
+++ b/desktop-widgets/preferences/preferences_network.cpp
@@ -1,9 +1,9 @@
 #include "preferences_network.h"
 #include "ui_preferences_network.h"
-#include "dive.h"
+#include "core/dive.h"
 #include "subsurfacewebservices.h"
-#include "subsurface-core/prefs-macros.h"
-#include "subsurface-core/cloudstorage.h"
+#include "core/prefs-macros.h"
+#include "core/cloudstorage.h"
 
 #include <QNetworkProxy>
 #include <QSettings>
diff --git a/desktop-widgets/preferences/preferences_units.cpp b/desktop-widgets/preferences/preferences_units.cpp
index cc77e51bb..8fb67a813 100644
--- a/desktop-widgets/preferences/preferences_units.cpp
+++ b/desktop-widgets/preferences/preferences_units.cpp
@@ -1,7 +1,7 @@
 #include "preferences_units.h"
 #include "ui_preferences_units.h"
-#include "prefs-macros.h"
-#include "qthelper.h"
+#include "core/prefs-macros.h"
+#include "core/qthelper.h"
 
 #include <QSettings>
 
diff --git a/desktop-widgets/preferences/preferencesdialog.cpp b/desktop-widgets/preferences/preferencesdialog.cpp
index 34df09b27..01d0aace4 100644
--- a/desktop-widgets/preferences/preferencesdialog.cpp
+++ b/desktop-widgets/preferences/preferencesdialog.cpp
@@ -8,7 +8,7 @@
 #include "preferences_graph.h"
 #include "preferences_network.h"
 
-#include "subsurface-core/qthelper.h"
+#include "core/qthelper.h"
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/desktop-widgets/preferences/preferencesdialog.h b/desktop-widgets/preferences/preferencesdialog.h
index 5f7f5f979..9210dddb0 100644
--- a/desktop-widgets/preferences/preferencesdialog.h
+++ b/desktop-widgets/preferences/preferencesdialog.h
@@ -2,7 +2,7 @@
 #define PREFERENCES_WIDGET_H
 
 #include <QDialog>
-#include "pref.h"
+#include "core/pref.h"
 
 class AbstractPreferencesWidget;
 class QListWidget;