projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a bug where the session restore always marked you as away
[quassel.git]
/
src
/
client
/
clientsyncer.h
diff --git
a/src/client/clientsyncer.h
b/src/client/clientsyncer.h
index
7ff5399
..
aa8d786
100644
(file)
--- a/
src/client/clientsyncer.h
+++ b/
src/client/clientsyncer.h
@@
-44,7
+44,7
@@
public:
ClientSyncer(QObject *parent = 0);
~ClientSyncer();
ClientSyncer(QObject *parent = 0);
~ClientSyncer();
- inline const QIODevice *currentDevice() { return socket; }
+ inline const QIODevice *currentDevice() { return
_
socket; }
signals:
void recvPartialItem(quint32 avail, quint32 size);
signals:
void recvPartialItem(quint32 avail, quint32 size);
@@
-100,6
+100,7
@@
private slots:
void setWarningsHandler(const char *slot);
void resetWarningsHandler();
void setWarningsHandler(const char *slot);
void resetWarningsHandler();
+ void resetConnection();
#ifdef HAVE_SSL
void ignoreSslWarnings(bool permanently);
#ifdef HAVE_SSL
void ignoreSslWarnings(bool permanently);
@@
-108,8
+109,9
@@
private slots:
#endif
private:
#endif
private:
- QPointer<QIODevice> socket;
- quint32 blockSize;
+ QPointer<QIODevice> _socket;
+ quint32 _blockSize;
+
QVariantMap coreConnectionInfo;
QVariantMap _coreMsgBuffer;
QVariantMap coreConnectionInfo;
QVariantMap _coreMsgBuffer;