Merge pull request #159 from igorkorsukov/w/rcmd/rcmd_step16

added set methods to UriQuery

Author: igorkorsukov

framework/global/types/uri.cpp

@@ -306,6 +306,20 @@ UriQuery& UriQuery::set(const std::string& key, const Val& val)
     return *this;
 }
 
+UriQuery UriQuery::set(const ValMap& vals) const
+{
+    UriQuery copy(*this);
+    copy.set(vals);
+    return copy;
+}
+
+UriQuery UriQuery::set(const std::string& key, const Val& val) const
+{
+    UriQuery copy(*this);
+    copy.set(key, val);
+    return copy;
+}
+
 UriQuery UriQuery::addingParam(const std::string& key, const Val& val) const
 {
     UriQuery copy(*this);

framework/global/types/uri.h

@@ -86,13 +86,23 @@ class UriQuery
 
     const Params& params() const;
     Val param(const std::string& key, const Val& def = Val()) const;
-    void addParam(const std::string& key, const Val& val);
     UriQuery& set(const ValMap& vals);
     UriQuery& set(const std::string& key, const Val& val);
     UriQuery& set(const std::string& key, const ValList& vals) { return set(key, Val(vals)); }
     UriQuery& set(const std::string& key, const std::string& val) { return set(key, Val(val)); }
+    UriQuery& set(const std::string& key, const char* val) { return set(key, Val(val)); }
     UriQuery& set(const std::string& key, int val) { return set(key, Val(val)); }
     UriQuery& set(const std::string& key, bool val) { return set(key, Val(val)); }
+
+    UriQuery set(const ValMap& vals) const;
+    UriQuery set(const std::string& key, const Val& val) const;
+    UriQuery set(const std::string& key, const ValList& vals) const { return set(key, Val(vals)); }
+    UriQuery set(const std::string& key, const std::string& val) const { return set(key, Val(val)); }
+    UriQuery set(const std::string& key, const char* val) const { return set(key, Val(val)); }
+    UriQuery set(const std::string& key, int val) const { return set(key, Val(val)); }
+    UriQuery set(const std::string& key, bool val) const { return set(key, Val(val)); }
+
+    void addParam(const std::string& key, const Val& val);
     UriQuery addingParam(const std::string& key, const Val& val) const;
     bool contains(const std::string& key) const;