Merge branch 'cmakeAndPreferences'

1 files changed, 0 insertions, 54 deletions

diff --git a/qt-ui/preferences.h b/qt-ui/preferences.h
deleted file mode 100644
index 326b1f964..000000000
--- a/qt-ui/preferences.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef PREFERENCES_H
-#define PREFERENCES_H
-
-#include <QDialog>
-#include "pref.h"
-
-#include "ui_preferences.h"
-
-#ifndef Q_OS_ANDROID
-	class QWebView;
-#endif
-
-class QAbstractButton;
-
-class PreferencesDialog : public QDialog {
-	Q_OBJECT
-public:
-	static PreferencesDialog *instance();
-	void showEvent(QShowEvent *);
-	void emitSettingsChanged();
-
-signals:
-	void settingsChanged();
-public
-slots:
-	void buttonClicked(QAbstractButton *button);
-	void on_chooseFile_clicked();
-	void on_resetSettings_clicked();
-	void syncSettings();
-	void loadSettings();
-	void restorePrefs();
-	void rememberPrefs();
-	void gflowChanged(int gf);
-	void gfhighChanged(int gf);
-	void proxyType_changed(int idx);
-	void on_btnUseDefaultFile_toggled(bool toggle);
-	void on_noDefaultFile_toggled(bool toggle);
-	void on_localDefaultFile_toggled(bool toggle);
-	void on_cloudDefaultFile_toggled(bool toggle);
-	void facebookLoggedIn();
-	void facebookDisconnect();
-	void cloudPinNeeded();
-	void passwordUpdateSuccessfull();
-private:
-	explicit PreferencesDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
-	void setUiFromPrefs();
-	Ui::PreferencesDialog ui;
-	struct preferences oldPrefs;
-    #ifndef Q_OS_ANDROID
-	QWebView *facebookWebView;
-    #endif
-};
-
-#endif // PREFERENCES_H