Skip to content

Commit

Permalink
fix warnings
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@14693 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Nov 16, 2010
1 parent e2e17b4 commit f22f772
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/analysis/raster/qgsrastercalcnode.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ class ANALYSIS_EXPORT QgsRasterCalcNode
QgsRasterCalcNode* mLeft;
QgsRasterCalcNode* mRight;
QgsRasterMatrix* mRasterMatrix;
QString mRasterName;
double mNumber;
QString mRasterName;
Operator mOperator;
};

Expand Down
2 changes: 2 additions & 0 deletions src/core/gps/qgsgpsdconnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion src/ui/qgsabout.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgscomposerarrowwidgetbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsfieldcalculatorbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsitempositiondialogbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsoptionsbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgspgnewconnectionbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down

0 comments on commit f22f772

Please sign in to comment.