cleanup

2 files changed, 3 insertions, 7 deletions

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index e868b02a..817dc80c 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -206,8 +206,6 @@ FaceTrackNoIR::FaceTrackNoIR(QWidget *parent, Qt::WFlags flags) :
 	_curve_config = 0;

 

 	tracker = 0;

-//	_display = 0;

-	l = 0;

 	trayIcon = 0;

 

 	setupFaceTrackNoIR();

@@ -1056,7 +1054,7 @@ void FaceTrackNoIR::createIconGroupBox()
 	QDir settingsDir( QCoreApplication::applicationDirPath() );

 

     {

-        QStringList protocols = settingsDir.entryList( QStringList() << (LIB_PREFIX "ftnoir-proto-*." SONAME), QDir::Files, QDir::Name );

+        QStringList protocols = settingsDir.entryList( QStringList() << (LIB_PREFIX "opentrack-proto-*." SONAME), QDir::Files, QDir::Name );

         for ( int i = 0; i < protocols.size(); i++) {

             QIcon icon;

             QString longName;

@@ -1080,7 +1078,7 @@ void FaceTrackNoIR::createIconGroupBox()
 

     {

         ui.cbxSecondTrackerSource->addItem(QIcon(), "None");

-        QStringList trackers = settingsDir.entryList( QStringList() << (LIB_PREFIX "ftnoir-tracker-*." SONAME), QDir::Files, QDir::Name );

+        QStringList trackers = settingsDir.entryList( QStringList() << (LIB_PREFIX "opentrack-tracker-*." SONAME), QDir::Files, QDir::Name );

         for ( int i = 0; i < trackers.size(); i++) {

             QIcon icon;

             QString longName;

@@ -1106,7 +1104,7 @@ void FaceTrackNoIR::createIconGroupBox()
     {

         dlopen_filters.push_back((DynamicLibrary*) NULL);

         ui.iconcomboFilter->addItem(QIcon(), "None");

-        QStringList filters = settingsDir.entryList( QStringList() << (LIB_PREFIX "ftnoir-filter-*." SONAME), QDir::Files, QDir::Name );

+        QStringList filters = settingsDir.entryList( QStringList() << (LIB_PREFIX "opentrack-filter-*." SONAME), QDir::Files, QDir::Name );

         for ( int i = 0; i < filters.size(); i++) {

             QIcon icon;

             QString fullName;

diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h
index cfe440ae..3e4f3f96 100644
--- a/facetracknoir/facetracknoir.h
+++ b/facetracknoir/facetracknoir.h
@@ -140,8 +140,6 @@ private:
     IFilterDialog* pFilterDialog;				// Pointer to Filter dialog instance (in DLL)

 

 	/** Widget variables **/

-	QVBoxLayout *l;

-	QWidget *_preferences;

 	QWidget *_keyboard_shortcuts;

 	QWidget *_curve_config;