replace deprecated functions
svn path=/trunk/KDE/kdebase/workspace/; revision=564035icc-effect-5.14.5
parent
f3e320d5a4
commit
816cf2a2e9
|
@ -286,7 +286,7 @@ void LaptopButton::reset(unsigned long changed)
|
||||||
void LaptopButton::setBitmap(const unsigned char *bitmap)
|
void LaptopButton::setBitmap(const unsigned char *bitmap)
|
||||||
{
|
{
|
||||||
if (bitmap)
|
if (bitmap)
|
||||||
deco = QBitmap(8, 8, bitmap, true);
|
deco = QBitmap::fromData( QSize(8, 8), bitmap);
|
||||||
else {
|
else {
|
||||||
deco = QBitmap(8,8);
|
deco = QBitmap(8,8);
|
||||||
deco.fill(Qt::color0);
|
deco.fill(Qt::color0);
|
||||||
|
|
|
@ -294,8 +294,7 @@ ModernButton::ModernButton(ButtonType type, ModernSys *parent, const char *name)
|
||||||
setObjectName( name );
|
setObjectName( name );
|
||||||
setAttribute(Qt::WA_NoSystemBackground, true);
|
setAttribute(Qt::WA_NoSystemBackground, true);
|
||||||
|
|
||||||
QBitmap mask(14, 15, QPixmap::defaultDepth() > 8 ?
|
QBitmap mask = QBitmap::fromData( QSize(14, 15), QPixmap::defaultDepth() > 8 ? btnhighcolor_mask_bits : lowcolor_mask_bits);
|
||||||
btnhighcolor_mask_bits : lowcolor_mask_bits, true);
|
|
||||||
resize(14, 15);
|
resize(14, 15);
|
||||||
|
|
||||||
setMask(mask);
|
setMask(mask);
|
||||||
|
@ -344,7 +343,7 @@ void ModernButton::reset(unsigned long changed)
|
||||||
void ModernButton::setBitmap(const unsigned char *bitmap)
|
void ModernButton::setBitmap(const unsigned char *bitmap)
|
||||||
{
|
{
|
||||||
if (bitmap)
|
if (bitmap)
|
||||||
deco = QBitmap(8, 8, bitmap, true);
|
deco = QBitmap::fromData( QSize(8, 8), bitmap);
|
||||||
else {
|
else {
|
||||||
deco = QBitmap(8,8);
|
deco = QBitmap(8,8);
|
||||||
deco.fill(Qt::color0);
|
deco.fill(Qt::color0);
|
||||||
|
|
|
@ -288,7 +288,7 @@ void RedmondButton::setBitmap(const unsigned char *bitmap)
|
||||||
pix = QPixmap();
|
pix = QPixmap();
|
||||||
|
|
||||||
if (bitmap)
|
if (bitmap)
|
||||||
deco = QBitmap(10, 10, bitmap, true);
|
deco = QBitmap::fromData( QSize(10, 10), bitmap);
|
||||||
else {
|
else {
|
||||||
deco = QBitmap(10,10);
|
deco = QBitmap(10,10);
|
||||||
deco.fill(Qt::color0);
|
deco.fill(Qt::color0);
|
||||||
|
|
|
@ -283,7 +283,7 @@ WebButton::drawButton(QPainter *p)
|
||||||
WebButton::setBitmap(const unsigned char *bitmap)
|
WebButton::setBitmap(const unsigned char *bitmap)
|
||||||
{
|
{
|
||||||
if (bitmap)
|
if (bitmap)
|
||||||
bitmap_ = QBitmap(8,8, bitmap, true);
|
bitmap_ = QBitmap::fromData( QSize(8, 8), bitmap);
|
||||||
else
|
else
|
||||||
bitmap_ = QBitmap(8,8);
|
bitmap_ = QBitmap(8,8);
|
||||||
bitmap_.setMask(bitmap_);
|
bitmap_.setMask(bitmap_);
|
||||||
|
|
Loading…
Reference in New Issue