Skip to content

Commit c5f5e7f

Browse files
author
jef
committed
reindent qgsvectorlayer.cpp - PLEASE run scripts/prepare-commit.sh before commit
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10993 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b2d1d0d commit c5f5e7f

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

src/core/qgsvectorlayer.cpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2402,20 +2402,20 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
24022402
}
24032403

24042404
mAttributeAliasMap.clear();
2405-
QDomNode aliasesNode = node.namedItem("aliases");
2406-
if(!aliasesNode.isNull())
2405+
QDomNode aliasesNode = node.namedItem( "aliases" );
2406+
if ( !aliasesNode.isNull() )
24072407
{
24082408
QDomElement aliasElem;
24092409
int index;
24102410
QString name;
24112411

2412-
QDomNodeList aliasNodeList = aliasesNode.toElement().elementsByTagName("alias");
2413-
for(int i = 0; i < aliasNodeList.size(); ++i)
2412+
QDomNodeList aliasNodeList = aliasesNode.toElement().elementsByTagName( "alias" );
2413+
for ( int i = 0; i < aliasNodeList.size(); ++i )
24142414
{
2415-
aliasElem = aliasNodeList.at(i).toElement();
2416-
index = aliasElem.attribute("index").toInt();
2417-
name = aliasElem.attribute("name");
2418-
mAttributeAliasMap.insert(index, name);
2415+
aliasElem = aliasNodeList.at( i ).toElement();
2416+
index = aliasElem.attribute( "index" ).toInt();
2417+
name = aliasElem.attribute( "name" );
2418+
mAttributeAliasMap.insert( index, name );
24192419
}
24202420
}
24212421

@@ -2553,18 +2553,18 @@ bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString&
25532553
}
25542554

25552555
//attribute aliases
2556-
if(mAttributeAliasMap.size() > 0)
2556+
if ( mAttributeAliasMap.size() > 0 )
25572557
{
2558-
QDomElement aliasElem = doc.createElement("aliases");
2558+
QDomElement aliasElem = doc.createElement( "aliases" );
25592559
QMap<int, QString>::const_iterator a_it = mAttributeAliasMap.constBegin();
2560-
for(; a_it != mAttributeAliasMap.constEnd(); ++a_it)
2560+
for ( ; a_it != mAttributeAliasMap.constEnd(); ++a_it )
25612561
{
2562-
QDomElement aliasEntryElem = doc.createElement("alias");
2563-
aliasEntryElem.setAttribute("index", QString::number(a_it.key()));
2564-
aliasEntryElem.setAttribute("name", a_it.value());
2565-
aliasElem.appendChild(aliasEntryElem);
2562+
QDomElement aliasEntryElem = doc.createElement( "alias" );
2563+
aliasEntryElem.setAttribute( "index", QString::number( a_it.key() ) );
2564+
aliasEntryElem.setAttribute( "name", a_it.value() );
2565+
aliasElem.appendChild( aliasEntryElem );
25662566
}
2567-
node.appendChild(aliasElem);
2567+
node.appendChild( aliasElem );
25682568
}
25692569

25702570
// add the display field
@@ -2713,16 +2713,16 @@ bool QgsVectorLayer::addAttribute( QString name, QString type )
27132713
return addAttribute( QgsField( name, map[ type ], type ) );
27142714
}
27152715

2716-
void QgsVectorLayer::addAttributeAlias(int attIndex, QString aliasString)
2716+
void QgsVectorLayer::addAttributeAlias( int attIndex, QString aliasString )
27172717
{
2718-
mAttributeAliasMap.insert(attIndex, aliasString);
2719-
emit layerModified(false);
2718+
mAttributeAliasMap.insert( attIndex, aliasString );
2719+
emit layerModified( false );
27202720
}
27212721

2722-
QString QgsVectorLayer::attributeAlias(int attributeIndex) const
2722+
QString QgsVectorLayer::attributeAlias( int attributeIndex ) const
27232723
{
2724-
QMap<int, QString>::const_iterator alias_it = mAttributeAliasMap.find(attributeIndex);
2725-
if(alias_it != mAttributeAliasMap.constEnd())
2724+
QMap<int, QString>::const_iterator alias_it = mAttributeAliasMap.find( attributeIndex );
2725+
if ( alias_it != mAttributeAliasMap.constEnd() )
27262726
{
27272727
return alias_it.value();
27282728
}
@@ -2732,10 +2732,10 @@ QString QgsVectorLayer::attributeAlias(int attributeIndex) const
27322732
}
27332733
}
27342734

2735-
QString QgsVectorLayer::attributeDisplayName(int attributeIndex) const
2735+
QString QgsVectorLayer::attributeDisplayName( int attributeIndex ) const
27362736
{
2737-
QString displayName = attributeAlias(attributeIndex);
2738-
if(displayName.isEmpty())
2737+
QString displayName = attributeAlias( attributeIndex );
2738+
if ( displayName.isEmpty() )
27392739
{
27402740
const QgsFieldMap& fields = pendingFields();
27412741
QgsFieldMap::const_iterator fieldIt = fields.find( attributeIndex );
@@ -2767,7 +2767,7 @@ bool QgsVectorLayer::deleteAttribute( int index )
27672767
mDeletedAttributeIds.insert( index );
27682768
mAddedAttributeIds.remove( index );
27692769
mUpdatedFields.remove( index );
2770-
mAttributeAliasMap.remove(index);
2770+
mAttributeAliasMap.remove( index );
27712771

27722772
setModified( true, false );
27732773

0 commit comments

Comments
 (0)