From 816cf2a2e9b0ea7b7586940898514087529c1259 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@kde.org>
Date: Wed, 19 Jul 2006 06:49:37 +0000
Subject: [PATCH] replace deprecated functions

svn path=/trunk/KDE/kdebase/workspace/; revision=564035
---
 clients/laptop/laptopclient.cpp    | 2 +-
 clients/modernsystem/modernsys.cpp | 5 ++---
 clients/redmond/redmond.cpp        | 2 +-
 clients/web/WebButton.cpp          | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/clients/laptop/laptopclient.cpp b/clients/laptop/laptopclient.cpp
index 86a415cc97..ef20a875fc 100644
--- a/clients/laptop/laptopclient.cpp
+++ b/clients/laptop/laptopclient.cpp
@@ -286,7 +286,7 @@ void LaptopButton::reset(unsigned long changed)
 void LaptopButton::setBitmap(const unsigned char *bitmap)
 {
     if (bitmap)
-        deco = QBitmap(8, 8, bitmap, true);
+        deco = QBitmap::fromData( QSize(8,  8),  bitmap);
     else {
         deco = QBitmap(8,8);
         deco.fill(Qt::color0);
diff --git a/clients/modernsystem/modernsys.cpp b/clients/modernsystem/modernsys.cpp
index 5947db3400..6e0526c68c 100644
--- a/clients/modernsystem/modernsys.cpp
+++ b/clients/modernsystem/modernsys.cpp
@@ -294,8 +294,7 @@ ModernButton::ModernButton(ButtonType type, ModernSys *parent, const char *name)
     setObjectName( name );
     setAttribute(Qt::WA_NoSystemBackground, true);
 
-    QBitmap mask(14, 15, QPixmap::defaultDepth() > 8 ?
-                 btnhighcolor_mask_bits : lowcolor_mask_bits, true);
+    QBitmap mask = QBitmap::fromData( QSize(14,  15),  QPixmap::defaultDepth() > 8 ? btnhighcolor_mask_bits : lowcolor_mask_bits);
     resize(14, 15);
 
     setMask(mask);
@@ -344,7 +343,7 @@ void ModernButton::reset(unsigned long changed)
 void ModernButton::setBitmap(const unsigned char *bitmap)
 {
     if (bitmap)
-        deco = QBitmap(8, 8, bitmap, true);
+        deco = QBitmap::fromData( QSize(8,  8),  bitmap);
     else {
         deco = QBitmap(8,8);
         deco.fill(Qt::color0);
diff --git a/clients/redmond/redmond.cpp b/clients/redmond/redmond.cpp
index 5677a365a9..40f6953108 100644
--- a/clients/redmond/redmond.cpp
+++ b/clients/redmond/redmond.cpp
@@ -288,7 +288,7 @@ void RedmondButton::setBitmap(const unsigned char *bitmap)
         pix = QPixmap();
 
 	if (bitmap)
-		deco = QBitmap(10, 10, bitmap, true);
+		deco = QBitmap::fromData( QSize(10,  10),  bitmap);
 	else {
 		deco = QBitmap(10,10);
 		deco.fill(Qt::color0);
diff --git a/clients/web/WebButton.cpp b/clients/web/WebButton.cpp
index 707738d797..1e8dcf8023 100644
--- a/clients/web/WebButton.cpp
+++ b/clients/web/WebButton.cpp
@@ -283,7 +283,7 @@ WebButton::drawButton(QPainter *p)
 WebButton::setBitmap(const unsigned char *bitmap)
 {
   if (bitmap)
-    bitmap_ = QBitmap(8,8, bitmap, true);
+    bitmap_ = QBitmap::fromData( QSize(8, 8),  bitmap);
   else
     bitmap_ = QBitmap(8,8);
   bitmap_.setMask(bitmap_);