[QGIS Commit] r14693 - in trunk/qgis/src: analysis/raster core/gps
ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Nov 16 15:46:14 EST 2010
Author: jef
Date: 2010-11-16 12:46:14 -0800 (Tue, 16 Nov 2010)
New Revision: 14693
Modified:
trunk/qgis/src/analysis/raster/qgsrastercalcnode.h
trunk/qgis/src/core/gps/qgsgpsdconnection.cpp
trunk/qgis/src/ui/qgsabout.ui
trunk/qgis/src/ui/qgscomposerarrowwidgetbase.ui
trunk/qgis/src/ui/qgsfieldcalculatorbase.ui
trunk/qgis/src/ui/qgsitempositiondialogbase.ui
trunk/qgis/src/ui/qgsoptionsbase.ui
trunk/qgis/src/ui/qgspgnewconnectionbase.ui
trunk/qgis/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
Log:
fix warnings
Modified: trunk/qgis/src/analysis/raster/qgsrastercalcnode.h
===================================================================
--- trunk/qgis/src/analysis/raster/qgsrastercalcnode.h 2010-11-16 20:33:34 UTC (rev 14692)
+++ trunk/qgis/src/analysis/raster/qgsrastercalcnode.h 2010-11-16 20:46:14 UTC (rev 14693)
@@ -79,8 +79,8 @@
QgsRasterCalcNode* mLeft;
QgsRasterCalcNode* mRight;
QgsRasterMatrix* mRasterMatrix;
+ double mNumber;
QString mRasterName;
- double mNumber;
Operator mOperator;
};
Modified: trunk/qgis/src/core/gps/qgsgpsdconnection.cpp
===================================================================
--- trunk/qgis/src/core/gps/qgsgpsdconnection.cpp 2010-11-16 20:33:34 UTC (rev 14692)
+++ trunk/qgis/src/core/gps/qgsgpsdconnection.cpp 2010-11-16 20:46:14 UTC (rev 14693)
@@ -46,6 +46,8 @@
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
}
Modified: trunk/qgis/src/ui/qgsabout.ui
===================================================================
--- trunk/qgis/src/ui/qgsabout.ui 2010-11-16 20:33:34 UTC (rev 14692)
+++ trunk/qgis/src/ui/qgsabout.ui 2010-11-16 20:46:14 UTC (rev 14693)
@@ -202,7 +202,7 @@
<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">
Modified: trunk/qgis/src/ui/qgscomposerarrowwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerarrowwidgetbase.ui 2010-11-16 20:33:34 UTC (rev 14692)
+++ trunk/qgis/src/ui/qgscomposerarrowwidgetbase.ui 2010-11-16 20:46:14 UTC (rev 14693)
@@ -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">
Modified: trunk/qgis/src/ui/qgsfieldcalculatorbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsfieldcalculatorbase.ui 2010-11-16 20:33:34 UTC (rev 14692)
+++ trunk/qgis/src/ui/qgsfieldcalculatorbase.ui 2010-11-16 20:46:14 UTC (rev 14693)
@@ -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">
Modified: trunk/qgis/src/ui/qgsitempositiondialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsitempositiondialogbase.ui 2010-11-16 20:33:34 UTC (rev 14692)
+++ trunk/qgis/src/ui/qgsitempositiondialogbase.ui 2010-11-16 20:46:14 UTC (rev 14693)
@@ -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">
Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui 2010-11-16 20:33:34 UTC (rev 14692)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui 2010-11-16 20:46:14 UTC (rev 14693)
@@ -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">
Modified: trunk/qgis/src/ui/qgspgnewconnectionbase.ui
===================================================================
--- trunk/qgis/src/ui/qgspgnewconnectionbase.ui 2010-11-16 20:33:34 UTC (rev 14692)
+++ trunk/qgis/src/ui/qgspgnewconnectionbase.ui 2010-11-16 20:46:14 UTC (rev 14693)
@@ -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>
Modified: trunk/qgis/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui 2010-11-16 20:33:34 UTC (rev 14692)
+++ trunk/qgis/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui 2010-11-16 20:46:14 UTC (rev 14693)
@@ -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">
More information about the QGIS-commit
mailing list