Fix sip binding

qgis · Jul 23, 2018 · 6e1f14b · 6e1f14b
1 parent 7692e35
commit 6e1f14b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 14 deletions.
diff --git a/python/server/auto_generated/qgsserverparameters.sip.in b/python/server/auto_generated/qgsserverparameters.sip.in
@@ -195,7 +195,7 @@ defined.
 %End
 
   protected:
-    virtual bool loadParameter( const QPair<QString, QString> &item );
+    virtual bool loadParameter( const QString &name, const QString &value );
 
 
 };

diff --git a/src/server/qgsserverparameters.cpp b/src/server/qgsserverparameters.cpp
@@ -431,14 +431,14 @@ void QgsServerParameters::load( const QUrlQuery &query )
         mParameters[name].raiseError();
       }
     }
-    else if ( ! loadParameter( item ) )
+    else if ( ! loadParameter( item.first, item.second ) )
     {
       mUnmanagedParameters[item.first.toUpper()] = item.second;
     }
   }
 }
 
-bool QgsServerParameters::loadParameter( const QPair<QString, QString> & )
+bool QgsServerParameters::loadParameter( const QString &, const QString & )
 {
   return false;
 }

diff --git a/src/server/qgsserverparameters.h b/src/server/qgsserverparameters.h
@@ -179,7 +179,7 @@ class SERVER_EXPORT QgsServerParameters
     QString version() const;
 
   protected:
-    virtual bool loadParameter( const QPair<QString, QString> &item );
+    virtual bool loadParameter( const QString &name, const QString &value );
 
     QMap<QString, QString> mUnmanagedParameters;
 

diff --git a/src/server/services/wfs/qgswfsparameters.cpp b/src/server/services/wfs/qgswfsparameters.cpp
@@ -173,15 +173,14 @@ namespace QgsWfs
     load( parameters.urlQuery() );
   }
 
-  bool QgsWfsParameters::loadParameter( const QPair<QString, QString> &parameter )
+  bool QgsWfsParameters::loadParameter( const QString &key, const QString &value )
   {
     bool loaded = false;
 
-    const QString key = parameter.first;
     const QgsWfsParameter::Name name = QgsWfsParameter::name( key );
     if ( name >= 0 )
     {
-      mWfsParameters[name].mValue = parameter.second;
+      mWfsParameters[name].mValue = value;
       if ( ! mWfsParameters[name].isValid() )
       {
         mWfsParameters[name].raiseError();

diff --git a/src/server/services/wfs/qgswfsparameters.h b/src/server/services/wfs/qgswfsparameters.h
@@ -263,7 +263,7 @@ namespace QgsWfs
       QString geometryNameAsString() const;
 
     private:
-      bool loadParameter( const QPair<QString, QString> &parameter ) override;
+      bool loadParameter( const QString &name, const QString &key ) override;
       void save( const QgsWfsParameter &parameter );
 
       void log( const QString &msg ) const;

diff --git a/src/server/services/wms/qgswmsparameters.cpp b/src/server/services/wms/qgswmsparameters.cpp
@@ -472,11 +472,10 @@ namespace QgsWms
     load( parameters.urlQuery() );
   }
 
-  bool QgsWmsParameters::loadParameter( const QPair<QString, QString> &parameter )
+  bool QgsWmsParameters::loadParameter( const QString &key, const QString &value )
   {
     bool loaded = false;
 
-    const QString key = parameter.first;
     const QRegExp composerParamRegExp( QStringLiteral( "^MAP\\d+:" ) );
     if ( key.contains( composerParamRegExp ) )
     {
@@ -487,7 +486,7 @@ namespace QgsWms
       if ( name >= 0 )
       {
         QgsWmsParameter param = mWmsParameters[name];
-        param.mValue = parameter.second;
+        param.mValue = value;
         param.mId = mapId;
 
         if ( ! param.isValid() )
@@ -504,7 +503,7 @@ namespace QgsWms
       const QgsWmsParameter::Name name = QgsWmsParameter::name( key );
       if ( name >= 0 )
       {
-        mWmsParameters[name].mValue = parameter.second;
+        mWmsParameters[name].mValue = value;
         if ( ! mWmsParameters[name].isValid() )
         {
           mWmsParameters[name].raiseError();
@@ -519,7 +518,7 @@ namespace QgsWms
         {
           QString id = key.left( separator );
           QString param = key.right( key.length() - separator - 1 );
-          mExternalWMSParameters[id].insert( param, parameter.second );
+          mExternalWMSParameters[id].insert( param, value );
 
           loaded = true;
         }

diff --git a/src/server/services/wms/qgswmsparameters.h b/src/server/services/wms/qgswmsparameters.h
@@ -991,7 +991,7 @@ namespace QgsWms
       QString layoutParameter( const QString &id, bool &ok ) const;
 
     private:
-      bool loadParameter( const QPair<QString, QString> &parameter ) override;
+      bool loadParameter( const QString &name, const QString &value ) override;
 
       void save( const QgsWmsParameter &parameter, bool multi = false );