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 /subsurface-desktop-helper.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 'subsurface-desktop-helper.cpp')
| -rw-r--r-- | subsurface-desktop-helper.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/subsurface-desktop-helper.cpp b/subsurface-desktop-helper.cpp index 420f75249..ef349ad3d 100644 --- a/subsurface-desktop-helper.cpp +++ b/subsurface-desktop-helper.cpp @@ -1,27 +1,26 @@ /* qt-gui.cpp */ /* Qt UI implementation */ -#include "dive.h" -#include "display.h" +#include "core/dive.h" +#include "core/display.h" #include "desktop-widgets/mainwindow.h" -#include "helpers.h" -#include "pluginmanager.h" +#include "core/helpers.h" +#include "core/pluginmanager.h" #include <QApplication> #include <QDesktopWidget> #include <QNetworkProxy> #include <QLibraryInfo> - -#include "qt-gui.h" +#include "core/qt-gui.h" #ifdef SUBSURFACE_MOBILE #include <QQuickWindow> #include <QQmlApplicationEngine> #include <QQmlContext> #include <QSortFilterProxyModel> -#include "qt-mobile/qmlmanager.h" +#include "mobile-widgets/qmlmanager.h" #include "qt-models/divelistmodel.h" -#include "qt-mobile/qmlprofile.h" +#include "mobile-widgets/qmlprofile.h" QObject *qqWindowObject = NULL; #endif |