From 4975618a22701f9e11e734db0e418cb9a173cf65 Mon Sep 17 00:00:00 2001 From: Rick Xing Date: Mon, 8 Dec 2008 03:49:44 +0000 Subject: [PATCH] add brace to avoid compiling warning of gcc svn path=/trunk/KDE/kdebase/workspace/; revision=894172 --- client.cpp | 2 ++ effects/diminactive.cpp | 2 ++ group.cpp | 2 ++ placement.cpp | 4 +++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/client.cpp b/client.cpp index e924b70878..020effe0c5 100644 --- a/client.cpp +++ b/client.cpp @@ -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() diff --git a/effects/diminactive.cpp b/effects/diminactive.cpp index 22fc3d4d10..5f6daac1d2 100644 --- a/effects/diminactive.cpp +++ b/effects/diminactive.cpp @@ -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 diff --git a/group.cpp b/group.cpp index d95cc3f374..348bd70c7d 100644 --- a/group.cpp +++ b/group.cpp @@ -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." ; diff --git a/placement.cpp b/placement.cpp index d44924dc41..a1e50db73e 100644 --- a/placement.cpp +++ b/placement.cpp @@ -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)