aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/theme/packthemedialog.cpp
diff options
context:
space:
mode:
authorGravatar Noldor2008-08-04 16:14:40 +0000
committerGravatar Noldor2008-08-04 16:14:40 +0000
commitbb4fcd90315ef77460676935005cdbbde1e55f76 (patch)
tree74d3fda8fc99ff3beb2f1c679bde03dc1a7bb145 /src/modules/theme/packthemedialog.cpp
parentcompilation fix (diff)
downloadKVIrc-bb4fcd90315ef77460676935005cdbbde1e55f76.tar.gz
KVIrc-bb4fcd90315ef77460676935005cdbbde1e55f76.tar.bz2
KVIrc-bb4fcd90315ef77460676935005cdbbde1e55f76.zip
more QT4 port (objects module) + vs2005 projects update + some compilation fixes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2174 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/theme/packthemedialog.cpp')
-rw-r--r--src/modules/theme/packthemedialog.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index d7ee2f1bb..dd917c0b1 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -336,9 +336,9 @@ void KviPackThemeDialog::imageSelectionChanged(const QString &szImagePath)
{
QPixmap out;
if(pix.width() > 300 || pix.height() > 225)
- out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio,Qt::SmoothTransformation));
+ out.fromImage(pix.scaled(300,225,Qt::KeepAspectRatio,Qt::SmoothTransformation));
else
- out.convertFromImage(pix);
+ out.fromImage(pix);
m_pImageLabel->setPixmap(out);
return;
}
@@ -371,9 +371,9 @@ bool KviPackThemeDialog::packTheme()
if(!pix.isNull())
{
if(pix.width() > 300 || pix.height() > 225)
- out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio));
+ out.fromImage(pix.scaled(300,225,Qt::KeepAspectRatio));
else
- out.convertFromImage(pix);
+ out.fromImage(pix);
} else {
if(!m_szImagePath.isEmpty())
{