Skip to content

Commit c6dc31a

Browse files
committed
Document QgsValueMapFieldFormatter::NullValue
1 parent 928f360 commit c6dc31a

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

src/core/fieldformatter/qgsvaluemapfieldformatter.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
#include "qgsvectorlayer.h"
1919

20+
const QString QgsValueMapFieldFormatter::NullValue = QStringLiteral( "{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}" );
21+
2022
QString QgsValueMapFieldFormatter::id() const
2123
{
2224
return QStringLiteral( "ValueMap" );
@@ -28,7 +30,7 @@ QString QgsValueMapFieldFormatter::representValue( QgsVectorLayer* layer, int fi
2830

2931
QString valueInternalText;
3032
if ( value.isNull() )
31-
valueInternalText = VALUEMAP_NULL_TEXT;
33+
valueInternalText = NullValue;
3234
else
3335
valueInternalText = value.toString();
3436

src/core/fieldformatter/qgsvaluemapfieldformatter.h

+7-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,16 @@
1818

1919
#include "qgsfieldformatter.h"
2020

21-
#define VALUEMAP_NULL_TEXT QStringLiteral( "{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}" )
22-
2321
class CORE_EXPORT QgsValueMapFieldFormatter : public QgsFieldFormatter
2422
{
2523
public:
24+
25+
/**
26+
* Will be saved in the configuration when a value is NULL.
27+
* It's the magic UUID {2839923C-8B7D-419E-B84B-CA2FE9B80EC7}
28+
*/
29+
static const QString NullValue;
30+
2631
virtual QString id() const override;
2732

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

src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ QVariantMap QgsValueMapConfigDlg::config()
5454

5555
QString ks = ki->text();
5656
if (( ks == QgsApplication::nullRepresentation() ) && !( ki->flags() & Qt::ItemIsEditable ) )
57-
ks = VALUEMAP_NULL_TEXT;
57+
ks = QgsValueMapFieldFormatter::NullValue;
5858

5959
if ( !vi || vi->text().isNull() )
6060
{
@@ -137,7 +137,7 @@ void QgsValueMapConfigDlg::updateMap( const QMap<QString, QVariant> &map, bool i
137137

138138
if ( insertNull )
139139
{
140-
setRow( row, VALUEMAP_NULL_TEXT, QStringLiteral( "<NULL>" ) );
140+
setRow( row, QgsValueMapFieldFormatter::NullValue, QStringLiteral( "<NULL>" ) );
141141
++row;
142142
}
143143

@@ -156,7 +156,7 @@ void QgsValueMapConfigDlg::setRow( int row, const QString& value, const QString&
156156
QTableWidgetItem* valueCell;
157157
QTableWidgetItem* descriptionCell = new QTableWidgetItem( description );
158158
tableWidget->insertRow( row );
159-
if ( value == VALUEMAP_NULL_TEXT )
159+
if ( value == QgsValueMapFieldFormatter::NullValue )
160160
{
161161
QFont cellFont;
162162
cellFont.setItalic( true );
@@ -175,7 +175,7 @@ void QgsValueMapConfigDlg::setRow( int row, const QString& value, const QString&
175175

176176
void QgsValueMapConfigDlg::addNullButtonPushed()
177177
{
178-
setRow( tableWidget->rowCount() - 1, VALUEMAP_NULL_TEXT, QStringLiteral( "<NULL>" ) );
178+
setRow( tableWidget->rowCount() - 1, QgsValueMapFieldFormatter::NullValue, QStringLiteral( "<NULL>" ) );
179179
}
180180

181181
void QgsValueMapConfigDlg::loadFromLayerButtonPushed()
@@ -248,7 +248,7 @@ void QgsValueMapConfigDlg::loadFromCSVButtonPushed()
248248
}
249249

250250
if ( key == QgsApplication::nullRepresentation() )
251-
key = VALUEMAP_NULL_TEXT;
251+
key = QgsValueMapFieldFormatter::NullValue;
252252

253253
map[ key ] = val;
254254
}

src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void QgsValueMapSearchWidgetWrapper::initWidget( QWidget* editor )
147147

148148
while ( it != cfg.constEnd() )
149149
{
150-
if ( it.value() != VALUEMAP_NULL_TEXT )
150+
if ( it.value() != QgsValueMapFieldFormatter::NullValue )
151151
mComboBox->addItem( it.key(), it.value() );
152152
++it;
153153
}

src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ QVariant QgsValueMapWidgetWrapper::value() const
3333
if ( mComboBox )
3434
v = mComboBox->currentData();
3535

36-
if ( v == VALUEMAP_NULL_TEXT )
36+
if ( v == QgsValueMapFieldFormatter::NullValue )
3737
v = QVariant( field().type() );
3838

3939
return v;
@@ -79,7 +79,7 @@ void QgsValueMapWidgetWrapper::setValue( const QVariant& value )
7979
{
8080
QString v;
8181
if ( value.isNull() )
82-
v = VALUEMAP_NULL_TEXT;
82+
v = QgsValueMapFieldFormatter::NullValue;
8383
else
8484
v = value.toString();
8585

0 commit comments

Comments
 (0)