[Valgrind-valkyrie-dev] valkyrie: r439 - in trunk/valkyrie: help options

[<sv...@va...>]

Author: sewardj
Date: 2008-06-28 19:56:26 +0100 (Sat, 28 Jun 2008)
New Revision: 439

Log:
Minor changes to get a warning-free build with gcc-4.3.  (nothing serious)


Modified:
   trunk/valkyrie/help/hand_book.cpp
   trunk/valkyrie/options/intspinbox.cpp
   trunk/valkyrie/options/vk_option.cpp


Modified: trunk/valkyrie/help/hand_book.cpp
===================================================================
--- trunk/valkyrie/help/hand_book.cpp	2008-06-15 13:32:14 UTC (rev 438)
+++ trunk/valkyrie/help/hand_book.cpp	2008-06-28 18:56:26 UTC (rev 439)
@@ -112,7 +112,7 @@
          QStringList browsers = QStringList::split( ':', env_browser );
          QStringList::iterator it;
          for (it=browsers.begin(); it != browsers.end(); ++it ) {
-            if (ok = try_launch_browser(*it, link))
+            if ( (ok = try_launch_browser(*it, link)) )
                break;
          }
          if (!ok) {
@@ -130,7 +130,7 @@
       browsers << "firefox" << "mozilla" << "konqueror" << "netscape";
       QStringList::iterator it;
       for (it=browsers.begin(); it != browsers.end(); ++it ) {
-         if (ok = try_launch_browser(*it, link))
+         if ( (ok = try_launch_browser(*it, link)) )
             break;
       }
    }

Modified: trunk/valkyrie/options/intspinbox.cpp
===================================================================
--- trunk/valkyrie/options/intspinbox.cpp	2008-06-15 13:32:14 UTC (rev 438)
+++ trunk/valkyrie/options/intspinbox.cpp	2008-06-28 18:56:26 UTC (rev 439)
@@ -230,7 +230,7 @@
    QStyle::SFlags flags = QStyle::Style_Default;
    if ( isEnabled() )
       flags |= QStyle::Style_Enabled;
-   if ( hasFocus() || focusProxy() && focusProxy()->hasFocus() )
+   if ( hasFocus() || (focusProxy() && focusProxy()->hasFocus()) )
       flags |= QStyle::Style_HasFocus;
 
    QStyle::SCFlags active;

Modified: trunk/valkyrie/options/vk_option.cpp
===================================================================
--- trunk/valkyrie/options/vk_option.cpp	2008-06-15 13:32:14 UTC (rev 438)
+++ trunk/valkyrie/options/vk_option.cpp	2008-06-28 18:56:26 UTC (rev 439)
@@ -275,8 +275,8 @@
    if (m_argType == VkOPTION::ARG_UINT) {
       /* except don't test cachegrind's horrible cache options */
       bool dontTest = ( m_configGroup == "cachegrind" &&
-                        ( m_longFlag == "I1" |
-                          m_longFlag == "D1" |
+                        ( m_longFlag == "I1" ||
+                          m_longFlag == "D1" ||
                           m_longFlag == "L2" ) );
       if (!dontTest) {
          /* min|max */