Remove all traces of deprecated QgsFieldMap. Funded by Sourcepole.

manisandro · manisandro · commit 51c6c60f6e61 · 2014-06-11T12:04:55.000+02:00
diff --git a/src/core/qgsfeature.h b/src/core/qgsfeature.h
@@ -100,7 +100,6 @@ typedef QMap<int, QVariant> QgsAttributeMap;
 typedef QVector<QVariant> QgsAttributes;
 
 class QgsField;
-typedef QMap<int, QgsField> QgsFieldMap;
 
 #include "qgsfield.h"
 
diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h
@@ -149,9 +149,6 @@ class CORE_EXPORT QgsField
 
 }; // class QgsField
 
-// key = field index, value=field data
-typedef QMap<int, QgsField> QgsFieldMap;
-
 
 /**
  \ingroup core
diff --git a/src/core/qgslabel.h b/src/core/qgslabel.h
@@ -41,7 +41,6 @@ class QgsLabelAttributes;
 
 typedef QList<int> QgsAttributeList;
 
-typedef QMap<int, QgsField> QgsFieldMap;
 class QgsFields;
 
 /** \ingroup core
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -150,7 +150,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
     /**
      * Return a map of indexes with field names for this layer
      * @return map of fields
-     * @see QgsFieldMap
+     * @see QgsFields
      */
     virtual const QgsFields &fields() const = 0;
 
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -3440,10 +3440,10 @@ QString QgsVectorLayer::metadata()
   myMetadata += "</th>";
 
   //get info for each field by looping through them
-  const QgsFieldMap& myFields = pendingFields();
-  for ( QgsFieldMap::const_iterator it = myFields.begin(); it != myFields.end(); ++it )
+  const QgsFields& myFields = pendingFields();
+  for ( int i = 0, n = myFields.size(); i < n; ++i )
   {
-    const QgsField& myField = *it;
+    const QgsField& myField = fields[i];
 
     myMetadata += "<tr><td>";
     myMetadata += myField.name();
diff --git a/src/gui/symbology-ng/qgsrendererv2widget.cpp b/src/gui/symbology-ng/qgsrendererv2widget.cpp
@@ -243,7 +243,6 @@ void QgsRendererV2DataDefinedMenus::populateMenu( QMenu* menu, QString fieldName
 
   bool hasField = false;
   const QgsFields & flds = mLayer->pendingFields();
-  //const QgsFieldMap& flds = mLayer->pendingFields();
   for ( int idx = 0; idx < flds.count(); ++idx )
   {
     const QgsField& fld = flds[idx];
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -2897,7 +2897,7 @@ void QgsGrassModuleInput::updateQgisLayers()
       mMapLayers.push_back( vector );
       mVectorLayerNames.push_back( grassLayer );
 
-      // convert from QgsFieldMap to std::vector<QgsField>
+      // convert from QgsFields to std::vector<QgsField>
       mVectorFields.push_back( vector->dataProvider()->fields() );
     }
     else if ( mType == Raster && layer->type() == QgsMapLayer::RasterLayer )
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -1491,7 +1491,7 @@ QGis::WkbType QgsMssqlProvider::getWkbType( QString geometryType, int dim )
 
 QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(
   const QString& uri,
-  const QgsFieldMap &fields,
+  const QgsFields &fields,
   QGis::WkbType wkbType,
   const QgsCoordinateReferenceSystem *srs,
   bool overwrite,
@@ -1541,25 +1541,25 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(
   {
     int index = 0;
     QString pk = primaryKey = "qgs_fid";
-    for ( QgsFieldMap::const_iterator fldIt = fields.begin(); fldIt != fields.end(); ++fldIt )
+    for ( int i = 0, n = fields.size(); i < n; ++i )
     {
-      if ( fldIt.value().name() == primaryKey )
+      if ( fields[i].name() == primaryKey )
       {
         // it already exists, try again with a new name
         primaryKey = QString( "%1_%2" ).arg( pk ).arg( index++ );
-        fldIt = fields.begin();
+        i = 0;
       }
     }
   }
   else
   {
     // search for the passed field
-    for ( QgsFieldMap::const_iterator fldIt = fields.begin(); fldIt != fields.end(); ++fldIt )
+    for ( int i = 0, n = fields.size(); i < n; ++i )
     {
-      if ( fldIt.value().name() == primaryKey )
+      if ( fields[i].name() == primaryKey )
       {
         // found, get the field type
-        QgsField fld = fldIt.value();
+        QgsField fld = fields[i];
         if ( convertField( fld ) )
         {
           primaryKeyType = fld.typeName();
@@ -1688,12 +1688,12 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(
 
     // get the list of fields
     QList<QgsField> flist;
-    for ( QgsFieldMap::const_iterator fldIt = fields.begin(); fldIt != fields.end(); ++fldIt )
+    for ( int i = 0, n = fields.size(); i < n; ++i )
     {
-      QgsField fld = fldIt.value();
+      QgsField fld = fields[i];
       if ( fld.name() == primaryKey )
       {
-        oldToNewAttrIdxMap->insert( fldIt.key(), 0 );
+        oldToNewAttrIdxMap->insert( fields.indexFromName( fld.name() ), 0 );
         continue;
       }
 
@@ -1714,7 +1714,7 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(
 
       flist.append( fld );
       if ( oldToNewAttrIdxMap )
-        oldToNewAttrIdxMap->insert( fldIt.key(), offset++ );
+        oldToNewAttrIdxMap->insert( fields.indexFromName( fld.name() ), offset++ );
     }
 
     if ( !provider->addAttributes( flist ) )
@@ -1782,7 +1782,7 @@ QGISEXTERN QgsDataItem *dataItem( QString thePath, QgsDataItem *parentItem )
 
 QGISEXTERN QgsVectorLayerImport::ImportError createEmptyLayer(
   const QString& uri,
-  const QgsFieldMap &fields,
+  const QgsFields &fields,
   QGis::WkbType wkbType,
   const QgsCoordinateReferenceSystem *srs,
   bool overwrite,
diff --git a/src/providers/mssql/qgsmssqlprovider.h b/src/providers/mssql/qgsmssqlprovider.h
@@ -231,7 +231,7 @@ class QgsMssqlProvider : public QgsVectorDataProvider
     /** Import a vector layer into the database */
     static QgsVectorLayerImport::ImportError createEmptyLayer(
       const QString& uri,
-      const QgsFieldMap &fields,
+      const QgsFields &fields,
       QGis::WkbType wkbType,
       const QgsCoordinateReferenceSystem *srs,
       bool overwrite,

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,6 @@ void QgsRendererV2DataDefinedMenus::populateMenu( QMenu* menu, QString fieldName`
`243`	`243`
`244`	`244`	`bool hasField = false;`
`245`	`245`	`const QgsFields & flds = mLayer->pendingFields();`
`246`		`- //const QgsFieldMap& flds = mLayer->pendingFields();`
`247`	`246`	`for ( int idx = 0; idx < flds.count(); ++idx )`
`248`	`247`	`{`
`249`	`248`	`const QgsField& fld = flds[idx];`
Original file line number	Diff line number	Diff line change
`@@ -2897,7 +2897,7 @@ void QgsGrassModuleInput::updateQgisLayers()`
`2897`	`2897`	`mMapLayers.push_back( vector );`
`2898`	`2898`	`mVectorLayerNames.push_back( grassLayer );`
`2899`	`2899`
`2900`		`- // convert from QgsFieldMap to std::vector<QgsField>`
	`2900`	`+ // convert from QgsFields to std::vector<QgsField>`
`2901`	`2901`	`mVectorFields.push_back( vector->dataProvider()->fields() );`
`2902`	`2902`	`}`
`2903`	`2903`	`else if ( mType == Raster && layer->type() == QgsMapLayer::RasterLayer )`
Original file line number	Diff line number	Diff line change
`@@ -1491,7 +1491,7 @@ QGis::WkbType QgsMssqlProvider::getWkbType( QString geometryType, int dim )`
`1491`	`1491`
`1492`	`1492`	`QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(`
`1493`	`1493`	`const QString& uri,`
`1494`		`- const QgsFieldMap &fields,`
	`1494`	`+ const QgsFields &fields,`
`1495`	`1495`	`QGis::WkbType wkbType,`
`1496`	`1496`	`const QgsCoordinateReferenceSystem *srs,`
`1497`	`1497`	`bool overwrite,`
`@@ -1541,25 +1541,25 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(`
`1541`	`1541`	`{`
`1542`	`1542`	`int index = 0;`
`1543`	`1543`	`QString pk = primaryKey = "qgs_fid";`
`1544`		`- for ( QgsFieldMap::const_iterator fldIt = fields.begin(); fldIt != fields.end(); ++fldIt )`
	`1544`	`+ for ( int i = 0, n = fields.size(); i < n; ++i )`
`1545`	`1545`	`{`
`1546`		`- if ( fldIt.value().name() == primaryKey )`
	`1546`	`+ if ( fields[i].name() == primaryKey )`
`1547`	`1547`	`{`
`1548`	`1548`	`// it already exists, try again with a new name`
`1549`	`1549`	`primaryKey = QString( "%1_%2" ).arg( pk ).arg( index++ );`
`1550`		`- fldIt = fields.begin();`
	`1550`	`+ i = 0;`
`1551`	`1551`	`}`
`1552`	`1552`	`}`
`1553`	`1553`	`}`
`1554`	`1554`	`else`
`1555`	`1555`	`{`
`1556`	`1556`	`// search for the passed field`
`1557`		`- for ( QgsFieldMap::const_iterator fldIt = fields.begin(); fldIt != fields.end(); ++fldIt )`
	`1557`	`+ for ( int i = 0, n = fields.size(); i < n; ++i )`
`1558`	`1558`	`{`
`1559`		`- if ( fldIt.value().name() == primaryKey )`
	`1559`	`+ if ( fields[i].name() == primaryKey )`
`1560`	`1560`	`{`
`1561`	`1561`	`// found, get the field type`
`1562`		`- QgsField fld = fldIt.value();`
	`1562`	`+ QgsField fld = fields[i];`
`1563`	`1563`	`if ( convertField( fld ) )`
`1564`	`1564`	`{`
`1565`	`1565`	`primaryKeyType = fld.typeName();`
`@@ -1688,12 +1688,12 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(`
`1688`	`1688`
`1689`	`1689`	`// get the list of fields`
`1690`	`1690`	`QList<QgsField> flist;`
`1691`		`- for ( QgsFieldMap::const_iterator fldIt = fields.begin(); fldIt != fields.end(); ++fldIt )`
	`1691`	`+ for ( int i = 0, n = fields.size(); i < n; ++i )`
`1692`	`1692`	`{`
`1693`		`- QgsField fld = fldIt.value();`
	`1693`	`+ QgsField fld = fields[i];`
`1694`	`1694`	`if ( fld.name() == primaryKey )`
`1695`	`1695`	`{`
`1696`		`- oldToNewAttrIdxMap->insert( fldIt.key(), 0 );`
	`1696`	`+ oldToNewAttrIdxMap->insert( fields.indexFromName( fld.name() ), 0 );`
`1697`	`1697`	`continue;`
`1698`	`1698`	`}`
`1699`	`1699`
`@@ -1714,7 +1714,7 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(`
`1714`	`1714`
`1715`	`1715`	`flist.append( fld );`
`1716`	`1716`	`if ( oldToNewAttrIdxMap )`
`1717`		`- oldToNewAttrIdxMap->insert( fldIt.key(), offset++ );`
	`1717`	`+ oldToNewAttrIdxMap->insert( fields.indexFromName( fld.name() ), offset++ );`
`1718`	`1718`	`}`
`1719`	`1719`
`1720`	`1720`	`if ( !provider->addAttributes( flist ) )`
`@@ -1782,7 +1782,7 @@ QGISEXTERN QgsDataItem dataItem( QString thePath, QgsDataItem parentItem )`
`1782`	`1782`
`1783`	`1783`	`QGISEXTERN QgsVectorLayerImport::ImportError createEmptyLayer(`
`1784`	`1784`	`const QString& uri,`
`1785`		`- const QgsFieldMap &fields,`
	`1785`	`+ const QgsFields &fields,`
`1786`	`1786`	`QGis::WkbType wkbType,`
`1787`	`1787`	`const QgsCoordinateReferenceSystem *srs,`
`1788`	`1788`	`bool overwrite,`