Fix slots for new syncobj

diff --git a/src/client/clientignorelistmanager.cpp b/src/client/clientignorelistmanager.cpp
index f4b1f91..e54eeb7 100644 (file)
--- a/src/client/clientignorelistmanager.cpp
+++ b/src/client/clientignorelistmanager.cpp
@@ -25,10 +25,5 @@ INIT_SYNCABLE_OBJECT(ClientIgnoreListManager)
 ClientIgnoreListManager::ClientIgnoreListManager(QObject *parent)
     : IgnoreListManager(parent)
 {
-  connect(this, SIGNAL(updated(const QVariantMap&)), this, SLOT(ignoreListUpdated(const QVariantMap&)));
-}
-
-void ClientIgnoreListManager::ignoreListUpdated(const QVariantMap &newMap) {
-  if(newMap != initIgnoreList())
-    emit ignoreListChanged();
+  connect(this, SIGNAL(updated()), SIGNAL(ignoreListChanged()));
 }

diff --git a/src/client/clientignorelistmanager.h b/src/client/clientignorelistmanager.h
index 61a9c49..eac7c72 100644 (file)
--- a/src/client/clientignorelistmanager.h
+++ b/src/client/clientignorelistmanager.h
@@ -34,9 +34,6 @@ public:
 
 signals:
   void ignoreListChanged();
-
-private slots:
-  void ignoreListUpdated(const QVariantMap &newMap);
 };
 
 #endif // CLIENTIGNORELISTMANAGER_H

diff --git a/src/common/ignorelistmanager.h b/src/common/ignorelistmanager.h
index 9ad4301..1d44b0b 100644 (file)
--- a/src/common/ignorelistmanager.h
+++ b/src/common/ignorelistmanager.h
@@ -93,13 +93,14 @@ public:
     */
   StrictnessType match(const Message &msg, const QString &network = QString());
 
+  virtual void addIgnoreListItem(IgnoreType type, const QString &ignoreRule, bool isRegEx, StrictnessType strictness,
+                                 ScopeType scope, const QString &scopeRule, bool isActive);
+  virtual void addIgnoreListItem(const IgnoreListItem &item);
+
 public slots:
   virtual QVariantMap initIgnoreList() const;
   virtual void initSetIgnoreList(const QVariantMap &ignoreList);
 
-  virtual void addIgnoreListItem(IgnoreType type, const QString &ignoreRule, bool isRegEx, StrictnessType strictness,
-                             ScopeType scope, const QString &scopeRule, bool isActive);
-  virtual void addIgnoreListItem(const IgnoreListItem &item);
 protected:
   void setIgnoreList(const QList<IgnoreListItem> &ignoreList) { _ignoreList = ignoreList; }
 

diff --git a/src/qtui/settingspages/ignorelistmodel.cpp b/src/qtui/settingspages/ignorelistmodel.cpp
index 445201a..ec09dec 100644 (file)
--- a/src/qtui/settingspages/ignorelistmodel.cpp
+++ b/src/qtui/settingspages/ignorelistmodel.cpp
@@ -254,7 +254,7 @@ void IgnoreListModel::initDone() {
 }
 
 void IgnoreListModel::clientConnected() {
-  connect(Client::ignoreListManager(), SIGNAL(updated(QVariantMap)), SLOT(revert()));
+  connect(Client::ignoreListManager(), SIGNAL(updated()), SLOT(revert()));
   if(Client::ignoreListManager()->isInitialized())
     initDone();
   else