summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-02-23 10:41:53 +0100
committerStanislaw Halik <sthalik@misaki.pl>2017-02-23 10:41:53 +0100
commit41b5350cd19093b6ee0820b59e101eaef18fe030 (patch)
tree62b8239f2cb9937ad1d4ecd9e8c927e032c3a43e
parent1e91bdd402b5d3ae1f46111bd2f1fc670300433c (diff)
fix build errors on Linux
-rw-r--r--logic/work.cpp2
-rw-r--r--logic/work.hpp2
-rw-r--r--qxt-mini/qxtglobalshortcut_x11.cpp1
3 files changed, 3 insertions, 2 deletions
diff --git a/logic/work.cpp b/logic/work.cpp
index 102b859e..7b9e550e 100644
--- a/logic/work.cpp
+++ b/logic/work.cpp
@@ -60,7 +60,7 @@ std::shared_ptr<TrackLogger> Work::make_logger(main_settings &s)
}
-Work::Work(Mappings& m, QFrame* frame, mem<dylib>& tracker_, mem<dylib>& filter_, mem<dylib>& proto_) :
+Work::Work(Mappings& m, QFrame* frame, mem<dylib> tracker_, mem<dylib> filter_, mem<dylib> proto_) :
libs(frame, tracker_, filter_, proto_),
logger(make_logger(s)),
tracker(std::make_shared<Tracker>(m, libs, *logger)),
diff --git a/logic/work.hpp b/logic/work.hpp
index ff0524bd..d44f506c 100644
--- a/logic/work.hpp
+++ b/logic/work.hpp
@@ -35,7 +35,7 @@ struct OPENTRACK_LOGIC_EXPORT Work
std::shared_ptr<Shortcuts> sc;
std::vector<key_tuple> keys;
- Work(Mappings& m, QFrame* frame, mem<dylib>& tracker, mem<dylib>& filter, mem<dylib>& proto);
+ Work(Mappings& m, QFrame* frame, mem<dylib> tracker, mem<dylib> filter, mem<dylib> proto);
~Work();
void reload_shortcuts();
bool is_ok() const;
diff --git a/qxt-mini/qxtglobalshortcut_x11.cpp b/qxt-mini/qxtglobalshortcut_x11.cpp
index b87ebccd..ac744162 100644
--- a/qxt-mini/qxtglobalshortcut_x11.cpp
+++ b/qxt-mini/qxtglobalshortcut_x11.cpp
@@ -30,6 +30,7 @@
** <http://libqxt.org> <foundation@libqxt.org>
*****************************************************************************/
+#include <QDebug>
#include <QVector>
#include <QApplication>
// include private header for great justice -sh 20131015