projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes #746 - Quassel unsets default modes set by server upon first connect
[quassel.git]
/
src
/
core
/
corenetwork.h
diff --git
a/src/core/corenetwork.h
b/src/core/corenetwork.h
index
d263f3f
..
a6d3678
100644
(file)
--- a/
src/core/corenetwork.h
+++ b/
src/core/corenetwork.h
@@
-37,10
+37,12
@@
class CoreIdentity;
class IrcServerHandler;
class CoreIdentity;
class IrcServerHandler;
-class UserInputHandler;
+class
Core
UserInputHandler;
class CtcpHandler;
class CtcpHandler;
+class CoreIgnoreListManager;
class CoreNetwork : public Network {
class CoreNetwork : public Network {
+ SYNCABLE_OBJECT
Q_OBJECT
public:
Q_OBJECT
public:
@@
-53,8
+55,9
@@
public:
inline CoreNetworkConfig *networkConfig() const { return coreSession()->networkConfig(); }
inline IrcServerHandler *ircServerHandler() const { return _ircServerHandler; }
inline CoreNetworkConfig *networkConfig() const { return coreSession()->networkConfig(); }
inline IrcServerHandler *ircServerHandler() const { return _ircServerHandler; }
- inline UserInputHandler *userInputHandler() const { return _userInputHandler; }
+ inline
Core
UserInputHandler *userInputHandler() const { return _userInputHandler; }
inline CtcpHandler *ctcpHandler() const { return _ctcpHandler; }
inline CtcpHandler *ctcpHandler() const { return _ctcpHandler; }
+ inline CoreIgnoreListManager *ignoreListManager() { return coreSession()->ignoreListManager(); }
//! Decode a string using the server (network) decoding.
inline QString serverDecode(const QByteArray &string) const { return decodeServerString(string); }
//! Decode a string using the server (network) decoding.
inline QString serverDecode(const QByteArray &string) const { return decodeServerString(string); }
@@
-111,6
+114,10
@@
public slots:
bool setAutoWhoDone(const QString &channel);
bool setAutoWhoDone(const QString &channel);
+ void updateIssuedModes(const QString &requestedModes);
+ void updatePersistentModes(QString addModes, QString removeModes);
+ void resetPersistentModes();
+
Server usedServer() const;
inline void resetPingTimeout() { _pingCount = 0; }
Server usedServer() const;
inline void resetPingTimeout() { _pingCount = 0; }
@@
-168,7
+175,7
@@
private:
#endif
IrcServerHandler *_ircServerHandler;
#endif
IrcServerHandler *_ircServerHandler;
- UserInputHandler *_userInputHandler;
+
Core
UserInputHandler *_userInputHandler;
CtcpHandler *_ctcpHandler;
QHash<QString, QString> _channelKeys; // stores persistent channels and their passwords, if any
CtcpHandler *_ctcpHandler;
QHash<QString, QString> _channelKeys; // stores persistent channels and their passwords, if any
@@
-200,6
+207,8
@@
private:
int _burstSize; // size of the token bucket
int _tokenBucket; // the virtual bucket that holds the tokens
QList<QByteArray> _msgQueue;
int _burstSize; // size of the token bucket
int _tokenBucket; // the virtual bucket that holds the tokens
QList<QByteArray> _msgQueue;
+
+ QString _requestedUserModes; // 2 strings separated by a '-' character. first part are requested modes to add, the second to remove
};
#endif //CORENETWORK_H
};
#endif //CORENETWORK_H