X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=b5e205b8e6360a46c44dfede86778c6889e89b18;hp=aa1c75ad12a0fae734cf4624ff937de3c707a216;hb=85b55cf023c96f4dbd61ec415a15214f99e281b3;hpb=5225cf288d73e76905f85380ec52418c3b04efee diff --git a/src/common/main.cpp b/src/common/main.cpp index aa1c75ad..b5e205b8 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -142,22 +142,10 @@ int main(int argc, char **argv) { signal(SIGBUS, handle_crash); signal(SIGSEGV, handle_crash); #endif // #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) - + Global::registerMetaTypes(); Global::setupVersion(); -/* -#if defined BUILD_CORE - Global::runMode = Global::CoreOnly; - QCoreApplication app(argc, argv); -#elif defined BUILD_QTUI - Global::runMode = Global::ClientOnly; - QApplication app(argc, argv); -#else - Global::runMode = Global::Monolithic; - QApplication app(argc, argv); -#endif -*/ #if defined BUILD_CORE Global::runMode = Global::CoreOnly; QCoreApplication app(argc, argv); @@ -230,7 +218,7 @@ int main(int argc, char **argv) { QCoreApplication::setApplicationName("Quassel IRC"); QCoreApplication::setOrganizationName("Quassel Project"); - + #ifndef BUILD_QTUI Core::instance(); // create and init the core #endif @@ -252,10 +240,10 @@ int main(int argc, char **argv) { } #endif -#ifndef BUILD_CORE +#ifndef BUILD_CORE app.resumeSessionIfPossible(); #endif - + int exitCode = app.exec(); #ifndef BUILD_QTUI