From 41b5350cd19093b6ee0820b59e101eaef18fe030 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 23 Feb 2017 10:41:53 +0100 Subject: fix build errors on Linux --- logic/work.cpp | 2 +- logic/work.hpp | 2 +- qxt-mini/qxtglobalshortcut_x11.cpp | 1 + 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 Work::make_logger(main_settings &s) } -Work::Work(Mappings& m, QFrame* frame, mem& tracker_, mem& filter_, mem& proto_) : +Work::Work(Mappings& m, QFrame* frame, mem tracker_, mem filter_, mem proto_) : libs(frame, tracker_, filter_, proto_), logger(make_logger(s)), tracker(std::make_shared(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 sc; std::vector keys; - Work(Mappings& m, QFrame* frame, mem& tracker, mem& filter, mem& proto); + Work(Mappings& m, QFrame* frame, mem tracker, mem filter, mem 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 @@ ** *****************************************************************************/ +#include #include #include // include private header for great justice -sh 20131015 -- cgit v1.2.3