Build fixes
This commit is contained in:
parent
675760975c
commit
b9aaca7706
2 changed files with 4 additions and 4 deletions
|
|
@ -643,7 +643,7 @@ void Instance::loadFromJson(const QString &filename) {
|
||||||
|
|
||||||
} else if ((*value).isObject()) {
|
} else if ((*value).isObject()) {
|
||||||
|
|
||||||
const auto keyPlurals = (*value).isObject()
|
const auto keyPlurals = (*value).toObject();
|
||||||
const auto pluralList = keyPlurals.keys();
|
const auto pluralList = keyPlurals.keys();
|
||||||
|
|
||||||
for (auto pli = keyList.constBegin(), ple = keyList.constEnd(); pli != ple; ++pli) {
|
for (auto pli = keyList.constBegin(), ple = keyList.constEnd(); pli != ple; ++pli) {
|
||||||
|
|
@ -656,8 +656,8 @@ void Instance::loadFromJson(const QString &filename) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto name = QByteArray(key + "#" + plural);
|
const auto name = QByteArray().append(key + "#" + plural);
|
||||||
const auto translation = QByteArray((*pluralValue).toString());
|
const auto translation = QByteArray().append((*pluralValue).toString());
|
||||||
|
|
||||||
applyValue(name, translation);
|
applyValue(name, translation);
|
||||||
if (--limit <= 0) {
|
if (--limit <= 0) {
|
||||||
|
|
|
||||||
|
|
@ -211,7 +211,7 @@ inline void SetNetworkBoost(int boost) {
|
||||||
|
|
||||||
DeclareSetting(bool, ShowPhoneInDrawer);
|
DeclareSetting(bool, ShowPhoneInDrawer);
|
||||||
|
|
||||||
using ScaleVector = std::std::vector<int>;
|
using ScaleVector = std::vector<int>;
|
||||||
DeclareRefSetting(ScaleVector, InterfaceScales);
|
DeclareRefSetting(ScaleVector, InterfaceScales);
|
||||||
bool HasCustomScales();
|
bool HasCustomScales();
|
||||||
bool AddCustomScale(int scale);
|
bool AddCustomScale(int scale);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue