diff --git a/settings/kcmkonsoledialog.ui b/settings/kcmkonsoledialog.ui index 17d654114..e7ab0bd13 100644 --- a/settings/kcmkonsoledialog.ui +++ b/settings/kcmkonsoledialog.ui @@ -230,7 +230,7 @@ 0 - + 1 @@ -246,10 +246,10 @@ 0 - + 0 - + 8 diff --git a/settings/schemaeditor.cpp b/settings/schemaeditor.cpp index 7f21ade58..55e6eef8e 100644 --- a/settings/schemaeditor.cpp +++ b/settings/schemaeditor.cpp @@ -200,9 +200,9 @@ void SchemaEditor::previewLoaded(bool l) if (l) { QMatrix mat; pix = - spix->transformed(mat. - scale(180.0 / spix->QPixmap::width(), - 100.0 / spix->QPixmap::height())); + spix->pixmap().transformed(mat. + scale(180.0 / spix->pixmap().width(), + 100.0 / spix->pixmap().height())); kDebug(0) << "Loaded" << endl; loaded = true; if (transparencyCheck->isChecked()) { diff --git a/settings/schemaeditor.h b/settings/schemaeditor.h index 9841578ea..352a466cc 100644 --- a/settings/schemaeditor.h +++ b/settings/schemaeditor.h @@ -25,9 +25,9 @@ #include #include //Added by qt3to4: -#include +#include #include -class QPixmap; +class KPixmap; class KSharedPixmap; #include "schemadialog.h" @@ -71,7 +71,7 @@ class SchemaEditor : public SchemaDialog QVector type; // 0= custom, 1= sysfg, 2=sysbg, 3=rcolor QVector transparent; QVector bold; - QPixmap pix; + KPixmap pix; KSharedPixmap *spix; QString defaultSchema; bool loaded;