deprecated--

QPixmap::convertFromImage()

svn path=/trunk/KDE/kdebase/konsole/; revision=532766

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);

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);