projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finaly got rid of the synchronizers, making Quassel quite a bit more lightweight...
[quassel.git]
/
src
/
common
/
networkinfo.h
diff --git
a/src/common/networkinfo.h
b/src/common/networkinfo.h
index
6f2ab48
..
8be0d98
100644
(file)
--- a/
src/common/networkinfo.h
+++ b/
src/common/networkinfo.h
@@
-29,7
+29,6
@@
#include <QPointer>
class SignalProxy;
#include <QPointer>
class SignalProxy;
-class Synchronizer;
class IrcUser;
class IrcChannel;
class IrcUser;
class IrcChannel;
@@
-42,13
+41,15
@@
class NetworkInfo : public QObject {
Q_PROPERTY(QString myNick READ myNick WRITE setMyNick STORED false)
public:
Q_PROPERTY(QString myNick READ myNick WRITE setMyNick STORED false)
public:
- NetworkInfo(const uint &networkid,
SignalProxy *proxy,
QObject *parent = 0);
+ NetworkInfo(const uint &networkid, QObject *parent = 0);
// virtual ~NetworkInfo();
uint networkId() const;
bool initialized() const;
// virtual ~NetworkInfo();
uint networkId() const;
bool initialized() const;
- Synchronizer *synchronizer();
+ SignalProxy *proxy() const;
+ void setProxy(SignalProxy *proxy);
+
bool isMyNick(const QString &nick) const;
bool isMyNick(IrcUser *ircuser) const;
bool isMyNick(const QString &nick) const;
bool isMyNick(IrcUser *ircuser) const;
@@
-115,7
+116,7
@@
signals:
void currentServerSet(const QString ¤tServer);
void myNickSet(const QString &mynick);
void currentServerSet(const QString ¤tServer);
void myNickSet(const QString &mynick);
- void supportAdded(const QString ¶m, const QString &value
= QString()
);
+ void supportAdded(const QString ¶m, const QString &value);
void supportRemoved(const QString ¶m);
void ircUserAdded(QString hostmask);
void supportRemoved(const QString ¶m);
void ircUserAdded(QString hostmask);
@@
-143,8
+144,7
@@
private:
//QVariantMap networkSettings;
//QVariantMap identity;
//QVariantMap networkSettings;
//QVariantMap identity;
- QPointer<Synchronizer> _synchronizer;
-
+ QPointer<SignalProxy> _proxy;
void determinePrefixes();
};
void determinePrefixes();
};