diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2013-05-07 23:44:35 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-05-07 23:44:35 +0200 |
commit | 985f2199c8ae3879d831a43ca0b92633eccc1855 (patch) | |
tree | aca0c39ddc9a5cde5dfc086ff148b9124549c7e7 /facetracknoir/facetracknoir.h | |
parent | 68d27922f0f624876fe06e2215fd813b2086d0cb (diff) |
Remove Linux-only crash bug and dead code
Diffstat (limited to 'facetracknoir/facetracknoir.h')
-rw-r--r-- | facetracknoir/facetracknoir.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h index aa657c0e..ece1d9b9 100644 --- a/facetracknoir/facetracknoir.h +++ b/facetracknoir/facetracknoir.h @@ -122,13 +122,10 @@ public: }
#if defined(_WIN32) || defined(__WIN32)
- Key keyCenter, keyZero, keyStartStop, keyInhibit;
+ Key keyCenter;
KeybindingWorker* keybindingWorker;
#else
QxtGlobalShortcut* keyCenter;
- QxtGlobalShortcut* keyZero;
- QxtGlobalShortcut* keyStartStop;
- QxtGlobalShortcut* keyInhibit;
#endif
public slots:
void shortcutRecentered();
@@ -272,18 +269,18 @@ class KeybindingWorkerDummy { private:
LPDIRECTINPUT8 din;
LPDIRECTINPUTDEVICE8 dinkeyboard;
- Key kCenter, kInhibit, kStartStop, kZero;
+ Key kCenter;
FaceTrackNoIR& window;
public:
volatile bool should_quit;
~KeybindingWorkerDummy();
- KeybindingWorkerDummy(FaceTrackNoIR& w, Key keyCenter, Key keyInhibit, Key keyStartStop, Key keyZero);
+ KeybindingWorkerDummy(FaceTrackNoIR& w, Key keyCenter);
void run();
};
#else
class KeybindingWorkerDummy {
public:
- KeybindingWorkerDummy(FaceTrackNoIR& w, Key keyCenter, Key keyInhibit, Key keyStartStop, Key keyZero);
+ KeybindingWorkerDummy(FaceTrackNoIR& w, Key keyCenter);
void run() {}
};
#endif
@@ -291,12 +288,10 @@ public: class KeybindingWorker : public QThread, public KeybindingWorkerDummy {
Q_OBJECT
public:
- KeybindingWorker(FaceTrackNoIR& w, Key keyCenter, Key keyInhibit, Key keyStartStop, Key keyZero) : KeybindingWorkerDummy(w, keyCenter, keyInhibit, keyStartStop, keyZero)
+ KeybindingWorker(FaceTrackNoIR& w, Key keyCenter) : KeybindingWorkerDummy(w, keyCenter)
{
}
void run() {
KeybindingWorkerDummy::run();
}
-
-
};
|