[QGIS Commit] r14030 - in trunk/qgis/src: core/symbology-ng providers/wfs

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-08-08 16:11:42 +0000 (Sun, 08 Aug 2010)
New Revision: 14030

Modified:
   trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
   trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
   trunk/qgis/src/providers/wfs/qgswfsdata.h
   trunk/qgis/src/providers/wfs/qgswfsprovider.cpp
Log:
fix build with Qt 4.4

Modified: trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp	2010-08-08 14:24:30 UTC (rev 14029)
+++ trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp	2010-08-08 16:11:42 UTC (rev 14030)
@@ -186,7 +186,11 @@
     it->symbol()->startRender( context );
 
   // cleanup mTempSymbols
+#if QT_VERSION < 0x40600
+  QMap<QgsSymbolV2*, QgsSymbolV2*>::iterator it2 = mTempSymbols.begin();
+#else
   QHash<QgsSymbolV2*, QgsSymbolV2*>::iterator it2 = mTempSymbols.begin();
+#endif
   for ( ; it2 != mTempSymbols.end(); ++it2 )
   {
     it2.value()->stopRender( context );

Modified: trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h	2010-08-08 14:24:30 UTC (rev 14029)
+++ trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h	2010-08-08 16:11:42 UTC (rev 14030)
@@ -131,7 +131,11 @@
     int mRotationFieldIdx, mSizeScaleFieldIdx;
 
     //! temporary symbols, used for data-defined rotation and scaling
+#if QT_VERSION < 0x40600
+    QMap<QgsSymbolV2*, QgsSymbolV2*> mTempSymbols;
+#else
     QHash<QgsSymbolV2*, QgsSymbolV2*> mTempSymbols;
+#endif
 
     QgsSymbolV2* symbolForValue( double value );
 };

Modified: trunk/qgis/src/providers/wfs/qgswfsdata.h
===================================================================
--- trunk/qgis/src/providers/wfs/qgswfsdata.h	2010-08-08 14:24:30 UTC (rev 14029)
+++ trunk/qgis/src/providers/wfs/qgswfsdata.h	2010-08-08 16:11:42 UTC (rev 14030)
@@ -25,6 +25,7 @@
 #include <list>
 #include <set>
 #include <stack>
+#include <QPair>
 class QgsRectangle;
 class QgsCoordinateReferenceSystem;
 

Modified: trunk/qgis/src/providers/wfs/qgswfsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wfs/qgswfsprovider.cpp	2010-08-08 14:24:30 UTC (rev 14029)
+++ trunk/qgis/src/providers/wfs/qgswfsprovider.cpp	2010-08-08 16:11:42 UTC (rev 14030)
@@ -35,6 +35,7 @@
 #include <QFile>
 #include <QUrl>
 #include <QWidget>
+#include <QPair>
 #include <cfloat>
 
 static const QString TEXT_PROVIDER_KEY = "WFS";