Skip to content

Commit

Permalink
fix warnings (gcc 4.5.1, Qt 4.7.1)
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14742 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Nov 22, 2010
1 parent 8a27577 commit 6b9214b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
6 changes: 5 additions & 1 deletion src/app/legend/qgslegend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,10 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
mDropAction = INSERT;
}
}
else
{
line_y = visualItemRect( item ).bottom() - 2;
}

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

bool renderFlagState;
bool renderFlagState = false;
bool changing = mChanging;
mChanging = true;

Expand Down
1 change: 0 additions & 1 deletion src/app/legend/qgslegendlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,6 @@ void QgsLegendLayer::updateItemListCountV2( SymbologyList& itemList, QgsVectorLa
symbolIt = symbolList.constBegin();
for ( ; symbolIt != symbolList.constEnd(); ++symbolIt )
{
QgsSymbolV2* debug = symbolIt->second;
itemList.push_back( qMakePair( symbolIt->first + " [" + QString::number( mSymbolCountMap[symbolIt->second] ) + "]", itemMap[symbolIt->first] ) );
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsmaptoolsimplify.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ void QgsMapToolSimplify::toleranceChanged( int tolerance )
QgsSimplifyFeature::simplifyPolygon( f, mTolerance );
}
}
mRubberBand->setToGeometry( f.geometry(), false );
mRubberBand->setToGeometry( f.geometry(), 0 );
}


Expand Down Expand Up @@ -287,7 +287,7 @@ void QgsMapToolSimplify::canvasPressEvent( QMouseEvent * e )
}

mRubberBand = new QgsRubberBand( mCanvas );
mRubberBand->setToGeometry( mSelectedFeature.geometry(), false );
mRubberBand->setToGeometry( mSelectedFeature.geometry(), 0 );
mRubberBand->setColor( Qt::red );
mRubberBand->setWidth( 2 );
mRubberBand->show();
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsgeometry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3822,7 +3822,7 @@ QString QgsGeometry::exportToWkt()
if ( !mGeometry )
{
QgsDebugMsg( "WKB geometry not available!" );
return false;
return QString::null;
}

QGis::WkbType wkbType;
Expand Down Expand Up @@ -4085,7 +4085,7 @@ QString QgsGeometry::exportToWkt()

default:
QgsDebugMsg( "error: mGeometry type not recognized" );
return QString();
return QString::null;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qgsgrasstoolsbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<attribute name="title">
<string>Modules List</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout_1">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/oracle_raster/qgsselectgeorasterbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
<property name="title">
<string>Selection</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout_1">
<item row="0" column="0">
<widget class="QLineEdit" name="lineEdit"/>
</item>
Expand Down

0 comments on commit 6b9214b

Please sign in to comment.