Skip to content

Commit f55d9c1

Browse files
committedJul 23, 2018
Add a remove method thanks to enum value
1 parent 6e1f14b commit f55d9c1

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed
 

‎src/server/qgsserverparameters.cpp

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,14 +260,28 @@ QgsServerParameter::QgsServerParameter( const QgsServerParameter::Name name,
260260

261261
QString QgsServerParameter::name( const QgsServerParameter::Name name )
262262
{
263-
const QMetaEnum metaEnum( QMetaEnum::fromType<QgsServerParameter::Name>() );
264-
return metaEnum.valueToKey( name );
263+
if ( name == QgsServerParameter::VERSION_SERVICE )
264+
{
265+
return QStringLiteral( "VERSION" );
266+
}
267+
else
268+
{
269+
const QMetaEnum metaEnum( QMetaEnum::fromType<QgsServerParameter::Name>() );
270+
return metaEnum.valueToKey( name );
271+
}
265272
}
266273

267274
QgsServerParameter::Name QgsServerParameter::name( const QString &name )
268275
{
269-
const QMetaEnum metaEnum( QMetaEnum::fromType<QgsServerParameter::Name>() );
270-
return ( QgsServerParameter::Name ) metaEnum.keyToValue( name.toUpper().toStdString().c_str() );
276+
if ( name.compare( QStringLiteral( "VERSION" ) ) == 0 )
277+
{
278+
return QgsServerParameter::VERSION_SERVICE;
279+
}
280+
else
281+
{
282+
const QMetaEnum metaEnum( QMetaEnum::fromType<QgsServerParameter::Name>() );
283+
return ( QgsServerParameter::Name ) metaEnum.keyToValue( name.toUpper().toStdString().c_str() );
284+
}
271285
}
272286

273287
void QgsServerParameter::raiseError() const
@@ -318,6 +332,11 @@ QUrlQuery QgsServerParameters::urlQuery() const
318332
return query;
319333
}
320334

335+
void QgsServerParameters::remove( QgsServerParameter::Name name )
336+
{
337+
remove( QgsServerParameter::name( name ) );
338+
}
339+
321340
void QgsServerParameters::remove( const QString &key )
322341
{
323342
if ( mUnmanagedParameters.contains( key ) )

‎src/server/qgsserverparameters.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ class SERVER_EXPORT QgsServerParameters
127127
*/
128128
void remove( const QString &key );
129129

130+
void remove( QgsServerParameter::Name name );
131+
130132
/**
131133
* Returns the value of a parameter.
132134
* \param key the name of the parameter

0 commit comments

Comments
 (0)
Please sign in to comment.