Skip to content

Commit f3ac8bc

Browse files
nyalldawsonnyalldawson
committed
Rename method which causes spell check issues
1 parent 5f04a2a commit f3ac8bc

4 files changed

Lines changed: 55 additions & 55 deletions

File tree

‎python/core/qgspropertycollection.sip‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class QgsAbstractPropertyCollection
5151

5252
virtual bool hasActiveProperties() const = 0;
5353

54-
virtual bool hasActiveDynamicProperties() const = 0;
54+
virtual bool hasDynamicProperties() const = 0;
5555

5656
virtual bool writeXml( QDomElement& collectionElem, QDomDocument& doc, const QgsPropertiesDefinition& definitions ) const = 0;
5757

@@ -87,7 +87,7 @@ class QgsPropertyCollection : QgsAbstractPropertyCollection
8787
QSet< QString > referencedFields( const QgsExpressionContext& context = QgsExpressionContext() ) const;
8888
bool isActive( int key ) const;
8989
bool hasActiveProperties() const;
90-
bool hasActiveDynamicProperties() const;
90+
bool hasDynamicProperties() const;
9191
bool writeXml( QDomElement& collectionElem, QDomDocument& doc, const QgsPropertiesDefinition& definitions ) const;
9292
bool readXml( const QDomElement& collectionElem, const QDomDocument& doc, const QgsPropertiesDefinition& definitions );
9393

@@ -123,7 +123,7 @@ class QgsPropertyCollectionStack : QgsAbstractPropertyCollection
123123

124124
bool hasActiveProperties() const;
125125

126-
bool hasActiveDynamicProperties() const;
126+
bool hasDynamicProperties() const;
127127

128128
bool isActive( int key ) const;
129129

‎src/core/qgspropertycollection.cpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ QgsPropertyCollection::QgsPropertyCollection( const QString& name )
9393
: QgsAbstractPropertyCollection( name )
9494
, mDirty( false )
9595
, mHasActiveProperties( false )
96-
, mHasActiveDynamicProperties( false )
96+
, mHasDynamicProperties( false )
9797
{}
9898

9999
int QgsPropertyCollection::count() const
@@ -122,7 +122,7 @@ void QgsPropertyCollection::clear()
122122
mProperties.clear();
123123
mDirty = false;
124124
mHasActiveProperties = false;
125-
mHasActiveDynamicProperties = false;
125+
mHasDynamicProperties = false;
126126
}
127127

128128
void QgsPropertyCollection::setProperty( int key, const QgsProperty& property )
@@ -214,7 +214,7 @@ bool QgsPropertyCollection::isActive( int key ) const
214214
void QgsPropertyCollection::rescan() const
215215
{
216216
mHasActiveProperties = false;
217-
mHasActiveDynamicProperties = false;
217+
mHasDynamicProperties = false;
218218
mCount = 0;
219219
if ( !mProperties.isEmpty() )
220220
{
@@ -226,7 +226,7 @@ void QgsPropertyCollection::rescan() const
226226
mHasActiveProperties = true;
227227
if ( it.value().propertyType() != QgsProperty::StaticProperty )
228228
{
229-
mHasActiveDynamicProperties = true;
229+
mHasDynamicProperties = true;
230230
break;
231231
}
232232
}
@@ -245,12 +245,12 @@ bool QgsPropertyCollection::hasActiveProperties() const
245245
return mHasActiveProperties;
246246
}
247247

248-
bool QgsPropertyCollection::hasActiveDynamicProperties() const
248+
bool QgsPropertyCollection::hasDynamicProperties() const
249249
{
250250
if ( mDirty )
251251
rescan();
252252

253-
return mHasActiveDynamicProperties;
253+
return mHasDynamicProperties;
254254
}
255255

256256
bool QgsPropertyCollection::writeXml( QDomElement &collectionElem, QDomDocument &doc, const QgsPropertiesDefinition& definitions ) const
@@ -309,10 +309,10 @@ bool QgsPropertyCollection::readXml( const QDomElement &collectionElem, const QD
309309

310310
mCount++;
311311
mHasActiveProperties = mHasActiveProperties || prop.isActive();
312-
mHasActiveDynamicProperties = mHasActiveDynamicProperties ||
313-
( prop.isActive() &&
314-
( prop.propertyType() == QgsProperty::FieldBasedProperty ||
315-
prop.propertyType() == QgsProperty::ExpressionBasedProperty ) );
312+
mHasDynamicProperties = mHasDynamicProperties ||
313+
( prop.isActive() &&
314+
( prop.propertyType() == QgsProperty::FieldBasedProperty ||
315+
prop.propertyType() == QgsProperty::ExpressionBasedProperty ) );
316316
}
317317
return true;
318318
}
@@ -324,7 +324,7 @@ bool QgsPropertyCollection::readXml( const QDomElement &collectionElem, const QD
324324
QgsPropertyCollectionStack::QgsPropertyCollectionStack()
325325
: mDirty( false )
326326
, mHasActiveProperties( false )
327-
, mHasActiveDynamicProperties( false )
327+
, mhasDynamicProperties( false )
328328
{
329329

330330
}
@@ -338,15 +338,15 @@ QgsPropertyCollectionStack::QgsPropertyCollectionStack( const QgsPropertyCollect
338338
: QgsAbstractPropertyCollection( other )
339339
, mDirty( false )
340340
, mHasActiveProperties( false )
341-
, mHasActiveDynamicProperties( false )
341+
, mhasDynamicProperties( false )
342342
{
343343
clear();
344344

345345
Q_FOREACH ( QgsPropertyCollection* collection, other.mStack )
346346
{
347347
mStack << new QgsPropertyCollection( *collection );
348348
mHasActiveProperties |= collection->hasActiveProperties();
349-
mHasActiveDynamicProperties |= collection->hasActiveDynamicProperties();
349+
mhasDynamicProperties |= collection->hasDynamicProperties();
350350
}
351351
}
352352

@@ -359,7 +359,7 @@ QgsPropertyCollectionStack &QgsPropertyCollectionStack::operator=( const QgsProp
359359
{
360360
mStack << new QgsPropertyCollection( *collection );
361361
mHasActiveProperties |= collection->hasActiveProperties();
362-
mHasActiveDynamicProperties |= collection->hasActiveDynamicProperties();
362+
mhasDynamicProperties |= collection->hasDynamicProperties();
363363
}
364364

365365
return *this;
@@ -375,7 +375,7 @@ void QgsPropertyCollectionStack::clear()
375375
qDeleteAll( mStack );
376376
mStack.clear();
377377
mHasActiveProperties = false;
378-
mHasActiveDynamicProperties = false;
378+
mhasDynamicProperties = false;
379379
mDirty = false;
380380
}
381381

@@ -415,12 +415,12 @@ bool QgsPropertyCollectionStack::hasActiveProperties() const
415415
return mHasActiveProperties;
416416
}
417417

418-
bool QgsPropertyCollectionStack::hasActiveDynamicProperties() const
418+
bool QgsPropertyCollectionStack::hasDynamicProperties() const
419419
{
420420
if ( mDirty )
421421
rescan();
422422

423-
return mHasActiveDynamicProperties;
423+
return mhasDynamicProperties;
424424
}
425425

426426
bool QgsPropertyCollectionStack::isActive( int key ) const
@@ -531,12 +531,12 @@ bool QgsPropertyCollectionStack::readXml( const QDomElement& collectionElem, con
531531
void QgsPropertyCollectionStack::rescan() const
532532
{
533533
mHasActiveProperties = false;
534-
mHasActiveDynamicProperties = false;
534+
mhasDynamicProperties = false;
535535
Q_FOREACH ( const QgsPropertyCollection* collection, mStack )
536536
{
537537
mHasActiveProperties |= collection->hasActiveProperties();
538-
mHasActiveDynamicProperties |= collection->hasActiveDynamicProperties();
539-
if ( mHasActiveProperties && mHasActiveDynamicProperties )
538+
mhasDynamicProperties |= collection->hasDynamicProperties();
539+
if ( mHasActiveProperties && mhasDynamicProperties )
540540
break;
541541
}
542542
mDirty = false;

‎src/core/qgspropertycollection.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class CORE_EXPORT QgsAbstractPropertyCollection
205205
/**
206206
* Returns true if the collection has any active properties, or false if all properties
207207
* within the collection are deactivated.
208-
* @see hasActiveDynamicProperties()
208+
* @see hasDynamicProperties()
209209
*/
210210
virtual bool hasActiveProperties() const = 0;
211211

@@ -214,7 +214,7 @@ class CORE_EXPORT QgsAbstractPropertyCollection
214214
* within the collection are deactivated or if the collection only contains static properties.
215215
* @see hasActiveProperties()
216216
*/
217-
virtual bool hasActiveDynamicProperties() const = 0;
217+
virtual bool hasDynamicProperties() const = 0;
218218

219219
/**
220220
* Writes the current state of the property collection into an XML element
@@ -284,7 +284,7 @@ class CORE_EXPORT QgsPropertyCollection : public QgsAbstractPropertyCollection
284284
QSet< QString > referencedFields( const QgsExpressionContext& context = QgsExpressionContext() ) const override;
285285
bool isActive( int key ) const override;
286286
bool hasActiveProperties() const override;
287-
bool hasActiveDynamicProperties() const override;
287+
bool hasDynamicProperties() const override;
288288
bool writeXml( QDomElement& collectionElem, QDomDocument& doc, const QgsPropertiesDefinition& definitions ) const override;
289289
bool readXml( const QDomElement& collectionElem, const QDomDocument& doc, const QgsPropertiesDefinition& definitions ) override;
290290

@@ -313,7 +313,7 @@ class CORE_EXPORT QgsPropertyCollection : public QgsAbstractPropertyCollection
313313

314314
mutable bool mDirty;
315315
mutable bool mHasActiveProperties;
316-
mutable bool mHasActiveDynamicProperties;
316+
mutable bool mHasDynamicProperties;
317317
mutable int mCount = 0;
318318

319319
//! Scans through properties and updates cached values
@@ -384,7 +384,7 @@ class CORE_EXPORT QgsPropertyCollectionStack : public QgsAbstractPropertyCollect
384384
* Returns true if the collection has any active properties, or false if all properties
385385
* within the collection are deactivated.
386386
* @see isActive()
387-
* @see hasActiveDynamicProperties()
387+
* @see hasDynamicProperties()
388388
*/
389389
bool hasActiveProperties() const override;
390390

@@ -393,7 +393,7 @@ class CORE_EXPORT QgsPropertyCollectionStack : public QgsAbstractPropertyCollect
393393
* within the collection are deactivated or if the collection only contains static properties.
394394
* @see hasActiveProperties()
395395
*/
396-
bool hasActiveDynamicProperties() const override;
396+
bool hasDynamicProperties() const override;
397397

398398
/**
399399
* Returns true if the stack contains an active property with the specified key.
@@ -441,7 +441,7 @@ class CORE_EXPORT QgsPropertyCollectionStack : public QgsAbstractPropertyCollect
441441

442442
mutable bool mDirty;
443443
mutable bool mHasActiveProperties;
444-
mutable bool mHasActiveDynamicProperties;
444+
mutable bool mhasDynamicProperties;
445445

446446
//! Scans through properties and updates cached values
447447
void rescan() const;

0 commit comments

Comments
 (0)