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

add brace to avoid compiling warning of gcc

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=894172
This commit is contained in:
Rick Xing 2008-12-08 03:49:44 +00:00
parent 1edf7d2e62
commit 4975618a22
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.cpp
View file

@ -1490,10 +1490,12 @@ void Client::readIcons( Window win, QPixmap* icon, QPixmap* miniicon )
if( icon != NULL )
*icon = KWindowSystem::icon( win, 32, 32, true, KWindowSystem::NETWM | KWindowSystem::WMHints );
if( miniicon != NULL )
{
if( icon == NULL || !icon->isNull())
*miniicon = KWindowSystem::icon( win, 16, 16, true, KWindowSystem::NETWM | KWindowSystem::WMHints );
else
*miniicon = QPixmap();
}
}
void Client::getIcons()

2
effects/diminactive.cpp
View file

@ -89,6 +89,7 @@ void DimInactiveEffect::windowActivated( EffectWindow* w )
}
active = w;
if( active != NULL )
{
if( dim_by_group )
{
if( active->group() != NULL )
@ -99,6 +100,7 @@ void DimInactiveEffect::windowActivated( EffectWindow* w )
}
else
active->addRepaintFull();
}
}
} // namespace

2
group.cpp
View file

@ -785,10 +785,12 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined )
if( isSplash() && new_transient_for == None )
new_transient_for = rootWindow();
if( new_transient_for == None )
{
if( defined ) // sometimes WM_TRANSIENT_FOR is set to None, instead of root window
new_property_value = new_transient_for = rootWindow();
else
return None;
}
if( new_transient_for == window()) // pointing to self
{ // also fix the property itself
kWarning( 1216 ) << "Client " << this << " has WM_TRANSIENT_FOR poiting to itself." ;

4
placement.cpp
View file

@ -374,12 +374,14 @@ void Placement::placeCascaded (Client* c, QRect& area, Policy nextPlacement)
if ((yp + ch) > H) yp = Y;
if ((xp + cw) > W)
{
if (!yp)
{
place(c,area,nextPlacement);
return;
}
else xp = X;
else xp = X;
}
//if this isn't the first window
if (cci[dn].pos.x() != X && cci[dn].pos.y() != Y)