From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/modules/objects/class_pixmap.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/modules/objects/class_pixmap.h') diff --git a/src/modules/objects/class_pixmap.h b/src/modules/objects/class_pixmap.h index 22d1b95d..8b6ba37d 100644 --- a/src/modules/objects/class_pixmap.h +++ b/src/modules/objects/class_pixmap.h @@ -24,12 +24,12 @@ -#include -#include +#include +#include #ifdef COMPILE_USE_QT4 - #include + #include #else - #include + #include #endif #include "kvi_string.h" @@ -40,18 +40,19 @@ class KviKvsObject_pixmap : public KviKvsObject { Q_OBJECT -// Q_PROPERTY(QPixmap pixmap READ getPixmap) + TQ_OBJECT +// TQ_PROPERTY(TQPixmap pixmap READ getPixmap) public: KVSO_DECLARE_OBJECT(KviKvsObject_pixmap); - QPixmap * getPixmap(); - QImage * getImage(); + TQPixmap * getPixmap(); + TQImage * getImage(); void pixmapChanged(){bPixmapModified=true;} void imageChanged(){bImageModified=true;} - QPixmap * pixmap(){ return m_pPixmap; } + TQPixmap * pixmap(){ return m_pPixmap; } protected: - QPixmap * m_pPixmap; - QImage * m_pImage; + TQPixmap * m_pPixmap; + TQImage * m_pImage; bool bImageModified; bool bPixmapModified; signals: -- cgit v1.2.1