diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-19 21:59:09 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-19 21:59:09 +0200 |
| commit | 709dac6140502566fac4156b83b998895dc07377 (patch) | |
| tree | 9fbab707da7baba8e3268960eee2458e2bc6a709 /facetracknoir | |
| parent | dd87370ff2818ee3c3d67ba104405b85ee44daba (diff) | |
fix link errors on win32 -only-
Diffstat (limited to 'facetracknoir')
| -rw-r--r-- | facetracknoir/facetracknoir.cpp | 2 | ||||
| -rw-r--r-- | facetracknoir/facetracknoir.h | 6 | ||||
| -rw-r--r-- | facetracknoir/shortcuts.cpp | 6 | ||||
| -rw-r--r-- | facetracknoir/version.c | 5 |
4 files changed, 7 insertions, 12 deletions
diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index 76d7af19..44fa11f0 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -22,9 +22,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. * *********************************************************************************/ #include "facetracknoir.h" -#include "shortcuts.h" #include "opentrack/tracker.h" -#include "curve-config.h" #include <QFileDialog> FaceTrackNoIR::FaceTrackNoIR() : QMainWindow(nullptr), diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h index 0c5d902f..32bf8239 100644 --- a/facetracknoir/facetracknoir.h +++ b/facetracknoir/facetracknoir.h @@ -48,8 +48,8 @@ #include "opentrack/main-settings.hpp" #include "opentrack/plugin-support.h" #include "opentrack/tracker.h" -#include "./shortcuts.h" -#include "./curve-config.h" +#include "shortcuts.h" +#include "curve-config.h" using namespace options; @@ -85,7 +85,7 @@ private: ptr<IProtocolDialog> pProtocolDialog; ptr<IFilterDialog> pFilterDialog; - ptr<QWidget> shortcuts_widget; + ptr<KeyboardShortcutDialog> shortcuts_widget; ptr<MapWidget> mapping_widget; QShortcut kbd_quit; diff --git a/facetracknoir/shortcuts.cpp b/facetracknoir/shortcuts.cpp index 94c46376..53d67957 100644 --- a/facetracknoir/shortcuts.cpp +++ b/facetracknoir/shortcuts.cpp @@ -1,5 +1,7 @@ -#include "facetracknoir/facetracknoir.h" -#include "facetracknoir/shortcuts.h" +#include "facetracknoir.h" +#include "shortcuts.h" + +// XXX todo remove ref to ui class -sh 20141019 KeyboardShortcutDialog::KeyboardShortcutDialog( FaceTrackNoIR *ftnoir, QWidget *parent ) : QWidget( parent, Qt::Dialog) diff --git a/facetracknoir/version.c b/facetracknoir/version.c deleted file mode 100644 index 0ef4ec14..00000000 --- a/facetracknoir/version.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef IN_VERSION_UNIT -# define IN_CRAPOLA_COMPILE_UNIT -volatile const char* opentrack_version = OPENTRACK_VERSION; -#else -#endif |