1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QMetaObjectBuilder: replace two signed comparisons with one unsigned one

Browse Source 
... where possible. It's a cleanup commit following the
change from QVector to std:vector and the corresponding
signed/unsigned comparison fixes.

Change-Id: I927445686d24d542cae024cac0f34ff1fd82d20f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2015-06-14 11:50:46 +02:00
parent 94fb503769
commit 2bbe1f9982
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/kernel/qmetaobjectbuilder.cpp
View File

@ -760,7 +760,7 @@ void QMetaObjectBuilder::addMetaObject
*/ */
QMetaMethodBuilder QMetaObjectBuilder::method(int index) const QMetaMethodBuilder QMetaObjectBuilder::method(int index) const
{ {
if (index >= 0 && index < int(d->methods.size())) if (uint(index) < d->methods.size())
return QMetaMethodBuilder(this, index); return QMetaMethodBuilder(this, index);
else else
return QMetaMethodBuilder(); return QMetaMethodBuilder();
@ -773,7 +773,7 @@ QMetaMethodBuilder QMetaObjectBuilder::method(int index) const
*/ */
QMetaMethodBuilder QMetaObjectBuilder::constructor(int index) const QMetaMethodBuilder QMetaObjectBuilder::constructor(int index) const
{ {
if (index >= 0 && index < int(d->constructors.size())) if (uint(index) < d->constructors.size())
return QMetaMethodBuilder(this, -(index + 1)); return QMetaMethodBuilder(this, -(index + 1));
else else
return QMetaMethodBuilder(); return QMetaMethodBuilder();
@ -786,7 +786,7 @@ QMetaMethodBuilder QMetaObjectBuilder::constructor(int index) const
*/ */
QMetaPropertyBuilder QMetaObjectBuilder::property(int index) const QMetaPropertyBuilder QMetaObjectBuilder::property(int index) const
{ {
if (index >= 0 && index < int(d->properties.size())) if (uint(index) < d->properties.size())
return QMetaPropertyBuilder(this, index); return QMetaPropertyBuilder(this, index);
else else
return QMetaPropertyBuilder(); return QMetaPropertyBuilder();
@ -800,7 +800,7 @@ QMetaPropertyBuilder QMetaObjectBuilder::property(int index) const
*/ */
QMetaEnumBuilder QMetaObjectBuilder::enumerator(int index) const QMetaEnumBuilder QMetaObjectBuilder::enumerator(int index) const
{ {
if (index >= 0 && index < int(d->enumerators.size())) if (uint(index) < d->enumerators.size())
return QMetaEnumBuilder(this, index); return QMetaEnumBuilder(this, index);
else else
return QMetaEnumBuilder(); return QMetaEnumBuilder();
@ -864,7 +864,7 @@ QByteArray QMetaObjectBuilder::classInfoValue(int index) const
*/ */
void QMetaObjectBuilder::removeMethod(int index) void QMetaObjectBuilder::removeMethod(int index)
{ {
if (index >= 0 && index < int(d->methods.size())) { if (uint(index) < d->methods.size()) {
d->methods.erase(d->methods.begin() + index); d->methods.erase(d->methods.begin() + index);
for (size_t prop = 0; prop < d->properties.size(); ++prop) { for (size_t prop = 0; prop < d->properties.size(); ++prop) {
// Adjust the indices of property notify signal references. // Adjust the indices of property notify signal references.
@ -886,7 +886,7 @@ void QMetaObjectBuilder::removeMethod(int index)
*/ */
void QMetaObjectBuilder::removeConstructor(int index) void QMetaObjectBuilder::removeConstructor(int index)
{ {
if (index >= 0 && index < int(d->constructors.size())) if (uint(index) < d->constructors.size())
d->constructors.erase(d->constructors.begin() + index); d->constructors.erase(d->constructors.begin() + index);
} }
@ -898,7 +898,7 @@ void QMetaObjectBuilder::removeConstructor(int index)
*/ */
void QMetaObjectBuilder::removeProperty(int index) void QMetaObjectBuilder::removeProperty(int index)
{ {
if (index >= 0 && index < int(d->properties.size())) if (uint(index) < d->properties.size())
d->properties.erase(d->properties.begin() + index); d->properties.erase(d->properties.begin() + index);
} }
@ -911,7 +911,7 @@ void QMetaObjectBuilder::removeProperty(int index)
*/ */
void QMetaObjectBuilder::removeEnumerator(int index) void QMetaObjectBuilder::removeEnumerator(int index)
{ {
if (index >= 0 && index < int(d->enumerators.size())) if (uint(index) < d->enumerators.size())
d->enumerators.erase(d->enumerators.begin() + index); d->enumerators.erase(d->enumerators.begin() + index);
} }