Skip to content
Permalink
Browse files

renamed QgsSymbologyV2Conversion to QgsSymbologyConversion

  • Loading branch information
3nids committed Aug 5, 2016
1 parent f2c3fb0 commit acbf5cddb452ea2d2f776ef585c4af3c849f366a
@@ -31,6 +31,7 @@ This page tries to maintain a list with incompatible changes that happened in pr
<tr><td>QgsSymbolLayerV2Utils <td>QgsSymbolLayerUtils
<tr><td>QgsSymbolLayerV2Widget <td>QgsSymbolLayerWidget
<tr><td>QgsSymbolLevelsV2Dialog <td>QgsSymbolLevelsDialog
<tr><td>QgsSymbologyV2Conversion <td>QgsSymbologyConversion
<tr><th>QgsSymbolV2 <th>QgsSymbol
<tr><td>QgsSymbolV2LegendNode <td>QgsSymbolLegendNode
<tr><td>QgsSymbolV2LevelItem <td>QgsSymbolLevelItem
@@ -318,7 +318,7 @@
%Include symbology-ng/qgsvectorfieldsymbollayer.sip
%Include symbology-ng/qgsarrowsymbollayer.sip

%Include symbology-ng/qgssymbologyv2conversion.sip
%Include symbology-ng/qgssymbologyconversion.sip

%Include dxf/qgsdxfexport.sip

@@ -1,7 +1,7 @@
class QgsSymbologyV2Conversion
class QgsSymbologyConversion
{
%TypeHeaderCode
#include <qgssymbologyv2conversion.h>
#include <qgssymbologyconversion.h>
%End
public:

@@ -67,7 +67,7 @@

#include "qgsrendererv2propertiesdialog.h"
#include "qgsstylev2.h"
#include "qgssymbologyv2conversion.h"
#include "qgssymbologyconversion.h"

QgsVectorLayerProperties::QgsVectorLayerProperties(
QgsVectorLayer *lyr,
@@ -40,7 +40,7 @@ SET(QGIS_CORE_SRCS
symbology-ng/qgssymbollayer.cpp
symbology-ng/qgssymbollayerregistry.cpp
symbology-ng/qgssymbollayerutils.cpp
symbology-ng/qgssymbologyv2conversion.cpp
symbology-ng/qgssymbologyconversion.cpp
symbology-ng/qgssymbol.cpp
symbology-ng/qgsvectorcolorrampv2.cpp
symbology-ng/qgsvectorfieldsymbollayer.cpp
@@ -827,7 +827,7 @@ SET(QGIS_CORE_HDRS
symbology-ng/qgssymbollayer.h
symbology-ng/qgssymbollayerregistry.h
symbology-ng/qgssymbollayerutils.h
symbology-ng/qgssymbologyv2conversion.h
symbology-ng/qgssymbologyconversion.h
symbology-ng/qgssymbol.h
symbology-ng/qgsvectorcolorrampv2.h
symbology-ng/qgsvectorfieldsymbollayer.h
@@ -79,7 +79,7 @@
#include "qgssinglesymbolrendererv2.h"
#include "qgsdiagramrendererv2.h"
#include "qgsstylev2.h"
#include "qgssymbologyv2conversion.h"
#include "qgssymbologyconversion.h"
#include "qgspallabeling.h"
#include "qgssimplifymethod.h"
#include "qgsexpressioncontext.h"
@@ -1777,7 +1777,7 @@ bool QgsVectorLayer::readStyle( const QDomNode &node, QString &errorMessage )
}
else
{
QgsFeatureRendererV2* r = QgsSymbologyV2Conversion::readOldRenderer( node, geometryType() );
QgsFeatureRendererV2* r = QgsSymbologyConversion::readOldRenderer( node, geometryType() );
if ( !r )
r = QgsFeatureRendererV2::defaultRenderer( geometryType() );

@@ -1,5 +1,5 @@
/***************************************************************************
qgssymbologyv2conversion.cpp
qgssymbologyconversion.cpp
---------------------
begin : December 2009
copyright : (C) 2009 by Martin Dobias
@@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include "qgssymbologyv2conversion.h"
#include "qgssymbologyconversion.h"

#include "qgslogger.h"

@@ -91,14 +91,14 @@ static Qt::PenStyle readOutlineStyle( const QDomNode& synode )
{
QDomNode outlstnode = synode.namedItem( "outlinestyle" );
QDomElement outlstelement = outlstnode.toElement();
return QgsSymbologyV2Conversion::qString2PenStyle( outlstelement.text() );
return QgsSymbologyConversion::qString2PenStyle( outlstelement.text() );
}

static Qt::BrushStyle readBrushStyle( const QDomNode& synode )
{
QDomNode fillpnode = synode.namedItem( "fillpattern" );
QDomElement fillpelement = fillpnode.toElement();
return QgsSymbologyV2Conversion::qString2BrushStyle( fillpelement.text() );
return QgsSymbologyConversion::qString2BrushStyle( fillpelement.text() );
}

static QString readMarkerSymbolName( const QDomNode& synode )
@@ -282,7 +282,7 @@ static QgsFeatureRendererV2* readOldUniqueValueRenderer( const QDomNode& rnode,



QgsFeatureRendererV2* QgsSymbologyV2Conversion::readOldRenderer( const QDomNode& layerNode, QgsWkbTypes::GeometryType geomType )
QgsFeatureRendererV2* QgsSymbologyConversion::readOldRenderer( const QDomNode& layerNode, QgsWkbTypes::GeometryType geomType )
{
QDomNode singlenode = layerNode.namedItem( "singlesymbol" );
QDomNode graduatednode = layerNode.namedItem( "graduatedsymbol" );
@@ -352,7 +352,7 @@ UNSUPPORTED SYMBOL PROPERTY: texture



QString QgsSymbologyV2Conversion::penStyle2QString( Qt::PenStyle penstyle )
QString QgsSymbologyConversion::penStyle2QString( Qt::PenStyle penstyle )
{
if ( penstyle == Qt::NoPen )
{
@@ -388,7 +388,7 @@ QString QgsSymbologyV2Conversion::penStyle2QString( Qt::PenStyle penstyle )
}
}

Qt::PenStyle QgsSymbologyV2Conversion::qString2PenStyle( const QString& penString )
Qt::PenStyle QgsSymbologyConversion::qString2PenStyle( const QString& penString )
{
if ( penString == "NoPen" )
{
@@ -424,7 +424,7 @@ Qt::PenStyle QgsSymbologyV2Conversion::qString2PenStyle( const QString& penStrin
}
}

QString QgsSymbologyV2Conversion::brushStyle2QString( Qt::BrushStyle brushstyle )
QString QgsSymbologyConversion::brushStyle2QString( Qt::BrushStyle brushstyle )
{
if ( brushstyle == Qt::NoBrush )
{
@@ -497,7 +497,7 @@ QString QgsSymbologyV2Conversion::brushStyle2QString( Qt::BrushStyle brushstyle
}
}

Qt::BrushStyle QgsSymbologyV2Conversion::qString2BrushStyle( const QString& brushString )
Qt::BrushStyle QgsSymbologyConversion::qString2BrushStyle( const QString& brushString )
{
if ( brushString == "NoBrush" )
{
@@ -1,5 +1,5 @@
/***************************************************************************
qgssymbologyv2conversion.h
qgssymbologyconversion.h
---------------------
begin : December 2009
copyright : (C) 2009 by Martin Dobias
@@ -12,8 +12,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef QGSSYMBOLOGYV2CONVERSION_H
#define QGSSYMBOLOGYV2CONVERSION_H
#ifndef QGSSYMBOLOGYCONVERSION_H
#define QGSSYMBOLOGYCONVERSION_H

class QDomNode;

@@ -25,7 +25,7 @@ class QgsFeatureRendererV2;

/** \ingroup core
* This class is not a part of public API, it is intended only for compatibility with older versions of QGIS (1.x) */
class CORE_EXPORT QgsSymbologyV2Conversion
class CORE_EXPORT QgsSymbologyConversion
{
public:

@@ -38,4 +38,4 @@ class CORE_EXPORT QgsSymbologyV2Conversion
static Qt::BrushStyle qString2BrushStyle( const QString& string );
};

#endif // QGSSYMBOLOGYV2CONVERSION_H
#endif // QGSSYMBOLOGYCONVERSION_H
@@ -273,7 +273,7 @@
"DualEdgeTriangulation": ["DualEdgeTriangulation(int nop, Triangulation *decorator)", "setDecorator(Triangulation *d)"],
"QgsProjectionSelector": ["setSelectedAuthId(const QString &authId)", "setSelectedCrsId(long theCRSID)", "QgsProjectionSelector(QWidget *parent, const char *name=\"\", Qt::WindowFlags fl=0)", "selectedProj4String()", "setSelectedCrsName(const QString &theCRSName)", "selectedName()", "sridSelected(const QString &theSRID)"],
"QgsImageFillSymbolLayer": ["setOutlineWidthMapUnitScale(const QgsMapUnitScale &scale)", "outlineWidthMapUnitScale() const ", "setOutlineWidthUnit(QgsSymbol::OutputUnit unit)", "outlineWidthUnit() const ", "applyDataDefinedSettings(QgsSymbolRenderContext &context)"],
"QgsSymbologyV2Conversion": ["brushStyle2QString(Qt::BrushStyle brushstyle)", "qString2PenStyle(const QString &string)", "penStyle2QString(Qt::PenStyle penstyle)", "qString2BrushStyle(const QString &string)"],
"QgsSymbologyConversion": ["brushStyle2QString(Qt::BrushStyle brushstyle)", "qString2PenStyle(const QString &string)", "penStyle2QString(Qt::PenStyle penstyle)", "qString2BrushStyle(const QString &string)"],
"QgsRelationEditorWidget": ["setEditorContext(const QgsAttributeEditorContext &context)", "setRelationFeature(const QgsRelation &relation, const QgsFeature &feature)", "setFeature(const QgsFeature &feature)"],
"QgsDashSpaceDialog": ["QgsDashSpaceDialog(const QVector< qreal > &v, QWidget *parent=nullptr, Qt::WindowFlags f=0)", "dashDotVector() const "],
"QgsAuthMethodConfig": ["setMethod(const QString &method)", "setUri(const QString &uri)"],
@@ -908,7 +908,7 @@
"QgsComposerAttributeTableCompareV2",
"QgsCptCityColorRampV2",
"QgsAttributeEditorContext",
"QgsSymbologyV2Conversion",
"QgsSymbologyConversion",
"QgsAttributeEditorRelation",
"QgsPointDisplacementRendererWidget",
"QgsOSMDatabase",

0 comments on commit acbf5cd

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