diff --git a/clients/b2/b2client.cpp b/clients/b2/b2client.cpp index ce87c6a46a..83a3e4933b 100644 --- a/clients/b2/b2client.cpp +++ b/clients/b2/b2client.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -59,7 +59,7 @@ enum { #define NUM_PIXMAPS (P_NUM_BUTTON_TYPES * NumStates) -static KPixmap *pixmap[NUM_PIXMAPS]; +static QPixmap *pixmap[NUM_PIXMAPS]; // active #define PIXMAP_A(i) (pixmap[(i) * NumStates + Norm]) @@ -74,7 +74,7 @@ static KPixmap *pixmap[NUM_PIXMAPS]; // inactive, down #define PIXMAP_ID(i) (pixmap[(i) * NumStates + IDown]) -static KPixmap* titleGradient[2] = {0, 0}; +static QPixmap* titleGradient[2] = {0, 0}; static int thickness = 4; // Frame thickness static int buttonSize = 16; @@ -154,7 +154,7 @@ static void read_config(B2ClientFactory *f) } } -static void drawB2Rect(KPixmap *pix, const QColor &primary, bool down) +static void drawB2Rect(QPixmap *pix, const QColor &primary, bool down) { QPainter p(pix); QColor hColor = primary.light(150); @@ -201,17 +201,17 @@ static void create_pixmaps() switch (i / NumStates) { case P_MAX: // will be initialized by copying P_CLOSE case P_RESIZE: - pixmap[i] = new KPixmap(); + pixmap[i] = new QPixmap(); break; case P_ICONIFY: - pixmap[i] = new KPixmap(10, 10); + pixmap[i] = new QPixmap(10, 10); break; case P_SHADE: case P_CLOSE: - pixmap[i] = new KPixmap(bsize, bsize); + pixmap[i] = new QPixmap(bsize, bsize); break; default: - pixmap[i] = new KPixmap(16, 16); + pixmap[i] = new QPixmap(16, 16); break; } } @@ -968,11 +968,11 @@ static void redraw_pixmaps() drawB2Rect(PIXMAP_ID(P_CLOSE), iGrp.color( QPalette::Button ), true); // shade - KPixmap thinBox(buttonSize - 2, 6); + QPixmap thinBox(buttonSize - 2, 6); for (i = 0; i < NumStates; i++) { bool is_act = (i < 2); bool is_down = ((i & 1) == 1); - KPixmap *pix = pixmap[P_SHADE * NumStates + i]; + QPixmap *pix = pixmap[P_SHADE * NumStates + i]; QColor color = is_act ? aGrp.color( QPalette::Button ) : iGrp.color( QPalette::Button ); drawB2Rect(&thinBox, color, is_down); pix->fill(Qt::black); @@ -987,8 +987,8 @@ static void redraw_pixmaps() } // normalize + iconify - KPixmap smallBox( 10, 10 ); - KPixmap largeBox( 12, 12 ); + QPixmap smallBox( 10, 10 ); + QPixmap largeBox( 12, 12 ); for (i = 0; i < NumStates; i++) { bool is_act = (i < 3); @@ -1087,7 +1087,7 @@ static void redraw_pixmaps() for (i = 0; i < 2; i++) { if (titleColor[2 * i] != titleColor[2 * i + 1]) { if (!titleGradient[i]) { - titleGradient[i] = new KPixmap; + titleGradient[i] = new QPixmap; } *titleGradient[i] = QPixmap(64, buttonSize + 3); KPixmapEffect::gradient(*titleGradient[i], diff --git a/clients/default/kdedefault.cpp b/clients/default/kdedefault.cpp index 2a80dd693e..fd13f95cf6 100644 --- a/clients/default/kdedefault.cpp +++ b/clients/default/kdedefault.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -119,25 +119,25 @@ static const unsigned char pinup_mask_bits[] = { // =========================================================================== -static KPixmap* titlePix; -static KPixmap* titleBuffer; -static KPixmap* aUpperGradient; -static KPixmap* iUpperGradient; +static QPixmap* titlePix; +static QPixmap* titleBuffer; +static QPixmap* aUpperGradient; +static QPixmap* iUpperGradient; -static KPixmap* pinDownPix; -static KPixmap* pinUpPix; -static KPixmap* ipinDownPix; -static KPixmap* ipinUpPix; +static QPixmap* pinDownPix; +static QPixmap* pinUpPix; +static QPixmap* ipinDownPix; +static QPixmap* ipinUpPix; -static KPixmap* rightBtnUpPix[2]; -static KPixmap* rightBtnDownPix[2]; -static KPixmap* irightBtnUpPix[2]; -static KPixmap* irightBtnDownPix[2]; +static QPixmap* rightBtnUpPix[2]; +static QPixmap* rightBtnDownPix[2]; +static QPixmap* irightBtnUpPix[2]; +static QPixmap* irightBtnDownPix[2]; -static KPixmap* leftBtnUpPix[2]; -static KPixmap* leftBtnDownPix[2]; -static KPixmap* ileftBtnUpPix[2]; -static KPixmap* ileftBtnDownPix[2]; +static QPixmap* leftBtnUpPix[2]; +static QPixmap* leftBtnDownPix[2]; +static QPixmap* ileftBtnUpPix[2]; +static QPixmap* ileftBtnDownPix[2]; static KDEDefaultHandler* clientHandler; static int toolTitleHeight; @@ -268,7 +268,7 @@ void KDEDefaultHandler::createPixmaps() QPainter p; QPainter maskPainter; int i, x, y; - titlePix = new KPixmap(132, normalTitleHeight+2); + titlePix = new QPixmap(132, normalTitleHeight+2); QBitmap mask(132, normalTitleHeight+2); mask.fill(Qt::color0); @@ -306,7 +306,7 @@ void KDEDefaultHandler::createPixmaps() // Create the titlebar gradients if (activeTitleColor1 != activeTitleColor2) { - aUpperGradient = new KPixmap(128, normalTitleHeight+2); + aUpperGradient = new QPixmap(128, normalTitleHeight+2); KPixmapEffect::gradient(*aUpperGradient, activeTitleColor1, activeTitleColor2, @@ -315,7 +315,7 @@ void KDEDefaultHandler::createPixmaps() if (inactiveTitleColor1 != inactiveTitleColor2) { - iUpperGradient = new KPixmap(128, normalTitleHeight+2); + iUpperGradient = new QPixmap(128, normalTitleHeight+2); KPixmapEffect::gradient(*iUpperGradient, inactiveTitleColor1, @@ -330,14 +330,14 @@ void KDEDefaultHandler::createPixmaps() // Active pins g = options()->palette( ColorButtonBg, true ); - pinUpPix = new KPixmap(16, 16); + pinUpPix = new QPixmap(16, 16); p.begin( pinUpPix ); kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits, pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); p.end(); pinUpPix->setMask( QBitmap::fromData(QSize( 16, 16 ), pinup_mask_bits) ); - pinDownPix = new KPixmap(16, 16); + pinDownPix = new QPixmap(16, 16); p.begin( pinDownPix ); kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits, pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL ); @@ -346,14 +346,14 @@ void KDEDefaultHandler::createPixmaps() // Inactive pins g = options()->palette( ColorButtonBg, false ); - ipinUpPix = new KPixmap(16, 16); + ipinUpPix = new QPixmap(16, 16); p.begin( ipinUpPix ); kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits, pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); p.end(); ipinUpPix->setMask( QBitmap::fromData(QSize( 16, 16 ), pinup_mask_bits) ); - ipinDownPix = new KPixmap(16, 16); + ipinDownPix = new QPixmap(16, 16); p.begin( ipinDownPix ); kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits, pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL ); @@ -361,28 +361,28 @@ void KDEDefaultHandler::createPixmaps() ipinDownPix->setMask( QBitmap::fromData(QSize( 16, 16 ), pindown_mask_bits) ); // Create a title buffer for flicker-free painting - titleBuffer = new KPixmap(); + titleBuffer = new QPixmap(); // Cache all possible button states - leftBtnUpPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); - leftBtnDownPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); - ileftBtnUpPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); - ileftBtnDownPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); + leftBtnUpPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight); + leftBtnDownPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight); + ileftBtnUpPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight); + ileftBtnDownPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight); - rightBtnUpPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); - rightBtnDownPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); - irightBtnUpPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); - irightBtnDownPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); + rightBtnUpPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight); + rightBtnDownPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight); + irightBtnUpPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight); + irightBtnDownPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight); - leftBtnUpPix[false] = new KPixmap(toolTitleHeight, normalTitleHeight); - leftBtnDownPix[false] = new KPixmap(toolTitleHeight, normalTitleHeight); - ileftBtnUpPix[false] = new KPixmap(normalTitleHeight, normalTitleHeight); - ileftBtnDownPix[false] = new KPixmap(normalTitleHeight, normalTitleHeight); + leftBtnUpPix[false] = new QPixmap(toolTitleHeight, normalTitleHeight); + leftBtnDownPix[false] = new QPixmap(toolTitleHeight, normalTitleHeight); + ileftBtnUpPix[false] = new QPixmap(normalTitleHeight, normalTitleHeight); + ileftBtnDownPix[false] = new QPixmap(normalTitleHeight, normalTitleHeight); - rightBtnUpPix[false] = new KPixmap(toolTitleHeight, toolTitleHeight); - rightBtnDownPix[false] = new KPixmap(toolTitleHeight, toolTitleHeight); - irightBtnUpPix[false] = new KPixmap(toolTitleHeight, toolTitleHeight); - irightBtnDownPix[false] = new KPixmap(toolTitleHeight, toolTitleHeight); + rightBtnUpPix[false] = new QPixmap(toolTitleHeight, toolTitleHeight); + rightBtnDownPix[false] = new QPixmap(toolTitleHeight, toolTitleHeight); + irightBtnUpPix[false] = new QPixmap(toolTitleHeight, toolTitleHeight); + irightBtnDownPix[false] = new QPixmap(toolTitleHeight, toolTitleHeight); // Draw the button state pixmaps g = options()->palette( ColorTitleBar, true ); @@ -472,7 +472,7 @@ void KDEDefaultHandler::freePixmaps() } -void KDEDefaultHandler::drawButtonBackground(KPixmap *pix, +void KDEDefaultHandler::drawButtonBackground(QPixmap *pix, const QPalette &g, bool sunken) { QPainter p; @@ -677,7 +677,7 @@ void KDEDefaultButton::drawButton(QPainter *p) p->drawPixmap(isDown() ? xOff+1: xOff, isDown() ? yOff+1 : yOff, *deco); } else { - KPixmap btnpix; + QPixmap btnpix; if (type()==OnAllDesktopsButton) { if (active) diff --git a/clients/kwmtheme/kwmthemeclient.cpp b/clients/kwmtheme/kwmthemeclient.cpp index d309dcf6a8..3aea8f3526 100644 --- a/clients/kwmtheme/kwmthemeclient.cpp +++ b/clients/kwmtheme/kwmthemeclient.cpp @@ -65,8 +65,8 @@ enum FramePixmap{FrameTop=0, FrameBottom, FrameLeft, FrameRight, FrameTopLeft, static QPixmap *framePixmaps[8]; static QPixmap *menuPix, *iconifyPix, *closePix, *maxPix, *minmaxPix, *pinupPix, *pindownPix; -static KPixmap *aTitlePix = 0; -static KPixmap *iTitlePix = 0; +static QPixmap *aTitlePix = 0; +static QPixmap *iTitlePix = 0; static KPixmapEffect::GradientType grType; static int maxExtent, titleAlign; static bool titleGradient = true; @@ -152,13 +152,13 @@ static void create_pixmaps() tmpStr = config->readEntry("TitlebarLook"); if(tmpStr == "shadedVertical"){ - aTitlePix = new KPixmap; + aTitlePix = new QPixmap; aTitlePix->resize(32, 20); KPixmapEffect::gradient(*aTitlePix, options()->color(KDecorationOptions::ColorTitleBar, true), options()->color(KDecorationOptions::ColorTitleBlend, true), KPixmapEffect::VerticalGradient); - iTitlePix = new KPixmap; + iTitlePix = new QPixmap; iTitlePix->resize(32, 20); KPixmapEffect::gradient(*iTitlePix, options()->color(KDecorationOptions::ColorTitleBar, false), @@ -185,14 +185,14 @@ static void create_pixmaps() titleGradient = false; tmpStr = config->readEntry("TitlebarPixmapActive", ""); if(!tmpStr.isEmpty()){ - aTitlePix = new KPixmap; + aTitlePix = new QPixmap; aTitlePix->load(locate("data", "kwin/pics/" + tmpStr)); } else aTitlePix = NULL; tmpStr = config->readEntry("TitlebarPixmapInactive", ""); if(!tmpStr.isEmpty()){ - iTitlePix = new KPixmap; + iTitlePix = new QPixmap; iTitlePix->load(locate("data", "kwin/pics/" + tmpStr)); } else @@ -340,8 +340,8 @@ void KWMThemeClient::init() } } if(titleGradient){ - aGradient = new KPixmap; - iGradient = new KPixmap; + aGradient = new QPixmap; + iGradient = new QPixmap; } else{ aGradient = 0; @@ -369,7 +369,7 @@ void KWMThemeClient::drawTitle(QPainter &dest) r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2); } - KPixmap *fill = isActive() ? aTitlePix : iTitlePix; + QPixmap *fill = isActive() ? aTitlePix : iTitlePix; if(fill) p.drawTiledPixmap(r, *fill); else if(titleGradient){ diff --git a/clients/kwmtheme/kwmthemeclient.h b/clients/kwmtheme/kwmthemeclient.h index b1d6239654..c16f08fac6 100644 --- a/clients/kwmtheme/kwmthemeclient.h +++ b/clients/kwmtheme/kwmthemeclient.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/clients/laptop/laptopclient.cpp b/clients/laptop/laptopclient.cpp index d5433cb002..48f456ecb1 100644 --- a/clients/laptop/laptopclient.cpp +++ b/clients/laptop/laptopclient.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -46,17 +46,17 @@ static const unsigned char sticky_bits[] = { 0x3c, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3c}; static QPixmap *titlePix; -static KPixmap *aUpperGradient; -static KPixmap *iUpperGradient; +static QPixmap *aUpperGradient; +static QPixmap *iUpperGradient; // buttons active, inactive, up, down, and 2 sizes :P -static KPixmap *btnPix1; -static KPixmap *iBtnPix1; -static KPixmap *btnDownPix1; -static KPixmap *iBtnDownPix1; -static KPixmap *btnPix2; -static KPixmap *btnDownPix2; -static KPixmap *iBtnPix2; -static KPixmap *iBtnDownPix2; +static QPixmap *btnPix1; +static QPixmap *iBtnPix1; +static QPixmap *btnDownPix1; +static QPixmap *iBtnDownPix1; +static QPixmap *btnPix2; +static QPixmap *btnDownPix2; +static QPixmap *iBtnPix2; +static QPixmap *iBtnDownPix2; static QColor btnForeground; static int titleHeight = 14; @@ -81,7 +81,7 @@ static inline const KDecorationOptions* options() return KDecoration::options(); } -static void drawButtonFrame(KPixmap *pix, const QPalette &g, bool sunken) +static void drawButtonFrame(QPixmap *pix, const QPalette &g, bool sunken) { QPainter p; int w = pix->width(); @@ -145,8 +145,8 @@ static void create_pixmaps() titlePix->setMask(mask); if(QPixmap::defaultDepth() > 8){ - aUpperGradient = new KPixmap(32, titleHeight+2); - iUpperGradient = new KPixmap(32, titleHeight+2); + aUpperGradient = new QPixmap(32, titleHeight+2); + iUpperGradient = new QPixmap(32, titleHeight+2); QColor bgColor = options()->color(KDecoration::ColorTitleBar, true); KPixmapEffect::gradient(*aUpperGradient, bgColor.light(120), @@ -162,14 +162,14 @@ static void create_pixmaps() QPalette g = options()->palette(KDecoration::ColorButtonBg, true); g.setCurrentColorGroup( QPalette::Active ); QColor c = g.color( QPalette::Background ); - btnPix1 = new KPixmap(btnWidth1, titleHeight); - btnDownPix1 = new KPixmap(btnWidth1, titleHeight); - btnPix2 = new KPixmap(btnWidth2, titleHeight); - btnDownPix2 = new KPixmap(btnWidth2, titleHeight); - iBtnPix1 = new KPixmap(btnWidth1, titleHeight); - iBtnDownPix1 = new KPixmap(btnWidth1, titleHeight); - iBtnPix2 = new KPixmap(btnWidth2, titleHeight); - iBtnDownPix2 = new KPixmap(btnWidth2, titleHeight); + btnPix1 = new QPixmap(btnWidth1, titleHeight); + btnDownPix1 = new QPixmap(btnWidth1, titleHeight); + btnPix2 = new QPixmap(btnWidth2, titleHeight); + btnDownPix2 = new QPixmap(btnWidth2, titleHeight); + iBtnPix1 = new QPixmap(btnWidth1, titleHeight); + iBtnDownPix1 = new QPixmap(btnWidth1, titleHeight); + iBtnPix2 = new QPixmap(btnWidth2, titleHeight); + iBtnDownPix2 = new QPixmap(btnWidth2, titleHeight); if(QPixmap::defaultDepth() > 8){ KPixmapEffect::gradient(*btnPix1, c.light(120), c.dark(130), KPixmapEffect::DiagonalGradient); diff --git a/clients/modernsystem/modernsys.cpp b/clients/modernsystem/modernsys.cpp index 4ac83b0a4f..ee0741aa26 100644 --- a/clients/modernsystem/modernsys.cpp +++ b/clients/modernsystem/modernsys.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -75,8 +75,8 @@ static unsigned char btnhighcolor_mask_bits[] = { 0x00,0x40,0x80,0x00,0x00,0x00,0x39,0x00,0x00,0x00,0x20,0x99,0x0f,0x08,0xc4, 0x00,0x00,0x00,0x67,0x00,0x00,0x00,0x58,0x5f,0x43,0x68,0x61,0x6e,0x67,0x65 }; -static KPixmap *aUpperGradient=0; -static KPixmap *iUpperGradient=0; +static QPixmap *aUpperGradient=0; +static QPixmap *iUpperGradient=0; static QPixmap *buttonPix=0; static QPixmap *buttonPixDown=0; static QPixmap *iButtonPix=0; @@ -161,8 +161,8 @@ static void create_pixmaps() btnSource = new QImage(btnhighcolor_xpm); if(QPixmap::defaultDepth() > 8){ - aUpperGradient = new KPixmap( 32, title_height+2 ); - iUpperGradient = new KPixmap( 32, title_height+2);; + aUpperGradient = new QPixmap( 32, title_height+2 ); + iUpperGradient = new QPixmap( 32, title_height+2);; KPixmapEffect::gradient(*aUpperGradient, options()->color(KDecoration::ColorTitleBar, true).light(130), options()->color(KDecoration::ColorTitleBlend, true), diff --git a/clients/plastik/plastik.cpp b/clients/plastik/plastik.cpp index 5a8b875a33..e2df0755b8 100644 --- a/clients/plastik/plastik.cpp +++ b/clients/plastik/plastik.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include "misc.h" @@ -240,9 +240,9 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow const int titleBarTileHeight = (toolWindow ? m_titleHeightTool : m_titleHeight) + 2; // gradient used as well in TitleBarTileTop as TitleBarTile const int gradientHeight = 2 + titleBarTileHeight-1; - KPixmap gradient(1, gradientHeight); + QPixmap gradient(1, gradientHeight); QPainter painter(&gradient); - KPixmap tempPixmap( 1, 4 ); + QPixmap tempPixmap( 1, 4 ); KPixmapEffect::gradient(tempPixmap, getColor(TitleGradient1, active), getColor(TitleGradient2, active), diff --git a/clients/plastik/plastikbutton.cpp b/clients/plastik/plastikbutton.cpp index dccffd3fc3..a8a5fed40d 100644 --- a/clients/plastik/plastikbutton.cpp +++ b/clients/plastik/plastikbutton.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include "plastikbutton.h" @@ -173,7 +173,7 @@ void PlastikButton::drawButton(QPainter *painter) QRect r(0,0,width(),height()); bool active = m_client->isActive(); - KPixmap tempPixmap; + QPixmap tempPixmap; QColor highlightColor; if(type() == CloseButton) { diff --git a/clients/quartz/quartz.cpp b/clients/quartz/quartz.cpp index d143b2d5b2..f7e2807f1e 100644 --- a/clients/quartz/quartz.cpp +++ b/clients/quartz/quartz.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "quartz.h" @@ -115,12 +115,12 @@ bool onAllDesktopsButtonOnLeft = true; bool coloredFrame = true; bool extraSlim = false; -KPixmap* titleBlocks = NULL; -KPixmap* ititleBlocks = NULL; -KPixmap* pinDownPix = NULL; -KPixmap* pinUpPix = NULL; -KPixmap* ipinDownPix = NULL; -KPixmap* ipinUpPix = NULL; +QPixmap* titleBlocks = NULL; +QPixmap* ititleBlocks = NULL; +QPixmap* pinDownPix = NULL; +QPixmap* pinUpPix = NULL; +QPixmap* ipinDownPix = NULL; +QPixmap* ipinUpPix = NULL; static int normalTitleHeight; static int toolTitleHeight; static int borderWidth; @@ -250,7 +250,7 @@ void QuartzHandler::readConfig() // This does the colour transition magic. (You say "Oh, is that it?") // This may be made configurable at a later stage -void QuartzHandler::drawBlocks( KPixmap *pi, KPixmap &p, const QColor &c1, const QColor &c2 ) +void QuartzHandler::drawBlocks( QPixmap *pi, KPixmap &p, const QColor &c1, const QColor &c2 ) { QPainter px; @@ -302,7 +302,7 @@ void QuartzHandler::createPixmaps() g2.setCurrentColorGroup( QPalette::Active ); QColor c = g2.color(QPalette::Background).light(130); - titleBlocks = new KPixmap( normalTitleHeight*25/18, normalTitleHeight ); + titleBlocks = new QPixmap( normalTitleHeight*25/18, normalTitleHeight ); drawBlocks( titleBlocks, *titleBlocks, c, c2 ); g2 = options()->palette(ColorTitleBlend, false); @@ -312,7 +312,7 @@ void QuartzHandler::createPixmaps() g2.setCurrentColorGroup( QPalette::Active ); c = g2.color(QPalette::Background).light(130); - ititleBlocks = new KPixmap( normalTitleHeight*25/18, normalTitleHeight ); + ititleBlocks = new QPixmap( normalTitleHeight*25/18, normalTitleHeight ); drawBlocks( ititleBlocks, *ititleBlocks, c, c2 ); // Set the on all desktops pin pixmaps; @@ -325,14 +325,14 @@ void QuartzHandler::createPixmaps() g2 = options()->palette( ColorButtonBg, true ); g2.setCurrentColorGroup( QPalette::Active ); - pinUpPix = new KPixmap(16, 16); + pinUpPix = new QPixmap(16, 16); p.begin( pinUpPix ); p.fillRect( 0, 0, 16, 16, c); kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pinup_white_bits, pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); p.end(); - pinDownPix = new KPixmap(16, 16); + pinDownPix = new QPixmap(16, 16); p.begin( pinDownPix ); p.fillRect( 0, 0, 16, 16, c); kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pindown_white_bits, @@ -347,14 +347,14 @@ void QuartzHandler::createPixmaps() g2 = options()->palette( ColorButtonBg, false ); g2.setCurrentColorGroup( QPalette::Active ); - ipinUpPix = new KPixmap(16, 16); + ipinUpPix = new QPixmap(16, 16); p.begin( ipinUpPix ); p.fillRect( 0, 0, 16, 16, c); kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pinup_white_bits, pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); p.end(); - ipinDownPix = new KPixmap(16, 16); + ipinDownPix = new QPixmap(16, 16); p.begin( ipinDownPix ); p.fillRect( 0, 0, 16, 16, c); kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pindown_white_bits, diff --git a/clients/redmond/redmond.cpp b/clients/redmond/redmond.cpp index c0f2ea49a0..90f91512eb 100644 --- a/clients/redmond/redmond.cpp +++ b/clients/redmond/redmond.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -81,17 +81,17 @@ static unsigned char question_bits[] = { // Up / Down titlebar button images -static KPixmap *btnPix1; -static KPixmap *iBtnPix1; -static KPixmap *btnDownPix1; -static KPixmap *iBtnDownPix1; +static QPixmap *btnPix1; +static QPixmap *iBtnPix1; +static QPixmap *btnDownPix1; +static QPixmap *iBtnDownPix1; -static KPixmap *miniBtnPix1; -static KPixmap *iMiniBtnPix1; -static KPixmap *miniBtnDownPix1; -static KPixmap *iMiniBtnDownPix1; +static QPixmap *miniBtnPix1; +static QPixmap *iMiniBtnPix1; +static QPixmap *miniBtnDownPix1; +static QPixmap *iMiniBtnDownPix1; -static KPixmap *defaultMenuPix; +static QPixmap *defaultMenuPix; static QColor *btnForeground; static bool pixmaps_created = false; @@ -142,15 +142,15 @@ static void create_pixmaps () bool highcolor = QPixmap::defaultDepth() > 8; - btnPix1 = new KPixmap; - btnDownPix1 = new KPixmap; - iBtnPix1 = new KPixmap; - iBtnDownPix1 = new KPixmap; - miniBtnPix1 = new KPixmap; - miniBtnDownPix1 = new KPixmap; - iMiniBtnPix1 = new KPixmap; - iMiniBtnDownPix1 = new KPixmap; - defaultMenuPix = new KPixmap(kdelogo); + btnPix1 = new QPixmap; + btnDownPix1 = new QPixmap; + iBtnPix1 = new QPixmap; + iBtnDownPix1 = new QPixmap; + miniBtnPix1 = new QPixmap; + miniBtnDownPix1 = new QPixmap; + iMiniBtnPix1 = new QPixmap; + iMiniBtnDownPix1 = new QPixmap; + defaultMenuPix = new QPixmap(kdelogo); // buttons (active/inactive, sunken/unsunken) QColorGroup g = options()->palette(KDecoration::ColorButtonBg, true).active(); @@ -551,7 +551,7 @@ void RedmondDeco::paintEvent( QPaintEvent* ) // KS - Add gradient caching if needed at a later stage. // Create a disposable pixmap buffer for the title blend - KPixmap* titleBuffer = new KPixmap; + QPixmap* titleBuffer = new KPixmap; *titleBuffer = QPixmap(w-2*modBorderWidth, titleHeight); if (titleBuffer->depth() > 16) {