X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fglobal.h;h=1c72f05e450daa37572bbe0b21f0fe3ddea22328;hb=f9fc50a5e043668a2525a6c0903ea339d4ba05b7;hp=79cfce53628b81df578c82d94ae2a37391187a36;hpb=53fb39baea40512c3b88abcf37a14cef05fcc287;p=quassel.git

diff --git a/src/common/global.h b/src/common/global.h
index 79cfce53..1c72f05e 100644
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005 by the Quassel IRC Team                            *
+ *   Copyright (C) 2005 by the Quassel Project                             *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,21 +23,29 @@
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
+#include <QString>
+
 // Enable some shortcuts and stuff
 //#define DEVELMODE
 
-
 /** The protocol version we use fo the communication between core and GUI */
-#define GUI_PROTOCOL 4
+#define GUI_PROTOCOL 5
 
 //#define DEFAULT_PORT 4242
 
 /* Some global stuff */
 
 namespace Global {
+  // 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.
+  const QString coreApplicationName = "Quassel Core";
+  const QString clientApplicationName = "Quassel Client";
+
   enum RunMode { Monolithic, ClientOnly, CoreOnly };
   extern RunMode runMode;
   extern unsigned int defaultPort;
+
+  void registerMetaTypes();
 }
 
 #endif