X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=57d60333f97d1420e754551379b7d475841a85d9;hp=788fb37279a2337fbb575d04fd99cc23b2950a2b;hb=af5ee11e78a6c98f755d0cc5e3bef77028b227dd;hpb=965183188ee726036685fcba379c2559bd183247 diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp index 788fb372..57d60333 100644 --- a/src/common/quassel.cpp +++ b/src/common/quassel.cpp @@ -35,15 +35,13 @@ #include "syncableobject.h" Quassel::BuildInfo Quassel::_buildInfo; -CliParser *Quassel::_cliParser = 0; +AbstractCliParser *Quassel::_cliParser = 0; Quassel::RunMode Quassel::_runMode; bool Quassel::_initialized = false; 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); @@ -73,10 +71,6 @@ 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");