From 723463e72c2a9ee14492d444e5363f516e24b0c0 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 30 Nov 2015 12:00:14 +0100 Subject: [PATCH] Id: Make versionedId QTC_ASSERT that there is a major version There are no more users that use this without giving at least a major version. Change-Id: I4ed3c41eb87811435b9e354aa4b2ae8cc1979681 Reviewed-by: Tim Jenssen --- src/plugins/coreplugin/id.cpp | 3 +-- src/plugins/coreplugin/id.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/coreplugin/id.cpp b/src/plugins/coreplugin/id.cpp index e3c329b5054..5a6b9073000 100644 --- a/src/plugins/coreplugin/id.cpp +++ b/src/plugins/coreplugin/id.cpp @@ -248,8 +248,7 @@ Id Id::fromSetting(const QVariant &variant) Id Id::versionedId(const QByteArray &prefix, int major, int minor) { - if (major < 0) - return fromName(prefix); + QTC_ASSERT(major >= 0, return fromName(prefix)); QByteArray result = prefix + '.'; result += QString::number(major).toLatin1(); diff --git a/src/plugins/coreplugin/id.h b/src/plugins/coreplugin/id.h index 3f42c5fbab2..29d7cb47a75 100644 --- a/src/plugins/coreplugin/id.h +++ b/src/plugins/coreplugin/id.h @@ -74,7 +74,7 @@ public: static Id fromName(const QByteArray &ba); // FIXME: avoid. static Id fromSetting(const QVariant &variant); // Good to use. - static Id versionedId(const QByteArray &prefix, int major = -1, int minor = -1); + static Id versionedId(const QByteArray &prefix, int major, int minor = -1); static QSet fromStringList(const QStringList &list); static QStringList toStringList(const QSet &ids);