From 0760fe011114fa440275b487eaf766b015f40e5b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik 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. --- opentrack/shortcuts.h | 69 --------------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 opentrack/shortcuts.h (limited to 'opentrack/shortcuts.h') diff --git a/opentrack/shortcuts.h b/opentrack/shortcuts.h deleted file mode 100644 index 2362c88b..00000000 --- a/opentrack/shortcuts.h +++ /dev/null @@ -1,69 +0,0 @@ -/* Copyright (c) 2014-2015, Stanislaw Halik - - * Permission to use, copy, modify, and/or distribute this - * software for any purpose with or without fee is hereby granted, - * provided that the above copyright notice and this permission - * notice appear in all copies. - */ - -#pragma once -#include -#include -#include -#include - -#ifdef BUILD_api -# include "opentrack-compat/export.hpp" -#else -# include "opentrack-compat/import.hpp" -#endif - -#include "qxt-mini/QxtGlobalShortcut" -#include "opentrack-compat/options.hpp" -#include "opentrack/main-settings.hpp" - -#ifdef _WIN32 -# include "keybinding-worker.hpp" -#endif - -#if defined(__GNUC__) && !defined(_WIN32) -# define unused_on_unix(t, i) t __attribute__((unused)) i -#else -# define unused_on_unix(t, i) t i -#endif - -using namespace options; - -struct OPENTRACK_EXPORT Shortcuts : public QObject { - Q_OBJECT - -public: - using K = -#ifndef _WIN32 - mem -#else - Key -#endif - ; - - using fun = std::function; - using tt = std::tuple; - std::vector keys; -#ifdef _WIN32 - KeybindingWorker::Token key_token; -#endif - - Shortcuts() -#ifdef _WIN32 - : key_token([&](const Key& k) { receiver(k); }) -#endif - {} - - void reload(const std::vector> &keys_); -private: - void free_binding(K& key); - void bind_keyboard_shortcut(K &key, const key_opts& k, bool held); -#ifdef _WIN32 - void receiver(const Key& k); -#endif -}; -- cgit v1.2.3