projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Fix build without SSL
[quassel.git]
/
src
/
core
/
core.h
diff --git
a/src/core/core.h
b/src/core/core.h
index
7da4f22
..
102252b
100644
(file)
--- a/
src/core/core.h
+++ b/
src/core/core.h
@@
-40,12
+40,12
@@
#include "authenticator.h"
#include "bufferinfo.h"
#include "deferredptr.h"
#include "authenticator.h"
#include "bufferinfo.h"
#include "deferredptr.h"
+#include "identserver.h"
#include "message.h"
#include "oidentdconfiggenerator.h"
#include "sessionthread.h"
#include "storage.h"
#include "types.h"
#include "message.h"
#include "oidentdconfiggenerator.h"
#include "sessionthread.h"
#include "storage.h"
#include "types.h"
-#include "identserver.h"
class CoreAuthHandler;
class CoreSession;
class CoreAuthHandler;
class CoreSession;
@@
-68,6
+68,8
@@
public:
Core();
~Core() override;
Core();
~Core() override;
+ void init();
+
/*** Storage access ***/
// These methods are threadsafe.
/*** Storage access ***/
// These methods are threadsafe.
@@
-707,8
+709,11
@@
signals:
//! Emitted when database schema upgrade starts or ends
void dbUpgradeInProgress(bool inProgress);
//! Emitted when database schema upgrade starts or ends
void dbUpgradeInProgress(bool inProgress);
+ //! Emitted when a fatal error was encountered during async initialization
+ void exitRequested(int exitCode, const QString &reason);
+
public slots:
public slots:
-
bool init
();
+
void initAsync
();
/** Persist storage.
*
/** Persist storage.
*
@@
-807,7
+812,7
@@
private:
QDateTime _startTime;
IdentServer *_identServer {nullptr};
QDateTime _startTime;
IdentServer *_identServer {nullptr};
-
+
bool _initialized{false};
bool _configured{false};
bool _initialized{false};
bool _configured{false};