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>
This commit is contained in:
Dirk Hohndel 2016-04-04 22:02:03 -07:00
parent 2d760a7bff
commit 7be962bfc2
254 changed files with 572 additions and 582 deletions

View file

@ -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>

View file

@ -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
#endif

View file

@ -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();
}
}

View file

@ -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
#undef DANGER_GF

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -2,7 +2,7 @@
#define PREFERENCES_WIDGET_H
#include <QDialog>
#include "pref.h"
#include "core/pref.h"
class AbstractPreferencesWidget;
class QListWidget;