X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fignorelistmodel.cpp;h=0af0364d0ed07b17ea217be54eeae6c4c1591383;hp=5dec6cc6ab1a25b6ef8ac8e32df2bf10eb3ccf36;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=9d54503555534a2c554f09a33df6afa33d6308ec

diff --git a/src/qtui/settingspages/ignorelistmodel.cpp b/src/qtui/settingspages/ignorelistmodel.cpp
index 5dec6cc6..0af0364d 100644
--- a/src/qtui/settingspages/ignorelistmodel.cpp
+++ b/src/qtui/settingspages/ignorelistmodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -87,19 +87,20 @@ QVariant IgnoreListModel::data(const QModelIndex &index, int role) const
     case Qt::DisplayRole:
         switch (index.column()) {
         case 1:
-            if (ignoreListManager()[index.row()].type == IgnoreListManager::SenderIgnore)
+            if (ignoreListManager()[index.row()].type() == IgnoreListManager::SenderIgnore)
                 return tr("By Sender");
             else
                 return tr("By Message");
         }
+        // Intentional fallthrough
     case Qt::EditRole:
         switch (index.column()) {
         case 0:
-            return ignoreListManager()[index.row()].isActive;
+            return ignoreListManager()[index.row()].isEnabled();
         case 1:
-            return ignoreListManager()[index.row()].type;
+            return ignoreListManager()[index.row()].type();
         case 2:
-            return ignoreListManager()[index.row()].ignoreRule;
+            return ignoreListManager()[index.row()].contents();
         default:
             return QVariant();
         }
@@ -123,17 +124,18 @@ bool IgnoreListModel::setData(const QModelIndex &index, const QVariant &value, i
 
     switch (index.column()) {
     case 0:
-        cloneIgnoreListManager()[index.row()].isActive = newValue.toBool();
+        cloneIgnoreListManager()[index.row()].setIsEnabled(newValue.toBool());
         return true;
     case 1:
-        cloneIgnoreListManager()[index.row()].type = (IgnoreListManager::IgnoreType)newValue.toInt();
+        cloneIgnoreListManager()[index.row()].setType(
+                    (IgnoreListManager::IgnoreType)newValue.toInt());
         return true;
     case 2:
         if (ignoreListManager().contains(newValue.toString())) {
             return false;
         }
         else {
-            cloneIgnoreListManager()[index.row()].ignoreRule = newValue.toString();
+            cloneIgnoreListManager()[index.row()].setContents(newValue.toString());
             return true;
         }
     default:
@@ -145,12 +147,12 @@ bool IgnoreListModel::setData(const QModelIndex &index, const QVariant &value, i
 bool IgnoreListModel::newIgnoreRule(const IgnoreListManager::IgnoreListItem &item)
 {
     IgnoreListManager &manager = cloneIgnoreListManager();
-    if (manager.contains(item.ignoreRule))
+    if (manager.contains(item.contents()))
         return false;
     beginInsertRows(QModelIndex(), rowCount(), rowCount());
     // manager.addIgnoreListItem(item);
-    manager.addIgnoreListItem(item.type, item.ignoreRule, item.isRegEx, item.strictness, item.scope,
-        item.scopeRule, item.isActive);
+    manager.addIgnoreListItem(item.type(), item.contents(), item.isRegEx(), item.strictness(),
+                              item.scope(), item.scopeRule(), item.isEnabled());
     endInsertRows();
     return true;
 }
@@ -173,7 +175,8 @@ void IgnoreListModel::loadDefaults()
     IgnoreListManager::IgnoreList defaults = IgnoreListModel::defaults();
     beginInsertRows(QModelIndex(), 0, defaults.count() - 1);
     foreach(IgnoreListManager::IgnoreListItem item, defaults) {
-      manager.addIgnoreListItem(item.ignoreRule, item.isRegEx, item.strictness, item.scope, item.scopeRule);
+      manager.addIgnoreListItem(item.contents(), item.isRegEx(), item.strictness(), item.scope(),
+                                item.scopeRule());
     }
     endInsertRows();*/
 }
@@ -262,7 +265,8 @@ void IgnoreListModel::revert()
 
     _configChanged = false;
     emit configChanged(false);
-    reset();
+    beginResetModel();
+    endResetModel();
 }
 
 
@@ -279,7 +283,8 @@ void IgnoreListModel::commit()
 void IgnoreListModel::initDone()
 {
     _modelReady = true;
-    reset();
+    beginResetModel();
+    endResetModel();
     emit modelReady(true);
 }
 
@@ -299,7 +304,8 @@ void IgnoreListModel::clientDisconnected()
     // clear
     _clonedIgnoreListManager = ClientIgnoreListManager();
     _modelReady = false;
-    reset();
+    beginResetModel();
+    endResetModel();
     emit modelReady(false);
 }