From 0857c6e17df7cf14a49b0fa3662b6f59b5bf7bb0 Mon Sep 17 00:00:00 2001
From: Thorsten Roeder <thorsten.roeder@weihenstephan.org>
Date: Sat, 22 Apr 2006 18:12:21 +0000
Subject: [PATCH] deprecated-- QPixmap::convertFromImage()

svn path=/trunk/KDE/kdebase/konsole/; revision=532766
---
 konsole/konsole.cpp       | 4 ++--
 settings/schemaeditor.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/konsole/konsole.cpp b/konsole/konsole.cpp
index 64fc18b8..2a679c8a 100644
--- a/konsole/konsole.cpp
+++ b/konsole/konsole.cpp
@@ -3217,9 +3217,9 @@ void Konsole::notifySessionState(TESession* session, int state)
 
     // make sure they are not larger than 16x16
     if (normal.width() > 16 || normal.height() > 16)
-      normal.convertFromImage(normal.convertToImage().scaled(16,16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+      normal.convertFromImage(normal.toImage().scaled(16,16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
     if (active.width() > 16 || active.height() > 16)
-      active.convertFromImage(active.convertToImage().scaled(16,16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+      active.convertFromImage(active.toImage().scaled(16,16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
 
     QIcon iconset;
     iconset.setPixmap(normal, QIcon::Small, QIcon::Normal);
diff --git a/settings/schemaeditor.cpp b/settings/schemaeditor.cpp
index 33f525dc..0ff51ad7 100644
--- a/settings/schemaeditor.cpp
+++ b/settings/schemaeditor.cpp
@@ -171,7 +171,7 @@ void SchemaEditor::updatePreview()
     if (transparencyCheck->isChecked()) {
 	if (loaded) {
 	    float rx = (100.0 - shadeSlide->value()) / 100;
-	    QImage ima(pix.convertToImage());
+	    QImage ima(pix.toImage());
 	    ima = KImageEffect::fade(ima, rx, shadeColor->color());
 	    QPixmap pm;
 	    pm.convertFromImage(ima);