Skip to content

Commit d457a89

Browse files
nyalldawsonnyalldawson
committedFeb 14, 2017
Remove QgsDataDefined
Now completely replaced by QgsProperty and the properties framework
·
ltr-3_40final-3_0_0
1 parent be46f78 commit d457a89

File tree

10 files changed

+37
-1102
lines changed

10 files changed

+37
-1102
lines changed
 

‎doc/api_break.dox

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ Use QgsComposerAttributeTableV2 instead.
250250
- QgsCRSCache was removed. QgsCoordinateReferenceSystem now internally uses a cache for CRS creation,
251251
so there is no longer a need for the separate cache class. Code which previously called QgsCRSCache::updateCRSCache()
252252
should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinateTransformCache::instance()->invalidateCrs( authid ).
253+
- QgsDataDefined was removed. Use the QgsProperty framework instead.
253254
- QgsDataDefinedButton was removed. Use QgsPropertyOverrideButton instead.
254255
- QgsFileNameWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
255256
- QgsFormAnnotationItem. Use QgsFormAnnotation instead.

‎python/core/core.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
%Include qgscoordinatetransform.sip
3434
%Include qgscredentials.sip
3535
%Include qgscrscache.sip
36-
%Include qgsdatadefined.sip
3736
%Include qgsdataitem.sip
3837
%Include qgsdataitemprovider.sip
3938
%Include qgsdataitemproviderregistry.sip

‎python/core/qgsdatadefined.sip

Lines changed: 0 additions & 179 deletions
This file was deleted.

‎src/core/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ SET(QGIS_CORE_SRCS
112112
qgscredentials.cpp
113113
qgscrscache.cpp
114114
qgsdartmeasurement.cpp
115-
qgsdatadefined.cpp
116115
qgsdataitem.cpp
117116
qgsdataitemprovider.cpp
118117
qgsdataitemproviderregistry.cpp
@@ -671,7 +670,6 @@ SET(QGIS_CORE_HDRS
671670
qgscrscache.h
672671
qgscsexception.h
673672
qgsdartmeasurement.h
674-
qgsdatadefined.h
675673
qgsdataitem.h
676674
qgsdataitemprovider.h
677675
qgsdataitemproviderregistry.h

‎src/core/qgsdatadefined.cpp

Lines changed: 0 additions & 286 deletions
This file was deleted.

‎src/core/qgsdatadefined.h

Lines changed: 0 additions & 218 deletions
This file was deleted.

‎src/core/qgsdatadefined_p.h

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎tests/src/core/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ ADD_QGIS_TEST(connectionpooltest testqgsconnectionpool.cpp)
123123
ADD_QGIS_TEST(contrastenhancementtest testcontrastenhancements.cpp)
124124
ADD_QGIS_TEST(coordinatereferencesystemtest testqgscoordinatereferencesystem.cpp)
125125
ADD_QGIS_TEST(coordinatetransformtest testqgscoordinatetransform.cpp)
126-
ADD_QGIS_TEST(datadefined testqgsdatadefined.cpp)
127126
ADD_QGIS_TEST(dataitemtest testqgsdataitem.cpp)
128127
ADD_QGIS_TEST(datasourceuritest testqgsdatasourceuri.cpp)
129128
ADD_QGIS_TEST(diagramtest testqgsdiagram.cpp)

‎tests/src/core/testqgsdatadefined.cpp

Lines changed: 0 additions & 327 deletions
This file was deleted.

‎tests/src/core/testqgsproperty.cpp

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ class TestQgsProperty : public QObject
7878
void staticProperty(); //test for QgsStaticProperty
7979
void fieldBasedProperty(); //test for QgsFieldBasedProperty
8080
void expressionBasedProperty(); //test for QgsExpressionBasedProperty
81+
void equality();
8182
void propertyTransformer(); //test for QgsPropertyTransformer
8283
void propertyTransformerFromExpression(); // text converting expression into QgsPropertyTransformer
8384
void sizeScaleTransformer(); //test for QgsSizeScaleTransformer
@@ -557,6 +558,41 @@ void TestQgsProperty::expressionBasedProperty()
557558
QVERIFY( p4.transformer() );
558559
}
559560

561+
void TestQgsProperty::equality()
562+
{
563+
QgsProperty dd1;
564+
dd1.setActive( true );
565+
dd1.setField( QStringLiteral( "field" ) );
566+
QgsProperty dd2;
567+
dd2.setActive( true );
568+
dd2.setField( QStringLiteral( "field" ) );
569+
QVERIFY( dd1 == dd2 );
570+
QVERIFY( !( dd1 != dd2 ) );
571+
572+
dd1.setExpressionString( QStringLiteral( "expression" ) );
573+
dd2.setExpressionString( QStringLiteral( "expression" ) );
574+
QVERIFY( dd1 == dd2 );
575+
QVERIFY( !( dd1 != dd2 ) );
576+
577+
//test that all applicable components contribute to equality
578+
dd2.setActive( false );
579+
QVERIFY( !( dd1 == dd2 ) );
580+
QVERIFY( dd1 != dd2 );
581+
dd2.setActive( true );
582+
dd2.setExpressionString( QStringLiteral( "a" ) );
583+
QVERIFY( !( dd1 == dd2 ) );
584+
QVERIFY( dd1 != dd2 );
585+
dd2.setField( QStringLiteral( "field" ) );
586+
QVERIFY( !( dd1 == dd2 ) );
587+
QVERIFY( dd1 != dd2 );
588+
dd1.setField( QStringLiteral( "fieldb" ) );
589+
QVERIFY( !( dd1 == dd2 ) );
590+
QVERIFY( dd1 != dd2 );
591+
dd1.setField( QStringLiteral( "field" ) );
592+
QVERIFY( dd1 == dd2 );
593+
QVERIFY( !( dd1 != dd2 ) );
594+
}
595+
560596
void TestQgsProperty::propertyTransformer()
561597
{
562598
QgsExpressionContext context;

0 commit comments

Comments
 (0)
Please sign in to comment.