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

Merging from old trunk:

Browse source 
r604645 | mlaurent | 2006-11-13 16:31:59 +0100 (Mon, 13 Nov 2006) | 2 lines

Fix compile with compilator!=gcc


svn path=/trunk/KDE/kdebase/workspace/; revision=659311
This commit is contained in:
Luboš Luňák 2007-04-29 22:38:19 +00:00
parent a18969213a
commit 1f71d535b5
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bridge.cpp
View file

@ -69,7 +69,9 @@ NET::WindowType Bridge::windowType( unsigned long supported_types ) const
QIcon Bridge::icon() const QIcon Bridge::icon() const
{ {
#ifdef __GNUC__
#warning KDE4 drop me ? #warning KDE4 drop me ?
#endif
return QIcon( /*c->miniIcon(),*/ c->icon()); return QIcon( /*c->miniIcon(),*/ c->icon());
} }

6
lib/kdecoration.cpp
View file

@ -396,7 +396,9 @@ const QPalette& KDecorationOptions::palette(ColorType type, bool active) const
int idx = type + (active ? 0 : NUM_COLORS); int idx = type + (active ? 0 : NUM_COLORS);
if(d->pal[idx]) if(d->pal[idx])
return(*d->pal[idx]); return(*d->pal[idx]);
#ifdef __GNUC__
#warning KDE4 : why construct the palette this way? #warning KDE4 : why construct the palette this way?
#endif
// TODO: Is this worth 'porting' to Qt4? // TODO: Is this worth 'porting' to Qt4?
// d->pal[idx] = new QPalette(Qt::black, d->colors[idx], d->colors[idx].light(150), // d->pal[idx] = new QPalette(Qt::black, d->colors[idx], d->colors[idx].light(150),
// d->colors[idx].dark(), d->colors[idx].dark(120), // d->colors[idx].dark(), d->colors[idx].dark(120),
@ -446,7 +448,7 @@ KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick(
button == Qt::MidButton? d->OpMaxButtonMiddleClick : button == Qt::MidButton? d->OpMaxButtonMiddleClick :
d->OpMaxButtonLeftClick; d->OpMaxButtonLeftClick;
} }
#ifdef __GNUC__
#warning Redo all the XYZChange() virtuals as signals. #warning Redo all the XYZChange() virtuals as signals.
#endif
#include "kdecoration.moc" #include "kdecoration.moc"

2
lib/kdecoration_p.cpp
View file

@ -152,7 +152,9 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
inactiveFont = wmConfig.readEntry("inactiveFont", activeFont); inactiveFont = wmConfig.readEntry("inactiveFont", activeFont);
activeFontSmall = activeFont; activeFontSmall = activeFont;
#ifdef __GNUC__
#warning KDE4 : is it useful ? ( temporary hack ) #warning KDE4 : is it useful ? ( temporary hack )
#endif
// activeFontSmall.setPointSize(activeFont.pointSize() - 2 > 0 ? activeFont.pointSize() - 2 : activeFont.pointSize()+1 ); // activeFontSmall.setPointSize(activeFont.pointSize() - 2 > 0 ? activeFont.pointSize() - 2 : activeFont.pointSize()+1 );
activeFontSmall = wmConfig.readEntry("activeFontSmall", activeFontSmall); activeFontSmall = wmConfig.readEntry("activeFontSmall", activeFontSmall);
inactiveFontSmall = wmConfig.readEntry("inactiveFontSmall", activeFontSmall); inactiveFontSmall = wmConfig.readEntry("inactiveFontSmall", activeFontSmall);