projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Fix build with Qt 5.11
[quassel.git]
/
src
/
core
/
coreapplication.h
diff --git
a/src/core/coreapplication.h
b/src/core/coreapplication.h
index
b350d52
..
af53d88
100644
(file)
--- a/
src/core/coreapplication.h
+++ b/
src/core/coreapplication.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 *
@@
-18,8
+18,7
@@
* 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
#include <QCoreApplication>
#include <QCoreApplication>
@@
-38,21
+37,12
@@
public:
bool init();
bool init();
- /**
- * Requests a reload of relevant runtime configuration.
- *
- * In particular, signals to the Core to reload SSL certificates.
- *
- * @return True if configuration reload successful, otherwise false
- */
- bool reloadConfig();
-
private:
bool _coreCreated;
};
private:
bool _coreCreated;
};
-class CoreApplication : public QCoreApplication
, public Quassel
+class CoreApplication : public QCoreApplication
{
Q_OBJECT
public:
{
Q_OBJECT
public:
@@
-61,18
+51,6
@@
public:
bool init();
bool init();
- /**
- * Requests a reload of relevant runtime configuration.
- *
- * @see Quassel::reloadConfig()
- *
- * @return True if configuration reload successful, otherwise false
- */
- bool reloadConfig();
-
private:
CoreApplicationInternal *_internal;
};
private:
CoreApplicationInternal *_internal;
};
-
-
-#endif