X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fglobal.h;h=bd25ccdb566d772c56757f8d0489629ce78fe470;hp=4b337d5c888916aa9f056935f95a6d414ccc9e31;hb=8699dd758516d0ded076811e8ea656adc95e69d0;hpb=8f6f3932998ffb3778e4e077dfb301da4cf34c1f

diff --git a/src/common/global.h b/src/common/global.h
index 4b337d5c..bd25ccdb 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,20 +23,30 @@
 #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 3
+#define GUI_PROTOCOL 4
 
-#define DEFAULT_PORT 4242
+//#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