[QGIS Commit] r14742 - in trunk/qgis/src: app app/legend core plugins/grass plugins/oracle_raster

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-11-22 13:42:11 -0800 (Mon, 22 Nov 2010)
New Revision: 14742

Modified:
   trunk/qgis/src/app/legend/qgslegend.cpp
   trunk/qgis/src/app/legend/qgslegendlayer.cpp
   trunk/qgis/src/app/qgsmaptoolsimplify.cpp
   trunk/qgis/src/core/qgsgeometry.cpp
   trunk/qgis/src/plugins/grass/qgsgrasstoolsbase.ui
   trunk/qgis/src/plugins/oracle_raster/qgsselectgeorasterbase.ui
Log:
fix warnings (gcc 4.5.1, Qt 4.7.1)

Modified: trunk/qgis/src/app/legend/qgslegend.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegend.cpp	2010-11-22 21:41:55 UTC (rev 14741)
+++ trunk/qgis/src/app/legend/qgslegend.cpp	2010-11-22 21:42:11 UTC (rev 14742)
@@ -383,6 +383,10 @@
         mDropAction = INSERT;
       }
     }
+    else
+    {
+      line_y = visualItemRect( item ).bottom() - 2;
+    }
 
     showLine( line_y, line_x );
     setCursor( QCursor( Qt::SizeVerCursor ) );
@@ -1554,7 +1558,7 @@
     ll->layer()->setLayerName( ll->text( 0 ) );
   }
 
-  bool renderFlagState;
+  bool renderFlagState = false;
   bool changing = mChanging;
   mChanging = true;
 

Modified: trunk/qgis/src/app/legend/qgslegendlayer.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegendlayer.cpp	2010-11-22 21:41:55 UTC (rev 14741)
+++ trunk/qgis/src/app/legend/qgslegendlayer.cpp	2010-11-22 21:42:11 UTC (rev 14742)
@@ -610,7 +610,6 @@
   symbolIt = symbolList.constBegin();
   for ( ; symbolIt != symbolList.constEnd(); ++symbolIt )
   {
-    QgsSymbolV2* debug = symbolIt->second;
     itemList.push_back( qMakePair( symbolIt->first + " [" + QString::number( mSymbolCountMap[symbolIt->second] ) + "]", itemMap[symbolIt->first] ) );
   }
 }

Modified: trunk/qgis/src/app/qgsmaptoolsimplify.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolsimplify.cpp	2010-11-22 21:41:55 UTC (rev 14741)
+++ trunk/qgis/src/app/qgsmaptoolsimplify.cpp	2010-11-22 21:42:11 UTC (rev 14742)
@@ -96,7 +96,7 @@
       QgsSimplifyFeature::simplifyPolygon( f, mTolerance );
     }
   }
-  mRubberBand->setToGeometry( f.geometry(), false );
+  mRubberBand->setToGeometry( f.geometry(), 0 );
 }
 
 
@@ -287,7 +287,7 @@
     }
 
     mRubberBand = new QgsRubberBand( mCanvas );
-    mRubberBand->setToGeometry( mSelectedFeature.geometry(), false );
+    mRubberBand->setToGeometry( mSelectedFeature.geometry(), 0 );
     mRubberBand->setColor( Qt::red );
     mRubberBand->setWidth( 2 );
     mRubberBand->show();

Modified: trunk/qgis/src/core/qgsgeometry.cpp
===================================================================
--- trunk/qgis/src/core/qgsgeometry.cpp	2010-11-22 21:41:55 UTC (rev 14741)
+++ trunk/qgis/src/core/qgsgeometry.cpp	2010-11-22 21:42:11 UTC (rev 14742)
@@ -3822,7 +3822,7 @@
   if ( !mGeometry )
   {
     QgsDebugMsg( "WKB geometry not available!" );
-    return false;
+    return QString::null;
   }
 
   QGis::WkbType wkbType;
@@ -4085,7 +4085,7 @@
 
     default:
       QgsDebugMsg( "error: mGeometry type not recognized" );
-      return QString();
+      return QString::null;
   }
 }
 

Modified: trunk/qgis/src/plugins/grass/qgsgrasstoolsbase.ui
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrasstoolsbase.ui	2010-11-22 21:41:55 UTC (rev 14741)
+++ trunk/qgis/src/plugins/grass/qgsgrasstoolsbase.ui	2010-11-22 21:42:11 UTC (rev 14742)
@@ -54,7 +54,7 @@
       <attribute name="title">
        <string>Modules List</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout">
+      <layout class="QGridLayout" name="gridLayout_1">
        <item row="0" column="0">
         <widget class="QLabel" name="label">
          <property name="text">

Modified: trunk/qgis/src/plugins/oracle_raster/qgsselectgeorasterbase.ui
===================================================================
--- trunk/qgis/src/plugins/oracle_raster/qgsselectgeorasterbase.ui	2010-11-22 21:41:55 UTC (rev 14741)
+++ trunk/qgis/src/plugins/oracle_raster/qgsselectgeorasterbase.ui	2010-11-22 21:42:11 UTC (rev 14742)
@@ -147,7 +147,7 @@
      <property name="title">
       <string>Selection</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
+     <layout class="QGridLayout" name="gridLayout_1">
       <item row="0" column="0">
        <widget class="QLineEdit" name="lineEdit"/>
       </item>