diff options
| author |  Noldor | 2008-03-26 08:33:40 +0000 |
|---|---|---|
| committer | Noldor | 2008-03-26 08:33:40 +0000 |
| commit | 2db2c90530f4979109640eea5020c607d3afc7f6 (patch) | |
| tree | ae825f329f83b7cf83c5a949becd1c2d12ca9c88 /src/modules/objects/class_pixmap.cpp | |
| parent | ported KviTalHBox and KviTalVBox to Qt4; (diff) | |
| download | KVIrc-2db2c90530f4979109640eea5020c607d3afc7f6.tar.gz KVIrc-2db2c90530f4979109640eea5020c607d3afc7f6.tar.bz2 KVIrc-2db2c90530f4979109640eea5020c607d3afc7f6.zip | |
More QT4 work and removed QT3 unused code in objects module.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1294 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects/class_pixmap.cpp')
| -rw-r--r-- | src/modules/objects/class_pixmap.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index c24ef09ab..1a73a2db3 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -127,13 +127,7 @@ bool KviKvsObject_pixmap::functionscale(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("sx",KVS_PT_REAL,0,uScaleX) KVSO_PARAMETER("sy",KVS_PT_REAL,0,uScaleY) KVSO_PARAMETERS_END(c) - #ifdef COMPILE_USE_QT4 - *m_pPixmap = m_pPixmap->scaled((m_pPixmap->width() * uScaleX), (m_pPixmap->height() * uScaleX)); - #else - QWMatrix wm; - wm.scale(uScaleX, uScaleY); - *m_pPixmap = m_pPixmap->xForm(wm); - #endif + *m_pPixmap = m_pPixmap->scaled((m_pPixmap->width() * uScaleX), (m_pPixmap->height() * uScaleX)); bPixmapModified=true; return true; } @@ -144,15 +138,9 @@ bool KviKvsObject_pixmap::functionrotate(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("a",KVS_PT_REAL,0,uDegrees) KVSO_PARAMETERS_END(c) - #ifdef COMPILE_USE_QT4 - QMatrix m; - m.rotate(uDegrees); - *m_pPixmap = m_pPixmap->transformed(m); - #else - QWMatrix wm; - wm.rotate(uDegrees); - *m_pPixmap = m_pPixmap->xForm(wm); - #endif + QMatrix m; + m.rotate(uDegrees); + *m_pPixmap = m_pPixmap->transformed(m); bPixmapModified=true; return true; } |