projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix wordwrap when using Qt > 4.6.3
[quassel.git]
/
src
/
core
/
coreapplication.cpp
diff --git
a/src/core/coreapplication.cpp
b/src/core/coreapplication.cpp
index
ca0f527
..
f7f36c5
100644
(file)
--- a/
src/core/coreapplication.cpp
+++ b/
src/core/coreapplication.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8 by the Quassel IRC Team
*
+ * Copyright (C) 2005-0
9 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 *
@@
-26,7
+26,7
@@
CoreApplicationInternal::CoreApplicationInternal()
: _coreCreated(false)
{
CoreApplicationInternal::CoreApplicationInternal()
: _coreCreated(false)
{
- Q_INIT_RESOURCE(sql);
+
}
CoreApplicationInternal::~CoreApplicationInternal() {
}
CoreApplicationInternal::~CoreApplicationInternal() {
@@
-52,12
+52,7
@@
bool CoreApplicationInternal::init() {
Core::instance(); // create and init the core
_coreCreated = true;
Core::instance(); // create and init the core
_coreCreated = true;
-#ifdef HAVE_KDE
- // if using KDE, option is called "restore" instead of "norestore"
- if(Quassel::isOptionSet("restore"))
-#else
if(!Quassel::isOptionSet("norestore"))
if(!Quassel::isOptionSet("norestore"))
-#endif
Core::restoreState();
return true;
Core::restoreState();
return true;
@@
-66,12
+61,11
@@
bool CoreApplicationInternal::init() {
/*****************************************************************************/
CoreApplication::CoreApplication(int &argc, char **argv)
/*****************************************************************************/
CoreApplication::CoreApplication(int &argc, char **argv)
-#ifdef HAVE_KDE
-: KApplication(false), Quassel() {
- Q_UNUSED(argc); Q_UNUSED(argv);
-#else
-: QCoreApplication(argc, argv), Quassel() {
-#endif
+ : QCoreApplication(argc, argv), Quassel()
+{
+#ifdef Q_OS_MAC
+ disableCrashhandler();
+#endif /* Q_OS_MAC */
setRunMode(Quassel::CoreOnly);
_internal = new CoreApplicationInternal();
setRunMode(Quassel::CoreOnly);
_internal = new CoreApplicationInternal();