Skip to content

Commit 6b9214b

Browse files
author
jef
committed
fix warnings (gcc 4.5.1, Qt 4.7.1)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14742 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8a27577 commit 6b9214b

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

src/app/legend/qgslegend.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,10 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
383383
mDropAction = INSERT;
384384
}
385385
}
386+
else
387+
{
388+
line_y = visualItemRect( item ).bottom() - 2;
389+
}
386390

387391
showLine( line_y, line_x );
388392
setCursor( QCursor( Qt::SizeVerCursor ) );
@@ -1554,7 +1558,7 @@ void QgsLegend::handleItemChange( QTreeWidgetItem* item, int column )
15541558
ll->layer()->setLayerName( ll->text( 0 ) );
15551559
}
15561560

1557-
bool renderFlagState;
1561+
bool renderFlagState = false;
15581562
bool changing = mChanging;
15591563
mChanging = true;
15601564

src/app/legend/qgslegendlayer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@ void QgsLegendLayer::updateItemListCountV2( SymbologyList& itemList, QgsVectorLa
610610
symbolIt = symbolList.constBegin();
611611
for ( ; symbolIt != symbolList.constEnd(); ++symbolIt )
612612
{
613-
QgsSymbolV2* debug = symbolIt->second;
614613
itemList.push_back( qMakePair( symbolIt->first + " [" + QString::number( mSymbolCountMap[symbolIt->second] ) + "]", itemMap[symbolIt->first] ) );
615614
}
616615
}

src/app/qgsmaptoolsimplify.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void QgsMapToolSimplify::toleranceChanged( int tolerance )
9696
QgsSimplifyFeature::simplifyPolygon( f, mTolerance );
9797
}
9898
}
99-
mRubberBand->setToGeometry( f.geometry(), false );
99+
mRubberBand->setToGeometry( f.geometry(), 0 );
100100
}
101101

102102

@@ -287,7 +287,7 @@ void QgsMapToolSimplify::canvasPressEvent( QMouseEvent * e )
287287
}
288288

289289
mRubberBand = new QgsRubberBand( mCanvas );
290-
mRubberBand->setToGeometry( mSelectedFeature.geometry(), false );
290+
mRubberBand->setToGeometry( mSelectedFeature.geometry(), 0 );
291291
mRubberBand->setColor( Qt::red );
292292
mRubberBand->setWidth( 2 );
293293
mRubberBand->show();

src/core/qgsgeometry.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3822,7 +3822,7 @@ QString QgsGeometry::exportToWkt()
38223822
if ( !mGeometry )
38233823
{
38243824
QgsDebugMsg( "WKB geometry not available!" );
3825-
return false;
3825+
return QString::null;
38263826
}
38273827

38283828
QGis::WkbType wkbType;
@@ -4085,7 +4085,7 @@ QString QgsGeometry::exportToWkt()
40854085

40864086
default:
40874087
QgsDebugMsg( "error: mGeometry type not recognized" );
4088-
return QString();
4088+
return QString::null;
40894089
}
40904090
}
40914091

src/plugins/grass/qgsgrasstoolsbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<attribute name="title">
5555
<string>Modules List</string>
5656
</attribute>
57-
<layout class="QGridLayout" name="gridLayout">
57+
<layout class="QGridLayout" name="gridLayout_1">
5858
<item row="0" column="0">
5959
<widget class="QLabel" name="label">
6060
<property name="text">

src/plugins/oracle_raster/qgsselectgeorasterbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<property name="title">
148148
<string>Selection</string>
149149
</property>
150-
<layout class="QGridLayout" name="gridLayout">
150+
<layout class="QGridLayout" name="gridLayout_1">
151151
<item row="0" column="0">
152152
<widget class="QLineEdit" name="lineEdit"/>
153153
</item>

0 commit comments

Comments
 (0)