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

Alpha version 1.2.18: Fix OS X old build.

This commit is contained in:
John Preston 2018-05-05 22:30:42 +03:00
parent 97b576f446
commit d2fa8ef0b0
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/boxes/connection_box.h
View File

@ -167,7 +167,6 @@ private:
void addNewItem(const ProxyData &proxy); void addNewItem(const ProxyData &proxy);
int _idCounter = 0; int _idCounter = 0;
int _selected = -1;
std::vector<Item> _list; std::vector<Item> _list;
rpl::event_stream<ItemView> _views; rpl::event_stream<ItemView> _views;
base::Timer _saveTimer; base::Timer _saveTimer;

20
Telegram/SourceFiles/core/update_checker.cpp
View File

@ -321,12 +321,12 @@ bool Updater::checkResponse(const QByteArray &response) {
LOG(("Update Error: Platform '%1' not found in response." LOG(("Update Error: Platform '%1' not found in response."
).arg(platform)); ).arg(platform));
return false; return false;
} else if (!it->isObject()) { } else if (!(*it).isObject()) {
LOG(("Update Error: Not an object found for platform '%1'." LOG(("Update Error: Not an object found for platform '%1'."
).arg(platform)); ).arg(platform));
return false; return false;
} }
const auto types = it->toObject(); const auto types = (*it).toObject();
const auto list = [&]() -> std::vector<QString> { const auto list = [&]() -> std::vector<QString> {
if (cBetaVersion()) { if (cBetaVersion()) {
return { "alpha", "beta", "stable" }; return { "alpha", "beta", "stable" };
@ -342,12 +342,12 @@ bool Updater::checkResponse(const QByteArray &response) {
const auto it = types.constFind(type); const auto it = types.constFind(type);
if (it == types.constEnd()) { if (it == types.constEnd()) {
continue; continue;
} else if (!it->isObject()) { } else if (!(*it).isObject()) {
LOG(("Update Error: Not an object found for '%1:%2'." LOG(("Update Error: Not an object found for '%1:%2'."
).arg(platform).arg(type)); ).arg(platform).arg(type));
return false; return false;
} }
const auto map = it->toObject(); const auto map = (*it).toObject();
const auto key = _testing ? "testing" : "released"; const auto key = _testing ? "testing" : "released";
const auto version = map.constFind(key); const auto version = map.constFind(key);
const auto link = map.constFind("link"); const auto link = map.constFind("link");
@ -357,17 +357,17 @@ bool Updater::checkResponse(const QByteArray &response) {
LOG(("Update Error: Link not found for '%1:%2'." LOG(("Update Error: Link not found for '%1:%2'."
).arg(platform).arg(type)); ).arg(platform).arg(type));
return false; return false;
} else if (!link->isString()) { } else if (!(*link).isString()) {
LOG(("Update Error: Link is not a string for '%1:%2'." LOG(("Update Error: Link is not a string for '%1:%2'."
).arg(platform).arg(type)); ).arg(platform).arg(type));
return false; return false;
} }
const auto isAvailableBeta = (type == "alpha"); const auto isAvailableBeta = (type == "alpha");
const auto availableVersion = [&] { const auto availableVersion = [&] {
if (version->isString()) { if ((*version).isString()) {
return version->toString().toULongLong(); return (*version).toString().toULongLong();
} else if (version->isDouble()) { } else if ((*version).isDouble()) {
return uint64(std::round(version->toDouble())); return uint64(std::round((*version).toDouble()));
} }
return 0ULL; return 0ULL;
}(); }();
@ -385,7 +385,7 @@ bool Updater::checkResponse(const QByteArray &response) {
if (compare > bestCompare) { if (compare > bestCompare) {
bestAvailableVersion = availableVersion; bestAvailableVersion = availableVersion;
bestIsAvailableBeta = isAvailableBeta; bestIsAvailableBeta = isAvailableBeta;
bestLink = link->toString(); bestLink = (*link).toString();
} }
} }
if (!bestAvailableVersion) { if (!bestAvailableVersion) {

1
Telegram/SourceFiles/ui/effects/radial_animation.h
View File

@ -78,7 +78,6 @@ public:
private: private:
const style::InfiniteRadialAnimation &_st; const style::InfiniteRadialAnimation &_st;
float64 _shown = 0.;
TimeMs _workStarted = 0; TimeMs _workStarted = 0;
TimeMs _workFinished = 0; TimeMs _workFinished = 0;
BasicAnimation _animation; BasicAnimation _animation;