Moving quasselui.h from common/ to client/ where it belongs.

Also get rid of the non-virtual destructor warning. Wth do we
need an empty destructor?

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 5f3d1f5..3ad8f7d 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(client_SRCS buffer.cpp buffertreemodel.cpp client.cpp clientsettings.cpp treemodel.cpp)
 SET(client_HDRS )
 SET(client_SRCS buffer.cpp buffertreemodel.cpp client.cpp clientsettings.cpp treemodel.cpp)
 SET(client_HDRS )

-SET(client_MOCS buffer.h buffertreemodel.h client.h clientsettings.h treemodel.h)
+SET(client_MOCS buffer.h buffertreemodel.h client.h clientsettings.h quasselui.h treemodel.h)

 
 QT4_WRAP_CPP(_MOC ${client_MOCS})
 
 
 QT4_WRAP_CPP(_MOC ${client_MOCS})
 

diff --git a/src/client/client.pri b/src/client/client.pri
index 930b8f7..3e694ea 100644 (file)
--- a/src/client/client.pri
+++ b/src/client/client.pri
@@ -1,4 +1,4 @@
 DEPMOD = common contrib/qxt
 QT_MOD = core network gui   # gui is needed just for QColor... FIXME!
 SRCS += buffer.cpp buffertreemodel.cpp client.cpp clientsettings.cpp treemodel.cpp
 DEPMOD = common contrib/qxt
 QT_MOD = core network gui   # gui is needed just for QColor... FIXME!
 SRCS += buffer.cpp buffertreemodel.cpp client.cpp clientsettings.cpp treemodel.cpp

-HDRS += buffer.h buffertreemodel.h client.h clientsettings.h treemodel.h
+HDRS += buffer.h buffertreemodel.h client.h clientsettings.h quasselui.h treemodel.h

diff --git a/src/common/quasselui.h b/src/client/quasselui.h
similarity index 98%
rename from src/common/quasselui.h
rename to src/client/quasselui.h
index f34d91d..414d599 100644 (file)
--- a/src/common/quasselui.h
+++ b/src/client/quasselui.h
@@ -27,7 +27,7 @@
 class AbstractUiMsg {
 
   public:
 class AbstractUiMsg {
 
   public:

-    //virtual ~AbstractUiMsg() {};
+    virtual ~AbstractUiMsg() {};

     virtual QString sender() const = 0;
     virtual QString text() const = 0;
     virtual MsgId msgId() const = 0;
     virtual QString sender() const = 0;
     virtual QString text() const = 0;
     virtual MsgId msgId() const = 0;

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 517a3d4..26e087a 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(common_SRCS global.cpp logger.cpp message.cpp settings.cpp signalproxy.cpp util.cpp ircuser.cpp)
 SET(common_HDRS global.h message.h util.h)
 SET(common_SRCS global.cpp logger.cpp message.cpp settings.cpp signalproxy.cpp util.cpp ircuser.cpp)
 SET(common_HDRS global.h message.h util.h)

-SET(common_MOCS logger.h ircuser.h quasselui.h settings.h signalproxy.h)
+SET(common_MOCS logger.h ircuser.h settings.h signalproxy.h)

 
 QT4_WRAP_CPP(_MOC ${common_MOCS})
 ADD_LIBRARY(common ${common_SRCS} ${_MOC})
 
 QT4_WRAP_CPP(_MOC ${common_MOCS})
 ADD_LIBRARY(common ${common_SRCS} ${_MOC})

diff --git a/src/common/common.pri b/src/common/common.pri
index 3dd80ef..c218ee9 100644 (file)
--- a/src/common/common.pri
+++ b/src/common/common.pri
@@ -1,4 +1,4 @@
 DEPMOD = contrib/qxt
 QT_MOD = network
 SRCS += global.cpp ircuser.cpp logger.cpp message.cpp settings.cpp signalproxy.cpp util.cpp
 DEPMOD = contrib/qxt
 QT_MOD = network
 SRCS += global.cpp ircuser.cpp logger.cpp message.cpp settings.cpp signalproxy.cpp util.cpp

-HDRS += global.h ircuser.h logger.h message.h quasselui.h settings.h signalproxy.h util.h
+HDRS += global.h ircuser.h logger.h message.h settings.h signalproxy.h util.h