X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreignorelistmanager.cpp;h=fc199711323bc0e33deec82bf13c25a973173e02;hp=c1de5e2a43db1d49359545ec29603e69096a2eb3;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e diff --git a/src/core/coreignorelistmanager.cpp b/src/core/coreignorelistmanager.cpp index c1de5e2a..fc199711 100644 --- a/src/core/coreignorelistmanager.cpp +++ b/src/core/coreignorelistmanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -23,37 +23,34 @@ #include "core.h" #include "coresession.h" -INIT_SYNCABLE_OBJECT(CoreIgnoreListManager) -CoreIgnoreListManager::CoreIgnoreListManager(CoreSession *parent) +CoreIgnoreListManager::CoreIgnoreListManager(CoreSession* parent) : IgnoreListManager(parent) { - CoreSession *session = qobject_cast(parent); + auto* session = qobject_cast(parent); if (!session) { qWarning() << "CoreIgnoreListManager: unable to load IgnoreList. Parent is not a Coresession!"; - //loadDefaults(); + // loadDefaults(); return; } initSetIgnoreList(Core::getUserSetting(session->user(), "IgnoreList").toMap()); // we store our settings whenever they change - connect(this, SIGNAL(updatedRemotely()), SLOT(save())); + connect(this, &SyncableObject::updatedRemotely, this, &CoreIgnoreListManager::save); - //if(isEmpty()) - //loadDefaults(); + // if(isEmpty()) + // loadDefaults(); } - -IgnoreListManager::StrictnessType CoreIgnoreListManager::match(const RawMessage &rawMsg, const QString &networkName) +IgnoreListManager::StrictnessType CoreIgnoreListManager::match(const RawMessage& rawMsg, const QString& networkName) { - //StrictnessType _match(const QString &msgContents, const QString &msgSender, Message::Type msgType, const QString &network, const QString &bufferName); + // StrictnessType _match(const QString &msgContents, const QString &msgSender, Message::Type msgType, const QString &network, const QString &bufferName); return _match(rawMsg.text, rawMsg.sender, rawMsg.type, networkName, rawMsg.target); } - void CoreIgnoreListManager::save() const { - CoreSession *session = qobject_cast(parent()); + auto* session = qobject_cast(parent()); if (!session) { qWarning() << "CoreIgnoreListManager: unable to save IgnoreList. Parent is not a Coresession!"; return; @@ -62,9 +59,9 @@ void CoreIgnoreListManager::save() const Core::setUserSetting(session->user(), "IgnoreList", initIgnoreList()); } - -//void CoreIgnoreListManager::loadDefaults() { +// void CoreIgnoreListManager::loadDefaults() { // foreach(IgnoreListItem item, IgnoreListManager::defaults()) { -// addIgnoreListItem(item.ignoreRule, item.isRegEx, item.strictness, item.scope, item.scopeRule); +// addIgnoreListItem(item.contents(), item.isRegEx(), item.strictness(), item.scope(), +// item.scopeRule()); // } //}