feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Id: Make versionedId QTC_ASSERT that there is a major version

Browse Source 
There are no more users that use this without giving at least a
major version.

Change-Id: I4ed3c41eb87811435b9e354aa4b2ae8cc1979681
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-30 12:00:14 +01:00
parent 71b4ce6673
commit 723463e72c
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/coreplugin/id.cpp
View File

@@ -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();

2
src/plugins/coreplugin/id.h
View File

@@ -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<Id> fromStringList(const QStringList &list);
static QStringList toStringList(const QSet<Id> &ids);