#include "ignorelistmodel.h"
#include <QDebug>
-#include <QStringList>
#include <QPushButton>
+#include <QStringList>
#include "client.h"
#include "signalproxy.h"
-IgnoreListModel::IgnoreListModel(QObject *parent)
+IgnoreListModel::IgnoreListModel(QObject* parent)
: QAbstractItemModel(parent)
{
// we need this signal for future connects to reset the data;
- connect(Client::instance(), SIGNAL(connected()), this, SLOT(clientConnected()));
- connect(Client::instance(), SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
+ connect(Client::instance(), &Client::connected, this, &IgnoreListModel::clientConnected);
+ connect(Client::instance(), &Client::disconnected, this, &IgnoreListModel::clientDisconnected);
if (Client::isConnected())
clientConnected();
emit modelReady(false);
}
-
-QVariant IgnoreListModel::data(const QModelIndex &index, int role) const
+QVariant IgnoreListModel::data(const QModelIndex& index, int role) const
{
if (!_modelReady)
return QVariant();
}
}
-
-bool IgnoreListModel::setData(const QModelIndex &index, const QVariant &value, int role)
+bool IgnoreListModel::setData(const QModelIndex& index, const QVariant& value, int role)
{
if (!_modelReady)
return false;
cloneIgnoreListManager()[index.row()].setIsEnabled(newValue.toBool());
return true;
case 1:
- cloneIgnoreListManager()[index.row()].setType(
- (IgnoreListManager::IgnoreType)newValue.toInt());
+ cloneIgnoreListManager()[index.row()].setType((IgnoreListManager::IgnoreType)newValue.toInt());
return true;
case 2:
if (ignoreListManager().contains(newValue.toString())) {
}
}
-
-bool IgnoreListModel::newIgnoreRule(const IgnoreListManager::IgnoreListItem &item)
+bool IgnoreListModel::newIgnoreRule(const IgnoreListManager::IgnoreListItem& item)
{
- IgnoreListManager &manager = cloneIgnoreListManager();
+ IgnoreListManager& manager = cloneIgnoreListManager();
if (manager.contains(item.contents()))
return false;
beginInsertRows(QModelIndex(), rowCount(), rowCount());
// manager.addIgnoreListItem(item);
- manager.addIgnoreListItem(item.type(), item.contents(), item.isRegEx(), item.strictness(),
- item.scope(), item.scopeRule(), item.isEnabled());
+ manager.addIgnoreListItem(item.type(), item.contents(), item.isRegEx(), item.strictness(), item.scope(), item.scopeRule(), item.isEnabled());
endInsertRows();
return true;
}
-
void IgnoreListModel::loadDefaults()
{
/*if(!_modelReady)
endInsertRows();*/
}
-
void IgnoreListModel::removeIgnoreRule(int index)
{
if (index < 0 || index >= rowCount())
return;
- IgnoreListManager &manager = cloneIgnoreListManager();
+ IgnoreListManager& manager = cloneIgnoreListManager();
beginRemoveRows(QModelIndex(), index, index);
manager.removeAt(index);
endRemoveRows();
}
-
-Qt::ItemFlags IgnoreListModel::flags(const QModelIndex &index) const
+Qt::ItemFlags IgnoreListModel::flags(const QModelIndex& index) const
{
if (!index.isValid()) {
return Qt::ItemIsDropEnabled;
}
}
-
QVariant IgnoreListModel::headerData(int section, Qt::Orientation orientation, int role) const
{
QStringList header;
- header << tr("Enabled")
- << tr("Type")
- << tr("Ignore Rule");
+ header << tr("Enabled") << tr("Type") << tr("Ignore Rule");
if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
return header[section];
return QVariant();
}
-
-QModelIndex IgnoreListModel::index(int row, int column, const QModelIndex &parent) const
+QModelIndex IgnoreListModel::index(int row, int column, const QModelIndex& parent) const
{
Q_UNUSED(parent);
if (row >= rowCount() || column >= columnCount())
- return QModelIndex();
+ return {};
return createIndex(row, column);
}
-
-const IgnoreListManager &IgnoreListModel::ignoreListManager() const
+const IgnoreListManager& IgnoreListModel::ignoreListManager() const
{
if (_configChanged)
return _clonedIgnoreListManager;
return *Client::ignoreListManager();
}
-
-IgnoreListManager &IgnoreListModel::ignoreListManager()
+IgnoreListManager& IgnoreListModel::ignoreListManager()
{
if (_configChanged)
return _clonedIgnoreListManager;
return *Client::ignoreListManager();
}
-
-IgnoreListManager &IgnoreListModel::cloneIgnoreListManager()
+IgnoreListManager& IgnoreListModel::cloneIgnoreListManager()
{
if (!_configChanged) {
_clonedIgnoreListManager = *Client::ignoreListManager();
return _clonedIgnoreListManager;
}
-
void IgnoreListModel::revert()
{
if (!_configChanged)
endResetModel();
}
-
void IgnoreListModel::commit()
{
if (!_configChanged)
revert();
}
-
void IgnoreListModel::initDone()
{
_modelReady = true;
emit modelReady(true);
}
-
void IgnoreListModel::clientConnected()
{
- connect(Client::ignoreListManager(), SIGNAL(updated()), SLOT(revert()));
+ connect(Client::ignoreListManager(), &IgnoreListManager::updated, this, &IgnoreListModel::revert);
if (Client::ignoreListManager()->isInitialized())
initDone();
else
- connect(Client::ignoreListManager(), SIGNAL(initDone()), SLOT(initDone()));
+ connect(Client::ignoreListManager(), &SyncableObject::initDone, this, &IgnoreListModel::initDone);
}
-
void IgnoreListModel::clientDisconnected()
{
// clear
emit modelReady(false);
}
-
-const IgnoreListManager::IgnoreListItem &IgnoreListModel::ignoreListItemAt(int row) const
+const IgnoreListManager::IgnoreListItem& IgnoreListModel::ignoreListItemAt(int row) const
{
return ignoreListManager()[row];
}
-
// FIXME use QModelIndex?
-void IgnoreListModel::setIgnoreListItemAt(int row, const IgnoreListManager::IgnoreListItem &item)
+void IgnoreListModel::setIgnoreListItemAt(int row, const IgnoreListManager::IgnoreListItem& item)
{
cloneIgnoreListManager()[row] = item;
emit dataChanged(createIndex(row, 0), createIndex(row, 2));
}
-
-const QModelIndex IgnoreListModel::indexOf(const QString &rule)
+const QModelIndex IgnoreListModel::indexOf(const QString& rule)
{
return createIndex(ignoreListManager().indexOf(rule), 2);
}