Compare commits
2 Commits
e22630b1bd
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 8c15113cb0 | |||
| 4253acb72b |
@@ -59,7 +59,7 @@ bool PIHTTPClient::init() {
|
||||
if (is_cancel) return false;
|
||||
CurlThreadPool::instance();
|
||||
if (!PRIVATE->init()) return false;
|
||||
auto ait = request.arguments().makeIterator();
|
||||
auto ait = request.queryArguments().makeIterator();
|
||||
while (ait.next()) {
|
||||
if (!url.contains('?'))
|
||||
url.append('?');
|
||||
|
||||
@@ -348,8 +348,8 @@ PIValueTree PIValueTreeConversions::fromJSONFile(const PIString & path) {
|
||||
auto ret = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(path))));
|
||||
auto ofp = overrideFile(path);
|
||||
if (PIFile::isExists(ofp)) {
|
||||
auto override = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(ofp))));
|
||||
ret.merge(override);
|
||||
auto override_vt = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(ofp))));
|
||||
ret.merge(override_vt);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
@@ -361,8 +361,8 @@ PIValueTree PIValueTreeConversions::fromTextFile(const PIString & path) {
|
||||
auto ofp = overrideFile(path);
|
||||
if (PIFile::isExists(ofp)) {
|
||||
PIFile of(ofp, PIIODevice::ReadOnly);
|
||||
auto override = PIValueTreeConversions::fromText(&of);
|
||||
ret.merge(override);
|
||||
auto override_vt = PIValueTreeConversions::fromText(&of);
|
||||
ret.merge(override_vt);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user