Merge branch 'develop'

1 files changed, 0 insertions, 29 deletions

diff --git a/gui/IconPickerDialog.h b/gui/IconPickerDialog.h
deleted file mode 100644
index 96fc61ff..00000000
--- a/gui/IconPickerDialog.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-#include <QDialog>
-#include <QItemSelection>
-
-namespace Ui {
-class IconPickerDialog;
-}
-
-class IconPickerDialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	explicit IconPickerDialog(QWidget *parent = 0);
-	~IconPickerDialog();
-	int exec(QString selection);
-	QString selectedIconKey;
-protected:
-	virtual bool eventFilter ( QObject* , QEvent* );
-private:
-	Ui::IconPickerDialog *ui;
-	
-private slots:
-	void selectionChanged ( QItemSelection,QItemSelection );
-	void activated ( QModelIndex );
-	void delayed_scroll ( QModelIndex );
-	void addNewIcon();
-	void removeSelectedIcon();
-};