Skip to content

Commit f22f772

Browse files
author
jef
committed
fix warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk@14693 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent e2e17b4 commit f22f772

9 files changed

+10
-8
lines changed

src/analysis/raster/qgsrastercalcnode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ class ANALYSIS_EXPORT QgsRasterCalcNode
7979
QgsRasterCalcNode* mLeft;
8080
QgsRasterCalcNode* mRight;
8181
QgsRasterMatrix* mRasterMatrix;
82-
QString mRasterName;
8382
double mNumber;
83+
QString mRasterName;
8484
Operator mOperator;
8585
};
8686

src/core/gps/qgsgpsdconnection.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ void QgsGpsdConnection::connected()
4646

4747
void QgsGpsdConnection::error( QAbstractSocket::SocketError socketError )
4848
{
49+
#if QGISDEBUG
4950
QTcpSocket *socket = qobject_cast< QTcpSocket * >( mSource );
5051
QgsDebugMsg( QString( "error: %1 %2" ).arg( socketError ).arg( socket->errorString() ) );
52+
#endif
5153
}

src/ui/qgsabout.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ p, li { white-space: pre-wrap; }
202202
<attribute name="title">
203203
<string>Contributors</string>
204204
</attribute>
205-
<layout class="QGridLayout" name="gridLayout">
205+
<layout class="QGridLayout" name="gridLayout_1">
206206
<item row="0" column="0">
207207
<widget class="QListWidget" name="lstContributors">
208208
<property name="alternatingRowColors">

src/ui/qgscomposerarrowwidgetbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<property name="title">
5959
<string>Arrow markers</string>
6060
</property>
61-
<layout class="QGridLayout" name="gridLayout">
61+
<layout class="QGridLayout" name="gridLayout_1">
6262
<item row="0" column="0" colspan="2">
6363
<widget class="QRadioButton" name="mDefaultMarkerRadioButton">
6464
<property name="text">

src/ui/qgsfieldcalculatorbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
</item>
297297
<item row="3" column="0" colspan="3">
298298
<widget class="QFrame" name="frame">
299-
<layout class="QGridLayout" name="gridLayout">
299+
<layout class="QGridLayout" name="gridLayout_3">
300300
<item row="1" column="1" rowspan="2" colspan="2">
301301
<widget class="QFrame" name="mValuesFrame">
302302
<layout class="QGridLayout">

src/ui/qgsitempositiondialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<property name="title">
9292
<string>Coordinates</string>
9393
</property>
94-
<layout class="QGridLayout" name="gridLayout">
94+
<layout class="QGridLayout" name="gridLayout_1">
9595
<item row="0" column="0">
9696
<widget class="QLabel" name="mXLabel">
9797
<property name="text">

src/ui/qgsoptionsbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@
587587
<property name="title">
588588
<string>Measure tool</string>
589589
</property>
590-
<layout class="QGridLayout" name="gridLayout">
590+
<layout class="QGridLayout" name="gridLayout_21">
591591
<item row="1" column="0">
592592
<widget class="QLabel" name="textLabel1_8">
593593
<property name="text">

src/ui/qgspgnewconnectionbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
</widget>
202202
</item>
203203
<item row="1" column="0">
204-
<layout class="QGridLayout" name="gridLayout">
204+
<layout class="QGridLayout" name="gridLayout_1">
205205
<property name="margin">
206206
<number>0</number>
207207
</property>

src/ui/qgsvectorgradientcolorrampv2dialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<property name="checked">
8080
<bool>false</bool>
8181
</property>
82-
<layout class="QGridLayout" name="gridLayout">
82+
<layout class="QGridLayout" name="gridLayout_1">
8383
<item row="0" column="1">
8484
<widget class="QPushButton" name="btnAddStop">
8585
<property name="text">

0 commit comments

Comments
 (0)