Skip to content

Commit a1f4991

Browse files
author
g_j_m
committed
Fix compiler warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk@6490 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent abb13a1 commit a1f4991

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/providers/postgres/qgspostgresprovider.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ bool QgsPostgresProvider::getNextFeature(QgsFeature& feat,
368368
feat.setFeatureId(oid);
369369

370370
// fetch attributes
371-
if (fetchAttributes.count() == fieldCount())
371+
if (static_cast<uint>(fetchAttributes.count()) == fieldCount())
372372
getFeatureAttributes(oid, row, feat); // only one sql query to get all attributes
373373
else
374374
getFeatureAttributes(oid, row, feat, fetchAttributes); // ineffective: one sql per attribute
@@ -1019,7 +1019,7 @@ QString QgsPostgresProvider::chooseViewColumn(const tableCols& cols)
10191019
// 'oid' columns in tables don't have a constraint on them, but
10201020
// they are useful to consider, so add them in if not already
10211021
// here.
1022-
for (int i = 0; i < oids.size(); ++i)
1022+
for (uint i = 0; i < oids.size(); ++i)
10231023
{
10241024
if (suitable.find(oids[i]->first) == suitable.end())
10251025
{
@@ -1493,7 +1493,7 @@ bool QgsPostgresProvider::addFeature(QgsFeature& f, int primaryKeyHighWater)
14931493
// Add the WKB geometry to the INSERT statement
14941494
QgsGeometry* geometry = f.geometry();
14951495
unsigned char* geom = geometry->wkbBuffer();
1496-
for (int i=0; i < geometry->wkbSize(); ++i)
1496+
for (uint i=0; i < geometry->wkbSize(); ++i)
14971497
{
14981498
if (useWkbHex)
14991499
{
@@ -1929,7 +1929,7 @@ bool QgsPostgresProvider::changeGeometryValues(QgsGeometryMap & geometry_map)
19291929

19301930
// Add the WKB geometry to the UPDATE statement
19311931
unsigned char* geom = iter->wkbBuffer();
1932-
for (int i=0; i < iter->wkbSize(); ++i)
1932+
for (uint i=0; i < iter->wkbSize(); ++i)
19331933
{
19341934
if (useWkbHex)
19351935
{

src/providers/wms/qgswmsprovider.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ QgsWmsProvider::QgsWmsProvider(QString const & uri)
6565
mHttpProxyUser(0),
6666
mHttpProxyPass(0),
6767
httpcapabilitiesresponse(0),
68+
imageCrs(DEFAULT_LATLON_CRS),
6869
cachedImage(0),
6970
cachedViewExtent(0),
7071
cachedPixelWidth(0),
7172
cachedPixelHeight(0),
7273
mCoordinateTransform(0),
7374
extentDirty(TRUE),
74-
imageCrs(DEFAULT_LATLON_CRS),
7575
mGetFeatureInfoUrlBase(0)
7676
{
7777
#ifdef QGISDEBUG
@@ -224,7 +224,7 @@ QSet<QString> QgsWmsProvider::supportedCrsForLayers(QStringList const & layers)
224224
QSet<QString> crsSet;
225225

226226
// convert std::vector to std::set for set comparisons
227-
for (int j = 0; j < crsVector.size(); j++)
227+
for (uint j = 0; j < crsVector.size(); j++)
228228
{
229229
crsSet.insert( crsVector[j] );
230230
}
@@ -1647,7 +1647,7 @@ void QgsWmsProvider::parseLayer(QDomElement const & e, QgsWmsLayerProperty& laye
16471647
extentForLayer[ layerProperty.name ] = layerProperty.ex_GeographicBoundingBox;
16481648

16491649
// see if we can refine the bounding box with the CRS-specific bounding boxes
1650-
for ( int i = 0; i < layerProperty.boundingBox.size(); i++ )
1650+
for ( uint i = 0; i < layerProperty.boundingBox.size(); i++ )
16511651
{
16521652
#ifdef QGISDEBUG
16531653
std::cout << "QgsWmsProvider::parseLayer: testing bounding box CRS which is "
@@ -2128,7 +2128,7 @@ QString QgsWmsProvider::getMetadata()
21282128

21292129
// Iterate through layers
21302130

2131-
for (int i = 0; i < layersSupported.size(); i++)
2131+
for (uint i = 0; i < layersSupported.size(); i++)
21322132
{
21332133

21342134
// TODO: Handle nested layers
@@ -2247,7 +2247,7 @@ QString QgsWmsProvider::getMetadata()
22472247
myMetadataQString += "</td></tr>";
22482248

22492249
// Layer Coordinate Reference Systems
2250-
for ( int j = 0; j < layersSupported[i].crs.size(); j++ )
2250+
for ( uint j = 0; j < layersSupported[i].crs.size(); j++ )
22512251
{
22522252
myMetadataQString += "<tr><td bgcolor=\"gray\">";
22532253
myMetadataQString += tr("Available in CRS");
@@ -2258,7 +2258,7 @@ QString QgsWmsProvider::getMetadata()
22582258
}
22592259

22602260
// Layer Styles
2261-
for (int j = 0; j < layersSupported[i].style.size(); j++)
2261+
for (uint j = 0; j < layersSupported[i].style.size(); j++)
22622262
{
22632263
myMetadataQString += "<tr><td bgcolor=\"gray\">";
22642264
myMetadataQString += tr("Available in style");

0 commit comments

Comments
 (0)