Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove code for reading of legacy (QGIS < 1.0) renderers
Also removes a bunch of unused old QMLs and upgrades one still in use
  • Loading branch information
wonder-sk committed Jan 27, 2017
1 parent ac79bc9 commit 0341478
Show file tree
Hide file tree
Showing 23 changed files with 924 additions and 1,686 deletions.
2 changes: 1 addition & 1 deletion doc/api_break.dox
Expand Up @@ -170,7 +170,6 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
<tr><td>QgsSymbolV2RenderContext<td>QgsSymbolRenderContext
<tr><td>QgsSymbolV2SelectorDialog<td>QgsSymbolSelectorDialog
<tr><td>QgsSymbolV2SelectorWidget<td>QgsSymbolSelectorWidget
<tr><td>QgsSymbologyV2Conversion<td>QgsSymbologyConversion
<tr><td>QgsVectorColorBrewerColorRampV2<td>QgsColorBrewerColorRamp
<tr><td>QgsVectorColorBrewerColorRampV2Dialog<td>QgsColorBrewerColorRampDialog
<tr><td>QgsVectorColorBrewerColorRampV2DialogBase<td>QgsColorBrewerColorRampDialogBase
Expand Down Expand Up @@ -267,6 +266,7 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
- QgsLegacyHelpers.
- QgsProviderCountCalcEvent and QgsProviderExtentCalcEvent. These classes were unused in QGIS core and unmaintained.
- QgsEditorWidgetConfig was removed. Use QVariantMap instead.
- QgsSymbologyV2Conversion was removed. Reading of renderers from pre-1.0 versions is not supported anymore.


General changes {#qgis_api_break_3_0_global}
Expand Down
2 changes: 0 additions & 2 deletions python/core/core.sip
Expand Up @@ -339,8 +339,6 @@
%Include symbology-ng/qgsvectorfieldsymbollayer.sip
%Include symbology-ng/qgsarrowsymbollayer.sip

%Include symbology-ng/qgssymbologyconversion.sip

%Include dxf/qgsdxfexport.sip

%Include geometry/qgsabstractgeometry.sip
Expand Down
15 changes: 0 additions & 15 deletions python/core/symbology-ng/qgssymbologyconversion.sip

This file was deleted.

1 change: 0 additions & 1 deletion src/app/qgsvectorlayerproperties.cpp
Expand Up @@ -67,7 +67,6 @@

#include "qgsrendererpropertiesdialog.h"
#include "qgsstyle.h"
#include "qgssymbologyconversion.h"

QgsVectorLayerProperties::QgsVectorLayerProperties(
QgsVectorLayer *lyr,
Expand Down
2 changes: 0 additions & 2 deletions src/core/CMakeLists.txt
Expand Up @@ -42,7 +42,6 @@ SET(QGIS_CORE_SRCS
symbology-ng/qgssymbollayer.cpp
symbology-ng/qgssymbollayerregistry.cpp
symbology-ng/qgssymbollayerutils.cpp
symbology-ng/qgssymbologyconversion.cpp
symbology-ng/qgssymbol.cpp
symbology-ng/qgsvectorfieldsymbollayer.cpp

Expand Down Expand Up @@ -868,7 +867,6 @@ SET(QGIS_CORE_HDRS
symbology-ng/qgssymbollayer.h
symbology-ng/qgssymbollayerregistry.h
symbology-ng/qgssymbollayerutils.h
symbology-ng/qgssymbologyconversion.h
symbology-ng/qgssymbol.h
symbology-ng/qgsvectorfieldsymbollayer.h
symbology-ng/qgsgeometrygeneratorsymbollayer.h
Expand Down
9 changes: 0 additions & 9 deletions src/core/qgsvectorlayer.cpp
Expand Up @@ -77,7 +77,6 @@
#include "qgssinglesymbolrenderer.h"
#include "qgsdiagramrenderer.h"
#include "qgsstyle.h"
#include "qgssymbologyconversion.h"
#include "qgspallabeling.h"
#include "qgssimplifymethod.h"
#include "qgsexpressioncontext.h"
Expand Down Expand Up @@ -1843,14 +1842,6 @@ bool QgsVectorLayer::readStyle( const QDomNode &node, QString &errorMessage )
result = false;
}
}
else
{
QgsFeatureRenderer* r = QgsSymbologyConversion::readOldRenderer( node, geometryType() );
if ( r )
{
setRenderer( r );
}
}

// make sure layer has a renderer - if none exists, fallback to a default renderer
if ( !renderer() )
Expand Down

0 comments on commit 0341478

Please sign in to comment.