From 06a46322b6107fe4a38c310a6292cc1ef3330950 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Fri, 12 Oct 2007 09:51:19 +0000 Subject: [PATCH] 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? --- src/client/CMakeLists.txt | 2 +- src/client/client.pri | 2 +- src/{common => client}/quasselui.h | 2 +- src/common/CMakeLists.txt | 2 +- src/common/common.pri | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename src/{common => client}/quasselui.h (98%) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 5f3d1f54..3ad8f7dd 100644 --- 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_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}) diff --git a/src/client/client.pri b/src/client/client.pri index 930b8f76..3e694ea1 100644 --- 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 -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 f34d91d4..414d5993 100644 --- a/src/common/quasselui.h +++ b/src/client/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; diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 517a3d4f..26e087a6 100644 --- 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_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}) diff --git a/src/common/common.pri b/src/common/common.pri index 3dd80ef1..c218ee9e 100644 --- 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 -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 -- 2.20.1