X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=1e6e1ed8ccd26041614923daed408ca12ae117ed;hb=de6fd75928284a7c8788e00a36e5de7e64b9e168;hp=84301f96d85d5a416d195e6830d625d6a033c9f5;hpb=4493458caaa821deb69a0cddf13beb98394977bb;p=quassel.git

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 84301f96..1e6e1ed8 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -42,8 +42,6 @@ bool Quassel::DEBUG = false;
 QString Quassel::_coreDumpFileName;
 
 Quassel::Quassel() {
-  Q_INIT_RESOURCE(i18n);
-
   // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
   signal(SIGTERM, handleSignal);
   signal(SIGINT, handleSignal);
@@ -58,11 +56,6 @@ Quassel::Quassel() {
 #  endif
 #endif
 
-  _cliParser = new CliParser();
-
-  // put shared client&core arguments here
-  cliParser()->addSwitch("debug",'d', tr("Enable debug output"));
-  cliParser()->addSwitch("help",'h', tr("Display this help and exit"));
 }
 
 Quassel::~Quassel() {
@@ -78,18 +71,15 @@ bool Quassel::init() {
 
   registerMetaTypes();
 
-  QCoreApplication::setApplicationName(buildInfo().applicationName);
-  QCoreApplication::setOrganizationName(buildInfo().organizationName);
-  QCoreApplication::setOrganizationDomain(buildInfo().organizationDomain);
-
   Network::setDefaultCodecForServer("ISO-8859-1");
   Network::setDefaultCodecForEncoding("UTF-8");
   Network::setDefaultCodecForDecoding("ISO-8859-15");
 
-  if(!cliParser()->parse(QCoreApplication::arguments()) || isOptionSet("help")) {
+  if(isOptionSet("help")) {
     cliParser()->usage();
     return false;
   }
+
   DEBUG = isOptionSet("debug");
   return true;
 }