fix warnings

git-svn-id: http://svn.osgeo.org/qgis/trunk@14693 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 16, 2010 · f22f772ba50481fbe9727e4b44ee1ad08e17d3b1 · f22f772
1 parent e2e17b4
commit f22f772ba50481fbe9727e4b44ee1ad08e17d3b1
diff --git a/src/analysis/raster/qgsrastercalcnode.h b/src/analysis/raster/qgsrastercalcnode.h
@@ -79,8 +79,8 @@ class ANALYSIS_EXPORT QgsRasterCalcNode
     QgsRasterCalcNode* mLeft;
     QgsRasterCalcNode* mRight;
     QgsRasterMatrix* mRasterMatrix;
-    QString mRasterName;
     double mNumber;
+    QString mRasterName;
     Operator mOperator;
 };
 

diff --git a/src/core/gps/qgsgpsdconnection.cpp b/src/core/gps/qgsgpsdconnection.cpp
@@ -46,6 +46,8 @@ void QgsGpsdConnection::connected()
 
 void QgsGpsdConnection::error( QAbstractSocket::SocketError socketError )
 {
+#if QGISDEBUG
   QTcpSocket *socket = qobject_cast< QTcpSocket * >( mSource );
   QgsDebugMsg( QString( "error: %1 %2" ).arg( socketError ).arg( socket->errorString() ) );
+#endif
 }
diff --git a/src/ui/qgsabout.ui b/src/ui/qgsabout.ui
@@ -202,7 +202,7 @@ p, li { white-space: pre-wrap; }
       <attribute name="title">
        <string>Contributors</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout">
+      <layout class="QGridLayout" name="gridLayout_1">
        <item row="0" column="0">
         <widget class="QListWidget" name="lstContributors">
          <property name="alternatingRowColors">

diff --git a/src/ui/qgscomposerarrowwidgetbase.ui b/src/ui/qgscomposerarrowwidgetbase.ui
@@ -58,7 +58,7 @@
          <property name="title">
           <string>Arrow markers</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout" name="gridLayout_1">
           <item row="0" column="0" colspan="2">
            <widget class="QRadioButton" name="mDefaultMarkerRadioButton">
             <property name="text">

diff --git a/src/ui/qgsfieldcalculatorbase.ui b/src/ui/qgsfieldcalculatorbase.ui
@@ -296,7 +296,7 @@
    </item>
    <item row="3" column="0" colspan="3">
     <widget class="QFrame" name="frame">
-     <layout class="QGridLayout" name="gridLayout">
+     <layout class="QGridLayout" name="gridLayout_3">
       <item row="1" column="1" rowspan="2" colspan="2">
        <widget class="QFrame" name="mValuesFrame">
         <layout class="QGridLayout">

diff --git a/src/ui/qgsitempositiondialogbase.ui b/src/ui/qgsitempositiondialogbase.ui
@@ -91,7 +91,7 @@
      <property name="title">
       <string>Coordinates</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
+     <layout class="QGridLayout" name="gridLayout_1">
       <item row="0" column="0">
        <widget class="QLabel" name="mXLabel">
         <property name="text">

diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
@@ -587,7 +587,7 @@
              <property name="title">
               <string>Measure tool</string>
              </property>
-             <layout class="QGridLayout" name="gridLayout">
+             <layout class="QGridLayout" name="gridLayout_21">
               <item row="1" column="0">
                <widget class="QLabel" name="textLabel1_8">
                 <property name="text">

diff --git a/src/ui/qgspgnewconnectionbase.ui b/src/ui/qgspgnewconnectionbase.ui
@@ -201,7 +201,7 @@
        </widget>
       </item>
       <item row="1" column="0">
-       <layout class="QGridLayout" name="gridLayout">
+       <layout class="QGridLayout" name="gridLayout_1">
         <property name="margin">
          <number>0</number>
         </property>

diff --git a/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui b/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
@@ -79,7 +79,7 @@
      <property name="checked">
       <bool>false</bool>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
+     <layout class="QGridLayout" name="gridLayout_1">
       <item row="0" column="1">
        <widget class="QPushButton" name="btnAddStop">
         <property name="text">