X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fglobal.h;h=26f9f6b90afecd2df135c32e7909b54c20c67c8a;hb=8ff5e8deb3662e1b540574e8f7a07d39edcf737e;hp=0759c27e28aa365fc34adbd26ea2f85fe92c9730;hpb=2bcb925e42921b124efd19d1978ff19f44a09113;p=quassel.git

diff --git a/src/common/global.h b/src/common/global.h
index 0759c27e..26f9f6b9 100644
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -23,6 +23,8 @@
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
+#include "cliparser.h"
+
 #include <QString>
 
 // Enable some shortcuts and stuff
@@ -33,16 +35,17 @@
 namespace Global {
 
   extern QString quasselVersion;
-  extern QString quasselDate;
-  extern uint quasselBuild;
+  extern QString quasselBaseVersion;
+  extern QString quasselBuildDate;
+  extern QString quasselBuildTime;
+  extern QString quasselCommit;
+  extern uint quasselArchiveDate;
+  extern uint protocolVersion;
 
-  //! Minimum client build number the core needs
-  extern uint clientBuildNeeded;
-  extern QString clientVersionNeeded;
+  extern uint clientNeedsProtocol;  //< Minimum protocol version the client needs
+  extern uint coreNeedsProtocol;    //< Minimum protocol version the core needs
 
-  //! Minimum core build number the client needs
-  extern uint coreBuildNeeded;
-  extern QString coreVersionNeeded;
+  extern QString quasselGeneratedVersion;  //< This is possibly set in version.gen
 
   // We need different config (QSettings) files for client and gui, since the core cannot work with GUI types
   // Set these here. They're used in ClientSettings and CoreSettings.
@@ -54,8 +57,9 @@ namespace Global {
   extern unsigned int defaultPort;
 
   extern bool DEBUG;
-
+  extern CliParser parser;
   void registerMetaTypes();
+  void setupVersion();
 };
 
 #endif