From 0760fe011114fa440275b487eaf766b015f40e5b Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 16 Jun 2016 12:34:31 +0200
Subject: all: split "api" into "api" and "logic"

Here, the "logic" module has all the stuff for building one's own
graphical user interface.

The "api" module has stuff used by other trackers.

While at it, each of "api", "logic", and "compat" need their own export
headers. This is because of preprocessor symbol clashes.

This is all because a change in the "gui"-only dependency required a
relink of all the trackers, protocols, and flters. It takes too long
when building in the release configuration. With the split, only the
"gui" module gets rebuilt. Since it has close to no static dependencies,
it's fast enough.
---
 gui/CMakeLists.txt     |  1 +
 gui/curve-config.cpp   |  6 +++---
 gui/curve-config.h     |  2 +-
 gui/keyboard.h         |  4 ++--
 gui/options-dialog.hpp |  2 +-
 gui/ui.cpp             |  2 +-
 gui/ui.h               | 10 +++++-----
 7 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'gui')

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 08534795..b7448b4c 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -17,6 +17,7 @@ if(NOT WIN32)
 endif()
 
 target_link_libraries(opentrack
+    opentrack-logic
     opentrack-spline-widget
     opentrack-pose-widget
     opentrack-version
diff --git a/gui/curve-config.cpp b/gui/curve-config.cpp
index e4396e01..61459c1c 100644
--- a/gui/curve-config.cpp
+++ b/gui/curve-config.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "curve-config.h"
-#include "opentrack/main-settings.hpp"
+#include "opentrack-logic/main-settings.hpp"
 MapWidget::MapWidget(Mappings& m, main_settings& s) :
     m(m)
 {
@@ -54,12 +54,12 @@ MapWidget::MapWidget(Mappings& m, main_settings& s) :
                 qfc.setEnabled(qfcs[i].checkbox->isChecked());
                 qfc.force_redraw();
             }
-            
+
             if (qfcs[i].axis >= 3)
                 qfcs[i].qfc->set_snap(2, 5);
             else
                 qfcs[i].qfc->set_snap(1, 5);
-            
+
             qfcs[i].qfc->setConfig(conf, name);
         }
     }
diff --git a/gui/curve-config.h b/gui/curve-config.h
index 0cbc7055..9a9475b9 100644
--- a/gui/curve-config.h
+++ b/gui/curve-config.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <QWidget>
-#include "opentrack/mappings.hpp"
+#include "opentrack-logic/mappings.hpp"
 #include "ui_mapping.h"
 
 class MapWidget: public QWidget
diff --git a/gui/keyboard.h b/gui/keyboard.h
index 696df605..07f326ea 100644
--- a/gui/keyboard.h
+++ b/gui/keyboard.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "ui_keyboard_listener.h"
 #ifdef _WIN32
-#include "opentrack/win32-shortcuts.h"
-#include "opentrack/keybinding-worker.hpp"
+#include "opentrack-logic/win32-shortcuts.h"
+#include "opentrack-logic/keybinding-worker.hpp"
 #endif
 #include <QLabel>
 #include <QKeyEvent>
diff --git a/gui/options-dialog.hpp b/gui/options-dialog.hpp
index a879a208..eee9d090 100644
--- a/gui/options-dialog.hpp
+++ b/gui/options-dialog.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ui_settings.h"
-#include "opentrack/shortcuts.h"
+#include "opentrack-logic/shortcuts.h"
 #include <QObject>
 #include <QWidget>
 #include <functional>
diff --git a/gui/ui.cpp b/gui/ui.cpp
index fd86aca8..63f40cf8 100644
--- a/gui/ui.cpp
+++ b/gui/ui.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "ui.h"
-#include "opentrack/tracker.h"
+#include "opentrack-logic/tracker.h"
 #include "opentrack-compat/options.hpp"
 #include "new_file_dialog.h"
 #include <QFileDialog>
diff --git a/gui/ui.h b/gui/ui.h
index 42c4630c..626b1bb3 100644
--- a/gui/ui.h
+++ b/gui/ui.h
@@ -23,12 +23,12 @@
 #include "ui_main.h"
 
 #include "opentrack-compat/options.hpp"
-#include "opentrack/main-settings.hpp"
+#include "opentrack-logic/main-settings.hpp"
 #include "opentrack/plugin-support.hpp"
-#include "opentrack/tracker.h"
-#include "opentrack/shortcuts.h"
-#include "opentrack/work.hpp"
-#include "opentrack/state.hpp"
+#include "opentrack-logic/tracker.h"
+#include "opentrack-logic/shortcuts.h"
+#include "opentrack-logic/work.hpp"
+#include "opentrack-logic/state.hpp"
 #include "curve-config.h"
 #include "options-dialog.hpp"
 #include "process_detector.h"
-- 
cgit v1.2.3