diff --git a/kdeui/notifications/kstatusnotifieritem.cpp b/kdeui/notifications/kstatusnotifieritem.cpp index b09d6115..4bf11aa8 100644 --- a/kdeui/notifications/kstatusnotifieritem.cpp +++ b/kdeui/notifications/kstatusnotifieritem.cpp @@ -879,8 +879,8 @@ void KStatusNotifierItemPrivate::minimizeRestore(bool show) KDbusImageStruct KStatusNotifierItemPrivate::imageToStruct(const QImage &image) { KDbusImageStruct icon; - icon.width = image.size().width(); - icon.height = image.size().height(); + icon.width = image.width(); + icon.height = image.height(); if (image.format() == QImage::Format_ARGB32) { icon.data = QByteArray((const char*)image.constBits(), image.byteCount()); } else { diff --git a/kdeui/windowmanagement/kwindowsystem_x11.cpp b/kdeui/windowmanagement/kwindowsystem_x11.cpp index 61cdfda1..2c7a8c6a 100644 --- a/kdeui/windowmanagement/kwindowsystem_x11.cpp +++ b/kdeui/windowmanagement/kwindowsystem_x11.cpp @@ -729,8 +729,8 @@ void KWindowSystem::setIcons( WId win, const QPixmap& icon, const QPixmap& miniI NETWinInfo info( QX11Info::display(), win, QX11Info::appRootWindow(), 0 ); QImage img = icon.toImage().convertToFormat( QImage::Format_ARGB32 ); NETIcon ni; - ni.size.width = img.size().width(); - ni.size.height = img.size().height(); + ni.size.width = img.width(); + ni.size.height = img.height(); ni.data = (unsigned char *) img.bits(); info.setIcon( ni, true ); if ( miniIcon.isNull() ) @@ -738,8 +738,8 @@ void KWindowSystem::setIcons( WId win, const QPixmap& icon, const QPixmap& miniI img = miniIcon.toImage().convertToFormat( QImage::Format_ARGB32 ); if ( img.isNull() ) return; - ni.size.width = img.size().width(); - ni.size.height = img.size().height(); + ni.size.width = img.width(); + ni.size.height = img.height(); ni.data = (unsigned char *) img.bits(); info.setIcon( ni, false ); } diff --git a/plasma/widgets/signalplotter.cpp b/plasma/widgets/signalplotter.cpp index 69bbc689..cf1b5cdc 100644 --- a/plasma/widgets/signalplotter.cpp +++ b/plasma/widgets/signalplotter.cpp @@ -633,8 +633,8 @@ void SignalPlotter::drawWidget(QPainter *p, uint w, uint height, int horizontalS h -= fontheight; } if (d->backgroundPixmap.isNull() || - (uint)d->backgroundPixmap.size().height() != height || - (uint)d->backgroundPixmap.size().width() != w) { + (uint)d->backgroundPixmap.height() != height || + (uint)d->backgroundPixmap.width() != w) { // recreate on resize etc d->backgroundPixmap = QPixmap(w, height); d->backgroundPixmap.fill(Qt::transparent);