Skip to content
Permalink
Browse files

Remove isDefined member

  • Loading branch information
pblottiere committed Jun 28, 2018
1 parent 1a078d9 commit 1c6b0582df0c3cb4dcb660c12c632f3ef19ae088
Showing with 2 additions and 4 deletions.
  1. +1 −2 src/server/qgsserverparameters.cpp
  2. +1 −2 src/server/qgsserverparameters.h
@@ -167,7 +167,7 @@ QMap<QString, QString> QgsServerParameters::toMap() const

for ( auto parameter : mParameters.toStdMap() )
{
if ( ! parameter.second.mDefined )
if ( parameter.second.mValue.isNull() )
continue;

const QString paramName = QgsServerParameter::name( parameter.first );
@@ -205,7 +205,6 @@ void QgsServerParameters::load( const QUrlQuery &query )
if ( name >= 0 )
{
mParameters[name].mValue = item.second;
mParameters[name].mDefined = true;
if ( ! mParameters[name].isValid() )
{
mParameters[name].raiseError();
@@ -39,7 +39,6 @@ class SERVER_EXPORT QgsServerParameterDefinition
QVariant::Type mType;
QVariant mValue;
QVariant mDefaultValue;
bool mDefined = false;
};

class SERVER_EXPORT QgsServerParameter : public QgsServerParameterDefinition
@@ -58,7 +57,7 @@ class SERVER_EXPORT QgsServerParameter : public QgsServerParameterDefinition
};
Q_ENUM( Name )

QgsServerParameter( const QgsServerParameter::Name name = Name::UNKNOWN,
QgsServerParameter( const QgsServerParameter::Name name = QgsServerParameter::UNKNOWN,
const QVariant::Type type = QVariant::String,
const QVariant defaultValue = QVariant( "" ) );

0 comments on commit 1c6b058

Please sign in to comment.
You can’t perform that action at this time.