projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use braced-init list when returning types
[quassel.git]
/
src
/
client
/
coreconnection.h
diff --git
a/src/client/coreconnection.h
b/src/client/coreconnection.h
index
69b4c9e
..
7902022
100644
(file)
--- a/
src/client/coreconnection.h
+++ b/
src/client/coreconnection.h
@@
-20,6
+20,8
@@
#pragma once
#pragma once
+#include "client-export.h"
+
#include <QNetworkConfigurationManager>
#include <QPointer>
#include <QTimer>
#include <QNetworkConfigurationManager>
#include <QPointer>
#include <QTimer>
@@
-41,7
+43,7
@@
class Network;
class Peer;
class SignalProxy;
class Peer;
class SignalProxy;
-class CoreConnection : public QObject
+class C
LIENT_EXPORT C
oreConnection : public QObject
{
Q_OBJECT
{
Q_OBJECT
@@
-54,7
+56,7
@@
public:
Synchronized
};
Synchronized
};
- CoreConnection(QObject *parent =
0
);
+ CoreConnection(QObject *parent =
nullptr
);
void init();
void init();
@@
-150,18
+152,18
@@
private slots:
private:
QPointer<ClientAuthHandler> _authHandler;
QPointer<Peer> _peer;
private:
QPointer<ClientAuthHandler> _authHandler;
QPointer<Peer> _peer;
- ConnectionState _state;
+ ConnectionState _state
{Disconnected}
;
QTimer _reconnectTimer;
QTimer _reconnectTimer;
- bool _wantReconnect;
- bool _wasReconnect;
+ bool _wantReconnect
{false}
;
+ bool _wasReconnect
{false}
;
QSet<QObject *> _netsToSync;
int _numNetsToSync;
QSet<QObject *> _netsToSync;
int _numNetsToSync;
- int _progressMinimum
, _progressMaximum, _progressValue
;
+ int _progressMinimum
{0}, _progressMaximum{-1}, _progressValue{-1}
;
QString _progressText;
QString _progressText;
- bool _resetting;
+ bool _resetting
{false}
;
CoreAccount _account;
CoreAccountModel *accountModel() const;
CoreAccount _account;
CoreAccountModel *accountModel() const;