projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use nullptr
[quassel.git]
/
src
/
client
/
client.h
diff --git
a/src/client/client.h
b/src/client/client.h
index
00c9c97
..
7642c3e
100644
(file)
--- a/
src/client/client.h
+++ b/
src/client/client.h
@@
-20,6
+20,10
@@
#pragma once
#pragma once
+#include "client-export.h"
+
+#include <memory>
+
#include <QList>
#include <QPointer>
#include <QList>
#include <QPointer>
@@
-29,6
+33,7
@@
#include "coreconnection.h"
#include "highlightrulemanager.h"
#include "quassel.h"
#include "coreconnection.h"
#include "highlightrulemanager.h"
#include "quassel.h"
+#include "singleton.h"
#include "types.h"
class Message;
#include "types.h"
class Message;
@@
-63,7
+68,7
@@
class TransferModel;
struct NetworkInfo;
struct NetworkInfo;
-class C
lient : public QObject
+class C
LIENT_EXPORT Client : public QObject, public Singleton<Client>
{
Q_OBJECT
{
Q_OBJECT
@@
-73,10
+78,9
@@
public:
RemoteCore
};
RemoteCore
};
- static bool instanceExists();
- static Client *instance();
- static void destroy();
- static void init(AbstractUi *);
+ Client(std::unique_ptr<AbstractUi>, QObject *parent = nullptr);
+ ~Client() override;
+
static AbstractUi *mainUi();
static QList<NetworkId> networkIds();
static AbstractUi *mainUi();
static QList<NetworkId> networkIds();
@@
-292,10
+296,6
@@
private slots:
void sendBufferedUserInput();
private:
void sendBufferedUserInput();
private:
- Client(QObject *parent = 0);
- virtual ~Client();
- void init();
-
void requestInitialBacklog();
/**
void requestInitialBacklog();
/**
@@
-311,10
+311,8
@@
private:
static void addNetwork(Network *);
static void addNetwork(Network *);
- static QPointer<Client> instanceptr;
-
SignalProxy *_signalProxy;
SignalProxy *_signalProxy;
-
AbstractUi *
_mainUi;
+
std::unique_ptr<AbstractUi>
_mainUi;
NetworkModel *_networkModel;
BufferModel *_bufferModel;
BufferSyncer *_bufferSyncer;
NetworkModel *_networkModel;
BufferModel *_bufferModel;
BufferSyncer *_bufferSyncer;