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>
This commit is contained in:
Tomaz Canabrava 2015-09-02 20:52:34 -03:00 committed by Dirk Hohndel
parent a079821423
commit 4c0156e3d5
105 changed files with 102 additions and 78 deletions

View file

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

View file

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

View file

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

View file

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