X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.h;h=bb4771e8009c68430ebb06f0ad6bc1d4f0caca24;hp=24459cd571f828773463b09e9deba015179a3798;hb=965183188ee726036685fcba379c2559bd183247;hpb=60021fef0c9644e022095043a9072d5ad99c89e4

diff --git a/src/common/quassel.h b/src/common/quassel.h
index 24459cd5..bb4771e8 100644
--- a/src/common/quassel.h
+++ b/src/common/quassel.h
@@ -57,10 +57,9 @@ public:
     QString organizationDomain;
   };
 
-  void setupBuildInfo(const QString &generated);
-
   virtual ~Quassel();
 
+  static void setupBuildInfo(const QString &generated);
   static inline const BuildInfo & buildInfo();
   static inline RunMode runMode();
 
@@ -98,7 +97,7 @@ const Quassel::BuildInfo & Quassel::buildInfo() { return _buildInfo; }
 Quassel::RunMode Quassel::runMode() { return _runMode; }
 void Quassel::setRunMode(Quassel::RunMode mode) { _runMode = mode; }
 
-CliParser *Quassel::cliParser() { return _cliParser; }
+CliParser *Quassel::cliParser() { return _cliParser ? _cliParser : _cliParser = new CliParser(); }
 QString Quassel::optionValue(const QString &key) { return cliParser()->value(key); }
 bool Quassel::isOptionSet(const QString &key) { return cliParser()->isSet(key); }