Cleanup

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index dfed692..c851907 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -8,7 +8,6 @@ include(${QT_USE_FILE})
 
 set(SOURCES
     abstractmessageprocessor.cpp
 
 set(SOURCES
     abstractmessageprocessor.cpp

-    abstractui.cpp

     backlogrequester.cpp
     buffermodel.cpp
     buffersettings.cpp
     backlogrequester.cpp
     buffermodel.cpp
     buffersettings.cpp

diff --git a/src/client/abstractui.cpp b/src/client/abstractui.cpp
deleted file mode 100644 (file)
index 6a88765..0000000
--- a/src/client/abstractui.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-09 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) version 3.                                           *
- *                                                                         *
- *   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 "abstractui.h"
-
-bool AbstractUi::_visible = false;
-
-AbstractUi::AbstractUi(QObject *parent) : QObject(parent) {
-
-}

diff --git a/src/client/abstractui.h b/src/client/abstractui.h
index 1c96dea..2ca395a 100644 (file)
--- a/src/client/abstractui.h
+++ b/src/client/abstractui.h
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *

  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -22,7 +22,8 @@
 #define QUASSELUI_H
 
 #include <QObject>
 #define QUASSELUI_H
 
 #include <QObject>

-#include "message.h"
+#include <QVariantMap>
+//#include "message.h"

 
 class MessageFilter;
 class MessageModel;
 
 class MessageFilter;
 class MessageModel;


@@ -35,26 +36,20 @@ class QMenu;
 class AbstractUi : public QObject {
   Q_OBJECT
 
 class AbstractUi : public QObject {
   Q_OBJECT
 

-  public:
-    AbstractUi(QObject *parent = 0);
-    virtual ~AbstractUi() {};
-    virtual void init() = 0;  // called after the client is initialized
-    virtual MessageModel *createMessageModel(QObject *parent) = 0;
-    virtual AbstractMessageProcessor *createMessageProcessor(QObject *parent) = 0;
+public:
+  AbstractUi(QObject *parent = 0) : QObject(parent) {}
+  virtual ~AbstractUi() {}
+  virtual void init() = 0;  // called after the client is initialized
+  virtual MessageModel *createMessageModel(QObject *parent) = 0;
+  virtual AbstractMessageProcessor *createMessageProcessor(QObject *parent) = 0;

 
 

-    inline static bool isVisible() { return _visible; }
-    inline static void setVisible(bool visible) { _visible = visible; }
+protected slots:
+  virtual void connectedToCore() {}
+  virtual void disconnectedFromCore() {}

 
 

-  protected slots:
-    virtual void connectedToCore() {}
-    virtual void disconnectedFromCore() {}
-
-  signals:
-    void connectToCore(const QVariantMap &connInfo);
-    void disconnectFromCore();
-
-  private:
-    static bool _visible;
+signals:
+  void connectToCore(const QVariantMap &connInfo);
+  void disconnectFromCore();

 };
 
 #endif
 };
 
 #endif