X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=main%2Fquassel.cpp;h=7ba190b1d4c8f1cb3f4905c95867f139a7c393bc;hp=6e90e13fddd2192da8f850625a0f1b638207c3db;hb=31d998779868a1b572972168b2e813893d70ab90;hpb=e368a1672c4f917bfa6adb52dae3b5ebfcd0db18

diff --git a/main/quassel.cpp b/main/quassel.cpp
index 6e90e13f..7ba190b1 100644
--- a/main/quassel.cpp
+++ b/main/quassel.cpp
@@ -28,12 +28,10 @@
 
 extern void messageHandler(QtMsgType type, const char *msg);
 
-Quassel * Quassel::init() {
-  if(quassel) return quassel;
+Quassel::Quassel() {
+  if(quassel) qFatal("Trying to instantiate more than one Quassel object!");
   qInstallMsgHandler(messageHandler);
-  quassel = new Quassel();
   //initIconMap();
-  return quassel;
 }
 
 /*
@@ -95,5 +93,3 @@ void Quassel::initIconMap() {
 
 Quassel *quassel = 0;
 Quassel::RunMode Quassel::runMode;
-QMutex Quassel::mutex;
-QHash<QString, QVariant> Quassel::data;