Merging from old trunk:
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:
parent
a18969213a
commit
1f71d535b5
3 changed files with 8 additions and 2 deletions
|
@ -69,7 +69,9 @@ NET::WindowType Bridge::windowType( unsigned long supported_types ) const
|
|||
|
||||
QIcon Bridge::icon() const
|
||||
{
|
||||
#ifdef __GNUC__
|
||||
#warning KDE4 drop me ?
|
||||
#endif
|
||||
return QIcon( /*c->miniIcon(),*/ c->icon());
|
||||
}
|
||||
|
||||
|
|
|
@ -396,7 +396,9 @@ const QPalette& KDecorationOptions::palette(ColorType type, bool active) const
|
|||
int idx = type + (active ? 0 : NUM_COLORS);
|
||||
if(d->pal[idx])
|
||||
return(*d->pal[idx]);
|
||||
#ifdef __GNUC__
|
||||
#warning KDE4 : why construct the palette this way?
|
||||
#endif
|
||||
// TODO: Is this worth 'porting' to Qt4?
|
||||
// d->pal[idx] = new QPalette(Qt::black, d->colors[idx], d->colors[idx].light(150),
|
||||
// d->colors[idx].dark(), d->colors[idx].dark(120),
|
||||
|
@ -446,7 +448,7 @@ KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick(
|
|||
button == Qt::MidButton? d->OpMaxButtonMiddleClick :
|
||||
d->OpMaxButtonLeftClick;
|
||||
}
|
||||
|
||||
#ifdef __GNUC__
|
||||
#warning Redo all the XYZChange() virtuals as signals.
|
||||
|
||||
#endif
|
||||
#include "kdecoration.moc"
|
||||
|
|
|
@ -152,7 +152,9 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
|
|||
inactiveFont = wmConfig.readEntry("inactiveFont", activeFont);
|
||||
|
||||
activeFontSmall = activeFont;
|
||||
#ifdef __GNUC__
|
||||
#warning KDE4 : is it useful ? ( temporary hack )
|
||||
#endif
|
||||
// activeFontSmall.setPointSize(activeFont.pointSize() - 2 > 0 ? activeFont.pointSize() - 2 : activeFont.pointSize()+1 );
|
||||
activeFontSmall = wmConfig.readEntry("activeFontSmall", activeFontSmall);
|
||||
inactiveFontSmall = wmConfig.readEntry("inactiveFontSmall", activeFontSmall);
|
||||
|
|
Loading…
Reference in a new issue