X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fglobal.h;h=dadbb91f6f3a771ed9ded35eb8334ba87ee35c24;hp=6da6103ca621f47ea7295e714015b8d1a0b1bf9c;hb=21d8d7f0a79eeeb541664aa80ce481fdbfc41f09;hpb=70706ff642683d03ff091cab25d984ec7d9612de

diff --git a/src/common/global.h b/src/common/global.h
index 6da6103c..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        *
@@ -18,43 +18,34 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+// This file needs probably to go away at some point. Not much left anymore.
+
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
-/** The protocol version we use fo the communication between core and GUI */
-#define GUI_PROTOCOL 3
+#include <QString>
 
-#define BACKLOG_FORMAT 2
-#define BACKLOG_STRING "QuasselIRC Backlog File"
+// Enable some shortcuts and stuff
+//#define DEVELMODE
 
-#define DEFAULT_PORT 4242
+/** The protocol version we use fo the communication between core and GUI */
+#define GUI_PROTOCOL 4
 
-#include <QHash>
-#include <QMutex>
-#include <QString>
-#include <QVariant>
+//#define DEFAULT_PORT 4242
 
 /* Some global stuff */
 
-typedef uint UserId;
-typedef uint MsgId;
-typedef uint BufferId;
-typedef uint NetworkId;
-
 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 QString quasselDir;
-}
-
-struct Exception {
-    Exception(QString msg = "Unknown Exception") : _msg(msg) {};
-    virtual ~Exception() {}; // make gcc happy
-    virtual inline QString msg() { return _msg; }
+  extern unsigned int defaultPort;
 
-  protected:
-    QString _msg;
-
-};
+  void registerMetaTypes();
+}
 
 #endif