Skip to content
Permalink
Browse files

Pssst... Quiet, there are people around

  • Loading branch information
m-kuhn committed Sep 29, 2017
1 parent ff385fb commit 05adea838bcf1dc281f10c9c9ee0ade0f70dea01
Showing with 7 additions and 8 deletions.
  1. +1 −1 src/core/qgsdatasourceuri.cpp
  2. +4 −4 src/core/qgsmaplayer.cpp
  3. +2 −3 src/core/qgsvectorlayer.cpp
@@ -215,7 +215,7 @@ QgsDataSourceUri::QgsDataSourceUri( QString uri )
}
else
{
QgsDebugMsg( "parameter \"" + pname + "\":\"" + pval + "\" added" );
QgsDebugMsgLevel( "parameter \"" + pname + "\":\"" + pval + "\" added", 4 );
setParam( pname, pval );
}
}
@@ -1071,7 +1071,7 @@ QString QgsMapLayer::loadDefaultStyle( bool &resultFlag )

bool QgsMapLayer::loadNamedStyleFromDatabase( const QString &db, const QString &uri, QString &qml )
{
QgsDebugMsg( QString( "db = %1 uri = %2" ).arg( db, uri ) );
QgsDebugMsgLevel( QString( "db = %1 uri = %2" ).arg( db, uri ), 4 );

bool resultFlag = false;

@@ -1081,7 +1081,7 @@ bool QgsMapLayer::loadNamedStyleFromDatabase( const QString &db, const QString &
const char *myTail = nullptr;
int myResult;

QgsDebugMsg( QString( "Trying to load style for \"%1\" from \"%2\"" ).arg( uri, db ) );
QgsDebugMsgLevel( QString( "Trying to load style for \"%1\" from \"%2\"" ).arg( uri, db ), 4 );

if ( db.isEmpty() || !QFile( db ).exists() )
return false;
@@ -1116,7 +1116,7 @@ bool QgsMapLayer::loadNamedStyleFromDatabase( const QString &db, const QString &

QString QgsMapLayer::loadNamedStyle( const QString &uri, bool &resultFlag )
{
QgsDebugMsg( QString( "uri = %1 myURI = %2" ).arg( uri, publicSource() ) );
QgsDebugMsgLevel( QString( "uri = %1 myURI = %2" ).arg( uri, publicSource() ), 4 );

resultFlag = false;

@@ -1138,7 +1138,7 @@ QString QgsMapLayer::loadNamedStyle( const QString &uri, bool &resultFlag )
else
{
QFileInfo project( QgsProject::instance()->fileName() );
QgsDebugMsg( QString( "project fileName: %1" ).arg( project.absoluteFilePath() ) );
QgsDebugMsgLevel( QString( "project fileName: %1" ).arg( project.absoluteFilePath() ), 4 );

QString qml;
if ( loadNamedStyleFromDatabase( QDir( QgsApplication::qgisSettingsDirPath() ).absoluteFilePath( QStringLiteral( "qgis.qmldb" ) ), uri, qml ) ||
@@ -1524,7 +1524,7 @@ bool QgsVectorLayer::setDataProvider( QString const &provider )

connect( mDataProvider, &QgsVectorDataProvider::raiseError, this, &QgsVectorLayer::raiseError );

QgsDebugMsg( "Instantiated the data provider plugin" );
QgsDebugMsgLevel( "Instantiated the data provider plugin", 4 );

mValid = mDataProvider->isValid();
if ( !mValid )
@@ -2691,7 +2691,7 @@ bool QgsVectorLayer::addFeatures( QgsFeatureList &features, Flags )

void QgsVectorLayer::setCoordinateSystem()
{
QgsDebugMsg( "----- Computing Coordinate System" );
QgsDebugMsgLevel( "----- Computing Coordinate System", 4 );

//
// Get the layers project info and set up the QgsCoordinateTransform
@@ -3043,7 +3043,6 @@ QVariant QgsVectorLayer::defaultValue( int index, const QgsFeature &feature, Qgs
return QVariant();

QString expression = mFields.at( index ).defaultValueDefinition().expression();
qWarning() << "DEFAUL TVALUE" << expression;
if ( expression.isEmpty() )
return mDataProvider->defaultValue( index );

0 comments on commit 05adea8

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