projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qtui: Fix quit sequence and lifetime issues
[quassel.git]
/
src
/
qtui
/
monoapplication.h
diff --git
a/src/qtui/monoapplication.h
b/src/qtui/monoapplication.h
index
b68ac48
..
6064312
100644
(file)
--- a/
src/qtui/monoapplication.h
+++ b/
src/qtui/monoapplication.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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 *
@@
-20,23
+20,37
@@
#pragma once
#pragma once
+#include <QPointer>
+#include <QThread>
+
#include "qtuiapplication.h"
#include "qtuiapplication.h"
-class CoreApplicationInternal;
+class Core;
+class InternalPeer;
class MonolithicApplication : public QtUiApplication
{
Q_OBJECT
class MonolithicApplication : public QtUiApplication
{
Q_OBJECT
+
public:
MonolithicApplication(int &, char **);
public:
MonolithicApplication(int &, char **);
- ~MonolithicApplication();
- bool init() override;
+ void init() override;
+
+protected:
+ Quassel::QuitHandler quitHandler() override;
+
+signals:
+ void connectInternalPeer(QPointer<InternalPeer> peer);
private slots:
private slots:
+ void onConnectionRequest(QPointer<InternalPeer> peer);
+ void onClientDestroyed();
+
+private:
void startInternalCore();
private:
void startInternalCore();
private:
-
CoreApplicationInternal *_internal
;
-
bool _internalInitDone
;
+
QPointer<Core> _core
;
+
QThread _coreThread
;
};
};