From 7be962bfc2879a72c32ff67518731347dcdff6de Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 4 Apr 2016 22:02:03 -0700 Subject: 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 --- profile-widget/profilewidget2.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'profile-widget/profilewidget2.cpp') diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 35a9594a3..5aa0c53a5 100644 --- 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 +#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 @@ -35,7 +35,7 @@ #include #endif #ifndef SUBSURFACE_MOBILE -#include "preferences/preferencesdialog.h" +#include "desktop-widgets/preferences/preferencesdialog.h" #endif #include -- cgit v1.2.3-70-g09d2