More startup profile hooks

nyalldawson · nyalldawson · commit a2e8cdedf10c · 2020-05-20T04:55:46.000+10:00
diff --git a/src/core/symbology/qgsstyle.cpp b/src/core/symbology/qgsstyle.cpp
@@ -586,18 +586,19 @@ bool QgsStyle::load( const QString &filename )
     while ( rc == SQLITE_OK && sqlite3_step( statement.get() ) == SQLITE_ROW )
     {
       QDomDocument doc;
-      QString symbol_name = statement.columnAsText( SymbolName );
+      QString symbolName = statement.columnAsText( SymbolName );
+      QgsScopedRuntimeProfile profile( symbolName );
       QString xmlstring = statement.columnAsText( SymbolXML );
       if ( !doc.setContent( xmlstring ) )
       {
-        QgsDebugMsg( "Cannot open symbol " + symbol_name );
+        QgsDebugMsg( "Cannot open symbol " + symbolName );
         continue;
       }
 
       QDomElement symElement = doc.documentElement();
       QgsSymbol *symbol = QgsSymbolLayerUtils::loadSymbol( symElement, QgsReadWriteContext() );
       if ( symbol )
-        mSymbols.insert( symbol_name, symbol );
+        mSymbols.insert( symbolName, symbol );
     }
   }
 
@@ -608,17 +609,18 @@ bool QgsStyle::load( const QString &filename )
     while ( rc == SQLITE_OK && sqlite3_step( statement.get() ) == SQLITE_ROW )
     {
       QDomDocument doc;
-      QString ramp_name = statement.columnAsText( ColorrampName );
+      const QString rampName = statement.columnAsText( ColorrampName );
+      QgsScopedRuntimeProfile profile( rampName );
       QString xmlstring = statement.columnAsText( ColorrampXML );
       if ( !doc.setContent( xmlstring ) )
       {
-        QgsDebugMsg( "Cannot open symbol " + ramp_name );
+        QgsDebugMsg( "Cannot open symbol " + rampName );
         continue;
       }
       QDomElement rampElement = doc.documentElement();
       QgsColorRamp *ramp = QgsSymbolLayerUtils::loadColorRamp( rampElement );
       if ( ramp )
-        mColorRamps.insert( ramp_name, ramp );
+        mColorRamps.insert( rampName, ramp );
     }
   }
 
@@ -630,6 +632,7 @@ bool QgsStyle::load( const QString &filename )
     {
       QDomDocument doc;
       const QString formatName = statement.columnAsText( TextFormatName );
+      QgsScopedRuntimeProfile profile( formatName );
       const QString xmlstring = statement.columnAsText( TextFormatXML );
       if ( !doc.setContent( xmlstring ) )
       {
@@ -651,6 +654,7 @@ bool QgsStyle::load( const QString &filename )
     {
       QDomDocument doc;
       const QString settingsName = statement.columnAsText( LabelSettingsName );
+      QgsScopedRuntimeProfile profile( settingsName );
       const QString xmlstring = statement.columnAsText( LabelSettingsXML );
       if ( !doc.setContent( xmlstring ) )
       {
@@ -672,6 +676,7 @@ bool QgsStyle::load( const QString &filename )
     {
       QDomDocument doc;
       const QString settingsName = statement.columnAsText( LegendPatchTableName );
+      QgsScopedRuntimeProfile profile( settingsName );
       const QString xmlstring = statement.columnAsText( LegendPatchTableXML );
       if ( !doc.setContent( xmlstring ) )
       {

Original file line number	Diff line number	Diff line change
`@@ -586,18 +586,19 @@ bool QgsStyle::load( const QString &filename )`
`586`	`586`	`while ( rc == SQLITE_OK && sqlite3_step( statement.get() ) == SQLITE_ROW )`
`587`	`587`	`{`
`588`	`588`	`QDomDocument doc;`
`589`		`- QString symbol_name = statement.columnAsText( SymbolName );`
	`589`	`+ QString symbolName = statement.columnAsText( SymbolName );`
	`590`	`+ QgsScopedRuntimeProfile profile( symbolName );`
`590`	`591`	`QString xmlstring = statement.columnAsText( SymbolXML );`
`591`	`592`	`if ( !doc.setContent( xmlstring ) )`
`592`	`593`	`{`
`593`		`- QgsDebugMsg( "Cannot open symbol " + symbol_name );`
	`594`	`+ QgsDebugMsg( "Cannot open symbol " + symbolName );`
`594`	`595`	`continue;`
`595`	`596`	`}`
`596`	`597`
`597`	`598`	`QDomElement symElement = doc.documentElement();`
`598`	`599`	`QgsSymbol *symbol = QgsSymbolLayerUtils::loadSymbol( symElement, QgsReadWriteContext() );`
`599`	`600`	`if ( symbol )`
`600`		`- mSymbols.insert( symbol_name, symbol );`
	`601`	`+ mSymbols.insert( symbolName, symbol );`
`601`	`602`	`}`
`602`	`603`	`}`
`603`	`604`
`@@ -608,17 +609,18 @@ bool QgsStyle::load( const QString &filename )`
`608`	`609`	`while ( rc == SQLITE_OK && sqlite3_step( statement.get() ) == SQLITE_ROW )`
`609`	`610`	`{`
`610`	`611`	`QDomDocument doc;`
`611`		`- QString ramp_name = statement.columnAsText( ColorrampName );`
	`612`	`+ const QString rampName = statement.columnAsText( ColorrampName );`
	`613`	`+ QgsScopedRuntimeProfile profile( rampName );`
`612`	`614`	`QString xmlstring = statement.columnAsText( ColorrampXML );`
`613`	`615`	`if ( !doc.setContent( xmlstring ) )`
`614`	`616`	`{`
`615`		`- QgsDebugMsg( "Cannot open symbol " + ramp_name );`
	`617`	`+ QgsDebugMsg( "Cannot open symbol " + rampName );`
`616`	`618`	`continue;`
`617`	`619`	`}`
`618`	`620`	`QDomElement rampElement = doc.documentElement();`
`619`	`621`	`QgsColorRamp *ramp = QgsSymbolLayerUtils::loadColorRamp( rampElement );`
`620`	`622`	`if ( ramp )`
`621`		`- mColorRamps.insert( ramp_name, ramp );`
	`623`	`+ mColorRamps.insert( rampName, ramp );`
`622`	`624`	`}`
`623`	`625`	`}`
`624`	`626`
`@@ -630,6 +632,7 @@ bool QgsStyle::load( const QString &filename )`
`630`	`632`	`{`
`631`	`633`	`QDomDocument doc;`
`632`	`634`	`const QString formatName = statement.columnAsText( TextFormatName );`
	`635`	`+ QgsScopedRuntimeProfile profile( formatName );`
`633`	`636`	`const QString xmlstring = statement.columnAsText( TextFormatXML );`
`634`	`637`	`if ( !doc.setContent( xmlstring ) )`
`635`	`638`	`{`
`@@ -651,6 +654,7 @@ bool QgsStyle::load( const QString &filename )`
`651`	`654`	`{`
`652`	`655`	`QDomDocument doc;`
`653`	`656`	`const QString settingsName = statement.columnAsText( LabelSettingsName );`
	`657`	`+ QgsScopedRuntimeProfile profile( settingsName );`
`654`	`658`	`const QString xmlstring = statement.columnAsText( LabelSettingsXML );`
`655`	`659`	`if ( !doc.setContent( xmlstring ) )`
`656`	`660`	`{`
`@@ -672,6 +676,7 @@ bool QgsStyle::load( const QString &filename )`
`672`	`676`	`{`
`673`	`677`	`QDomDocument doc;`
`674`	`678`	`const QString settingsName = statement.columnAsText( LegendPatchTableName );`
	`679`	`+ QgsScopedRuntimeProfile profile( settingsName );`
`675`	`680`	`const QString xmlstring = statement.columnAsText( LegendPatchTableXML );`
`676`	`681`	`if ( !doc.setContent( xmlstring ) )`
`677`	`682`	`{`