Committing a whole bunch of Identity-related stuff that's not actually used yet,

[quassel.git] / src / common / global.h

diff --git a/src/common/global.h b/src/common/global.h
index c298766..e8db8bb 100644 (file)
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -23,16 +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 IRC Core";
+  const QString clientApplicationName = "Quassel IRC Client";
+
   enum RunMode { Monolithic, ClientOnly, CoreOnly };
   extern RunMode runMode;
+  extern unsigned int defaultPort;
+
+  void registerMetaTypes();
 }
 
 #endif