[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets
From:       André Wöbbeking <woebbeking () kde ! org>
Date:       2008-07-29 10:13:34
Message-ID: 1217326414.716807.22688.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 839029 by woebbe:

Forwardport of rev. 838452:

GCC 4.3: warning: suggest parentheses around arithmetic in operand of |

and rev 838454:

GCC 4.3: warning: suggest parentheses around comparison in operand of &

 M  +1 -1      battery/battery.cpp  
 M  +1 -1      tasks/windowtaskitem.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/battery/battery.cpp #839028:839029
@@ -108,7 +108,7 @@
 
 void Battery::constraintsEvent(Plasma::Constraints constraints)
 {
-    if (constraints & Plasma::FormFactorConstraint | Plasma::SizeConstraint) {
+    if (constraints & (Plasma::FormFactorConstraint | Plasma::SizeConstraint)) {
         if (formFactor() == Plasma::Vertical) {
             setMaximumSize(QWIDGETSIZE_MAX, qMax(m_textRect.height(), contentsRect().width()));
             //kDebug() << "Vertical FormFactor";
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/windowtaskitem.cpp #839028:839029
@@ -119,7 +119,7 @@
 
 void WindowTaskItem::setTaskFlags(TaskFlags flags)
 {
-    if ((m_flags & TaskWantsAttention != 0) != (flags & TaskWantsAttention != 0)) {
+    if ((m_flags & TaskWantsAttention) != (flags & TaskWantsAttention)) {
         //kDebug() << "task attention state changed" << m_attentionTimerId;
         if (flags & TaskWantsAttention) {
             // start attention getting
[prev in list] [next in list] [prev in thread] [next in thread]