projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build the monolithic client (-DWANT_MONO=ON) by default again, as it's usable now
[quassel.git]
/
src
/
core
/
networkconnection.h
diff --git
a/src/core/networkconnection.h
b/src/core/networkconnection.h
index
a8e0b27
..
d947455
100644
(file)
--- a/
src/core/networkconnection.h
+++ b/
src/core/networkconnection.h
@@
-26,7
+26,7
@@
#include <QStringList>
#include <QTimer>
#include <QStringList>
#include <QTimer>
-#if
ndef QT_NO_OPEN
SSL
+#if
def HAVE_
SSL
# include <QSslSocket>
# include <QSslError>
#else
# include <QSslSocket>
# include <QSslError>
#else
@@
-89,7
+89,7
@@
public:
public slots:
// void setServerOptions();
void connectToIrc(bool reconnecting = false);
public slots:
// void setServerOptions();
void connectToIrc(bool reconnecting = false);
- void disconnectFromIrc(bool requested = true);
+ void disconnectFromIrc(bool requested = true
, const QString &reason = QString()
);
void userInput(BufferInfo bufferInfo, QString msg);
void putRawLine(QByteArray input);
void userInput(BufferInfo bufferInfo, QString msg);
void putRawLine(QByteArray input);
@@
-143,7
+143,7
@@
private slots:
void startAutoWhoCycle();
void nickChanged(const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
void startAutoWhoCycle();
void nickChanged(const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
-#if
ndef QT_NO_OPEN
SSL
+#if
def HAVE_
SSL
void socketEncrypted();
void sslErrors(const QList<QSslError> &errors);
#endif
void socketEncrypted();
void sslErrors(const QList<QSslError> &errors);
#endif
@@
-151,7
+151,7
@@
private slots:
void fillBucketAndProcessQueue();
private:
void fillBucketAndProcessQueue();
private:
-#if
ndef QT_NO_OPEN
SSL
+#if
def HAVE_
SSL
QSslSocket socket;
#else
QTcpSocket socket;
QSslSocket socket;
#else
QTcpSocket socket;
@@
-175,6
+175,9
@@
private:
QTimer _socketCloseTimer;
QTimer _socketCloseTimer;
+ /* this flag triggers quitRequested() once the socket is closed
+ * it is needed to determine whether or not the connection needs to be
+ *in the automatic session restore. */
bool _quitRequested;
bool _previousConnectionAttemptFailed;
bool _quitRequested;
bool _previousConnectionAttemptFailed;
@@
-198,8
+201,6
@@
private:
void writeToSocket(QByteArray s);
void writeToSocket(QByteArray s);
-
-
class ParseError : public Exception {
public:
ParseError(QString cmd, QString prefix, QStringList params);
class ParseError : public Exception {
public:
ParseError(QString cmd, QString prefix, QStringList params);