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

List:       kde-commits
Subject:    koffice/kexi/formeditor (silent)
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2009-02-18 20:51:17
Message-ID: 1234990277.640992.1827.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 928067 by staniek:

SVN_SILENT 
remove 2 errors and one gcc warning


 M  +11 -9     container.cpp  


--- trunk/koffice/kexi/formeditor/container.cpp #928066:928067
@@ -112,8 +112,8 @@
     Private(Container* toplevel, QWidget *container)
       : m_toplevel(toplevel)
       , m_widget(container)
+      , state(DoingNothing)
       , insertBegin(-1, -1)
-      , state(DoingNothing)
     {
     }
     ~Private() {
@@ -303,19 +303,21 @@
         else if ((d->form->selectedWidgets()->count() > 1)) { //&& \
(!d->form->manager()->isInserting())) // more than one widget selected  if \
                (!d->form->selectedWidgets()->contains(m_moving)) {
                 // widget is not selected, it becomes the only selected widget
-                const Form::WidgetSelectionFlags flags
-                    = Form::ReplacePreviousSelection
-                      | Form::LastSelection
-                      | ((mev->button() == Qt::RightButton) ? Form::DontRaise : 0);
+                Form::WidgetSelectionFlags flags
+                    = Form::ReplacePreviousSelection | Form::LastSelection;
+                if (mev->button() == Qt::RightButton) {
+                    flags |= Form::DontRaise;
+                }
                 selectWidget(m_moving, flags);
             }
             // If the widget is already selected, we do nothing (to ease widget \
moving, etc.)  }
         else {// if(!d->form->manager()->isInserting())
-            const Form::WidgetSelectionFlags flags
-                = Form::ReplacePreviousSelection
-                  | Form::LastSelection
-                  | ((mev->button() == Qt::RightButton) ? Form::DontRaise : 0);
+            Form::WidgetSelectionFlags flags
+                = Form::ReplacePreviousSelection | Form::LastSelection;
+            if (mev->button() == Qt::RightButton) {
+                flags |= Form::DontRaise;
+            }
             selectWidget(m_moving, flags);
         }
 


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