From 96c9508110f38a19be161652ea888c7d61ba279b Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Fri, 26 Dec 2008 03:08:22 +0100
Subject: [PATCH] Some more fixes

---
 src/common/cliparser.cpp     |  4 +++-
 src/core/coreapplication.cpp | 16 ++++++++--------
 src/qtui/mainwin.cpp         | 21 +++++++++++----------
 src/qtui/qtuiapplication.cpp |  7 ++++---
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/common/cliparser.cpp b/src/common/cliparser.cpp
index 2116577d..a5b72234 100644
--- a/src/common/cliparser.cpp
+++ b/src/common/cliparser.cpp
@@ -58,7 +58,9 @@ void CliParser::usage() {
 }
 
 #else
-void CliParser::addArgument(const QString &longName, const CliParserArg &arg) {
+void CliParser::addArgument(const QString &longName_, const CliParserArg &arg) {
+  QString longName = longName_;
+  longName.remove(QRegExp("\\s*<.*>\\s*")); // KCmdLineArgs takes args of the form "arg <defval>"
   if(argsHash.contains(longName)) qWarning() << "Warning: Multiple definition of argument" << longName;
   if(arg.shortName != 0 && !lnameOfShortArg(arg.shortName).isNull())
     qWarning().nospace() << "Warning: Redefining shortName '" << arg.shortName << "' for " << longName << " previously defined for " << lnameOfShortArg(arg.shortName);
diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 99fcfd80..9ad452ed 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -63,16 +63,14 @@ bool CoreApplicationInternal::init() {
 
 CoreApplication::CoreApplication(int &argc, char **argv)
 #ifdef HAVE_KDE
-  : KApplication(false),
+: KApplication(false), Quassel() {
+  Q_UNUSED(argc); Q_UNUSED(argv);
 #else
-  : QCoreApplication(argc, argv),
+: QCoreApplication(argc, argv), Quassel() {
 #endif
-    Quassel()
-{
+
   setRunMode(Quassel::CoreOnly);
   _internal = new CoreApplicationInternal();
-
-  qInstallMsgHandler(Logger::logMessage);
 }
 
 CoreApplication::~CoreApplication() {
@@ -80,7 +78,9 @@ CoreApplication::~CoreApplication() {
 }
 
 bool CoreApplication::init() {
-  if(Quassel::init())
-    return _internal->init();
+  if(Quassel::init() && _internal->init()) {
+    qInstallMsgHandler(Logger::logMessage);
+    return true;
+  }
   return false;
 }
diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 9d9bb815..06c9b899 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -62,17 +62,18 @@
 #include "topicwidget.h"
 #include "verticaldock.h"
 
-#ifdef HAVE_DBUS
-#  include "desktopnotificationbackend.h"
-#endif
-#ifdef HAVE_PHONON
-#  include "phononnotificationbackend.h"
-#endif
-#ifdef HAVE_KDE
+#ifndef HAVE_KDE
+#  ifdef HAVE_DBUS
+#    include "desktopnotificationbackend.h"
+#  endif
+#  ifdef HAVE_PHONON
+#    include "phononnotificationbackend.h"
+#  endif
+#  include "systraynotificationbackend.h"
+#  include "taskbarnotificationbackend.h"
+#else /* HAVE_KDE */
 #  include "knotificationbackend.h"
-#endif
-#include "systraynotificationbackend.h"
-#include "taskbarnotificationbackend.h"
+#endif /* HAVE_KDE */
 
 #include "settingspages/aliasessettingspage.h"
 #include "settingspages/appearancesettingspage.h"
diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 6972dd04..108b4bff 100644
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -48,11 +48,12 @@
 
 QtUiApplication::QtUiApplication(int &argc, char **argv)
 #ifdef HAVE_KDE
-  : KApplication(), Quassel()
+  : KApplication(), Quassel() {
+  Q_UNUSED(argc); Q_UNUSED(argv);
 #else
-  : QApplication(argc, argv), Quassel()
+  : QApplication(argc, argv), Quassel() {
 #endif
-{
+
   setRunMode(Quassel::ClientOnly);
 
   qInstallMsgHandler(Client::logMessage);
-- 
2.20.1