Skip to content
Permalink
Browse files

Silence

  • Loading branch information
m-kuhn committed May 3, 2018
1 parent 5c93666 commit 19261f09869678471a74d135d3cbfe43a6ba8448
Showing with 9 additions and 7 deletions.
  1. +4 −1 src/core/qgsfeaturefiltermodel.cpp
  2. +0 −1 src/core/qgsmaplayer.cpp
  3. +5 −5 src/core/qgsrelation.cpp
@@ -416,7 +416,9 @@ void QgsFeatureFilterModel::setExtraIdentifierValueUnguarded( const QVariant &ex
int index = 0;
for ( const Entry &entry : entries )
{
if ( entry.identifierValue == extraIdentifierValue && entry.identifierValue.isNull() == extraIdentifierValue.isNull() && entry.identifierValue.isValid() == extraIdentifierValue.isValid() )
if ( entry.identifierValue == extraIdentifierValue
&& entry.identifierValue.isNull() == extraIdentifierValue.isNull()
&& entry.identifierValue.isValid() == extraIdentifierValue.isValid() )
{
setExtraIdentifierValueIndex( index );
break;
@@ -434,6 +436,7 @@ void QgsFeatureFilterModel::setExtraIdentifierValueUnguarded( const QVariant &ex
else
mEntries.prepend( Entry( extraIdentifierValue, QStringLiteral( "(%1)" ).arg( extraIdentifierValue.toString() ), QgsFeature() ) );
endInsertRows();

setExtraIdentifierValueIndex( 0 );

reloadCurrentFeature();
@@ -1166,7 +1166,6 @@ QString QgsMapLayer::loadNamedProperty( const QString &uri, QgsMapLayer::Propert
{
QgsDebugMsgLevel( QString( "uri = %1 myURI = %2" ).arg( uri, publicSource() ), 4 );

QgsDebugMsg( "loadNamedProperty" );
resultFlag = false;

QDomDocument myDocument( QStringLiteral( "qgis" ) );
@@ -345,33 +345,33 @@ void QgsRelation::updateRelationStatus()
{
if ( !mReferencedLayer )
{
QgsDebugMsg( QString( "Invalid relation: referenced layer does not exist. ID: %1" ).arg( mReferencedLayerId ) );
QgsDebugMsgLevel( QStringLiteral( "Invalid relation: referenced layer does not exist. ID: %1" ).arg( mReferencedLayerId ), 4 );
mValid = false;
}
else if ( !mReferencingLayer )
{
QgsDebugMsg( QString( "Invalid relation: referencing layer does not exist. ID: %2" ).arg( mReferencingLayerId ) );
QgsDebugMsgLevel( QStringLiteral( "Invalid relation: referencing layer does not exist. ID: %2" ).arg( mReferencingLayerId ), 4 );
mValid = false;
}
else
{
if ( mFieldPairs.count() < 1 )
{
QgsDebugMsg( "Invalid relation: no pair of field is specified." );
QgsDebugMsgLevel( "Invalid relation: no pair of field is specified.", 4 );
mValid = false;
}

Q_FOREACH ( const FieldPair &fieldPair, mFieldPairs )
{
if ( -1 == mReferencingLayer->fields().lookupField( fieldPair.first ) )
{
QgsDebugMsg( QString( "Invalid relation: field %1 does not exist in referencing layer %2" ).arg( fieldPair.first, mReferencingLayer->name() ) );
QgsDebugMsg( QStringLiteral( "Invalid relation: field %1 does not exist in referencing layer %2" ).arg( fieldPair.first, mReferencingLayer->name() ) );
mValid = false;
break;
}
else if ( -1 == mReferencedLayer->fields().lookupField( fieldPair.second ) )
{
QgsDebugMsg( QString( "Invalid relation: field %1 does not exist in referencedg layer %2" ).arg( fieldPair.second, mReferencedLayer->name() ) );
QgsDebugMsg( QStringLiteral( "Invalid relation: field %1 does not exist in referencedg layer %2" ).arg( fieldPair.second, mReferencedLayer->name() ) );
mValid = false;
break;
}

0 comments on commit 19261f0

Please sign in to comment.
You can’t perform that action at this time.