procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Closed beta 1001007003: Fix build for old OS X.

This commit is contained in:
John Preston 2017-06-28 10:31:39 +03:00
parent c3db57a4fc
commit 67f2daa43c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Telegram/SourceFiles/lang/lang_instance.cpp
View File

@ -59,7 +59,9 @@ private:
bool _failed = true; bool _failed = true;
const char *_begin, *_ch, *_end; const char *_begin = nullptr;
const char *_ch = nullptr;
const char *_end = nullptr;
QString _result; QString _result;
OrderedSet<ushort> _tagsUsed; OrderedSet<ushort> _tagsUsed;
@ -69,6 +71,7 @@ private:
ValueParser::ValueParser(const QByteArray &key, LangKey keyIndex, const QByteArray &value) ValueParser::ValueParser(const QByteArray &key, LangKey keyIndex, const QByteArray &value)
: _key(key) : _key(key)
, _keyIndex(keyIndex) , _keyIndex(keyIndex)
, _currentTag("")
, _begin(value.constData()) , _begin(value.constData())
, _ch(_begin) , _ch(_begin)
, _end(_begin + value.size()) { , _end(_begin + value.size()) {
@ -146,7 +149,7 @@ bool ValueParser::parse() {
_result.append(_currentTagReplacer); _result.append(_currentTagReplacer);
_begin = _ch + 1; _begin = _ch + 1;
_currentTag = QLatin1String(); _currentTag = QLatin1String("");
} }
} }
appendToResult(_end); appendToResult(_end);

8
Telegram/SourceFiles/mtproto/special_config_request.cpp
View File

@ -104,10 +104,10 @@ void SpecialConfigRequest::dnsFinished() {
auto answerIt = response.find(qsl("Answer")); auto answerIt = response.find(qsl("Answer"));
if (answerIt == response.constEnd()) { if (answerIt == response.constEnd()) {
LOG(("Config Error: Could not find Answer in dns response JSON.")); LOG(("Config Error: Could not find Answer in dns response JSON."));
} else if (!answerIt->isArray()) { } else if (!(*answerIt).isArray()) {
LOG(("Config Error: Not an array received in Answer in dns response JSON.")); LOG(("Config Error: Not an array received in Answer in dns response JSON."));
} else { } else {
for (auto elem : answerIt->toArray()) { for (auto elem : (*answerIt).toArray()) {
if (!elem.isObject()) { if (!elem.isObject()) {
LOG(("Config Error: Not an object found in Answer array in dns response JSON.")); LOG(("Config Error: Not an object found in Answer array in dns response JSON."));
} else { } else {
@ -115,10 +115,10 @@ void SpecialConfigRequest::dnsFinished() {
auto dataIt = object.find(qsl("data")); auto dataIt = object.find(qsl("data"));
if (dataIt == object.constEnd()) { if (dataIt == object.constEnd()) {
LOG(("Config Error: Could not find data in Answer array entry in dns response JSON.")); LOG(("Config Error: Could not find data in Answer array entry in dns response JSON."));
} else if (!dataIt->isString()) { } else if (!(*dataIt).isString()) {
LOG(("Config Error: Not a string data found in Answer array entry in dns response JSON.")); LOG(("Config Error: Not a string data found in Answer array entry in dns response JSON."));
} else { } else {
auto data = dataIt->toString(); auto data = (*dataIt).toString();
entries.insertMulti(INT_MAX - data.size(), data); entries.insertMulti(INT_MAX - data.size(), data);
} }
} }