Fixed merge conflict

[easylist] / settingsform.h

diff --git a/settingsform.h b/settingsform.h
index 00a2290..b5c073f 100755 (executable)
--- a/settingsform.h
+++ b/settingsform.h
@@ -5,6 +5,7 @@
 #include <QWidget>\r
 #include <QSettings>\r
 #include <QCryptographicHash>\r
+#include <QMessageBox>\r
 #include "slidewidget.h"\r
 #include "globals.h"\r
 \r
@@ -24,6 +25,8 @@ public:
 \r
 signals:\r
     void signalNavigate(int step);\r
+protected:\r
+    bool eventFilter(QObject *obj, QEvent *e);\r
 \r
 private slots:\r
     void on_restoreSyncPushButton_clicked();\r