X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fglobal.h;h=dadbb91f6f3a771ed9ded35eb8334ba87ee35c24;hp=73ddd0be36297a15c77d2b83f9da2b876e72c509;hb=21d8d7f0a79eeeb541664aa80ce481fdbfc41f09;hpb=99c92e21b3b9eb5ed661632cdfb69aabfc6b2deb

diff --git a/src/common/global.h b/src/common/global.h
index 73ddd0be..dadbb91f 100644
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005 by The Quassel Team                                *
+ *   Copyright (C) 2005 by the Quassel Project                             *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -23,16 +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 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