Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix QgsFieldModel on ARM
  • Loading branch information
m-kuhn committed Aug 22, 2014
1 parent 2fa73f0 commit ae08c3e
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/gui/qgsfieldmodel.cpp
Expand Up @@ -231,7 +231,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
if ( !index.isValid() )
return QVariant();

qint64 exprIdx = index.internalId() - mFields.count();
int exprIdx = index.row() - mFields.count();

switch ( role )
{
Expand All @@ -241,7 +241,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
{
return "";
}
QgsField field = mFields[index.internalId()];
QgsField field = mFields[index.row()];
return field.name();
}

Expand All @@ -253,7 +253,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
}
else
{
QgsField field = mFields[index.internalId()];
QgsField field = mFields[index.row()];
return field.name();
}
}
Expand All @@ -264,7 +264,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
{
return QVariant();
}
return index.internalId();
return index.row();
}

case IsExpressionRole:
Expand All @@ -287,7 +287,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
{
if ( exprIdx < 0 )
{
QgsField field = mFields[index.internalId()];
QgsField field = mFields[index.row()];
return ( int )field.type();
}
return QVariant();
Expand All @@ -302,11 +302,11 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
}
else if ( role == Qt::EditRole )
{
return mFields[index.internalId()].name();
return mFields[index.row()].name();
}
else if ( mLayer )
{
return mLayer->attributeDisplayName( index.internalId() );
return mLayer->attributeDisplayName( index.row() );
}
else
return QVariant();
Expand Down

0 comments on commit ae08c3e

Please sign in to comment.