summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-11-01 11:28:17 +0100
committerStanislaw Halik <sthalik@misaki.pl>2015-11-01 11:28:17 +0100
commit0424a2802aec3600774ba9347c49312bb09b8cfe (patch)
treeea2e3d9fc0634e235b997b1b6054898a9478f9b2 /gui
parent5a2ddaf39cf5ad86cf43d8a01f51989b5e3afa49 (diff)
all: adjust options.hpp move to compat
Diffstat (limited to 'gui')
-rw-r--r--gui/main.cpp2
-rw-r--r--gui/new_file_dialog.h2
-rw-r--r--gui/process_detector.h2
-rw-r--r--gui/ui.cpp4
-rw-r--r--gui/ui.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/gui/main.cpp b/gui/main.cpp
index a63fe54a..3ae01404 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -3,7 +3,7 @@
#endif
#include "ui.h"
-#include "opentrack/options.hpp"
+#include "opentrack-compat/options.hpp"
using namespace options;
#include <QApplication>
#include <QCommandLineParser>
diff --git a/gui/new_file_dialog.h b/gui/new_file_dialog.h
index 3a35cf71..5fdabb3a 100644
--- a/gui/new_file_dialog.h
+++ b/gui/new_file_dialog.h
@@ -1,7 +1,7 @@
#pragma once
#include "ui_new_config.h"
-#include "opentrack/options.hpp"
+#include "opentrack-compat/options.hpp"
#include <QFile>
#include <QRegExp>
#include <QString>
diff --git a/gui/process_detector.h b/gui/process_detector.h
index f6497c90..e395e1a2 100644
--- a/gui/process_detector.h
+++ b/gui/process_detector.h
@@ -13,7 +13,7 @@
#include <QTableWidget>
#include <QResizeEvent>
-#include "opentrack/options.hpp"
+#include "opentrack-compat/options.hpp"
using namespace options;
class FancyTable : public QTableWidget
diff --git a/gui/ui.cpp b/gui/ui.cpp
index 5ea5dbfa..fc6d4754 100644
--- a/gui/ui.cpp
+++ b/gui/ui.cpp
@@ -8,7 +8,7 @@
#include "ui.h"
#include "opentrack/tracker.h"
-#include "opentrack/options.hpp"
+#include "opentrack-compat/options.hpp"
#include "new_file_dialog.h"
#include <QFileDialog>
#include <QDesktopServices>
@@ -411,7 +411,7 @@ bool mk_dialog(mem<dylib> lib, mem<t>& orig)
dialog->show();
dialog->raise();
- QObject::connect(dialog.get(), &BaseDialog::closing, [&]() -> void { orig = nullptr; });
+ QObject::connect(dialog.get(), &plugin_api::detail::BaseDialog::closing, [&]() -> void { orig = nullptr; });
return true;
}
diff --git a/gui/ui.h b/gui/ui.h
index 91e4ebbf..44bcde0c 100644
--- a/gui/ui.h
+++ b/gui/ui.h
@@ -19,7 +19,7 @@
#include "ui_main.h"
-#include "opentrack/options.hpp"
+#include "opentrack-compat/options.hpp"
#include "opentrack/main-settings.hpp"
#include "opentrack/plugin-support.hpp"
#include "opentrack/tracker.h"