Make QuasselTopia build again. Just run 'qtopiamake && make' in qtopia-build/

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

diff --git a/src/common/quasselui.h b/src/common/quasselui.h
index 0925b2e..f34d91d 100644 (file)
--- a/src/common/quasselui.h
+++ b/src/common/quasselui.h
@@ -27,7 +27,7 @@
 class AbstractUiMsg {
 
   public:
-    virtual ~AbstractUiMsg() {};
+    //virtual ~AbstractUiMsg() {};
     virtual QString sender() const = 0;
     virtual QString text() const = 0;
     virtual MsgId msgId() const = 0;
@@ -41,17 +41,15 @@ class AbstractUi : public QObject {
   Q_OBJECT
 
   public:
-    static void foo() {};
-    virtual ~AbstractUi() {};
     virtual void init() {};  // called after the client is initialized
-    virtual AbstractUiMsg *layoutMsg(const Message &) { return 0; }
+    virtual AbstractUiMsg *layoutMsg(const Message &) = 0;
 
   protected slots:
     virtual void connectedToCore() {}
     virtual void disconnectedFromCore() {}
 
   signals:
-    void connectToCore(const VarMap &connInfo);
+    void connectToCore(const QVariantMap &connInfo);
     void disconnectFromCore();
 
 };