projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use std::make_unique
[quassel.git]
/
src
/
core
/
coreapplication.cpp
diff --git
a/src/core/coreapplication.cpp
b/src/core/coreapplication.cpp
index
9ad6ef0
..
8fbf4aa
100644
(file)
--- a/
src/core/coreapplication.cpp
+++ b/
src/core/coreapplication.cpp
@@
-23,11
+23,6
@@
CoreApplication::CoreApplication(int &argc, char **argv)
: QCoreApplication(argc, argv)
{
CoreApplication::CoreApplication(int &argc, char **argv)
: QCoreApplication(argc, argv)
{
-#ifdef Q_OS_MAC
- Quassel::disableCrashHandler();
-#endif /* Q_OS_MAC */
-
- Quassel::setRunMode(Quassel::CoreOnly);
Quassel::registerQuitHandler([this]() {
connect(_core.get(), SIGNAL(shutdownComplete()), this, SLOT(onShutdownComplete()));
_core->shutdown();
Quassel::registerQuitHandler([this]() {
connect(_core.get(), SIGNAL(shutdownComplete()), this, SLOT(onShutdownComplete()));
_core->shutdown();
@@
-37,11
+32,7
@@
CoreApplication::CoreApplication(int &argc, char **argv)
void CoreApplication::init()
{
void CoreApplication::init()
{
- if (!Quassel::init()) {
- throw ExitException{EXIT_FAILURE, tr("Could not initialize Quassel!")};
- }
-
- _core.reset(new Core{}); // FIXME C++14: std::make_unique
+ _core = std::make_unique<Core>();
_core->init();
}
_core->init();
}