diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-09-02 20:52:34 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-10-30 10:36:48 -0700 |
| commit | 4c0156e3d51b389db8eccc3fa3da4b8f248f9b13 (patch) | |
| tree | 966868d29150fdba13a5a56fb4305bc432ec7a72 /qt-ui | |
| parent | a0798214231c652ac6142228f5ddfc4b65c921f8 (diff) | |
| download | subsurface-4c0156e3d51b389db8eccc3fa3da4b8f248f9b13.tar.gz | |
Move all core-functionality to subsurface-core
And adapt a new CMakeLists.txt file for it. On the way I've also
found out that we where double-compilling a few files. I've also
set the subsurface-core as a include_path but that was just to
reduce the noise on this commit, since I plan to remove it from
the include path to make it obligatory to specify something like
include "subsurface-core/dive.h"
for the header files. Since the app is growing quite a bit we ended
up having a few different files with almost same name that did
similar things, I want to kill that (for instance Dive.h, dive.h,
PrintDive.h and such).
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | qt-ui/configuredivecomputerdialog.h | 2 | ||||
| -rw-r--r-- | qt-ui/divelogimportdialog.h | 4 | ||||
| -rw-r--r-- | qt-ui/graphicsview-common.h | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/qt-ui/CMakeLists.txt b/qt-ui/CMakeLists.txt index 9def39ff3..a860faed5 100644 --- a/qt-ui/CMakeLists.txt +++ b/qt-ui/CMakeLists.txt @@ -4,6 +4,10 @@ qt5_wrap_ui(SUBSURFACE_UI_HDRS ${SUBSURFACE_UI}) qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc) source_group("Subsurface Interface Files" FILES ${SUBSURFACE_UI}) +if(BTSUPPORT) + set(BT_SRC_FILES btdeviceselectiondialog.cpp) +endif() + # the interface, in C++ set(SUBSURFACE_INTERFACE updatemanager.cpp diff --git a/qt-ui/configuredivecomputerdialog.h b/qt-ui/configuredivecomputerdialog.h index be76644a9..9ad30ac67 100644 --- a/qt-ui/configuredivecomputerdialog.h +++ b/qt-ui/configuredivecomputerdialog.h @@ -4,7 +4,7 @@ #include <QDialog> #include <QStringListModel> #include "ui_configuredivecomputerdialog.h" -#include "../libdivecomputer.h" +#include "subsurface-core/libdivecomputer.h" #include "configuredivecomputer.h" #include <QStyledItemDelegate> #include <QNetworkAccessManager> diff --git a/qt-ui/divelogimportdialog.h b/qt-ui/divelogimportdialog.h index 03bb14029..2d12c7cac 100644 --- a/qt-ui/divelogimportdialog.h +++ b/qt-ui/divelogimportdialog.h @@ -9,8 +9,8 @@ #include <QAbstractTableModel> #include <QStyledItemDelegate> -#include "../dive.h" -#include "../divelist.h" +#include "subsurface-core/dive.h" +#include "subsurface-core/divelist.h" namespace Ui { class DiveLogImportDialog; diff --git a/qt-ui/graphicsview-common.h b/qt-ui/graphicsview-common.h index 3c1cb75a0..2a757b2ae 100644 --- a/qt-ui/graphicsview-common.h +++ b/qt-ui/graphicsview-common.h @@ -1,7 +1,7 @@ #ifndef GRAPHICSVIEW_COMMON_H #define GRAPHICSVIEW_COMMON_H -#include "../color.h" +#include "subsurface-core/color.h" #include <QMap> #include <QVector> #include <QColor> |