projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #102 from mamarley/qcaqt5
[quassel.git]
/
src
/
qtui
/
qtuiapplication.cpp
diff --git
a/src/qtui/qtuiapplication.cpp
b/src/qtui/qtuiapplication.cpp
index
3d1d378
..
a279442
100644
(file)
--- a/
src/qtui/qtuiapplication.cpp
+++ b/
src/qtui/qtuiapplication.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
5
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 *
@@
-23,7
+23,7
@@
#include <QIcon>
#include <QStringList>
#include <QIcon>
#include <QStringList>
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
# include <KStandardDirs>
#endif
# include <KStandardDirs>
#endif
@@
-34,7
+34,7
@@
#include "qtuisettings.h"
QtUiApplication::QtUiApplication(int &argc, char **argv)
#include "qtuisettings.h"
QtUiApplication::QtUiApplication(int &argc, char **argv)
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
: KApplication(),
#else
: QApplication(argc, argv),
: KApplication(),
#else
: QApplication(argc, argv),
@@
-42,7
+42,7
@@
QtUiApplication::QtUiApplication(int &argc, char **argv)
Quassel(),
_aboutToQuit(false)
{
Quassel(),
_aboutToQuit(false)
{
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
Q_UNUSED(argc); Q_UNUSED(argv);
// We need to setup KDE's data dirs
Q_UNUSED(argc); Q_UNUSED(argv);
// We need to setup KDE's data dirs
@@
-52,15
+52,15
@@
QtUiApplication::QtUiApplication(int &argc, char **argv)
dataDirs.append(":/data/");
setDataDirPaths(dataDirs);
dataDirs.append(":/data/");
setDataDirPaths(dataDirs);
-#else /* HAVE_KDE */
+#else /* HAVE_KDE
4
*/
setDataDirPaths(findDataDirPaths());
setDataDirPaths(findDataDirPaths());
-#endif /* HAVE_KDE */
+#endif /* HAVE_KDE
4
*/
-#if defined(HAVE_KDE) || defined(Q_OS_MAC)
+#if defined(HAVE_KDE
4
) || defined(Q_OS_MAC)
disableCrashhandler();
disableCrashhandler();
-#endif /* HAVE_KDE || Q_OS_MAC */
+#endif /* HAVE_KDE
4
|| Q_OS_MAC */
setRunMode(Quassel::ClientOnly);
#if QT_VERSION < 0x050000
setRunMode(Quassel::ClientOnly);
#if QT_VERSION < 0x050000