projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the STORED attribute from Q_PROPERTY declarations
[quassel.git]
/
src
/
core
/
corenetwork.h
diff --git
a/src/core/corenetwork.h
b/src/core/corenetwork.h
index
4757578
..
bb7b12a
100644
(file)
--- a/
src/core/corenetwork.h
+++ b/
src/core/corenetwork.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-120,9
+120,10
@@
public slots:
// Blowfish stuff
#ifdef HAVE_QCA2
// Blowfish stuff
#ifdef HAVE_QCA2
- Cipher *cipher(const QString &recipient)
const
;
+ Cipher *cipher(const QString &recipient);
QByteArray cipherKey(const QString &recipient) const;
void setCipherKey(const QString &recipient, const QByteArray &key);
QByteArray cipherKey(const QString &recipient) const;
void setCipherKey(const QString &recipient, const QByteArray &key);
+ bool cipherUsesCBC(const QString &target);
#endif
void setAutoWhoEnabled(bool enabled);
#endif
void setAutoWhoEnabled(bool enabled);
@@
-173,7
+174,7
@@
private slots:
void socketHasData();
void socketError(QAbstractSocket::SocketError);
void socketInitialized();
void socketHasData();
void socketError(QAbstractSocket::SocketError);
void socketInitialized();
- inline void socketCloseTimeout() { socket.
disconnectFromHos
t(); }
+ inline void socketCloseTimeout() { socket.
abor
t(); }
void socketDisconnected();
void socketStateChanged(QAbstractSocket::SocketState);
void networkInitialized();
void socketDisconnected();
void socketStateChanged(QAbstractSocket::SocketState);
void networkInitialized();
@@
-225,6
+226,7
@@
private:
QTimer _pingTimer;
uint _lastPingTime;
uint _pingCount;
QTimer _pingTimer;
uint _lastPingTime;
uint _pingCount;
+ bool _sendPings;
QStringList _autoWhoQueue;
QHash<QString, int> _autoWhoPending;
QStringList _autoWhoQueue;
QHash<QString, int> _autoWhoPending;
@@
-237,9
+239,6
@@
private:
QList<QByteArray> _msgQueue;
QString _requestedUserModes; // 2 strings separated by a '-' character. first part are requested modes to add, the second to remove
QList<QByteArray> _msgQueue;
QString _requestedUserModes; // 2 strings separated by a '-' character. first part are requested modes to add, the second to remove
-
- // Blowfish key map
- QHash<QString, QByteArray> _cipherKeys;
};
};