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

List:       kde-commits
Subject:    branches/KDE/3.5/kdegraphics/kpovmodeler
From:       Michael Pyne <michael.pyne () kdemail ! net>
Date:       2006-04-22 5:48:34
Message-ID: 1145684914.305272.29205.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 532486 by mpyne:

Suspicious code fixes for kpovmodeler.

',' && foo() is always true, so reorganize parentheses to match the intent of the tests.

Initialize i to a value in pmspheresweep.cpp.

Set the success flag for all cases in pmvariant.cpp

I did not touch pmdockwidget.cpp:2474 as I'm not sure if the loop should break or not.


 M  +3 -3      pmpovrayparser.cpp  
 M  +1 -1      pmspheresweep.cpp  
 M  +1 -0      pmvariant.cpp  


--- branches/KDE/3.5/kdegraphics/kpovmodeler/pmpovrayparser.cpp #532485:532486
@@ -6974,13 +6974,13 @@
             if ( parseFloat( f ) )
             {
                gp->setRadiusGather( f );
-               if ( parseToken( ',' && parseFloat( f ) ) )
+               if ( parseToken( ',' ) && parseFloat( f ) )
                {
                   gp->setRadiusGatherMulti( f );
-                  if ( parseToken( ',' && parseFloat( f ) ) )
+                  if ( parseToken( ',' ) && parseFloat( f ) )
                   {
                      gp->setRadiusMedia( f );
-                     if ( parseToken( ',' && parseFloat( f ) ) )
+                     if ( parseToken( ',' ) && parseFloat( f ) )
                         gp->setRadiusMediaMulti( f );
                   }
                }
--- branches/KDE/3.5/kdegraphics/kpovmodeler/pmspheresweep.cpp #532485:532486
@@ -430,7 +430,7 @@
    QValueList<double>::Iterator it2;
    int i, nr;
 
-   for( it = m_points.begin( ), it2 = m_radii.begin( ), nr = 1;
+   for( it = m_points.begin( ), it2 = m_radii.begin( ), nr = 1, i = 0;
         it != m_points.end( ) && it2 != m_radii.end( ); ++it, ++it2, ++nr )
    {
       PM3DControlPoint* p = new PM3DControlPoint( *it, i++,
--- branches/KDE/3.5/kdegraphics/kpovmodeler/pmvariant.cpp #532485:532486
@@ -858,6 +858,7 @@
             success = false;
          break;
       case PMVariant::ThreeState:
+         success = true; // Assume success, set to false if we fail.
          if( value == "true" || value == "on" || value == "yes" )
             setThreeState( PMTrue );
          else if( value == "false" || value == "off" || value == "no" )
[prev in list] [next in list] [prev in thread] [next in thread]