Fixing conflicts merging master

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 4 deletions

diff --git a/src/cookiejar.h b/src/cookiejar.h
index 30d57ac1..cd2403a2 100644
--- a/src/cookiejar.h
+++ b/src/cookiejar.h
@@ -35,6 +35,7 @@
 
 // Forward Declarations
 class QSortFilterProxyModel;
+class QKeyEvent;
 class AutoSaver;
 
 
@@ -118,7 +119,8 @@ class CookieModel : public QAbstractTableModel
     Q_OBJECT
 
 public:
-    CookieModel(CookieJar *jar, QObject *parent = 0);
+    explicit CookieModel(CookieJar *jar, QObject *parent = 0);
+
     QVariant headerData(int section, Qt::Orientation orientation, int role) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
@@ -143,19 +145,24 @@ class CookiesDialog : public QDialog, public Ui_CookiesDialog
     Q_OBJECT
 
 public:
-    CookiesDialog(CookieJar *cookieJar, QWidget *parent = 0);
+    explicit CookiesDialog(CookieJar *cookieJar, QWidget *parent = 0);
 
 private:
     QSortFilterProxyModel *m_proxyModel;
 };
 
+
+// ----------------------------------------------------------------------------------------------------------------------
+
+
 class CookieExceptionsModel : public QAbstractTableModel
 {
     Q_OBJECT
     friend class CookiesExceptionsDialog;
 
 public:
-    CookieExceptionsModel(CookieJar *cookieJar, QObject *parent = 0);
+    explicit CookieExceptionsModel(CookieJar *cookieJar, QObject *parent = 0);
+
     QVariant headerData(int section, Qt::Orientation orientation, int role) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
@@ -182,7 +189,7 @@ class CookiesExceptionsDialog : public QDialog, public Ui_CookiesExceptionsDialo
     Q_OBJECT
 
 public:
-    CookiesExceptionsDialog(CookieJar *cookieJar, QWidget *parent = 0);
+    explicit CookiesExceptionsDialog(CookieJar *cookieJar, QWidget *parent = 0);
 
 private slots:
     void block();
@@ -197,3 +204,4 @@ private:
 };
 
 #endif // COOKIEJAR_H
+