diff options
Diffstat (limited to 'desktop-widgets')
52 files changed, 238 insertions, 238 deletions
diff --git a/desktop-widgets/about.cpp b/desktop-widgets/about.cpp index 02bb9b72b..6bd2503f6 100644 --- a/desktop-widgets/about.cpp +++ b/desktop-widgets/about.cpp @@ -1,5 +1,5 @@ -#include "about.h" -#include "version.h" +#include "desktop-widgets/about.h" +#include "core/version.h" #include <QDesktopServices> #include <QUrl> #include <QShortcut> diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp index 428b326e4..471db9a65 100644 --- a/desktop-widgets/configuredivecomputerdialog.cpp +++ b/desktop-widgets/configuredivecomputerdialog.cpp @@ -1,8 +1,8 @@ -#include "configuredivecomputerdialog.h" +#include "desktop-widgets/configuredivecomputerdialog.h" -#include "helpers.h" -#include "mainwindow.h" -#include "display.h" +#include "core/helpers.h" +#include "desktop-widgets/mainwindow.h" +#include "core/display.h" #include <QFileDialog> #include <QMessageBox> diff --git a/desktop-widgets/configuredivecomputerdialog.h b/desktop-widgets/configuredivecomputerdialog.h index 9ad30ac67..f3ea97de5 100644 --- a/desktop-widgets/configuredivecomputerdialog.h +++ b/desktop-widgets/configuredivecomputerdialog.h @@ -4,12 +4,12 @@ #include <QDialog> #include <QStringListModel> #include "ui_configuredivecomputerdialog.h" -#include "subsurface-core/libdivecomputer.h" -#include "configuredivecomputer.h" +#include "core/libdivecomputer.h" +#include "core/configuredivecomputer.h" #include <QStyledItemDelegate> #include <QNetworkAccessManager> #ifdef BT_SUPPORT -#include "btdeviceselectiondialog.h" +#include "desktop-widgets/btdeviceselectiondialog.h" #endif class GasSpinBoxItemDelegate : public QStyledItemDelegate { diff --git a/desktop-widgets/divecomputermanagementdialog.cpp b/desktop-widgets/divecomputermanagementdialog.cpp index fd9273ffb..41572355c 100644 --- a/desktop-widgets/divecomputermanagementdialog.cpp +++ b/desktop-widgets/divecomputermanagementdialog.cpp @@ -1,7 +1,7 @@ -#include "divecomputermanagementdialog.h" -#include "mainwindow.h" -#include "helpers.h" -#include "divecomputermodel.h" +#include "desktop-widgets/divecomputermanagementdialog.h" +#include "desktop-widgets/mainwindow.h" +#include "core/helpers.h" +#include "qt-models/divecomputermodel.h" #include <QMessageBox> #include <QShortcut> diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp index f3204a111..0aea54f2a 100644 --- a/desktop-widgets/divelistview.cpp +++ b/desktop-widgets/divelistview.cpp @@ -4,11 +4,11 @@ * classes for the divelist of Subsurface * */ -#include "filtermodels.h" -#include "modeldelegates.h" -#include "mainwindow.h" -#include "divepicturewidget.h" -#include "display.h" +#include "qt-models/filtermodels.h" +#include "desktop-widgets/modeldelegates.h" +#include "desktop-widgets/mainwindow.h" +#include "desktop-widgets/divepicturewidget.h" +#include "core/display.h" #include <unistd.h> #include <QSettings> #include <QKeyEvent> @@ -17,12 +17,12 @@ #include <QNetworkReply> #include <QStandardPaths> #include <QMessageBox> -#include "qthelper.h" -#include "undocommands.h" -#include "divelistview.h" -#include "divepicturemodel.h" -#include "metrics.h" -#include "helpers.h" +#include "core/qthelper.h" +#include "desktop-widgets/undocommands.h" +#include "desktop-widgets/divelistview.h" +#include "qt-models/divepicturemodel.h" +#include "core/metrics.h" +#include "core/helpers.h" // # Date Rtg Dpth Dur Tmp Wght Suit Cyl Gas SAC OTU CNS Loc static int defaultWidth[] = { 70, 140, 90, 50, 50, 50, 50, 70, 50, 50, 70, 50, 50, 500}; diff --git a/desktop-widgets/divelistview.h b/desktop-widgets/divelistview.h index aaec37af5..2554725b7 100644 --- a/desktop-widgets/divelistview.h +++ b/desktop-widgets/divelistview.h @@ -14,7 +14,7 @@ #include <QTreeView> #include <QLineEdit> #include <QNetworkAccessManager> -#include "divetripmodel.h" +#include "qt-models/divetripmodel.h" class DiveListView : public QTreeView { Q_OBJECT diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp index e7c53274c..5b58d0c1d 100644 --- a/desktop-widgets/divelogexportdialog.cpp +++ b/desktop-widgets/divelogexportdialog.cpp @@ -3,14 +3,14 @@ #include <QSettings> #include <QtConcurrent> -#include "divelogexportdialog.h" -#include "divelogexportlogic.h" -#include "diveshareexportdialog.h" +#include "desktop-widgets/divelogexportdialog.h" +#include "core/divelogexportlogic.h" +#include "desktop-widgets/diveshareexportdialog.h" #include "ui_divelogexportdialog.h" -#include "subsurfacewebservices.h" -#include "worldmap-save.h" -#include "save-html.h" -#include "mainwindow.h" +#include "desktop-widgets/subsurfacewebservices.h" +#include "core/worldmap-save.h" +#include "core/save-html.h" +#include "desktop-widgets/mainwindow.h" #define GET_UNIT(name, field, f, t) \ v = settings.value(QString(name)); \ diff --git a/desktop-widgets/divelogexportdialog.h b/desktop-widgets/divelogexportdialog.h index b72d96c50..e7cde318d 100644 --- a/desktop-widgets/divelogexportdialog.h +++ b/desktop-widgets/divelogexportdialog.h @@ -4,8 +4,8 @@ #include <QDialog> #include <QTextStream> #include <QFuture> -#include "helpers.h" -#include "statistics.h" +#include "core/helpers.h" +#include "core/statistics.h" class QAbstractButton; diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index 4e5607ed3..cd9026f87 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -1,6 +1,6 @@ -#include "divelogimportdialog.h" -#include "mainwindow.h" -#include "color.h" +#include "desktop-widgets/divelogimportdialog.h" +#include "desktop-widgets/mainwindow.h" +#include "core/color.h" #include "ui_divelogimportdialog.h" #include <QShortcut> #include <QDrag> diff --git a/desktop-widgets/divelogimportdialog.h b/desktop-widgets/divelogimportdialog.h index 2d12c7cac..811775379 100644 --- a/desktop-widgets/divelogimportdialog.h +++ b/desktop-widgets/divelogimportdialog.h @@ -9,8 +9,8 @@ #include <QAbstractTableModel> #include <QStyledItemDelegate> -#include "subsurface-core/dive.h" -#include "subsurface-core/divelist.h" +#include "core/dive.h" +#include "core/divelist.h" namespace Ui { class DiveLogImportDialog; diff --git a/desktop-widgets/divelogimportdialog.ui b/desktop-widgets/divelogimportdialog.ui index 6d154b7c6..36746ffe9 100644 --- a/desktop-widgets/divelogimportdialog.ui +++ b/desktop-widgets/divelogimportdialog.ui @@ -200,12 +200,12 @@ <customwidget> <class>ColumnNameView</class> <extends>QListView</extends> - <header>divelogimportdialog.h</header> + <header>desktop-widgets/divelogimportdialog.h</header> </customwidget> <customwidget> <class>ColumnDropCSVView</class> <extends>QTableView</extends> - <header>divelogimportdialog.h</header> + <header>desktop-widgets/divelogimportdialog.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/desktop-widgets/divepicturewidget.cpp b/desktop-widgets/divepicturewidget.cpp index d52fbb9d7..04ae76e23 100644 --- a/desktop-widgets/divepicturewidget.cpp +++ b/desktop-widgets/divepicturewidget.cpp @@ -1,8 +1,8 @@ -#include "divepicturewidget.h" -#include "divepicturemodel.h" -#include "metrics.h" -#include "dive.h" -#include "divelist.h" +#include "desktop-widgets/divepicturewidget.h" +#include "qt-models/divepicturemodel.h" +#include "core/metrics.h" +#include "core/dive.h" +#include "core/divelist.h" #include <unistd.h> #include <QtConcurrentMap> #include <QtConcurrentRun> @@ -11,8 +11,8 @@ #include <QCryptographicHash> #include <QNetworkAccessManager> #include <QNetworkReply> -#include <mainwindow.h> -#include <qthelper.h> +#include "desktop-widgets/mainwindow.h" +#include "core/qthelper.h" #include <QStandardPaths> #include <QtWidgets> diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp index f84781e96..3a2436c6c 100644 --- a/desktop-widgets/diveplanner.cpp +++ b/desktop-widgets/diveplanner.cpp @@ -1,12 +1,12 @@ -#include "diveplanner.h" -#include "modeldelegates.h" -#include "mainwindow.h" -#include "planner.h" -#include "helpers.h" -#include "cylindermodel.h" -#include "models.h" +#include "desktop-widgets/diveplanner.h" +#include "desktop-widgets/modeldelegates.h" +#include "desktop-widgets/mainwindow.h" +#include "core/planner.h" +#include "core/helpers.h" +#include "qt-models/cylindermodel.h" +#include "qt-models/models.h" #include "profile-widget/profilewidget2.h" -#include "diveplannermodel.h" +#include "qt-models/diveplannermodel.h" #include <QGraphicsSceneMouseEvent> #include <QMessageBox> diff --git a/desktop-widgets/diveplanner.h b/desktop-widgets/diveplanner.h index 1cc96adc3..03014cb9c 100644 --- a/desktop-widgets/diveplanner.h +++ b/desktop-widgets/diveplanner.h @@ -7,7 +7,7 @@ #include <QDateTime> #include <QSignalMapper> -#include "dive.h" +#include "core/dive.h" class QListView; class QModelIndex; diff --git a/desktop-widgets/diveplanner.ui b/desktop-widgets/diveplanner.ui index adb44fad9..b7d1e74bf 100644 --- a/desktop-widgets/diveplanner.ui +++ b/desktop-widgets/diveplanner.ui @@ -243,7 +243,7 @@ <customwidget> <class>TableView</class> <extends>QWidget</extends> - <header>tableview.h</header> + <header>desktop-widgets/tableview.h</header> <container>1</container> </customwidget> </customwidgets> diff --git a/desktop-widgets/diveshareexportdialog.cpp b/desktop-widgets/diveshareexportdialog.cpp index ed6e2829a..4460a44df 100644 --- a/desktop-widgets/diveshareexportdialog.cpp +++ b/desktop-widgets/diveshareexportdialog.cpp @@ -1,10 +1,10 @@ -#include "diveshareexportdialog.h" +#include "desktop-widgets/diveshareexportdialog.h" #include "ui_diveshareexportdialog.h" -#include "mainwindow.h" -#include "save-html.h" -#include "subsurfacewebservices.h" -#include "helpers.h" -#include "subsurface-core/cloudstorage.h" +#include "desktop-widgets/mainwindow.h" +#include "core/save-html.h" +#include "desktop-widgets/subsurfacewebservices.h" +#include "core/helpers.h" +#include "core/cloudstorage.h" #include <QDesktopServices> #include <QSettings> diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp index be6018b36..7ef4e1e28 100644 --- a/desktop-widgets/downloadfromdivecomputer.cpp +++ b/desktop-widgets/downloadfromdivecomputer.cpp @@ -1,10 +1,10 @@ -#include "downloadfromdivecomputer.h" -#include "helpers.h" -#include "mainwindow.h" -#include "divelistview.h" -#include "display.h" -#include "uemis.h" -#include "models.h" +#include "desktop-widgets/downloadfromdivecomputer.h" +#include "core/helpers.h" +#include "desktop-widgets/mainwindow.h" +#include "desktop-widgets/divelistview.h" +#include "core/display.h" +#include "core/uemis.h" +#include "qt-models/models.h" #include <QTimer> #include <QFileDialog> diff --git a/desktop-widgets/downloadfromdivecomputer.h b/desktop-widgets/downloadfromdivecomputer.h index 7acd49e95..33c3ef0a8 100644 --- a/desktop-widgets/downloadfromdivecomputer.h +++ b/desktop-widgets/downloadfromdivecomputer.h @@ -7,8 +7,8 @@ #include <QMap> #include <QAbstractTableModel> -#include "libdivecomputer.h" -#include "configuredivecomputerdialog.h" +#include "core/libdivecomputer.h" +#include "desktop-widgets/configuredivecomputerdialog.h" #include "ui_downloadfromdivecomputer.h" #if defined(BT_SUPPORT) diff --git a/desktop-widgets/globe.cpp b/desktop-widgets/globe.cpp index 135f195a1..39f030b74 100644 --- a/desktop-widgets/globe.cpp +++ b/desktop-widgets/globe.cpp @@ -1,10 +1,10 @@ -#include "globe.h" +#include "desktop-widgets/globe.h" #ifndef NO_MARBLE -#include "mainwindow.h" -#include "helpers.h" -#include "divelistview.h" -#include "maintab.h" -#include "display.h" +#include "desktop-widgets/mainwindow.h" +#include "core/helpers.h" +#include "desktop-widgets/divelistview.h" +#include "desktop-widgets/maintab.h" +#include "core/display.h" #include <QTimer> #include <QContextMenuEvent> diff --git a/desktop-widgets/locationInformation.ui b/desktop-widgets/locationInformation.ui index 58d065648..923e17f24 100644 --- a/desktop-widgets/locationInformation.ui +++ b/desktop-widgets/locationInformation.ui @@ -145,7 +145,7 @@ <customwidget> <class>KMessageWidget</class> <extends>QFrame</extends> - <header>kmessagewidget.h</header> + <header>desktop-widgets/kmessagewidget.h</header> <container>1</container> </customwidget> </customwidgets> diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index 5ca858a6b..20cc6fe1d 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -1,13 +1,13 @@ -#include "locationinformation.h" -#include "dive.h" -#include "mainwindow.h" -#include "divelistview.h" -#include "qthelper.h" -#include "globe.h" -#include "filtermodels.h" -#include "divelocationmodel.h" -#include "divesitehelpers.h" -#include "modeldelegates.h" +#include "desktop-widgets/locationinformation.h" +#include "core/dive.h" +#include "desktop-widgets/mainwindow.h" +#include "desktop-widgets/divelistview.h" +#include "core/qthelper.h" +#include "desktop-widgets/globe.h" +#include "qt-models/filtermodels.h" +#include "qt-models/divelocationmodel.h" +#include "core/divesitehelpers.h" +#include "desktop-widgets/modeldelegates.h" #include <QDebug> #include <QShowEvent> diff --git a/desktop-widgets/maintab.cpp b/desktop-widgets/maintab.cpp index eddf90b98..180814c9c 100644 --- a/desktop-widgets/maintab.cpp +++ b/desktop-widgets/maintab.cpp @@ -4,25 +4,25 @@ * classes for the "notebook" area of the main window of Subsurface * */ -#include "maintab.h" -#include "mainwindow.h" -#include "globe.h" -#include "helpers.h" -#include "statistics.h" -#include "modeldelegates.h" -#include "diveplannermodel.h" -#include "divelistview.h" -#include "display.h" +#include "desktop-widgets/maintab.h" +#include "desktop-widgets/mainwindow.h" +#include "desktop-widgets/globe.h" +#include "core/helpers.h" +#include "core/statistics.h" +#include "desktop-widgets/modeldelegates.h" +#include "qt-models/diveplannermodel.h" +#include "desktop-widgets/divelistview.h" +#include "core/display.h" #include "profile-widget/profilewidget2.h" -#include "diveplanner.h" -#include "divesitehelpers.h" -#include "cylindermodel.h" -#include "weightmodel.h" -#include "divepicturemodel.h" -#include "divecomputerextradatamodel.h" -#include "divelocationmodel.h" -#include "divesite.h" -#include "locationinformation.h" +#include "desktop-widgets/diveplanner.h" +#include "core/divesitehelpers.h" +#include "qt-models/cylindermodel.h" +#include "qt-models/weightmodel.h" +#include "qt-models/divepicturemodel.h" +#include "qt-models/divecomputerextradatamodel.h" +#include "qt-models/divelocationmodel.h" +#include "core/divesite.h" +#include "desktop-widgets/locationinformation.h" #include <QCompleter> #include <QSettings> diff --git a/desktop-widgets/maintab.h b/desktop-widgets/maintab.h index d4f7aaaa9..50a7d6d21 100644 --- a/desktop-widgets/maintab.h +++ b/desktop-widgets/maintab.h @@ -13,9 +13,9 @@ #include <QUuid> #include "ui_maintab.h" -#include "completionmodels.h" -#include "divelocationmodel.h" -#include "dive.h" +#include "qt-models/completionmodels.h" +#include "qt-models/divelocationmodel.h" +#include "core/dive.h" class WeightModel; class CylindersModel; diff --git a/desktop-widgets/maintab.ui b/desktop-widgets/maintab.ui index 7bc516b1a..964593b38 100644 --- a/desktop-widgets/maintab.ui +++ b/desktop-widgets/maintab.ui @@ -1205,47 +1205,47 @@ <customwidget> <class>KMessageWidget</class> <extends>QFrame</extends> - <header>kmessagewidget.h</header> + <header>desktop-widgets/kmessagewidget.h</header> <container>1</container> </customwidget> <customwidget> <class>StarWidget</class> <extends>QWidget</extends> - <header>starwidget.h</header> + <header>desktop-widgets/starwidget.h</header> <container>1</container> </customwidget> <customwidget> <class>MinMaxAvgWidget</class> <extends>QWidget</extends> - <header>simplewidgets.h</header> + <header>desktop-widgets/simplewidgets.h</header> <container>1</container> </customwidget> <customwidget> <class>TableView</class> <extends>QWidget</extends> - <header>tableview.h</header> + <header>desktop-widgets/desktop-widget/tableview.h</header> <container>1</container> </customwidget> <customwidget> <class>TagWidget</class> <extends>QPlainTextEdit</extends> - <header>tagwidget.h</header> + <header>desktop-widgets/tagwidget.h</header> </customwidget> <customwidget> <class>DivePictureWidget</class> <extends>QListView</extends> - <header>divepicturewidget.h</header> + <header>desktop-widgets/divepicturewidget.h</header> </customwidget> <customwidget> <class>QtWaitingSpinner</class> <extends>QWidget</extends> - <header>qtwaitingspinner.h</header> + <header>desktop-widgets/qtwaitingspinner.h</header> <container>1</container> </customwidget> <customwidget> <class>DiveLocationLineEdit</class> <extends>QLineEdit</extends> - <header>locationinformation.h</header> + <header>desktop-widgets/locationinformation.h</header> </customwidget> </customwidgets> <tabstops> diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index ca78b82af..c6f487486 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -12,50 +12,50 @@ #include <QShortcut> #include <QToolBar> -#include "version.h" -#include "divelistview.h" -#include "downloadfromdivecomputer.h" -#include "subsurfacewebservices.h" -#include "divecomputermanagementdialog.h" -#include "about.h" -#include "updatemanager.h" -#include "planner.h" -#include "filtermodels.h" +#include "core/version.h" +#include "desktop-widgets/divelistview.h" +#include "desktop-widgets/downloadfromdivecomputer.h" +#include "desktop-widgets/subsurfacewebservices.h" +#include "desktop-widgets/divecomputermanagementdialog.h" +#include "desktop-widgets/about.h" +#include "desktop-widgets/updatemanager.h" +#include "core/planner.h" +#include "qt-models/filtermodels.h" #include "profile-widget/profilewidget2.h" -#include "globe.h" -#include "divecomputer.h" -#include "maintab.h" -#include "diveplanner.h" +#include "desktop-widgets/globe.h" +#include "core/divecomputer.h" +#include "desktop-widgets/maintab.h" +#include "desktop-widgets/diveplanner.h" #ifndef NO_PRINTING #include <QPrintDialog> #include <QBuffer> -#include "printdialog.h" +#include "desktop-widgets/printdialog.h" #endif -#include "tankinfomodel.h" -#include "weigthsysteminfomodel.h" -#include "yearlystatisticsmodel.h" -#include "diveplannermodel.h" -#include "divelogimportdialog.h" -#include "divelogexportdialog.h" -#include "usersurvey.h" -#include "divesitehelpers.h" -#include "windowtitleupdate.h" -#include "locationinformation.h" +#include "qt-models/tankinfomodel.h" +#include "qt-models/weigthsysteminfomodel.h" +#include "qt-models/yearlystatisticsmodel.h" +#include "qt-models/diveplannermodel.h" +#include "desktop-widgets/divelogimportdialog.h" +#include "desktop-widgets/divelogexportdialog.h" +#include "desktop-widgets/usersurvey.h" +#include "core/divesitehelpers.h" +#include "core/windowtitleupdate.h" +#include "desktop-widgets/locationinformation.h" #include "preferences/preferencesdialog.h" #ifndef NO_USERMANUAL #include "usermanual.h" #endif -#include "divepicturemodel.h" -#include "git-access.h" +#include "qt-models/divepicturemodel.h" +#include "core/git-access.h" #include <QNetworkProxy> #include <QUndoStack> -#include <qthelper.h> +#include "core/qthelper.h" #include <QtConcurrentRun> -#include "subsurface-core/color.h" -#include "subsurface-core/isocialnetworkintegration.h" -#include "subsurface-core/pluginmanager.h" -#include <subsurface-qt/SettingsObjectWrapper.h> +#include "core/color.h" +#include "core/isocialnetworkintegration.h" +#include "core/pluginmanager.h" +#include "core/subsurface-qt/SettingsObjectWrapper.h" #if defined(FBSUPPORT) #include "plugins/facebook/facebook_integration.h" diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h index 7e7f5db1e..0a53405e8 100644 --- a/desktop-widgets/mainwindow.h +++ b/desktop-widgets/mainwindow.h @@ -14,9 +14,9 @@ #include <QProgressDialog> #include "ui_mainwindow.h" -#include "notificationwidget.h" -#include "windowtitleupdate.h" -#include "gpslocation.h" +#include "desktop-widgets/notificationwidget.h" +#include "core/windowtitleupdate.h" +#include "core/gpslocation.h" struct DiveList; class QSortFilterProxyModel; diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui index 724c83657..85f034692 100644 --- a/desktop-widgets/mainwindow.ui +++ b/desktop-widgets/mainwindow.ui @@ -750,13 +750,13 @@ <customwidget> <class>NotificationWidget</class> <extends>QWidget</extends> - <header>notificationwidget.h</header> + <header>desktop-widgets/notificationwidget.h</header> <container>1</container> </customwidget> <customwidget> <class>MultiFilter</class> <extends>QWidget</extends> - <header>simplewidgets.h</header> + <header>desktop-widgets/simplewidgets.h</header> <container>1</container> </customwidget> </customwidgets> diff --git a/desktop-widgets/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp index 377a1baed..a80137e80 100644 --- a/desktop-widgets/modeldelegates.cpp +++ b/desktop-widgets/modeldelegates.cpp @@ -1,18 +1,18 @@ -#include "modeldelegates.h" -#include "dive.h" -#include "gettextfromc.h" -#include "mainwindow.h" -#include "cylindermodel.h" -#include "models.h" -#include "starwidget.h" +#include "desktop-widgets/modeldelegates.h" +#include "core/dive.h" +#include "core/gettextfromc.h" +#include "desktop-widgets/mainwindow.h" +#include "qt-models/cylindermodel.h" +#include "qt-models/models.h" +#include "desktop-widgets/starwidget.h" #include "profile-widget/profilewidget2.h" -#include "tankinfomodel.h" -#include "weigthsysteminfomodel.h" -#include "weightmodel.h" -#include "divetripmodel.h" -#include "qthelper.h" +#include "qt-models/tankinfomodel.h" +#include "qt-models/weigthsysteminfomodel.h" +#include "qt-models/weightmodel.h" +#include "qt-models/divetripmodel.h" +#include "core/qthelper.h" #ifndef NO_MARBLE -#include "globe.h" +#include "desktop-widgets/globe.h" #endif #include <QCompleter> diff --git a/desktop-widgets/notificationwidget.h b/desktop-widgets/notificationwidget.h index 8a551a0b3..388982191 100644 --- a/desktop-widgets/notificationwidget.h +++ b/desktop-widgets/notificationwidget.h @@ -4,7 +4,7 @@ #include <QWidget> #include <QFutureWatcher> -#include <kmessagewidget.h> +#include "desktop-widgets/kmessagewidget.h" namespace Ui { class NotificationWidget; diff --git a/desktop-widgets/plugins/facebook/facebook_integration.h b/desktop-widgets/plugins/facebook/facebook_integration.h index 40b16917d..ce4793cad 100644 --- a/desktop-widgets/plugins/facebook/facebook_integration.h +++ b/desktop-widgets/plugins/facebook/facebook_integration.h @@ -1,7 +1,7 @@ #ifndef FACEBOOK_INTEGRATION_H #define FACEBOOK_INTEGRATION_H -#include "subsurface-core/isocialnetworkintegration.h" +#include "core/isocialnetworkintegration.h" #include <QString> class FacebookConnectWidget; @@ -23,4 +23,4 @@ private: SocialNetworkDialog *fbUploadDialog; }; -#endif
\ No newline at end of file +#endif 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; diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp index 6c9ec3f96..cbf31cb98 100644 --- a/desktop-widgets/simplewidgets.cpp +++ b/desktop-widgets/simplewidgets.cpp @@ -1,5 +1,5 @@ -#include "simplewidgets.h" -#include "filtermodels.h" +#include "desktop-widgets/simplewidgets.h" +#include "qt-models/filtermodels.h" #include <QProcess> #include <QFileDialog> @@ -10,14 +10,14 @@ #include <QDesktopServices> #include <QToolTip> -#include "file.h" -#include "mainwindow.h" -#include "helpers.h" +#include "core/file.h" +#include "desktop-widgets/mainwindow.h" +#include "core/helpers.h" #include "libdivecomputer/parser.h" -#include "divelistview.h" -#include "display.h" +#include "desktop-widgets/divelistview.h" +#include "core/display.h" #include "profile-widget/profilewidget2.h" -#include "undocommands.h" +#include "desktop-widgets/undocommands.h" class MinMaxAvgWidgetPrivate { public: diff --git a/desktop-widgets/simplewidgets.h b/desktop-widgets/simplewidgets.h index 8a7a5df6a..3c384ba89 100644 --- a/desktop-widgets/simplewidgets.h +++ b/desktop-widgets/simplewidgets.h @@ -18,8 +18,8 @@ class QNetworkReply; #include "ui_divecomponentselection.h" #include "ui_listfilter.h" #include "ui_filterwidget.h" -#include "exif.h" -#include <dive.h> +#include "core/exif.h" +#include "core/dive.h" class MinMaxAvgWidget : public QWidget { diff --git a/desktop-widgets/starwidget.cpp b/desktop-widgets/starwidget.cpp index a810883c2..67e22ddb7 100644 --- a/desktop-widgets/starwidget.cpp +++ b/desktop-widgets/starwidget.cpp @@ -1,8 +1,8 @@ -#include "starwidget.h" -#include "metrics.h" +#include "desktop-widgets/starwidget.h" +#include "core/metrics.h" #include <QSvgRenderer> #include <QMouseEvent> -#include "simplewidgets.h" +#include "desktop-widgets/simplewidgets.h" QImage StarWidget::activeStar; QImage StarWidget::inactiveStar; diff --git a/desktop-widgets/statistics/statisticswidget.cpp b/desktop-widgets/statistics/statisticswidget.cpp index d06f51a98..50d5f3149 100644 --- a/desktop-widgets/statistics/statisticswidget.cpp +++ b/desktop-widgets/statistics/statisticswidget.cpp @@ -1,5 +1,5 @@ -#include "statisticswidget.h" -#include "yearlystatisticsmodel.h" +#include "desktop-widgets/statistics/statisticswidget.h" +#include "qt-models/yearlystatisticsmodel.h" #include <QModelIndex> YearlyStatisticsWidget::YearlyStatisticsWidget(QWidget *parent): diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp index 2ca3de187..bd798c729 100644 --- a/desktop-widgets/subsurfacewebservices.cpp +++ b/desktop-widgets/subsurfacewebservices.cpp @@ -1,15 +1,15 @@ -#include "subsurfacewebservices.h" -#include "helpers.h" -#include "webservice.h" -#include "mainwindow.h" -#include "usersurvey.h" -#include "divelist.h" -#include "globe.h" -#include "maintab.h" -#include "display.h" -#include "membuffer.h" +#include "desktop-widgets/subsurfacewebservices.h" +#include "core/helpers.h" +#include "core/webservice.h" +#include "desktop-widgets/mainwindow.h" +#include "desktop-widgets/usersurvey.h" +#include "core/divelist.h" +#include "desktop-widgets/globe.h" +#include "desktop-widgets/maintab.h" +#include "core/display.h" +#include "core/membuffer.h" #include <errno.h> -#include "subsurface-core/cloudstorage.h" +#include "core/cloudstorage.h" #include <QDir> #include <QHttpMultiPart> diff --git a/desktop-widgets/tableview.cpp b/desktop-widgets/tableview.cpp index 40d5199ec..20b62ac3c 100644 --- a/desktop-widgets/tableview.cpp +++ b/desktop-widgets/tableview.cpp @@ -1,5 +1,5 @@ -#include "tableview.h" -#include "modeldelegates.h" +#include "desktop-widgets/tableview.h" +#include "desktop-widgets/modeldelegates.h" #include <QPushButton> #include <QSettings> diff --git a/desktop-widgets/tableview.h b/desktop-widgets/tableview.h index f72b256ea..c3afdaf12 100644 --- a/desktop-widgets/tableview.h +++ b/desktop-widgets/tableview.h @@ -9,7 +9,7 @@ #include "ui_tableview.h" -#include "metrics.h" +#include "core/metrics.h" class QPushButton; class QAbstractItemModel; diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h index 9e420f381..fc77a5079 100644 --- a/desktop-widgets/templatelayout.h +++ b/desktop-widgets/templatelayout.h @@ -7,7 +7,7 @@ #include "statistics.h" #include "qthelper.h" #include "helpers.h" -#include "subsurface-core/subsurface-qt/DiveObjectHelper.h" +#include "core/subsurface-qt/DiveObjectHelper.h" int getTotalWork(print_options *printOptions); void find_all_templates(); diff --git a/desktop-widgets/undocommands.cpp b/desktop-widgets/undocommands.cpp index 0fd182cb3..75fc810c6 100644 --- a/desktop-widgets/undocommands.cpp +++ b/desktop-widgets/undocommands.cpp @@ -1,6 +1,6 @@ -#include "undocommands.h" -#include "mainwindow.h" -#include "divelist.h" +#include "desktop-widgets/undocommands.h" +#include "desktop-widgets/mainwindow.h" +#include "core/divelist.h" UndoDeleteDive::UndoDeleteDive(QList<dive *> deletedDives) : diveList(deletedDives) { diff --git a/desktop-widgets/undocommands.h b/desktop-widgets/undocommands.h index 8e359db51..cca87ac2d 100644 --- a/desktop-widgets/undocommands.h +++ b/desktop-widgets/undocommands.h @@ -3,7 +3,7 @@ #include <QUndoCommand> #include <QMap> -#include "dive.h" +#include "core/dive.h" class UndoDeleteDive : public QUndoCommand { public: diff --git a/desktop-widgets/updatemanager.cpp b/desktop-widgets/updatemanager.cpp index daa65e007..b09d12439 100644 --- a/desktop-widgets/updatemanager.cpp +++ b/desktop-widgets/updatemanager.cpp @@ -1,13 +1,13 @@ -#include "updatemanager.h" -#include "helpers.h" -#include "qthelper.h" +#include "desktop-widgets/updatemanager.h" +#include "core/helpers.h" +#include "core/qthelper.h" #include <QtNetwork> #include <QMessageBox> #include <QUuid> -#include "subsurfacewebservices.h" -#include "version.h" -#include "mainwindow.h" -#include "subsurface-core/cloudstorage.h" +#include "desktop-widgets/subsurfacewebservices.h" +#include "core/version.h" +#include "desktop-widgets/mainwindow.h" +#include "core/cloudstorage.h" UpdateManager::UpdateManager(QObject *parent) : QObject(parent), diff --git a/desktop-widgets/usermanual.cpp b/desktop-widgets/usermanual.cpp index 6b676f16b..690307961 100644 --- a/desktop-widgets/usermanual.cpp +++ b/desktop-widgets/usermanual.cpp @@ -2,9 +2,9 @@ #include <QShortcut> #include <QFile> -#include "usermanual.h" -#include "mainwindow.h" -#include "helpers.h" +#include "desktop-widgets/usermanual.h" +#include "desktop-widgets/mainwindow.h" +#include "core/helpers.h" SearchBar::SearchBar(QWidget *parent): QWidget(parent) { diff --git a/desktop-widgets/usersurvey.cpp b/desktop-widgets/usersurvey.cpp index 6dba30d8b..c60ff8c83 100644 --- a/desktop-widgets/usersurvey.cpp +++ b/desktop-widgets/usersurvey.cpp @@ -2,14 +2,14 @@ #include <QMessageBox> #include <QSettings> -#include "usersurvey.h" +#include "desktop-widgets/usersurvey.h" #include "ui_usersurvey.h" -#include "version.h" -#include "subsurfacewebservices.h" -#include "updatemanager.h" +#include "core/version.h" +#include "desktop-widgets/subsurfacewebservices.h" +#include "desktop-widgets/updatemanager.h" -#include "helpers.h" -#include "subsurfacesysinfo.h" +#include "core/helpers.h" +#include "core/subsurfacesysinfo.h" UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent), ui(new Ui::UserSurvey) |