Rename setAttributeAlias and removeAttributeAlias

qgis · Oct 1, 2016 · 37e06ae · 37e06ae
1 parent 9c11814
commit 37e06ae
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 16 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -1415,7 +1415,9 @@ displayExpression instead. For the map tip use mapTipTemplate() instead.</li>
 <li>Deleted attributeEditorElementFromDomElement
 <li>editFormConfig() returns a copy instead of direct access (Use setEditFormConfig to update)
 <li>Removed valueRelation(), replaced with QgsEditFormConfig::editorWidgetConfig
-<li>Removed fieldNameIndex(), use QgsFields::lookupField() or QgsFields::indexFromName() instead
+<li>Removed fieldNameIndex(), use fields().lookupField() or fields().indexFromName() instead
+<li>Renamed addAttributeAlias() to setAttributeAlias()
+<li>Renamed remAttributeAlias() to removeAttributeAlias()
 </ul>
 
 \subsection qgis_api_break_3_0_QgsVectorLayerEditBuffer QgsVectorLayerEditBuffer

diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -1073,17 +1073,25 @@ class QgsVectorLayer : QgsMapLayer
      */
     bool addAttribute( const QgsField &field );
 
-    /** Sets an alias (a display name) for attributes to display in dialogs */
-    void addAttributeAlias( int attIndex, const QString& aliasString );
+    /**
+     * Sets an alias (a display name) for attributes to display in dialogs
+     *
+     * @note Added in QGIS 3.0
+     */
+    void setAttributeAlias( int index, const QString& aliasString );
 
-    /** Removes an alias (a display name) for attributes to display in dialogs */
-    void remAttributeAlias( int attIndex );
+    /**
+     * Removes an alias (a display name) for attributes to display in dialogs
+     *
+     * @note Added in QGIS 3.0
+     */
+    void removeAttributeAlias( int index );
 
     /** Renames an attribute field  (but does not commit it).
      * @param attIndex attribute index
      * @param newName new name of field
      * @note added in QGIS 2.16
-    */
+     */
     bool renameAttribute( int attIndex, const QString& newName );
 
     /**

diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -765,11 +765,11 @@ void QgsFieldsProperties::attributesListCellChanged( int row, int column )
     {
       if ( !aliasItem->text().trimmed().isEmpty() )
       {
-        mLayer->addAttributeAlias( idx, aliasItem->text() );
+        mLayer->setAttributeAlias( idx, aliasItem->text() );
       }
       else
       {
-        mLayer->remAttributeAlias( idx );
+        mLayer->removeAttributeAlias( idx );
       }
     }
   }

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2107,7 +2107,7 @@ bool QgsVectorLayer::addAttribute( const QgsField &field )
   return mEditBuffer->addAttribute( field );
 }
 
-void QgsVectorLayer::remAttributeAlias( int attIndex )
+void QgsVectorLayer::removeAttributeAlias( int attIndex )
 {
   if ( attIndex < 0 || attIndex >= fields().count() )
     return;
@@ -2131,7 +2131,7 @@ bool QgsVectorLayer::renameAttribute( int attIndex, const QString& newName )
   return mEditBuffer->renameAttribute( attIndex, newName );
 }
 
-void QgsVectorLayer::addAttributeAlias( int attIndex, const QString& aliasString )
+void QgsVectorLayer::setAttributeAlias( int attIndex, const QString& aliasString )
 {
   if ( attIndex < 0 || attIndex >= fields().count() )
     return;

diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1197,17 +1197,25 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      */
     bool addAttribute( const QgsField &field );
 
-    /** Sets an alias (a display name) for attributes to display in dialogs */
-    void addAttributeAlias( int attIndex, const QString& aliasString );
+    /**
+     * Sets an alias (a display name) for attributes to display in dialogs
+     *
+     * @note Added in QGIS 3.0
+     */
+    void setAttributeAlias( int index, const QString& aliasString );
 
-    /** Removes an alias (a display name) for attributes to display in dialogs */
-    void remAttributeAlias( int attIndex );
+    /**
+     * Removes an alias (a display name) for attributes to display in dialogs
+     *
+     * @note Added in QGIS 3.0
+     */
+    void removeAttributeAlias( int index );
 
     /** Renames an attribute field  (but does not commit it).
      * @param attIndex attribute index
      * @param newName new name of field
      * @note added in QGIS 2.16
-    */
+     */
     bool renameAttribute( int attIndex, const QString& newName );
 
     /**

diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -84,7 +84,8 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool
     //ensure that all fields required for filter expressions are prepared
     QSet<int> attributeIndexes = request.filterExpression()->referencedAttributeIndexes( mSource->mFields );
     attributeIndexes += attrs.toSet();
-    mRequest.setSubsetOfAttributes( attributeIndexes.toList() );
+    attrs = attributeIndexes.toList();
+    mRequest.setSubsetOfAttributes( attrs );
   }
   if ( request.filterType() == QgsFeatureRequest::FilterExpression && request.filterExpression()->needsGeometry() )
   {