projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
064c4db
)
Adapt to SignalProxy changes
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Mon, 24 Aug 2009 21:26:30 +0000
(23:26 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Mon, 24 Aug 2009 23:16:03 +0000
(
01:16
+0200)
src/client/clientignorelistmanager.cpp
patch
|
blob
|
history
src/client/clientignorelistmanager.h
patch
|
blob
|
history
src/common/ignorelistmanager.cpp
patch
|
blob
|
history
src/common/ignorelistmanager.h
patch
|
blob
|
history
src/core/coreignorelistmanager.cpp
patch
|
blob
|
history
src/core/coreignorelistmanager.h
patch
|
blob
|
history
diff --git
a/src/client/clientignorelistmanager.cpp
b/src/client/clientignorelistmanager.cpp
index
f042969
..
f4b1f91
100644
(file)
--- a/
src/client/clientignorelistmanager.cpp
+++ b/
src/client/clientignorelistmanager.cpp
@@
-20,6
+20,8
@@
#include "clientignorelistmanager.h"
#include "clientignorelistmanager.h"
+INIT_SYNCABLE_OBJECT(ClientIgnoreListManager)
+
ClientIgnoreListManager::ClientIgnoreListManager(QObject *parent)
: IgnoreListManager(parent)
{
ClientIgnoreListManager::ClientIgnoreListManager(QObject *parent)
: IgnoreListManager(parent)
{
diff --git
a/src/client/clientignorelistmanager.h
b/src/client/clientignorelistmanager.h
index
841ff4f
..
61a9c49
100644
(file)
--- a/
src/client/clientignorelistmanager.h
+++ b/
src/client/clientignorelistmanager.h
@@
-25,6
+25,7
@@
class ClientIgnoreListManager : public IgnoreListManager
{
class ClientIgnoreListManager : public IgnoreListManager
{
+ SYNCABLE_OBJECT
Q_OBJECT
public:
Q_OBJECT
public:
diff --git
a/src/common/ignorelistmanager.cpp
b/src/common/ignorelistmanager.cpp
index
a9fb4c6
..
d6164b8
100644
(file)
--- a/
src/common/ignorelistmanager.cpp
+++ b/
src/common/ignorelistmanager.cpp
@@
-26,6
+26,8
@@
#include "message.h"
#include "message.h"
+INIT_SYNCABLE_OBJECT(IgnoreListManager)
+
IgnoreListManager &IgnoreListManager::operator=(const IgnoreListManager &other) {
if(this == &other)
return *this;
IgnoreListManager &IgnoreListManager::operator=(const IgnoreListManager &other) {
if(this == &other)
return *this;
diff --git
a/src/common/ignorelistmanager.h
b/src/common/ignorelistmanager.h
index
a906b95
..
9ad4301
100644
(file)
--- a/
src/common/ignorelistmanager.h
+++ b/
src/common/ignorelistmanager.h
@@
-29,6
+29,7
@@
class Message;
class IgnoreListManager : public SyncableObject
{
class IgnoreListManager : public SyncableObject
{
+ SYNCABLE_OBJECT
Q_OBJECT
public:
inline IgnoreListManager(QObject *parent = 0) : SyncableObject(parent) { setAllowClientUpdates(true); }
Q_OBJECT
public:
inline IgnoreListManager(QObject *parent = 0) : SyncableObject(parent) { setAllowClientUpdates(true); }
diff --git
a/src/core/coreignorelistmanager.cpp
b/src/core/coreignorelistmanager.cpp
index
db9cc7d
..
140d123
100644
(file)
--- a/
src/core/coreignorelistmanager.cpp
+++ b/
src/core/coreignorelistmanager.cpp
@@
-23,6
+23,8
@@
#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)
{
diff --git
a/src/core/coreignorelistmanager.h
b/src/core/coreignorelistmanager.h
index
9576c1b
..
d455d2c
100644
(file)
--- a/
src/core/coreignorelistmanager.h
+++ b/
src/core/coreignorelistmanager.h
@@
-26,6
+26,7
@@
class CoreSession;
class CoreIgnoreListManager : public IgnoreListManager {
class CoreSession;
class CoreIgnoreListManager : public IgnoreListManager {
+ SYNCABLE_OBJECT
Q_OBJECT
public:
Q_OBJECT
public: