yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merging from old trunk:

Browse source 
r564550 | mkretz | 2006-07-20 15:11:46 +0200 (Thu, 20 Jul 2006) | 3 lines

toAscii() only returns a temporary QByteArray, the QPixmap ctor would crash for
me: keep the QByteArray until all three pixmaps are created


svn path=/trunk/KDE/kdebase/workspace/; revision=659258
This commit is contained in:
Luboš Luňák 2007-04-29 20:47:53 +00:00
parent d8439e8543
commit bb867a2213
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
kcmkwin/kwinoptions/mouse.cpp
View file

@ -44,6 +44,7 @@
#include <X11/Xutil.h>
#include <stdlib.h>
#include <cstring>
#include "mouse.h"
#include "mouse.moc"
@ -112,13 +113,13 @@ void createMaxButtonPixmaps()
"..............."},
};
QString baseColor(". c " + KGlobalSettings::baseColor().name());
QString textColor("# c " + KGlobalSettings::textColor().name());
QByteArray baseColor(". c " + KGlobalSettings::baseColor().name().toAscii());
QByteArray textColor("# c " + KGlobalSettings::textColor().name().toAscii());
for (int t = 0; t < 3; ++t)
{
maxButtonXpms[t][0] = "15 13 2 1";
maxButtonXpms[t][1] = baseColor.toAscii();
maxButtonXpms[t][2] = textColor.toAscii();
maxButtonXpms[t][1] = baseColor.constData();
maxButtonXpms[t][2] = textColor.constData();
maxButtonPixmaps[t] = QPixmap(maxButtonXpms[t]);
maxButtonPixmaps[t].setMask(maxButtonPixmaps[t].createHeuristicMask());
}