/***************************************************************************
- * Copyright (C) 2005-2013 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 *
#include "signalproxy.h"
IgnoreListModel::IgnoreListModel(QObject *parent)
- : QAbstractItemModel(parent),
- _configChanged(false),
- _modelReady(false)
+ : QAbstractItemModel(parent)
{
// we need this signal for future connects to reset the data;
connect(Client::instance(), SIGNAL(connected()), this, SLOT(clientConnected()));
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();
}
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:
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;
}
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();*/
}
_configChanged = false;
emit configChanged(false);
- reset();
+ beginResetModel();
+ endResetModel();
}
void IgnoreListModel::initDone()
{
_modelReady = true;
- reset();
+ beginResetModel();
+ endResetModel();
emit modelReady(true);
}
// clear
_clonedIgnoreListManager = ClientIgnoreListManager();
_modelReady = false;
- reset();
+ beginResetModel();
+ endResetModel();
emit modelReady(false);
}