Use QVersionNumber to compare version in native notifications

This commit is contained in:
Ilya Fedin 2020-06-03 08:29:14 +04:00 committed by John Preston
parent ab13d9bdaf
commit 0fbec5eba1

View file

@ -182,15 +182,11 @@ QVersionNumber ParseSpecificationVersion(
QString GetImageKey(const QVersionNumber &specificationVersion) { QString GetImageKey(const QVersionNumber &specificationVersion) {
if (!specificationVersion.isNull()) { if (!specificationVersion.isNull()) {
const auto majorVersion = specificationVersion.majorVersion(); if (specificationVersion >= QVersionNumber(1, 2)) {
const auto minorVersion = specificationVersion.minorVersion();
if ((majorVersion == 1 && minorVersion >= 2) || majorVersion > 1) {
return qsl("image-data"); return qsl("image-data");
} else if (majorVersion == 1 && minorVersion == 1) { } else if (specificationVersion == QVersionNumber(1, 1)) {
return qsl("image_data"); return qsl("image_data");
} else if ((majorVersion == 1 && minorVersion < 1) } else if (specificationVersion < QVersionNumber(1, 1)) {
|| majorVersion < 1) {
return qsl("icon_data"); return qsl("icon_data");
} else { } else {
LOG(("Native notification error: unknown specification version")); LOG(("Native notification error: unknown specification version"));