Skip to content

Commit 1fbebf1

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

File tree

4 files changed

+6
-40
lines changed

4 files changed

+6
-40
lines changed

src/app/legend/qgslegendlayerfile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ QgsLegendLayerFile::QgsLegendLayerFile( QTreeWidgetItem * theLegendItem, QString
4848
: QgsLegendItem( theLegendItem, theString ), mLyr( theLayer )
4949
{
5050
// Set the initial visibility flag for layers
51-
// This user option allows the user to turn off inital drawing of
51+
// This user option allows the user to turn off initial drawing of
5252
// layers when they are added to the map. This is useful when adding
5353
// many layers and the user wants to adjusty symbology, etc prior to
5454
// actually viewing the layer.

src/app/qgsmeasuredialog.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ void QgsMeasureDialog::updateUi()
208208
case QGis::Feet:
209209
mTable->setHeaderLabels( QStringList( tr( "Segments (in feet)" ) ) );
210210
break;
211+
case Qgis::DegreesMinutesSeconds:
212+
case Qgis::DegreesMinutesMinutes:
211213
case QGis::Degrees:
212214
mTable->setHeaderLabels( QStringList( tr( "Segments (in degrees)" ) ) );
213215
break;

src/app/qgstable.h

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/ui/qgsoptionsbase.ui

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<string>Options</string>
1414
</property>
1515
<property name="windowIcon" >
16-
<iconset/>
16+
<iconset>
17+
<normaloff/>
18+
</iconset>
1719
</property>
1820
<property name="sizeGripEnabled" >
1921
<bool>true</bool>

0 commit comments

Comments
 (0)