diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-28 18:31:12 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-28 18:31:12 +0000 |
commit | 0a80cfd57d271dd44221467efb426675fa470356 (patch) | |
tree | 6f503a31aa078eaf8fa015cf1749808529d49fc9 /src/modules/objects/class_pixmap.h | |
parent | 3329e5a804e28ef3f5eb51d1e7affdd5a508e8f2 (diff) | |
download | kvirc-0a80cfd57d271dd44221467efb426675fa470356.tar.gz kvirc-0a80cfd57d271dd44221467efb426675fa470356.zip |
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
Diffstat (limited to 'src/modules/objects/class_pixmap.h')
-rw-r--r-- | src/modules/objects/class_pixmap.h | 21 |
1 files changed, 11 insertions, 10 deletions
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 <qpixmap.h> -#include <qimage.h> +#include <tqpixmap.h> +#include <tqimage.h> #ifdef COMPILE_USE_QT4 - #include <QMatrix> + #include <TQMatrix> #else - #include <qwmatrix.h> + #include <tqwmatrix.h> #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: |