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>

30 files changed, 88 insertions, 88 deletions

diff --git a/qt-models/cleanertablemodel.cpp b/qt-models/cleanertablemodel.cpp
index 77d3f3369..ac8d10a33 100644
--- a/qt-models/cleanertablemodel.cpp
+++ b/qt-models/cleanertablemodel.cpp
@@ -1,5 +1,5 @@
 #include "cleanertablemodel.h"
-#include "metrics.h"
+#include "core/metrics.h"
 
 CleanerTableModel::CleanerTableModel(QObject *parent) : QAbstractTableModel(parent)
 {
diff --git a/qt-models/completionmodels.cpp b/qt-models/completionmodels.cpp
index a8b61aed5..7839398ee 100644
--- a/qt-models/completionmodels.cpp
+++ b/qt-models/completionmodels.cpp
@@ -1,5 +1,5 @@
-#include "completionmodels.h"
-#include "dive.h"
+#include "qt-models/completionmodels.h"
+#include "core/dive.h"
 #include <QSet>
 #include <QString>
 
diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp
index af01650a4..b1ce0be24 100644
--- a/qt-models/cylindermodel.cpp
+++ b/qt-models/cylindermodel.cpp
@@ -1,11 +1,11 @@
 #include "cylindermodel.h"
 #include "tankinfomodel.h"
 #include "models.h"
-#include "helpers.h"
-#include "dive.h"
-#include "color.h"
-#include "diveplannermodel.h"
-#include "gettextfromc.h"
+#include "core/helpers.h"
+#include "core/dive.h"
+#include "core/color.h"
+#include "qt-models/diveplannermodel.h"
+#include "core/gettextfromc.h"
 
 CylindersModel::CylindersModel(QObject *parent) :
 	CleanerTableModel(parent),
diff --git a/qt-models/cylindermodel.h b/qt-models/cylindermodel.h
index 9556bcc02..7115dbe25 100644
--- a/qt-models/cylindermodel.h
+++ b/qt-models/cylindermodel.h
@@ -2,7 +2,7 @@
 #define CYLINDERMODEL_H
 
 #include "cleanertablemodel.h"
-#include "dive.h"
+#include "core/dive.h"
 
 /* Encapsulation of the Cylinder Model, that presents the
  * Current cylinders that are used on a dive. */
diff --git a/qt-models/divecomputerextradatamodel.cpp b/qt-models/divecomputerextradatamodel.cpp
index 0f89a2a6b..d71c606a4 100644
--- a/qt-models/divecomputerextradatamodel.cpp
+++ b/qt-models/divecomputerextradatamodel.cpp
@@ -1,6 +1,6 @@
-#include "divecomputerextradatamodel.h"
-#include "dive.h"
-#include "metrics.h"
+#include "qt-models/divecomputerextradatamodel.h"
+#include "core/dive.h"
+#include "core/metrics.h"
 
 
 ExtraDataModel::ExtraDataModel(QObject *parent) : CleanerTableModel(parent),
diff --git a/qt-models/divecomputermodel.cpp b/qt-models/divecomputermodel.cpp
index 58641ff77..0dd110fcc 100644
--- a/qt-models/divecomputermodel.cpp
+++ b/qt-models/divecomputermodel.cpp
@@ -1,6 +1,6 @@
-#include "divecomputermodel.h"
-#include "dive.h"
-#include "divelist.h"
+#include "qt-models/divecomputermodel.h"
+#include "core/dive.h"
+#include "core/divelist.h"
 
 DiveComputerModel::DiveComputerModel(QMultiMap<QString, DiveComputerNode> &dcMap, QObject *parent) : CleanerTableModel(parent)
 {
diff --git a/qt-models/divecomputermodel.h b/qt-models/divecomputermodel.h
index bed48b81a..fe1b437ba 100644
--- a/qt-models/divecomputermodel.h
+++ b/qt-models/divecomputermodel.h
@@ -1,8 +1,8 @@
 #ifndef DIVECOMPUTERMODEL_H
 #define DIVECOMPUTERMODEL_H
 
-#include "cleanertablemodel.h"
-#include "divecomputer.h"
+#include "qt-models/cleanertablemodel.h"
+#include "core/divecomputer.h"
 
 class DiveComputerModel : public CleanerTableModel {
 	Q_OBJECT
diff --git a/qt-models/divelistmodel.cpp b/qt-models/divelistmodel.cpp
index af6825285..79d770853 100644
--- a/qt-models/divelistmodel.cpp
+++ b/qt-models/divelistmodel.cpp
@@ -1,5 +1,5 @@
-#include "divelistmodel.h"
-#include "helpers.h"
+#include "qt-models/divelistmodel.h"
+#include "core/helpers.h"
 #include <QDateTime>
 
 DiveListSortModel::DiveListSortModel(QObject *parent) : QSortFilterProxyModel(parent)
diff --git a/qt-models/divelistmodel.h b/qt-models/divelistmodel.h
index aae3bfc74..39c3497b9 100644
--- a/qt-models/divelistmodel.h
+++ b/qt-models/divelistmodel.h
@@ -4,9 +4,9 @@
 #include <QAbstractListModel>
 #include <QSortFilterProxyModel>
 
-#include "dive.h"
-#include "helpers.h"
-#include "subsurface-qt/DiveObjectHelper.h"
+#include "core/dive.h"
+#include "core/helpers.h"
+#include "core/subsurface-qt/DiveObjectHelper.h"
 
 class DiveListSortModel : public QSortFilterProxyModel
 {
diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp
index f77953760..877ca0552 100644
--- a/qt-models/divelocationmodel.cpp
+++ b/qt-models/divelocationmodel.cpp
@@ -1,6 +1,6 @@
-#include "units.h"
-#include "divelocationmodel.h"
-#include "dive.h"
+#include "core/units.h"
+#include "qt-models/divelocationmodel.h"
+#include "core/dive.h"
 #include <QDebug>
 #include <QLineEdit>
 #include <QIcon>
diff --git a/qt-models/divelocationmodel.h b/qt-models/divelocationmodel.h
index 185e0bc5f..cee67c5fe 100644
--- a/qt-models/divelocationmodel.h
+++ b/qt-models/divelocationmodel.h
@@ -4,7 +4,7 @@
 #include <QAbstractTableModel>
 #include <QStringListModel>
 #include <stdint.h>
-#include "units.h"
+#include "core/units.h"
 #include "ssrfsortfilterproxymodel.h"
 
 class QLineEdit;
diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp
index 173cf9dd0..04738eed0 100644
--- a/qt-models/divepicturemodel.cpp
+++ b/qt-models/divepicturemodel.cpp
@@ -1,8 +1,8 @@
-#include "divepicturemodel.h"
-#include "dive.h"
-#include "metrics.h"
-#include "divelist.h"
-#include "imagedownloader.h"
+#include "qt-models/divepicturemodel.h"
+#include "core/dive.h"
+#include "core/metrics.h"
+#include "core/divelist.h"
+#include "core/imagedownloader.h"
 
 #include <QtConcurrent>
 
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index c3996d077..16a2e40eb 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -1,9 +1,9 @@
 #include "diveplannermodel.h"
-#include "dive.h"
-#include "helpers.h"
-#include "cylindermodel.h"
-#include "planner.h"
-#include "models.h"
+#include "core/dive.h"
+#include "core/helpers.h"
+#include "qt-models/cylindermodel.h"
+#include "core/planner.h"
+#include "qt-models/models.h"
 
 /* TODO: Port this to CleanerTableModel to remove a bit of boilerplate and
  * use the signal warningMessage() to communicate errors to the MainWindow.
diff --git a/qt-models/diveplannermodel.h b/qt-models/diveplannermodel.h
index b87ed84c3..0770aa077 100644
--- a/qt-models/diveplannermodel.h
+++ b/qt-models/diveplannermodel.h
@@ -4,7 +4,7 @@
 #include <QAbstractTableModel>
 #include <QDateTime>
 
-#include "dive.h"
+#include "core/dive.h"
 
 class DivePlannerPointsModel : public QAbstractTableModel {
 	Q_OBJECT
diff --git a/qt-models/diveplotdatamodel.cpp b/qt-models/diveplotdatamodel.cpp
index 7a7ab195f..5bb9ebbd1 100644
--- a/qt-models/diveplotdatamodel.cpp
+++ b/qt-models/diveplotdatamodel.cpp
@@ -1,8 +1,8 @@
-#include "diveplotdatamodel.h"
-#include "dive.h"
-#include "profile.h"
-#include "divelist.h"
-#include "subsurface-core/color.h"
+#include "qt-models/diveplotdatamodel.h"
+#include "core/dive.h"
+#include "core/profile.h"
+#include "core/divelist.h"
+#include "core/color.h"
 
 DivePlotDataModel::DivePlotDataModel(QObject *parent) :
 	QAbstractTableModel(parent),
diff --git a/qt-models/diveplotdatamodel.h b/qt-models/diveplotdatamodel.h
index 21b0ffd5b..ef5b544cb 100644
--- a/qt-models/diveplotdatamodel.h
+++ b/qt-models/diveplotdatamodel.h
@@ -3,7 +3,7 @@
 
 #include <QAbstractTableModel>
 
-#include "display.h"
+#include "core/display.h"
 
 struct dive;
 struct plot_data;
diff --git a/qt-models/divesitepicturesmodel.cpp b/qt-models/divesitepicturesmodel.cpp
index 3777f1d36..272716b07 100644
--- a/qt-models/divesitepicturesmodel.cpp
+++ b/qt-models/divesitepicturesmodel.cpp
@@ -1,6 +1,6 @@
-#include "divesitepicturesmodel.h"
-#include "dive.h"
-#include "stdint.h"
+#include "qt-models/divesitepicturesmodel.h"
+#include "core/dive.h"
+#include <stdint.h>
 
 #include <QtConcurrent>
 #include <QPixmap>
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp
index 78a7a7420..e0f95b0b3 100644
--- a/qt-models/divetripmodel.cpp
+++ b/qt-models/divetripmodel.cpp
@@ -1,8 +1,8 @@
-#include "divetripmodel.h"
-#include "gettextfromc.h"
-#include "metrics.h"
-#include "divelist.h"
-#include "helpers.h"
+#include "qt-models/divetripmodel.h"
+#include "core/gettextfromc.h"
+#include "core/metrics.h"
+#include "core/divelist.h"
+#include "core/helpers.h"
 #include <QIcon>
 
 static int nitrox_sort_value(struct dive *dive)
diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h
index 31cee9633..7844d813f 100644
--- a/qt-models/divetripmodel.h
+++ b/qt-models/divetripmodel.h
@@ -2,7 +2,7 @@
 #define DIVETRIPMODEL_H
 
 #include "treemodel.h"
-#include "dive.h"
+#include "core/dive.h"
 
 struct DiveItem : public TreeItem {
 	Q_DECLARE_TR_FUNCTIONS(TripItem)
diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp
index 452b1077f..b4aacf1bd 100644
--- a/qt-models/filtermodels.cpp
+++ b/qt-models/filtermodels.cpp
@@ -1,7 +1,7 @@
-#include "filtermodels.h"
-#include "models.h"
-#include "display.h"
-#include "divetripmodel.h"
+#include "qt-models/filtermodels.h"
+#include "qt-models/models.h"
+#include "core/display.h"
+#include "qt-models/divetripmodel.h"
 
 #include <QDebug>
 
@@ -309,7 +309,7 @@ MultiFilterSortModel::MultiFilterSortModel(QObject *parent) :
 	QSortFilterProxyModel(parent),
 	divesDisplayed(0),
 	justCleared(false),
-	curr_dive_site(NULL)	
+	curr_dive_site(NULL)
 {
 }
 
diff --git a/qt-models/gpslistmodel.cpp b/qt-models/gpslistmodel.cpp
index 3ea03f040..0023198f7 100644
--- a/qt-models/gpslistmodel.cpp
+++ b/qt-models/gpslistmodel.cpp
@@ -1,5 +1,5 @@
-#include "gpslistmodel.h"
-#include "helpers.h"
+#include "qt-models/gpslistmodel.h"
+#include "core/helpers.h"
 #include <QVector>
 
 GpsListModel *GpsListModel::m_instance = NULL;
diff --git a/qt-models/gpslistmodel.h b/qt-models/gpslistmodel.h
index 870540b4f..34eae4c56 100644
--- a/qt-models/gpslistmodel.h
+++ b/qt-models/gpslistmodel.h
@@ -1,7 +1,7 @@
 #ifndef GPSLISTMODEL_H
 #define GPSLISTMODEL_H
 
-#include "gpslocation.h"
+#include "core/gpslocation.h"
 #include <QObject>
 #include <QAbstractListModel>
 
diff --git a/qt-models/models.cpp b/qt-models/models.cpp
index 48b22797c..d02f466a4 100644
--- a/qt-models/models.cpp
+++ b/qt-models/models.cpp
@@ -4,8 +4,8 @@
  * classes for the equipment models of Subsurface
  *
  */
-#include "models.h"
-#include "helpers.h"
+#include "qt-models/models.h"
+#include "core/helpers.h"
 
 #include <QLocale>
 #include <QSettings>
diff --git a/qt-models/models.h b/qt-models/models.h
index f152af469..8e4aba6af 100644
--- a/qt-models/models.h
+++ b/qt-models/models.h
@@ -13,11 +13,11 @@
 #include <QSortFilterProxyModel>
 #include <QPixmap>
 
-#include "metrics.h"
+#include "core/metrics.h"
 
-#include "subsurface-core/dive.h"
-#include "subsurface-core/divelist.h"
-#include "subsurface-core/divecomputer.h"
+#include "core/dive.h"
+#include "core/divelist.h"
+#include "core/divecomputer.h"
 #include "cleanertablemodel.h"
 #include "treemodel.h"
 
diff --git a/qt-models/tankinfomodel.cpp b/qt-models/tankinfomodel.cpp
index b32437392..3e9e654bf 100644
--- a/qt-models/tankinfomodel.cpp
+++ b/qt-models/tankinfomodel.cpp
@@ -1,7 +1,7 @@
-#include "tankinfomodel.h"
-#include "dive.h"
-#include "gettextfromc.h"
-#include "metrics.h"
+#include "qt-models/tankinfomodel.h"
+#include "core/dive.h"
+#include "core/gettextfromc.h"
+#include "core/metrics.h"
 
 TankInfoModel *TankInfoModel::instance()
 {
diff --git a/qt-models/treemodel.cpp b/qt-models/treemodel.cpp
index 01db3520f..b98f3f4db 100644
--- a/qt-models/treemodel.cpp
+++ b/qt-models/treemodel.cpp
@@ -1,5 +1,5 @@
-#include "treemodel.h"
-#include "metrics.h"
+#include "qt-models/treemodel.h"
+#include "core/metrics.h"
 
 TreeItem::TreeItem()
 {
diff --git a/qt-models/weightmodel.cpp b/qt-models/weightmodel.cpp
index 1ab8c24c8..ec1398d0e 100644
--- a/qt-models/weightmodel.cpp
+++ b/qt-models/weightmodel.cpp
@@ -1,9 +1,9 @@
-#include "weightmodel.h"
-#include "dive.h"
-#include "gettextfromc.h"
-#include "metrics.h"
-#include "helpers.h"
-#include "weigthsysteminfomodel.h"
+#include "qt-models/weightmodel.h"
+#include "core/dive.h"
+#include "core/gettextfromc.h"
+#include "core/metrics.h"
+#include "core/helpers.h"
+#include "qt-models/weigthsysteminfomodel.h"
 
 WeightModel::WeightModel(QObject *parent) : CleanerTableModel(parent),
 	changed(false),
diff --git a/qt-models/weightmodel.h b/qt-models/weightmodel.h
index 5ab67e592..d251dec68 100644
--- a/qt-models/weightmodel.h
+++ b/qt-models/weightmodel.h
@@ -2,7 +2,7 @@
 #define WEIGHTMODEL_H
 
 #include "cleanertablemodel.h"
-#include "dive.h"
+#include "core/dive.h"
 
 /* Encapsulation of the Weight Model, that represents
  * the current weights on a dive. */
diff --git a/qt-models/weigthsysteminfomodel.cpp b/qt-models/weigthsysteminfomodel.cpp
index daa305284..c7d9e7fad 100644
--- a/qt-models/weigthsysteminfomodel.cpp
+++ b/qt-models/weigthsysteminfomodel.cpp
@@ -1,7 +1,7 @@
-#include "weigthsysteminfomodel.h"
-#include "dive.h"
-#include "metrics.h"
-#include "gettextfromc.h"
+#include "qt-models/weigthsysteminfomodel.h"
+#include "core/dive.h"
+#include "core/metrics.h"
+#include "core/gettextfromc.h"
 
 WSInfoModel *WSInfoModel::instance()
 {
diff --git a/qt-models/yearlystatisticsmodel.cpp b/qt-models/yearlystatisticsmodel.cpp
index f6579f499..8c96ff14a 100644
--- a/qt-models/yearlystatisticsmodel.cpp
+++ b/qt-models/yearlystatisticsmodel.cpp
@@ -1,8 +1,8 @@
-#include "yearlystatisticsmodel.h"
-#include "dive.h"
-#include "helpers.h"
-#include "metrics.h"
-#include "statistics.h"
+#include "qt-models/yearlystatisticsmodel.h"
+#include "core/dive.h"
+#include "core/helpers.h"
+#include "core/metrics.h"
+#include "core/statistics.h"
 
 class YearStatisticsItem : public TreeItem {
 public: