X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fqtuiapplication.cpp;h=a279442b1882dcb84200fee1703d23111aa5d991;hb=e50ae7a06fc4e5d3a911c361d30953410deab609;hp=3d1d3780a09cb591cba4f27b75929cd381cbbbcf;hpb=5c6c9730bd840bcd51f32988dd4e224fed69c85d;p=quassel.git diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp index 3d1d3780..a279442b 100644 --- a/src/qtui/qtuiapplication.cpp +++ b/src/qtui/qtuiapplication.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -23,7 +23,7 @@ #include #include -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include #endif @@ -34,7 +34,7 @@ #include "qtuisettings.h" QtUiApplication::QtUiApplication(int &argc, char **argv) -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 : KApplication(), #else : QApplication(argc, argv), @@ -42,7 +42,7 @@ QtUiApplication::QtUiApplication(int &argc, char **argv) Quassel(), _aboutToQuit(false) { -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 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); -#else /* HAVE_KDE */ +#else /* HAVE_KDE4 */ setDataDirPaths(findDataDirPaths()); -#endif /* HAVE_KDE */ +#endif /* HAVE_KDE4 */ -#if defined(HAVE_KDE) || defined(Q_OS_MAC) +#if defined(HAVE_KDE4) || defined(Q_OS_MAC) disableCrashhandler(); -#endif /* HAVE_KDE || Q_OS_MAC */ +#endif /* HAVE_KDE4 || Q_OS_MAC */ setRunMode(Quassel::ClientOnly); #if QT_VERSION < 0x050000