Offline editing: preserve scale based visibility

m-kuhn · m-kuhn · commit 3dbf70ffe5a9 · 2015-01-22T17:19:09.000+01:00
diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
@@ -838,17 +838,15 @@ void QgsOfflineEditing::updateFidLookup( QgsVectorLayer* remoteLayer, sqlite3* d
   }
 }
 
-void QgsOfflineEditing::copySymbology( const QgsVectorLayer* sourceLayer, QgsVectorLayer* targetLayer )
+void QgsOfflineEditing::copySymbology( QgsVectorLayer* sourceLayer, QgsVectorLayer* targetLayer )
 {
   QString error;
   QDomDocument doc;
-  QDomElement node = doc.createElement( "symbology" );
-  doc.appendChild( node );
-  sourceLayer->writeSymbology( node, doc, error );
+  sourceLayer->exportNamedStyle( doc, error );
 
   if ( error.isEmpty() )
   {
-    targetLayer->readSymbology( node, error );
+    targetLayer->importNamedStyle( doc, error );
   }
   if ( !error.isEmpty() )
   {
diff --git a/src/core/qgsofflineediting.h b/src/core/qgsofflineediting.h
@@ -104,7 +104,7 @@ class CORE_EXPORT QgsOfflineEditing : public QObject
     void applyAttributeValueChanges( QgsVectorLayer* offlineLayer, QgsVectorLayer* remoteLayer, sqlite3* db, int layerId, int commitNo );
     void applyGeometryChanges( QgsVectorLayer* remoteLayer, sqlite3* db, int layerId, int commitNo );
     void updateFidLookup( QgsVectorLayer* remoteLayer, sqlite3* db, int layerId );
-    void copySymbology( const QgsVectorLayer* sourceLayer, QgsVectorLayer* targetLayer );
+    void copySymbology( QgsVectorLayer* sourceLayer, QgsVectorLayer* targetLayer );
     QMap<int, int> attributeLookup( QgsVectorLayer* offlineLayer, QgsVectorLayer* remoteLayer );
 
     void showWarning( const QString& message );

Original file line number	Diff line number	Diff line change
`@@ -838,17 +838,15 @@ void QgsOfflineEditing::updateFidLookup( QgsVectorLayer* remoteLayer, sqlite3* d`
`838`	`838`	`}`
`839`	`839`	`}`
`840`	`840`
`841`		`-void QgsOfflineEditing::copySymbology( const QgsVectorLayer* sourceLayer, QgsVectorLayer* targetLayer )`
	`841`	`+void QgsOfflineEditing::copySymbology( QgsVectorLayer* sourceLayer, QgsVectorLayer* targetLayer )`
`842`	`842`	`{`
`843`	`843`	`QString error;`
`844`	`844`	`QDomDocument doc;`
`845`		`- QDomElement node = doc.createElement( "symbology" );`
`846`		`- doc.appendChild( node );`
`847`		`- sourceLayer->writeSymbology( node, doc, error );`
	`845`	`+ sourceLayer->exportNamedStyle( doc, error );`
`848`	`846`
`849`	`847`	`if ( error.isEmpty() )`
`850`	`848`	`{`
`851`		`- targetLayer->readSymbology( node, error );`
	`849`	`+ targetLayer->importNamedStyle( doc, error );`
`852`	`850`	`}`
`853`	`851`	`if ( !error.isEmpty() )`
`854`	`852`	`{`