diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-04-04 22:02:03 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-04-04 22:33:58 -0700 |
| commit | 7be962bfc2879a72c32ff67518731347dcdff6de (patch) | |
| tree | d05bf7ab234a448ee37a15b608e2b939f2285d07 /desktop-widgets/mainwindow.cpp | |
| parent | 2d760a7bff71c46c5aeba37c40d236ea16eefea2 (diff) | |
| download | subsurface-7be962bfc2879a72c32ff67518731347dcdff6de.tar.gz | |
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>
Diffstat (limited to 'desktop-widgets/mainwindow.cpp')
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
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" |