Remove isDefined member

pblottiere · pblottiere · commit 1c6b0582df0c · 2018-07-23T08:07:07.000+01:00
diff --git a/src/server/qgsserverparameters.cpp b/src/server/qgsserverparameters.cpp
@@ -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();
diff --git a/src/server/qgsserverparameters.h b/src/server/qgsserverparameters.h
@@ -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( "" ) );
 

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ QMap<QString, QString> QgsServerParameters::toMap() const`
`167`	`167`
`168`	`168`	`for ( auto parameter : mParameters.toStdMap() )`
`169`	`169`	`{`
`170`		`- if ( ! parameter.second.mDefined )`
	`170`	`+ if ( parameter.second.mValue.isNull() )`
`171`	`171`	`continue;`
`172`	`172`
`173`	`173`	`const QString paramName = QgsServerParameter::name( parameter.first );`
`@@ -205,7 +205,6 @@ void QgsServerParameters::load( const QUrlQuery &query )`
`205`	`205`	`if ( name >= 0 )`
`206`	`206`	`{`
`207`	`207`	`mParameters[name].mValue = item.second;`
`208`		`- mParameters[name].mDefined = true;`
`209`	`208`	`if ( ! mParameters[name].isValid() )`
`210`	`209`	`{`
`211`	`210`	`mParameters[name].raiseError();`