projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Modernize compile settings; require C++14
[quassel.git]
/
src
/
core
/
coreapplication.h
diff --git
a/src/core/coreapplication.h
b/src/core/coreapplication.h
index
2bd5386
..
216eda0
100644
(file)
--- a/
src/core/coreapplication.h
+++ b/
src/core/coreapplication.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
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 *
@@
-18,47
+18,29
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#ifndef COREAPPLICATION_H_
-#define COREAPPLICATION_H_
+#pragma once
-#ifdef HAVE_KDE
-# include <KApplication>
-#else
-# include <QCoreApplication>
-#endif
+#include <memory>
-#include "quassel.h"
-
-/// Encapsulates CoreApplication's logic.
-/** This allows it to be reused within MonolithicApplication as well.
- */
-class CoreApplicationInternal
-{
- Q_DECLARE_TR_FUNCTIONS(CoreApplicationInternal)
+#include <QCoreApplication>
-public:
- CoreApplicationInternal();
- ~CoreApplicationInternal();
-
- bool init();
-
-private:
- bool _coreCreated;
-};
+#include "core.h"
+#include "quassel.h"
+class Core;
-class CoreApplication : public QCoreApplication
, public Quassel
+class CoreApplication : public QCoreApplication
{
Q_OBJECT
{
Q_OBJECT
+
public:
CoreApplication(int &argc, char **argv);
public:
CoreApplication(int &argc, char **argv);
- ~CoreApplication();
- bool init();
+ void init();
+
+private slots:
+ void onShutdownComplete();
private:
private:
-
CoreApplicationInternal *_internal
;
+
std::unique_ptr<Core> _core
;
};
};
-
-
-#endif