projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement sender matching for highlight rules
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
d7b2ceb
..
3bc7cd0
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-31,6
+31,7
@@
#include "protocol.h"
#include "message.h"
#include "storage.h"
#include "protocol.h"
#include "message.h"
#include "storage.h"
+#include "corehighlightrulemanager.h"
class CoreBacklogManager;
class CoreBufferSyncer;
class CoreBacklogManager;
class CoreBufferSyncer;
@@
-87,6
+88,7
@@
public:
inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; }
inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; }
+ inline HighlightRuleManager *highlightRuleManager() { return &_highlightRuleManager; }
inline CoreTransferManager *transferManager() const { return _transferManager; }
inline CoreDccConfig *dccConfig() const { return _dccConfig; }
inline CoreTransferManager *transferManager() const { return _transferManager; }
inline CoreDccConfig *dccConfig() const { return _dccConfig; }
@@
-131,6
+133,8
@@
public slots:
void changePassword(PeerPtr peer, const QString &userName, const QString &oldPassword, const QString &newPassword);
void changePassword(PeerPtr peer, const QString &userName, const QString &oldPassword, const QString &newPassword);
+ void kickClient(int peerId);
+
QHash<QString, QString> persistentChannels(NetworkId) const;
/**
QHash<QString, QString> persistentChannels(NetworkId) const;
/**
@@
-169,6
+173,8
@@
signals:
void passwordChanged(PeerPtr peer, bool success);
void passwordChanged(PeerPtr peer, bool success);
+ void disconnectFromCore();
+
protected:
virtual void customEvent(QEvent *event);
protected:
virtual void customEvent(QEvent *event);
@@
-234,6
+240,7
@@
private:
QList<RawMessage> _messageQueue;
bool _processMessages;
CoreIgnoreListManager _ignoreListManager;
QList<RawMessage> _messageQueue;
bool _processMessages;
CoreIgnoreListManager _ignoreListManager;
+ CoreHighlightRuleManager _highlightRuleManager;
};
};