summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-09-22 15:22:28 +0200
committerStanislaw Halik <sthalik@misaki.pl>2014-09-22 15:22:28 +0200
commit906d19822771df7bbd60246ff9f05a00ad87eba3 (patch)
treed76608837aee8b26b47ed8b882fcc9e490725df9
parent083fd59b06aa9f9124e8161d915cc596e83f2589 (diff)
fixup! fix Linux build
-rw-r--r--facetracknoir/facetracknoir.cpp2
-rw-r--r--ftnoir_protocol_ft/ftnoir_protocol_ft.h2
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 3c36ab56..868b6dbf 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -214,6 +214,8 @@ void FaceTrackNoIR::save() {
save_mappings();
#if defined(__unix) || defined(__linux)
+ QSettings settings("opentrack");
+ const QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString();
QByteArray bytes = QFile::encodeName(currentFile);
const char* filename_as_asciiz = bytes.constData();
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
index dc534fda..5b45e41a 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
@@ -60,7 +60,7 @@ class FTNoIR_Protocol : public IProtocol
{
public:
FTNoIR_Protocol();
- virtual ~FTNoIR_Protocol();
+ ~FTNoIR_Protocol() override;
bool checkServerInstallationOK( );
void sendHeadposeToGame( const double *headpose );
QString getGameName() {
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
index b9f002a4..ea2cb75e 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
@@ -36,7 +36,7 @@ class Tracker : public QObject, public ITracker
Q_OBJECT
public:
Tracker();
- virtual ~Tracker();
+ ~Tracker() override;
void StartTracker(QFrame* frame);
void GetHeadPoseData(double *data);
void load_settings(ht_config_t* config);