}
#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);
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() {
}
bool CoreApplication::init() {
- if(Quassel::init())
- return _internal->init();
+ if(Quassel::init() && _internal->init()) {
+ qInstallMsgHandler(Logger::logMessage);
+ return true;
+ }
return false;
}
#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"
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);