projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Provide helper for getting member function traits
[quassel.git]
/
src
/
core
/
coreignorelistmanager.cpp
diff --git
a/src/core/coreignorelistmanager.cpp
b/src/core/coreignorelistmanager.cpp
index
3b630f3
..
1dac961
100644
(file)
--- a/
src/core/coreignorelistmanager.cpp
+++ b/
src/core/coreignorelistmanager.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-23,11
+23,10
@@
#include "core.h"
#include "coresession.h"
#include "core.h"
#include "coresession.h"
-INIT_SYNCABLE_OBJECT(CoreIgnoreListManager)
CoreIgnoreListManager::CoreIgnoreListManager(CoreSession *parent)
: IgnoreListManager(parent)
{
CoreIgnoreListManager::CoreIgnoreListManager(CoreSession *parent)
: IgnoreListManager(parent)
{
-
CoreSession
*session = qobject_cast<CoreSession *>(parent);
+
auto
*session = qobject_cast<CoreSession *>(parent);
if (!session) {
qWarning() << "CoreIgnoreListManager: unable to load IgnoreList. Parent is not a Coresession!";
//loadDefaults();
if (!session) {
qWarning() << "CoreIgnoreListManager: unable to load IgnoreList. Parent is not a Coresession!";
//loadDefaults();
@@
-37,7
+36,7
@@
CoreIgnoreListManager::CoreIgnoreListManager(CoreSession *parent)
initSetIgnoreList(Core::getUserSetting(session->user(), "IgnoreList").toMap());
// we store our settings whenever they change
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();
@@
-53,7
+52,7
@@
IgnoreListManager::StrictnessType CoreIgnoreListManager::match(const RawMessage
void CoreIgnoreListManager::save() const
{
void CoreIgnoreListManager::save() const
{
-
CoreSession
*session = qobject_cast<CoreSession *>(parent());
+
auto
*session = qobject_cast<CoreSession *>(parent());
if (!session) {
qWarning() << "CoreIgnoreListManager: unable to save IgnoreList. Parent is not a Coresession!";
return;
if (!session) {
qWarning() << "CoreIgnoreListManager: unable to save IgnoreList. Parent is not a Coresession!";
return;
@@
-65,6
+64,7
@@
void CoreIgnoreListManager::save() const
//void CoreIgnoreListManager::loadDefaults() {
// foreach(IgnoreListItem item, IgnoreListManager::defaults()) {
//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());
// }
//}
// }
//}