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>
2025-02-19 22:16:15 +00:00 · 2016-04-04 22:02:03 -07:00 · 2016-04-04 22:02:03 -07:00 · 7be962bfc2
commit 7be962bfc2
parent 2d760a7bff
254 changed files with 572 additions and 582 deletions
--- a/profile-widget/animationfunctions.cpp
+++ b/profile-widget/animationfunctions.cpp
@ -1,5 +1,5 @@
-#include "animationfunctions.h"
-#include "pref.h"
+#include "profile-widget/animationfunctions.h"
+#include "core/pref.h"
 #include <QPropertyAnimation>

 namespace Animations {
--- a/profile-widget/divecartesianaxis.cpp
+++ b/profile-widget/divecartesianaxis.cpp
@ -1,14 +1,14 @@
-#include "divecartesianaxis.h"
-#include "divetextitem.h"
-#include "helpers.h"
-#include <subsurface-qt/SettingsObjectWrapper.h>
+#include "profile-widget/divecartesianaxis.h"
+#include "profile-widget/divetextitem.h"
+#include "core/helpers.h"
+#include "core/subsurface-qt/SettingsObjectWrapper.h"
 #ifndef SUBSURFACE_MOBILE
-#include "preferences/preferencesdialog.h"
+#include "desktop-widgets/preferences/preferencesdialog.h"
 #endif
-#include "diveplotdatamodel.h"
-#include "animationfunctions.h"
-#include "divelineitem.h"
-#include "profilewidget2.h"
+#include "qt-models/diveplotdatamodel.h"
+#include "profile-widget/animationfunctions.h"
+#include "profile-widget/divelineitem.h"
+#include "profile-widget/profilewidget2.h"

 QPen DiveCartesianAxis::gridPen()
 {
--- a/profile-widget/divecartesianaxis.h
+++ b/profile-widget/divecartesianaxis.h
@ -3,7 +3,7 @@

 #include <QObject>
 #include <QGraphicsLineItem>
-#include "subsurface-core/color.h"
+#include "core/color.h"
 #include "profilewidget2.h"

 class QPropertyAnimation;
--- a/profile-widget/diveeventitem.cpp
+++ b/profile-widget/diveeventitem.cpp
@ -1,11 +1,11 @@
-#include "diveeventitem.h"
-#include "diveplotdatamodel.h"
-#include "divecartesianaxis.h"
-#include "animationfunctions.h"
-#include "libdivecomputer.h"
-#include "profile.h"
-#include "gettextfromc.h"
-#include "metrics.h"
+#include "profile-widget/diveeventitem.h"
+#include "qt-models/diveplotdatamodel.h"
+#include "profile-widget/divecartesianaxis.h"
+#include "profile-widget/animationfunctions.h"
+#include "core/libdivecomputer.h"
+#include "core/profile.h"
+#include "core/gettextfromc.h"
+#include "core/metrics.h"

 extern struct ev_select *ev_namelist;
 extern int evn_used;
--- a/profile-widget/divepixmapitem.cpp
+++ b/profile-widget/divepixmapitem.cpp
@ -1,9 +1,9 @@
-#include "divepixmapitem.h"
-#include "animationfunctions.h"
+#include "profile-widget/divepixmapitem.h"
+#include "profile-widget/animationfunctions.h"
 #include "qt-models/divepicturemodel.h"
-#include "pref.h"
+#include "core/pref.h"
 #ifndef SUBSURFACE_MOBILE
-#include "preferences/preferencesdialog.h"
+#include "desktop-widgets/preferences/preferencesdialog.h"
 #endif

 #include <QDesktopServices>
--- a/profile-widget/diveprofileitem.cpp
+++ b/profile-widget/diveprofileitem.cpp
@ -1,18 +1,18 @@
-#include "diveprofileitem.h"
-#include "diveplotdatamodel.h"
-#include "divecartesianaxis.h"
-#include "divetextitem.h"
-#include "animationfunctions.h"
-#include "dive.h"
-#include "profile.h"
+#include "profile-widget/diveprofileitem.h"
+#include "qt-models/diveplotdatamodel.h"
+#include "profile-widget/divecartesianaxis.h"
+#include "profile-widget/divetextitem.h"
+#include "profile-widget/animationfunctions.h"
+#include "core/dive.h"
+#include "core/profile.h"
 #ifndef SUBSURFACE_MOBILE
-#include "preferences/preferencesdialog.h"
+#include "desktop-widgets/preferences/preferencesdialog.h"
 #endif
 #include "qt-models/diveplannermodel.h"
-#include "helpers.h"
-#include <subsurface-qt/SettingsObjectWrapper.h>
+#include "core/helpers.h"
+#include "core/subsurface-qt/SettingsObjectWrapper.h"
 #include "libdivecomputer/parser.h"
-#include "profilewidget2.h"
+#include "profile-widget/profilewidget2.h"

 #include <QSettings>

--- a/profile-widget/divetextitem.cpp
+++ b/profile-widget/divetextitem.cpp
@ -1,6 +1,6 @@
 #include "divetextitem.h"
 #include "profilewidget2.h"
-#include "subsurface-core/color.h"
+#include "core/color.h"

 #include <QBrush>
 #include <QDebug>
--- a/profile-widget/divetooltipitem.cpp
+++ b/profile-widget/divetooltipitem.cpp
@ -1,19 +1,14 @@
-#include "divetooltipitem.h"
-#include "divecartesianaxis.h"
-#include "dive.h"
-#include "profile.h"
-#include "membuffer.h"
-#include "metrics.h"
+#include "profile-widget/divetooltipitem.h"
+#include "profile-widget/divecartesianaxis.h"
+#include "core/dive.h"
+#include "core/profile.h"
+#include "core/membuffer.h"
+#include "core/metrics.h"
 #include <QPropertyAnimation>
 #include <QSettings>
 #include <QGraphicsView>
 #include <QStyleOptionGraphicsItem>

-#define PORT_IN_PROGRESS 1
-#ifdef PORT_IN_PROGRESS
-#include "display.h"
-#endif
-
 void ToolTipItem::addToolTip(const QString &toolTip, const QIcon &icon, const QPixmap& pixmap)
 {
 	const IconMetrics& iconMetrics = defaultIconMetrics();
--- a/profile-widget/divetooltipitem.h
+++ b/profile-widget/divetooltipitem.h
@ -7,7 +7,7 @@
 #include <QRectF>
 #include <QIcon>
 #include <QTime>
-#include "display.h"
+#include "core/display.h"

 class DiveCartesianAxis;
 class QGraphicsLineItem;
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@ -1,24 +1,24 @@
-#include "profilewidget2.h"
+#include "profile-widget/profilewidget2.h"
 #include "qt-models/diveplotdatamodel.h"
-#include "helpers.h"
-#include "profile.h"
-#include "diveeventitem.h"
-#include "divetextitem.h"
-#include "divetooltipitem.h"
-#include "planner.h"
-#include "device.h"
-#include "ruleritem.h"
-#include "tankitem.h"
-#include "pref.h"
+#include "core/helpers.h"
+#include "core/profile.h"
+#include "profile-widget/diveeventitem.h"
+#include "profile-widget/divetextitem.h"
+#include "profile-widget/divetooltipitem.h"
+#include "core/planner.h"
+#include "core/device.h"
+#include "profile-widget/ruleritem.h"
+#include "profile-widget/tankitem.h"
+#include "core/pref.h"
 #include "qt-models/diveplannermodel.h"
 #include "qt-models/models.h"
 #include "qt-models/divepicturemodel.h"
-#include "divelist.h"
-#include <subsurface-qt/SettingsObjectWrapper.h>
+#include "core/divelist.h"
+#include "core/subsurface-qt/SettingsObjectWrapper.h"
 #ifndef SUBSURFACE_MOBILE
-#include "diveplanner.h"
-#include "simplewidgets.h"
-#include "divepicturewidget.h"
+#include "desktop-widgets/diveplanner.h"
+#include "desktop-widgets/simplewidgets.h"
+#include "desktop-widgets/divepicturewidget.h"
 #endif

 #include <libdivecomputer/parser.h>
@ -35,7 +35,7 @@
 #include <QTableView>
 #endif
 #ifndef SUBSURFACE_MOBILE
-#include "preferences/preferencesdialog.h"
+#include "desktop-widgets/preferences/preferencesdialog.h"
 #endif
 #include <QtWidgets>

--- a/profile-widget/profilewidget2.h
+++ b/profile-widget/profilewidget2.h
@ -13,9 +13,9 @@
 //  *
 //  * It needs to be dynamic, things should *flow* on it, not just appear / disappear.
 //  */
-#include "divelineitem.h"
-#include "diveprofileitem.h"
-#include "display.h"
+#include "profile-widget/divelineitem.h"
+#include "profile-widget/diveprofileitem.h"
+#include "core/display.h"

 class RulerItem2;
 struct dive;
--- a/profile-widget/ruleritem.cpp
+++ b/profile-widget/ruleritem.cpp
@ -1,14 +1,14 @@
-#include "ruleritem.h"
+#include "profile-widget/ruleritem.h"
 #ifndef SUBSURFACE_MOBILE
-#include "preferences/preferencesdialog.h"
+#include "desktop-widgets/preferences/preferencesdialog.h"
 #endif
-#include "profilewidget2.h"
-#include "display.h"
-#include "subsurface-core/subsurface-qt/SettingsObjectWrapper.h"
+#include "profile-widget/profilewidget2.h"
+#include "core/display.h"
+#include "core/subsurface-qt/SettingsObjectWrapper.h"

 #include <qgraphicssceneevent.h>

-#include "profile.h"
+#include "core/profile.h"

 RulerNodeItem2::RulerNodeItem2() :
 	entry(NULL),
--- a/profile-widget/ruleritem.h
+++ b/profile-widget/ruleritem.h
@ -4,8 +4,8 @@
 #include <QObject>
 #include <QGraphicsEllipseItem>
 #include <QGraphicsObject>
-#include "divecartesianaxis.h"
-#include "display.h"
+#include "profile-widget/divecartesianaxis.h"
+#include "core/display.h"

 struct plot_data;
 class RulerItem2;
--- a/profile-widget/tankitem.cpp
+++ b/profile-widget/tankitem.cpp
@ -1,7 +1,7 @@
-#include "tankitem.h"
-#include "diveplotdatamodel.h"
-#include "divetextitem.h"
-#include "profile.h"
+#include "profile-widget/tankitem.h"
+#include "qt-models/diveplotdatamodel.h"
+#include "profile-widget/divetextitem.h"
+#include "core/profile.h"
 #include <QPen>

 TankItem::TankItem(QObject *parent) :
--- a/profile-widget/tankitem.h
+++ b/profile-widget/tankitem.h
@ -4,9 +4,9 @@
 #include <QGraphicsItem>
 #include <QModelIndex>
 #include <QBrush>
-#include "divelineitem.h"
-#include "divecartesianaxis.h"
-#include "dive.h"
+#include "profile-widget/divelineitem.h"
+#include "profile-widget/divecartesianaxis.h"
+#include "core/dive.h"

 class TankItem : public QObject, public QGraphicsRectItem
 {