Work In Progress

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index fe1af92..c2fa0b6 100644 (file)
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -1,6 +1,6 @@
-SET(core_SRCS logger.cpp quassel.cpp proxy.cpp core.cpp)
-SET(core_HDRS quassel.h proxy.h)
-SET(core_MOCS logger.h core.h)
+SET(core_SRCS logger.cpp quassel.cpp core.cpp)
+SET(core_HDRS )
+SET(core_MOCS logger.h core.h quassel.h)
 
 QT4_WRAP_CPP(_MOC ${core_MOCS})
 ADD_LIBRARY(core ${_MOC} ${core_SRCS} ${core_HDRS})

diff --git a/core/logger.cpp b/core/logger.cpp
deleted file mode 100644 (file)
index cc9482c..0000000
--- a/core/logger.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005 by The Quassel Team                                *
- *   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.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include "quassel.h"
-#include "logger.h"
-
-#include <iostream>
-
-
-
-Logger::~Logger() {
-  qInstallMsgHandler(0);
-}
-
-void messageHandler(QtMsgType type, const char *msg) {
-  switch (type) {
-    case QtDebugMsg:
-      std::cerr << "[DEBUG] " << msg << "\n";
-      break;
-    case QtWarningMsg:
-      std::cerr << "[WARNING] " << msg << "\n";
-      break;
-    case QtCriticalMsg:
-      std::cerr << "[CRITICAL] " << msg << "\n";
-      break;
-    case QtFatalMsg:
-      std::cerr << "[FATAL] " << msg << "\n";
-      abort(); // deliberately core dump
-  }
-}
-
-Logger::Logger() {
-  qInstallMsgHandler(messageHandler);
-}

diff --git a/core/logger.h b/core/logger.h
deleted file mode 100644 (file)
index ba8eba4..0000000
--- a/core/logger.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005 by The Quassel Team                                *
- *   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.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef _LOGGER_H_
-#define _LOGGER_H_
-
-#include <QtCore>
-
-class Logger : public QObject {
-  Q_OBJECT
-
-  public:
-    Logger();
-    virtual ~Logger();
-
-
-
-  private:
-    //void messageHandler(QtMsgType type, const char *msg);
-};
-
-
-
-#endif

diff --git a/core/quassel.h b/core/quassel.h
index 3b7b5f7..a054e08 100644 (file)
--- a/core/quassel.h
+++ b/core/quassel.h
@@ -29,8 +29,11 @@ class Logger;
 
 /**
  * A static class containing global data.
+ * This is used in both core and GUI modules. Where appropriate, accessors are thread-safe
+ * to account for that fact.
  */
 class Quassel {
+  Q_OBJECT
 
   public:
     static void init();