changed std::map to QMap in QgsRasterLayer::identify(), updated PyQGIS

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8443 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 15, 2008 · 49e19e6 · 49e19e6
1 parent f59b118
commit 49e19e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/python/core/qgsrasterlayer.sip b/python/core/qgsrasterlayer.sip
@@ -78,8 +78,7 @@ public:
      *
      * \param point[in]  a coordinate in the CRS of this layer.
      */
-    // TODO: wrap
-    //void identify(const QgsPoint & point, std::map<QString,QString>& results);
+    void identify(const QgsPoint & point, QMap<QString,QString>& results /Out/);
 
     /** \brief Identify arbitrary details from the WMS server found on the point position
      *

diff --git a/src/app/qgsmaptoolidentify.cpp b/src/app/qgsmaptoolidentify.cpp
@@ -131,7 +131,7 @@ void QgsMapToolIdentify::identifyRasterLayer(QgsRasterLayer* layer, const QgsPoi
   if (!layer)
     return;
 
-  std::map<QString, QString> attributes;
+  QMap<QString, QString> attributes;
   layer->identify(point, attributes);
 
   if(!mResults)
@@ -152,10 +152,10 @@ void QgsMapToolIdentify::identifyRasterLayer(QgsRasterLayer* layer, const QgsPoi
   mResults->setTitle( layer->name() );
   mResults->setColumnText ( 0, QObject::tr("Band") );
 
-  std::map<QString, QString>::iterator it;
+  QMap<QString, QString>::iterator it;
   for (it = attributes.begin(); it != attributes.end(); it++)
   {
-    mResults->addAttribute(it->first, it->second);
+    mResults->addAttribute(it.key(), it.value());
   }
 
   mResults->addAttribute( tr("(clicked coordinate)"), point.stringRep() );

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -4804,7 +4804,7 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node )
 
 
 
-void QgsRasterLayer::identify(const QgsPoint& point, std::map<QString,QString>& results)
+void QgsRasterLayer::identify(const QgsPoint& point, QMap<QString,QString>& results)
 {
   double x = point.x();
   double y = point.y();

diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
@@ -128,6 +128,7 @@
 #include <QDateTime>
 #include <QVector>
 #include <QList>
+#include <QMap>
 
 #include "qgis.h"
 #include "qgspoint.h"
@@ -247,7 +248,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
      *
      * \param point[in]  a coordinate in the CRS of this layer.
      */
-    void identify(const QgsPoint & point, std::map<QString,QString>& results);
+    void identify(const QgsPoint & point, QMap<QString,QString>& results);
 
     /** \brief Identify arbitrary details from the WMS server found on the point position
      *