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>

1 files changed, 0 insertions, 67 deletions

diff --git a/color.h b/color.h
deleted file mode 100644
index 7938e59a6..000000000
--- a/color.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef COLOR_H
-#define COLOR_H
-
-/* The colors are named by picking the closest match
-   from http://chir.ag/projects/name-that-color */
-
-#include <QColor>
-
-// Greens
-#define CAMARONE1 QColor::fromRgbF(0.0, 0.4, 0.0, 1)
-#define FUNGREEN1 QColor::fromRgbF(0.0, 0.4, 0.2, 1)
-#define FUNGREEN1_HIGH_TRANS QColor::fromRgbF(0.0, 0.4, 0.2, 0.25)
-#define KILLARNEY1 QColor::fromRgbF(0.2, 0.4, 0.2, 1)
-#define APPLE1 QColor::fromRgbF(0.2, 0.6, 0.2, 1)
-#define APPLE1_MED_TRANS QColor::fromRgbF(0.2, 0.6, 0.2, 0.5)
-#define APPLE1_HIGH_TRANS QColor::fromRgbF(0.2, 0.6, 0.2, 0.25)
-#define LIMENADE1 QColor::fromRgbF(0.4, 0.8, 0.0, 1)
-#define ATLANTIS1 QColor::fromRgbF(0.4, 0.8, 0.2, 1)
-#define ATLANTIS2 QColor::fromRgbF(0.6, 0.8, 0.2, 1)
-#define RIOGRANDE1 QColor::fromRgbF(0.8, 0.8, 0.0, 1)
-#define EARLSGREEN1 QColor::fromRgbF(0.8, 0.8, 0.2, 1)
-#define FORESTGREEN1 QColor::fromRgbF(0.1, 0.5, 0.1, 1)
-#define NITROX_GREEN QColor::fromRgbF(0, 0.54, 0.375, 1)
-
-// Reds
-#define PERSIANRED1 QColor::fromRgbF(0.8, 0.2, 0.2, 1)
-#define TUSCANY1 QColor::fromRgbF(0.8, 0.4, 0.2, 1)
-#define PIRATEGOLD1 QColor::fromRgbF(0.8, 0.5, 0.0, 1)
-#define HOKEYPOKEY1 QColor::fromRgbF(0.8, 0.6, 0.2, 1)
-#define CINNABAR1 QColor::fromRgbF(0.9, 0.3, 0.2, 1)
-#define REDORANGE1 QColor::fromRgbF(1.0, 0.2, 0.2, 1)
-#define REDORANGE1_HIGH_TRANS QColor::fromRgbF(1.0, 0.2, 0.2, 0.25)
-#define REDORANGE1_MED_TRANS QColor::fromRgbF(1.0, 0.2, 0.2, 0.5)
-#define RED1_MED_TRANS QColor::fromRgbF(1.0, 0.0, 0.0, 0.5)
-#define RED1 QColor::fromRgbF(1.0, 0.0, 0.0, 1)
-
-// Monochromes
-#define BLACK1 QColor::fromRgbF(0.0, 0.0, 0.0, 1)
-#define BLACK1_LOW_TRANS QColor::fromRgbF(0.0, 0.0, 0.0, 0.75)
-#define BLACK1_HIGH_TRANS QColor::fromRgbF(0.0, 0.0, 0.0, 0.25)
-#define TUNDORA1_MED_TRANS QColor::fromRgbF(0.3, 0.3, 0.3, 0.5)
-#define MED_GRAY_HIGH_TRANS QColor::fromRgbF(0.5, 0.5, 0.5, 0.25)
-#define MERCURY1_MED_TRANS QColor::fromRgbF(0.9, 0.9, 0.9, 0.5)
-#define CONCRETE1_LOWER_TRANS QColor::fromRgbF(0.95, 0.95, 0.95, 0.9)
-#define WHITE1_MED_TRANS QColor::fromRgbF(1.0, 1.0, 1.0, 0.5)
-#define WHITE1 QColor::fromRgbF(1.0, 1.0, 1.0, 1)
-
-// Blues
-#define GOVERNORBAY2 QColor::fromRgbF(0.2, 0.2, 0.7, 1)
-#define GOVERNORBAY1_MED_TRANS QColor::fromRgbF(0.2, 0.2, 0.8, 0.5)
-#define ROYALBLUE2 QColor::fromRgbF(0.2, 0.2, 0.9, 1)
-#define ROYALBLUE2_LOW_TRANS QColor::fromRgbF(0.2, 0.2, 0.9, 0.75)
-#define AIR_BLUE QColor::fromRgbF(0.25, 0.75, 1.0, 1)
-#define AIR_BLUE_TRANS QColor::fromRgbF(0.25, 0.75, 1.0, 0.5)
-
-// Yellows / BROWNS
-#define SPRINGWOOD1 QColor::fromRgbF(0.95, 0.95, 0.9, 1)
-#define SPRINGWOOD1_MED_TRANS QColor::fromRgbF(0.95, 0.95, 0.9, 0.5)
-#define BROOM1_LOWER_TRANS QColor::fromRgbF(1.0, 1.0, 0.1, 0.9)
-#define PEANUT QColor::fromRgbF(0.5, 0.2, 0.1, 1.0)
-#define PEANUT_MED_TRANS QColor::fromRgbF(0.5, 0.2, 0.1, 0.5)
-#define NITROX_YELLOW QColor::fromRgbF(0.98, 0.89, 0.07, 1.0)
-
-// Magentas
-#define MEDIUMREDVIOLET1_HIGHER_TRANS QColor::fromRgbF(0.7, 0.2, 0.7, 0.1)
-
-#endif // COLOR_H