/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
CoreApplicationInternal::CoreApplicationInternal()
: _coreCreated(false)
{
- Q_INIT_RESOURCE(sql);
+
}
CoreApplicationInternal::~CoreApplicationInternal() {
Core::instance(); // create and init the core
_coreCreated = true;
- // if using KDE, option is called "restore" instead of "norestore"
- if(Quassel::isOptionSet("restore") || !Quassel::isOptionSet("norestore"))
+ if(!Quassel::isOptionSet("norestore"))
Core::restoreState();
return true;
/*****************************************************************************/
CoreApplication::CoreApplication(int &argc, char **argv)
-#ifdef HAVE_KDE
- : KApplication(false),
-#else
- : QCoreApplication(argc, argv),
-#endif
- Quassel()
+ : QCoreApplication(argc, argv), Quassel()
{
+#ifdef Q_OS_MAC
+ disableCrashhandler();
+#endif /* Q_OS_MAC */
+
setRunMode(Quassel::CoreOnly);
_internal = new CoreApplicationInternal();
-
- qInstallMsgHandler(Logger::logMessage);
}
CoreApplication::~CoreApplication() {
}
bool CoreApplication::init() {
- if(Quassel::init())
- return _internal->init();
+ if(Quassel::init() && _internal->init()) {
+ qInstallMsgHandler(Logger::logMessage);
+ return true;
+ }
return false;
}