Merge branch 'unstable' into trackhat

* unstable:
  fix vtable mess
  xargs sed -i -e s/'FaceTrackNoIR Error/Error/g'
  support rift 0.2.5, 0.4.2, 0.8.0
  rift: finish 0.2.5 support
  buffer flush
  rename "clientfiles/" to "contrib/" as customary
  add dropbox uploader to contrib
  add description on wiki for camera offset

3 files changed, 7 insertions, 7 deletions

diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp b/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp
index 57ee132c..eea1cbca 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp
@@ -230,11 +230,11 @@ void FTNoIR_Tracker::Initialize( QFrame *videoframe )
 				}
 
 		} else {
-			QMessageBox::warning(0,"FaceTrackNoIR Error", ComPort->errorString(),QMessageBox::Ok,QMessageBox::NoButton);
+			QMessageBox::warning(0,"Error", ComPort->errorString(),QMessageBox::Ok,QMessageBox::NoButton);
 		}
 	}
 	else {
-		QMessageBox::warning(0,"FaceTrackNoIR Error", "Unable to open ComPort",QMessageBox::Ok,QMessageBox::NoButton);
+		QMessageBox::warning(0,"Error", "Unable to open ComPort",QMessageBox::Ok,QMessageBox::NoButton);
 		delete ComPort;
 		ComPort = NULL;
 	} 
@@ -351,11 +351,11 @@ void FTNoIR_Tracker::start_tracker(QFrame*)
 				Log("Port setup, waiting for HAT frames to process");
                 qDebug()  << QTime::currentTime()  << " HAT wait MPU ";
         } else {
-			QMessageBox::warning(0,"FaceTrackNoIR Error", ComPort->errorString(),QMessageBox::Ok,QMessageBox::NoButton);
+			QMessageBox::warning(0,"Error", ComPort->errorString(),QMessageBox::Ok,QMessageBox::NoButton);
 		}
 	}
 	else {
-		QMessageBox::warning(0,"FaceTrackNoIR Error", "Unable to open ComPort: " + ComPort->errorString(), QMessageBox::Ok,QMessageBox::NoButton);
+		QMessageBox::warning(0,"Error", "Unable to open ComPort: " + ComPort->errorString(), QMessageBox::Ok,QMessageBox::NoButton);
 		delete ComPort;
 		ComPort = NULL;
 	} 
diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp
index 90cdeec1..3ef1a764 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.cpp
@@ -37,7 +37,7 @@ TrackerControls::TrackerControls() : theTracker(NULL), settingsDirty(false), tim
 
     // Stop if no SerialPort dispo
     if (ui.cbSerialPort->count()<1) {
-        QMessageBox::critical(this,"FaceTrackNoIR Error", "No SerialPort avaible");
+        QMessageBox::critical(this,"Error", "No SerialPort avaible");
     } else {
 
         int indxport =ui.cbSerialPort->findText(settings.SerialPortName,Qt::MatchExactly );
@@ -45,7 +45,7 @@ TrackerControls::TrackerControls() : theTracker(NULL), settingsDirty(false), tim
             ui.cbSerialPort->setCurrentIndex(indxport);
         } else {
             if (settings.SerialPortName != "")
-                QMessageBox::warning(this,"FaceTrackNoIR Error", "Selected SerialPort modified");
+                QMessageBox::warning(this,"Error", "Selected SerialPort modified");
             ui.cbSerialPort-> setCurrentIndex(indxport);
         }
     }
diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.h b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.h
index 7d0fcd83..ebaffc6d 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.h
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dialog.h
@@ -26,7 +26,7 @@ class TrackerControls: public QWidget, public ITrackerDialog
     Q_OBJECT
 public:
     explicit TrackerControls();
-    virtual ~TrackerControls();
+    ~TrackerControls() override;
 #ifdef OPENTRACK_API
     void Initialize(QWidget *parent) ; // unused
     void register_tracker(ITracker *tracker);