projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PSQL] properly preparing insert_sender queries (in all cases) before using them
[quassel.git]
/
src
/
core
/
coreuserinputhandler.h
diff --git
a/src/core/coreuserinputhandler.h
b/src/core/coreuserinputhandler.h
index
4cb2eb8
..
7c4e930
100644
(file)
--- a/
src/core/coreuserinputhandler.h
+++ b/
src/core/coreuserinputhandler.h
@@
-22,7
+22,9
@@
#define COREUSERINPUTHANDLER_H
#include "corebasichandler.h"
#define COREUSERINPUTHANDLER_H
#include "corebasichandler.h"
+#include "corenetwork.h"
+class Cipher;
class Server;
class CoreUserInputHandler : public CoreBasicHandler {
class Server;
class CoreUserInputHandler : public CoreBasicHandler {
@@
-30,6
+32,7
@@
class CoreUserInputHandler : public CoreBasicHandler {
public:
CoreUserInputHandler(CoreNetwork *parent = 0);
public:
CoreUserInputHandler(CoreNetwork *parent = 0);
+ inline CoreNetwork *coreNetwork() const { return qobject_cast<CoreNetwork *>(parent()); }
void handleUserInput(const BufferInfo &bufferInfo, const QString &text);
void handleUserInput(const BufferInfo &bufferInfo, const QString &text);
@@
-77,13
+80,13
@@
protected:
private:
void banOrUnban(const BufferInfo &bufferInfo, const QString &text, bool ban);
private:
void banOrUnban(const BufferInfo &bufferInfo, const QString &text, bool ban);
- void putPrivmsg(const QByteArray &target, const QByteArray &message,
bool encrypted
);
+ void putPrivmsg(const QByteArray &target, const QByteArray &message,
Cipher *cipher = 0
);
int lastParamOverrun(const QString &cmd, const QList<QByteArray> ¶ms);
int lastParamOverrun(const QString &cmd, const QList<QByteArray> ¶ms);
-
#ifdef HAVE_QCA2
- QByteArray encrypt(const Q
ByteArray &target, QByteArray &message)
;
-
#endif
-
+#ifdef HAVE_QCA2
+ QByteArray encrypt(const Q
String &target, const QByteArray &message, bool *didEncrypt = 0) const
;
+#endif
+
struct Command {
BufferInfo bufferInfo;
QString command;
struct Command {
BufferInfo bufferInfo;
QString command;