Skip to content

Commit 1b5e577

Browse files
m-kuhnm-kuhn
committedDec 20, 2016
Generic code cleanup
·
ltr-3_40final-3_0_0
1 parent 22c492e commit 1b5e577

22 files changed

+53
-87
lines changed
 

‎python/core/qgsfieldformatterregistry.sip

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,15 @@ class QgsFieldFormatterRegistry : QObject
2020
%End
2121
public:
2222

23-
QgsFieldFormatterRegistry();
23+
QgsFieldFormatterRegistry( QObject* parent /TransferThis/ );
2424
~QgsFieldFormatterRegistry();
2525

26-
void addFieldFormatter( QgsFieldFormatter* kit /Transfer/ );
27-
28-
void removeFieldFormatter( QgsFieldFormatter* kit );
29-
30-
QgsFieldFormatter* fieldKit( const QString& id ) const;
26+
void addFieldFormatter( QgsFieldFormatter* formatter /Transfer/ );
3127

28+
void removeFieldFormatter( QgsFieldFormatter* formatter );
29+
void removeFieldFormatter( const QString& id );
30+
QgsFieldFormatter* fieldFormatter( const QString& id ) const;
3231
signals:
33-
void fieldKitAdded( QgsFieldFormatter* kit );
34-
35-
void fieldKitRemoved( QgsFieldFormatter* kit );
32+
void fieldFormatterAdded( QgsFieldFormatter* formatter );
33+
void fieldFormatterRemoved( QgsFieldFormatter* formatter );
3634
};

‎src/app/qgisapp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6399,7 +6399,7 @@ QVariant QgisAppFieldValueConverter::convert( int idx, const QVariant& value )
63996399
return value;
64006400
}
64016401
const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, mLayer->fields().field( idx ).name() );
6402-
QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
6402+
QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( setup.type() );
64036403
return fieldKit->representValue( mLayer, idx, setup.config(), QVariant(), value );
64046404
}
64056405

‎src/app/qgsattributetypedialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const QVariantMap QgsAttributeTypeDialog::editorWidgetConfig()
142142
return QVariantMap();
143143
}
144144

145-
void QgsAttributeTypeDialog::setWidgetType( const QString& type )
145+
void QgsAttributeTypeDialog::setEditorWidgetType( const QString& type )
146146
{
147147
for ( int i = 0; i < selectionListWidget->count(); i++ )
148148
{
@@ -181,7 +181,7 @@ void QgsAttributeTypeDialog::setWidgetType( const QString& type )
181181
defaultExpressionChanged();
182182
}
183183

184-
void QgsAttributeTypeDialog::setWidgetConfig( const QVariantMap& config )
184+
void QgsAttributeTypeDialog::setEditorWidgetConfig( const QVariantMap& config )
185185
{
186186
mWidgetConfig = config;
187187
}
@@ -311,7 +311,7 @@ void QgsAttributeTypeDialog::on_selectionListWidget_currentRowChanged( int index
311311
{
312312
const QString editType = selectionListWidget->item( index )->data( Qt::UserRole ).toString();
313313

314-
setWidgetType( editType );
314+
setEditorWidgetType( editType );
315315
}
316316

317317
void QgsAttributeTypeDialog::defaultExpressionChanged()
@@ -350,7 +350,7 @@ void QgsAttributeTypeDialog::defaultExpressionChanged()
350350
return;
351351
}
352352

353-
QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( editorWidgetType() );
353+
QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( editorWidgetType() );
354354

355355
QString previewText = fieldKit->representValue( mLayer, mFieldIdx, editorWidgetConfig(), QVariant(), val );
356356

‎src/app/qgsattributetypedialog.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ class APP_EXPORT QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttribut
4343

4444
const QString editorWidgetText();
4545

46-
void setWidgetType( const QString& type );
46+
void setEditorWidgetType( const QString& type );
4747

4848
const QVariantMap editorWidgetConfig();
4949

50-
void setWidgetConfig( const QVariantMap& config );
50+
void setEditorWidgetConfig( const QVariantMap& config );
5151

5252
/**
5353
* Setter for checkbox to label on top

‎src/app/qgsfieldsproperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,8 @@ void QgsFieldsProperties::attributeTypeDialog()
577577
attributeTypeDialog.setConstraintExpressionEnforced( cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintExpression, QgsFieldConstraints::ConstraintStrengthHard ) == QgsFieldConstraints::ConstraintStrengthHard );
578578
attributeTypeDialog.setDefaultValueExpression( mLayer->defaultValueExpression( index ) );
579579

580-
attributeTypeDialog.setWidgetConfig( cfg.mEditorWidgetConfig );
581-
attributeTypeDialog.setWidgetType( cfg.mEditorWidgetType );
580+
attributeTypeDialog.setEditorWidgetConfig( cfg.mEditorWidgetConfig );
581+
attributeTypeDialog.setEditorWidgetType( cfg.mEditorWidgetType );
582582

583583
if ( !attributeTypeDialog.exec() )
584584
return;

‎src/app/qgsidentifyresultsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ QString QgsIdentifyResultsDialog::representValue( QgsVectorLayer* vlayer, const
734734
QMap<QString, QVariant>& layerCaches = mWidgetCaches[vlayer->id()];
735735

736736
QgsEditorWidgetFactory* factory = QgsEditorWidgetRegistry::instance()->factory( setup.type() );
737-
QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
737+
QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( setup.type() );
738738

739739
int idx = vlayer->fields().lookupField( fieldName );
740740

‎src/core/fieldformatter/qgsdatetimefieldformatter.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
#include "qgsfield.h"
2121
#include "qgsvectorlayer.h"
2222

23-
QgsDateTimeFieldFormatter::QgsDateTimeFieldFormatter()
24-
{
25-
26-
}
27-
2823
QString QgsDateTimeFieldFormatter::id() const
2924
{
3025
return QStringLiteral( "DateTime" );

‎src/core/fieldformatter/qgsdatetimefieldformatter.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
class CORE_EXPORT QgsDateTimeFieldFormatter : public QgsFieldFormatter
2626
{
2727
public:
28-
QgsDateTimeFieldFormatter();
29-
30-
QString id() const override;
28+
virtual QString id() const override;
3129

3230
virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
3331

‎src/core/fieldformatter/qgsfallbackfieldformatter.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
***************************************************************************/
1616
#include "qgsfallbackfieldformatter.h"
1717

18-
QgsFallbackFieldFormatter::QgsFallbackFieldFormatter()
19-
{
20-
21-
}
22-
2318
QString QgsFallbackFieldFormatter::id() const
2419
{
2520
return QString();

‎src/core/fieldformatter/qgsfallbackfieldformatter.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
class CORE_EXPORT QgsFallbackFieldFormatter : public QgsFieldFormatter
2222
{
2323
public:
24-
QgsFallbackFieldFormatter();
25-
26-
QString id() const override;
24+
virtual QString id() const override;
2725
};
2826

2927
#endif // QGSFALLBACKFIELDKIT_H

‎src/core/fieldformatter/qgskeyvaluefieldformatter.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717

1818
#include <QSettings>
1919

20-
QgsKeyValueFieldFormatter::QgsKeyValueFieldFormatter()
21-
{
22-
23-
}
24-
2520
QString QgsKeyValueFieldFormatter::id() const
2621
{
2722
return QStringLiteral( "KeyValue" );

‎src/core/fieldformatter/qgskeyvaluefieldformatter.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@
2121
class CORE_EXPORT QgsKeyValueFieldFormatter : public QgsFieldFormatter
2222
{
2323
public:
24-
QgsKeyValueFieldFormatter();
25-
26-
QString id() const override;
27-
QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
24+
virtual QString id() const override;
25+
virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
2826
};
2927

3028
#endif // QGSKEYVALUEFIELDKIT_H

‎src/core/fieldformatter/qgslistfieldformatter.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717

1818
#include <QSettings>
1919

20-
QgsListFieldFormatter::QgsListFieldFormatter()
21-
{
22-
23-
}
24-
2520
QString QgsListFieldFormatter::id() const
2621
{
2722
return QStringLiteral( "List" );

‎src/core/fieldformatter/qgslistfieldformatter.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
class CORE_EXPORT QgsListFieldFormatter : public QgsFieldFormatter
2222
{
2323
public:
24-
QgsListFieldFormatter();
24+
virtual QString id() const override;
2525

26-
QString id() const override;
27-
28-
QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
26+
virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
2927
};
3028

3129
#endif // QGSLISTFIELDKIT_H

‎src/core/fieldformatter/qgsrelationreferencefieldformatter.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
#include "qgsrelationmanager.h"
2323
#include "qgsvectorlayer.h"
2424

25-
QgsRelationReferenceFieldFormatter::QgsRelationReferenceFieldFormatter()
26-
{
27-
28-
}
29-
3025
QString QgsRelationReferenceFieldFormatter::id() const
3126
{
3227
return QStringLiteral( "RelationReference" );

‎src/core/fieldformatter/qgsrelationreferencefieldformatter.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
class CORE_EXPORT QgsRelationReferenceFieldFormatter : public QgsFieldFormatter
2222
{
2323
public:
24-
QgsRelationReferenceFieldFormatter();
25-
26-
QString id() const override;
24+
virtual QString id() const override;
2725

2826
virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
2927

‎src/core/fieldformatter/qgsvaluemapfieldformatter.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717

1818
#include "qgsvectorlayer.h"
1919

20-
QgsValueMapFieldFormatter::QgsValueMapFieldFormatter()
21-
{
22-
23-
}
24-
2520
QString QgsValueMapFieldFormatter::id() const
2621
{
2722
return QStringLiteral( "ValueMap" );

‎src/core/fieldformatter/qgsvaluemapfieldformatter.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@
2323
class CORE_EXPORT QgsValueMapFieldFormatter : public QgsFieldFormatter
2424
{
2525
public:
26-
QgsValueMapFieldFormatter();
26+
virtual QString id() const override;
2727

28-
QString id() const override;
28+
virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
2929

30-
QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
31-
32-
QVariant sortValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
30+
virtual QVariant sortValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
3331
};
3432

3533
#endif // QGSVALUEMAPFIELDKIT_H

‎src/core/qgsfieldformatterregistry.cpp

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,27 @@ QgsFieldFormatterRegistry::~QgsFieldFormatterRegistry()
4444
delete mFallbackFieldFormatter;
4545
}
4646

47-
void QgsFieldFormatterRegistry::addFieldFormatter( QgsFieldFormatter* kit )
47+
void QgsFieldFormatterRegistry::addFieldFormatter( QgsFieldFormatter* formatter )
4848
{
49-
mFieldFormatters.insert( kit->id(), kit );
50-
emit fieldKitAdded( kit );
49+
mFieldFormatters.insert( formatter->id(), formatter );
50+
emit fieldFormatterAdded( formatter );
5151
}
5252

53-
void QgsFieldFormatterRegistry::removeFieldFormatter( QgsFieldFormatter* kit )
53+
void QgsFieldFormatterRegistry::removeFieldFormatter( QgsFieldFormatter* formatter )
5454
{
55-
if ( mFieldFormatters.remove( kit->id() ) )
55+
removeFieldFormatter( formatter->id() );
56+
}
57+
58+
void QgsFieldFormatterRegistry::removeFieldFormatter( const QString& id )
59+
{
60+
if ( QgsFieldFormatter* formatter = mFieldFormatters.take( id ) )
5661
{
57-
emit fieldKitRemoved( kit );
58-
delete kit;
62+
emit fieldFormatterRemoved( formatter );
63+
delete formatter;
5964
}
6065
}
6166

62-
QgsFieldFormatter* QgsFieldFormatterRegistry::fieldKit( const QString& id ) const
67+
QgsFieldFormatter* QgsFieldFormatterRegistry::fieldFormatter( const QString& id ) const
6368
{
6469
return mFieldFormatters.value( id, mFallbackFieldFormatter );
6570
}

‎src/core/qgsfieldformatterregistry.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class CORE_EXPORT QgsFieldFormatterRegistry : public QObject
4141
*
4242
* Use the one provided by `QgsApplication::fieldKitRegistry()` instead.
4343
*/
44-
QgsFieldFormatterRegistry( QObject* parent = nullptr );
44+
explicit QgsFieldFormatterRegistry( QObject* parent = nullptr );
4545
~QgsFieldFormatterRegistry();
4646

4747
/**
@@ -50,31 +50,36 @@ class CORE_EXPORT QgsFieldFormatterRegistry : public QObject
5050
*
5151
* Ownership is transferred to the registry.
5252
*/
53-
void addFieldFormatter( QgsFieldFormatter* kit );
53+
void addFieldFormatter( QgsFieldFormatter* formatter );
5454

5555
/**
5656
* Remove a field formatter from the registry.
5757
* The field formatter will be deleted.
5858
*/
59-
void removeFieldFormatter( QgsFieldFormatter* kit );
59+
void removeFieldFormatter( QgsFieldFormatter* formatter );
60+
61+
/**
62+
* Remove the field formatter with the specified id.
63+
*/
64+
void removeFieldFormatter( const QString& id );
6065

6166
/**
6267
* Get a field formatter by its id. If there is no such id registered,
6368
* a default QgsFallbackFieldFormatter with a null id will be returned instead.
6469
*/
65-
QgsFieldFormatter* fieldKit( const QString& id ) const;
70+
QgsFieldFormatter* fieldFormatter( const QString& id ) const;
6671

6772
signals:
6873

6974
/**
7075
* Will be emitted after a new field formatter has been added.
7176
*/
72-
void fieldKitAdded( QgsFieldFormatter* kit );
77+
void fieldFormatterAdded( QgsFieldFormatter* formatter );
7378

7479
/**
7580
* Will be emitted just before a field formatter is removed and deleted.
7681
*/
77-
void fieldKitRemoved( QgsFieldFormatter* kit );
82+
void fieldFormatterRemoved( QgsFieldFormatter* formatter );
7883

7984
private:
8085
QHash<QString, QgsFieldFormatter*> mFieldFormatters;

‎src/gui/attributetable/qgsattributetablemodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ void QgsAttributeTableModel::loadAttributes()
343343
{
344344
const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( layer(), fields[idx].name() );
345345
QgsEditorWidgetFactory* widgetFactory = QgsEditorWidgetRegistry::instance()->factory( setup.type() );
346-
QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
346+
QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( setup.type() );
347347

348348
if ( widgetFactory )
349349
{

‎src/server/qgswmsserver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3383,7 +3383,7 @@ QDomElement QgsWmsServer::createFeatureGML(
33833383
QString QgsWmsServer::replaceValueMapAndRelation( QgsVectorLayer* vl, int idx, const QString& attributeVal )
33843384
{
33853385
const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( vl, vl->fields().field( idx ).name() );
3386-
QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
3386+
QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( setup.type() );
33873387
QString value( fieldKit->representValue( vl, idx, setup.config(), QVariant(), attributeVal ) );
33883388

33893389
if ( setup.config().value( QStringLiteral( "AllowMulti" ) ).toBool() && value.startsWith( QLatin1String( "{" ) ) && value.endsWith( QLatin1String( "}" ) ) )

0 commit comments

Comments
 (0)
Please sign in to comment.