Merge branch 'feature/settings-template'

Conflicts:
	README.md

2 files changed, 0 insertions, 20 deletions

diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h
index aabd3e51..f92bb7bb 100644
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h
@@ -9,7 +9,6 @@
 #include "ui_ftnoir_libevdev_controls.h"
 
 #include <QMessageBox>
-#include <QSettings>
 #include "facetracknoir/global-settings.h"
 
 extern "C" {
@@ -41,10 +40,6 @@ class LibevdevControls: public QWidget, public IProtocolDialog
 public:
 
     explicit LibevdevControls();
-    virtual ~LibevdevControls();
-    void showEvent ( QShowEvent *) {}
-
-    void Initialize(QWidget *);
     void registerProtocol(IProtocol *) {}
 	void unRegisterProtocol() {}
 
diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
index 6665a3d2..bb54c354 100644
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
@@ -8,21 +8,6 @@ LibevdevControls::LibevdevControls() : QWidget()
 	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
 }
 
-LibevdevControls::~LibevdevControls() {
-}
-
-//
-// Initialize tracker-client-dialog
-//
-void LibevdevControls::Initialize(QWidget *parent) {
-
-	QPoint offsetpos(100, 100);
-	if (parent) {
-		this->move(parent->pos() + offsetpos);
-	}
-	show();
-}
-
 void LibevdevControls::doOK() {
 	save();
 	this->close();