Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 10:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build fix for the case when QT_STRICT_ITERATORS is defined

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-06-10 18:43:11 +03:00
parent d8d68da000
commit 0cf616c2b7
16 changed files with 69 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/declarative/graphicsitems/qdeclarativegridview.cpp
View file

@ -773,7 +773,7 @@ void QDeclarativeGridViewPrivate::updateUnrequestedIndexes()
void QDeclarativeGridViewPrivate::updateUnrequestedPositions()
{
QHash<QDeclarativeItem*,int>::const_iterator it;
for (it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it) {
for (it = unrequestedItems.constBegin(); it != unrequestedItems.constEnd(); ++it) {
QDeclarativeItem *item = it.key();
if (flow == QDeclarativeGridView::LeftToRight) {
item->setPos(QPointF(colPosAt(*it), rowPosAt(*it)));

2
src/declarative/graphicsitems/qdeclarativelistview.cpp
View file

@ -893,7 +893,7 @@ void QDeclarativeListViewPrivate::updateUnrequestedPositions()
if (unrequestedItems.count()) {
qreal pos = position();
QHash<QDeclarativeItem*,int>::const_iterator it;
for (it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it) {
for (it = unrequestedItems.constBegin(); it != unrequestedItems.constEnd(); ++it) {
QDeclarativeItem *item = it.key();
if (orient == QDeclarativeListView::Vertical) {
if (item->y() + item->height() > pos && item->y() < pos + q->height())

24
src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
View file

@ -297,8 +297,8 @@ public:
if (!m_metaDataCreated) {
ensureRoles();
if (m_roleNames.count()) {
QHash<QByteArray, int>::const_iterator it = m_roleNames.begin();
while (it != m_roleNames.end()) {
QHash<QByteArray, int>::const_iterator it = m_roleNames.constBegin();
while (it != m_roleNames.constEnd()) {
int propId = m_delegateDataType->createProperty(it.key()) - m_delegateDataType->propertyOffset();
m_roleToPropId.insert(*it, propId);
++it;
@ -329,8 +329,8 @@ public:
}
QObject *item(int index) {
QObject *item = 0;
QHash<int, ObjectRef>::const_iterator it = find(index);
if (it != end())
QHash<int, ObjectRef>::const_iterator it = constFind(index);
if (it != constEnd())
item = (*it).obj;
return item;
}
@ -438,8 +438,8 @@ private:
int QDeclarativeVisualDataModelData::propForRole(int id) const
{
QDeclarativeVisualDataModelPrivate *model = QDeclarativeVisualDataModelPrivate::get(m_model);
QHash<int,int>::const_iterator it = model->m_roleToPropId.find(id);
if (it != model->m_roleToPropId.end())
QHash<int,int>::const_iterator it = model->m_roleToPropId.constFind(id);
if (it != model->m_roleToPropId.constEnd())
return *it;
return -1;
@ -495,8 +495,8 @@ QVariant QDeclarativeVisualDataModelDataMetaObject::initialValue(int propId)
}
} else if (model->m_listModelInterface) {
model->ensureRoles();
QHash<QByteArray,int>::const_iterator it = model->m_roleNames.find(propName);
if (it != model->m_roleNames.end()) {
QHash<QByteArray,int>::const_iterator it = model->m_roleNames.constFind(propName);
if (it != model->m_roleNames.constEnd()) {
QVariant value = model->m_listModelInterface->data(data->m_index, *it);
return value;
} else if (model->m_roles.count() == 1 && propName == "modelData") {
@ -510,8 +510,8 @@ QVariant QDeclarativeVisualDataModelDataMetaObject::initialValue(int propId)
if (propName == "hasModelChildren") {
return model->m_abstractItemModel->hasChildren(index);
} else {
QHash<QByteArray,int>::const_iterator it = model->m_roleNames.find(propName);
if (it != model->m_roleNames.end()) {
QHash<QByteArray,int>::const_iterator it = model->m_roleNames.constFind(propName);
if (it != model->m_roleNames.constEnd()) {
return model->m_abstractItemModel->data(index, *it);
} else if (model->m_roles.count() == 1 && propName == "modelData") {
//for compatibility with other lists, assign modelData if there is only a single role
@ -1185,8 +1185,8 @@ void QDeclarativeVisualDataModel::_q_itemsChanged(int index, int count,
}
}
for (QHash<int,QDeclarativeVisualDataModelPrivate::ObjectRef>::ConstIterator iter = d->m_cache.begin();
iter != d->m_cache.end(); ++iter) {
for (QHash<int,QDeclarativeVisualDataModelPrivate::ObjectRef>::ConstIterator iter = d->m_cache.constBegin();
iter != d->m_cache.constEnd(); ++iter) {
const int idx = iter.key();
if (idx >= index && idx < index+count) {

4
src/declarative/qml/qdeclarativecompiledbindings.cpp
View file

@ -2222,7 +2222,7 @@ int QDeclarativeBindingCompilerPrivate::registerString(const QString &string)
{
Q_ASSERT(!string.isEmpty());
QHash<QString, QPair<int, int> >::ConstIterator iter = registeredStrings.find(string);
QHash<QString, QPair<int, int> >::Iterator iter = registeredStrings.find(string);
if (iter == registeredStrings.end()) {
quint32 len = string.length();
@ -2259,7 +2259,7 @@ bool QDeclarativeBindingCompilerPrivate::subscription(const QStringList &sub, Re
int QDeclarativeBindingCompilerPrivate::subscriptionIndex(const QStringList &sub)
{
QString str = sub.join(QLatin1String("."));
QHash<QString, int>::ConstIterator iter = subscriptionIds.find(str);
QHash<QString, int>::Iterator iter = subscriptionIds.find(str);
if (iter == subscriptionIds.end())
iter = subscriptionIds.insert(str, subscriptionIds.count());
usedSubscriptionIds.insert(*iter);

4
src/declarative/qml/qdeclarativecompiler.cpp
View file

@ -2836,8 +2836,8 @@ int QDeclarativeCompiler::genContextCache()
QDeclarativeIntegerCache *cache = new QDeclarativeIntegerCache(engine);
for (QHash<QString, QDeclarativeParser::Object *>::ConstIterator iter = compileState.ids.begin();
iter != compileState.ids.end();
for (QHash<QString, QDeclarativeParser::Object *>::ConstIterator iter = compileState.ids.constBegin();
iter != compileState.ids.constEnd();
++iter)
cache->add(iter.key(), (*iter)->idIndex);

8
src/declarative/qml/qdeclarativeimport.cpp
View file

@ -178,8 +178,8 @@ void QDeclarativeImports::populateCache(QDeclarativeTypeNameCache *cache, QDecla
{
const QDeclarativeImportedNamespace &set = d->unqualifiedset;
for (QHash<QString,QDeclarativeImportedNamespace* >::ConstIterator iter = d->set.begin();
iter != d->set.end(); ++iter) {
for (QHash<QString,QDeclarativeImportedNamespace* >::ConstIterator iter = d->set.constBegin();
iter != d->set.constEnd(); ++iter) {
QDeclarativeTypeNameCache::Data *d = cache->data(iter.key());
if (d) {
@ -554,12 +554,12 @@ bool QDeclarativeImportsPrivate::add(const QDeclarativeDirComponents &qmldircomp
}
if (!versionFound && vmaj > -1 && vmin > -1 && !qmldircomponents.isEmpty()) {
QList<QDeclarativeDirParser::Component>::ConstIterator it = qmldircomponents.begin();
QList<QDeclarativeDirParser::Component>::ConstIterator it = qmldircomponents.constBegin();
int lowest_maj = INT_MAX;
int lowest_min = INT_MAX;
int highest_maj = INT_MIN;
int highest_min = INT_MIN;
for (; it != qmldircomponents.end(); ++it) {
for (; it != qmldircomponents.constEnd(); ++it) {
if (it->majorVersion > highest_maj || (it->majorVersion == highest_maj && it->minorVersion > highest_min)) {
highest_maj = it->majorVersion;
highest_min = it->minorVersion;

8
src/declarative/qml/qdeclarativepropertycache.cpp
View file

@ -127,14 +127,14 @@ void QDeclarativePropertyCache::clear()
if (data) data->release();
}
for (StringCache::ConstIterator iter = stringCache.begin();
iter != stringCache.end(); ++iter) {
for (StringCache::ConstIterator iter = stringCache.constBegin();
iter != stringCache.constEnd(); ++iter) {
RData *data = (*iter);
data->release();
}
for (IdentifierCache::ConstIterator iter = identifierCache.begin();
iter != identifierCache.end(); ++iter) {
for (IdentifierCache::ConstIterator iter = identifierCache.constBegin();
iter != identifierCache.constEnd(); ++iter) {
RData *data = (*iter);
data->release();
}

8
src/declarative/qml/qdeclarativetypeloader.cpp
View file

@ -631,8 +631,8 @@ QString QDeclarativeTypeLoader::absoluteFilePath(const QString &path)
QString dirPath = path.left(lastSlash);
StringSet *fileSet = 0;
QHash<QString,StringSet*>::const_iterator it = m_importDirCache.find(dirPath);
if (it == m_importDirCache.end()) {
QHash<QString,StringSet*>::const_iterator it = m_importDirCache.constFind(dirPath);
if (it == m_importDirCache.constEnd()) {
StringSet *files = qmlFilesInDirectory(path.left(lastSlash));
m_importDirCache.insert(dirPath, files);
fileSet = files;
@ -655,8 +655,8 @@ Return a QDeclarativeDirParser for absoluteFilePath. The QDeclarativeDirParser
const QDeclarativeDirParser *QDeclarativeTypeLoader::qmlDirParser(const QString &absoluteFilePath)
{
QDeclarativeDirParser *qmldirParser;
QHash<QString,QDeclarativeDirParser*>::const_iterator it = m_importQmlDirCache.find(absoluteFilePath);
if (it == m_importQmlDirCache.end()) {
QHash<QString,QDeclarativeDirParser*>::const_iterator it = m_importQmlDirCache.constFind(absoluteFilePath);
if (it == m_importQmlDirCache.constEnd()) {
qmldirParser = new QDeclarativeDirParser;
qmldirParser->setFileSource(absoluteFilePath);
qmldirParser->setUrl(QUrl::fromLocalFile(absoluteFilePath));

6
src/declarative/qml/qdeclarativeworkerscript.cpp
View file

@ -201,9 +201,9 @@ QScriptValue QDeclarativeWorkerScriptEnginePrivate::sendMessage(QScriptContext *
QScriptValue QDeclarativeWorkerScriptEnginePrivate::getWorker(int id)
{
QHash<int, WorkerScript *>::ConstIterator iter = workers.find(id);
QHash<int, WorkerScript *>::ConstIterator iter = workers.constFind(id);
if (iter == workers.end())
if (iter == workers.constEnd())
return workerEngine->nullValue();
WorkerScript *script = *iter;
@ -407,7 +407,7 @@ QScriptValue QDeclarativeWorkerScriptEnginePrivate::variantToScriptValue(const Q
QScriptValue rv = engine->newObject();
for (QVariantHash::ConstIterator iter = hash.begin(); iter != hash.end(); ++iter)
for (QVariantHash::ConstIterator iter = hash.constBegin(); iter != hash.constEnd(); ++iter)
rv.setProperty(iter.key(), variantToScriptValue(iter.value(), engine));
return rv;

22
src/declarative/util/qdeclarativelistmodel.cpp
View file

@ -44,14 +44,14 @@ void qdeclarativelistmodel_move(int from, int to, int n, T *items)
} else {
T replaced;
int i=0;
typename T::ConstIterator it=items->begin(); it += from+n;
typename T::ConstIterator it=items->constBegin(); it += from+n;
for (; i<to-from; ++i,++it)
replaced.append(*it);
i=0;
it=items->begin(); it += from;
it=items->constBegin(); it += from;
for (; i<n; ++i,++it)
replaced.append(*it);
typename T::ConstIterator f=replaced.begin();
typename T::Iterator f=replaced.begin();
typename T::Iterator t=items->begin(); t += from;
for (; f != replaced.end(); ++f, ++t)
*t = *f;
@ -1241,8 +1241,8 @@ QHash<int,QVariant> NestedListModel::data(int index, const QList<int> &roles, bo
for (int ii = 0; ii < roles.count(); ++ii) {
const QString &roleString = roleStrings.at(roles.at(ii));
QHash<QString, ModelNode *>::ConstIterator iter = node->properties.find(roleString);
if (iter != node->properties.end()) {
QHash<QString, ModelNode *>::ConstIterator iter = node->properties.constFind(roleString);
if (iter != node->properties.constEnd()) {
ModelNode *row = *iter;
rv.insert(roles.at(ii), valueForNode(row, hasNested));
}
@ -1265,8 +1265,8 @@ QVariant NestedListModel::data(int index, int role) const
const QString &roleString = roleStrings.at(role);
QHash<QString, ModelNode *>::ConstIterator iter = node->properties.find(roleString);
if (iter != node->properties.end()) {
QHash<QString, ModelNode *>::ConstIterator iter = node->properties.constFind(roleString);
if (iter != node->properties.constEnd()) {
ModelNode *row = *iter;
rv = valueForNode(row);
}
@ -1491,9 +1491,9 @@ void ModelNode::setListValue(const QScriptValue& valuelist) {
}
bool ModelNode::setProperty(const QString& prop, const QVariant& val) {
QHash<QString, ModelNode *>::const_iterator it = properties.find(prop);
QHash<QString, ModelNode *>::const_iterator it = properties.constFind(prop);
bool emitItemsChanged = false;
if (it != properties.end()) {
if (it != properties.constEnd()) {
if (val != (*it)->values[0])
emitItemsChanged = true;
(*it)->values[0] = val;
@ -1509,7 +1509,7 @@ bool ModelNode::setProperty(const QString& prop, const QVariant& val) {
void ModelNode::updateListIndexes()
{
for (QHash<QString, ModelNode *>::ConstIterator iter = properties.begin(); iter != properties.end(); ++iter) {
for (QHash<QString, ModelNode *>::ConstIterator iter = properties.constBegin(); iter != properties.constEnd(); ++iter) {
ModelNode *node = iter.value();
if (node->isArray) {
for (int i=0; i<node->values.count(); ++i) {
@ -1556,7 +1556,7 @@ void ModelNode::dump(ModelNode *node, int ind)
}
}
for (QHash<QString, ModelNode *>::ConstIterator iter = node->properties.begin(); iter != node->properties.end(); ++iter) {
for (QHash<QString, ModelNode *>::ConstIterator iter = node->properties.constBegin(); iter != node->properties.constEnd(); ++iter) {
qWarning().nospace() << indent << "Property " << iter.key() << ':';
dump(iter.value(), ind + 1);
}

12
src/declarative/util/qdeclarativeopenmetaobject.cpp
View file

@ -243,8 +243,8 @@ void QDeclarativeOpenMetaObject::setValue(int id, const QVariant &value)
QVariant QDeclarativeOpenMetaObject::value(const QByteArray &name) const
{
QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.find(name);
if (iter == d->type->d->names.end())
QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.constFind(name);
if (iter == d->type->d->names.constEnd())
return QVariant();
return d->getData(*iter);
@ -252,8 +252,8 @@ QVariant QDeclarativeOpenMetaObject::value(const QByteArray &name) const
QVariant &QDeclarativeOpenMetaObject::operator[](const QByteArray &name)
{
QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.find(name);
Q_ASSERT(iter != d->type->d->names.end());
QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.constFind(name);
Q_ASSERT(iter != d->type->d->names.constEnd());
return d->getData(*iter);
}
@ -265,10 +265,10 @@ QVariant &QDeclarativeOpenMetaObject::operator[](int id)
void QDeclarativeOpenMetaObject::setValue(const QByteArray &name, const QVariant &val)
{
QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.find(name);
QHash<QByteArray, int>::ConstIterator iter = d->type->d->names.constFind(name);
int id = -1;
if (iter == d->type->d->names.end()) {
if (iter == d->type->d->names.constEnd()) {
id = createProperty(name.constData(), "") - d->type->d->propertyOffset;
} else {
id = *iter;

2
src/declarative/util/qdeclarativetimeline.cpp
View file

@ -612,7 +612,7 @@ void QDeclarativeTimeLine::complete()
*/
void QDeclarativeTimeLine::clear()
{
for (QDeclarativeTimeLinePrivate::Ops::ConstIterator iter = d->ops.begin(); iter != d->ops.end(); ++iter)
for (QDeclarativeTimeLinePrivate::Ops::ConstIterator iter = d->ops.constBegin(); iter != d->ops.constEnd(); ++iter)
iter.key()->_t = 0;
d->ops.clear();
d->length = 0;

2
src/gui/dialogs/qfilesystemmodel.cpp
View file

@ -1470,7 +1470,7 @@ void QFileSystemModelPrivate::_q_directoryChanged(const QString &directory, cons
QHash<QString, QFileSystemNode*>::const_iterator i = parentNode->children.constBegin();
while (i != parentNode->children.constEnd()) {
QStringList::const_iterator iter = qBinaryFind(newFiles.constBegin(), newFiles.constEnd(), i.value()->fileName);
if (iter == newFiles.end()) {
if (iter == newFiles.constEnd()) {
toRemove.append(i.value()->fileName);
}
++i;

8
tests/auto/qfont/tst_qfont.cpp
View file

@ -120,14 +120,14 @@ void tst_QFont::italicOblique()
if (families.isEmpty())
return;
QStringList::ConstIterator f_it, f_end = families.end();
for (f_it = families.begin(); f_it != f_end; ++f_it) {
QStringList::ConstIterator f_it, f_end = families.constEnd();
for (f_it = families.constBegin(); f_it != f_end; ++f_it) {
QString family = *f_it;
QStringList styles = fdb.styles(family);
QVERIFY(!styles.isEmpty());
QStringList::ConstIterator s_it, s_end = styles.end();
for (s_it = styles.begin(); s_it != s_end; ++s_it) {
QStringList::ConstIterator s_it, s_end = styles.constEnd();
for (s_it = styles.constBegin(); s_it != s_end; ++s_it) {
QString style = *s_it;
if (fdb.isSmoothlyScalable(family, style)) {

12
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
View file

@ -108,13 +108,13 @@ void tst_QFontMetrics::metrics()
if (families.isEmpty())
return;
QStringList::ConstIterator f_it, f_end = families.end();
for (f_it = families.begin(); f_it != f_end; ++f_it) {
QStringList::ConstIterator f_it, f_end = families.constEnd();
for (f_it = families.constBegin(); f_it != f_end; ++f_it) {
const QString &family = *f_it;
QStringList styles = fdb.styles(family);
QStringList::ConstIterator s_it, s_end = styles.end();
for (s_it = styles.begin(); s_it != s_end; ++s_it) {
QStringList::ConstIterator s_it, s_end = styles.constEnd();
for (s_it = styles.constBegin(); s_it != s_end; ++s_it) {
const QString &style = *s_it;
if (fdb.isSmoothlyScalable(family, style)) {
@ -130,8 +130,8 @@ void tst_QFontMetrics::metrics()
} else {
QList<int> sizes = fdb.pointSizes(family, style);
QVERIFY(!sizes.isEmpty());
QList<int>::ConstIterator z_it, z_end = sizes.end();
for (z_it = sizes.begin(); z_it != z_end; ++z_it) {
QList<int>::ConstIterator z_it, z_end = sizes.constEnd();
for (z_it = sizes.constBegin(); z_it != z_end; ++z_it) {
const int size = *z_it;
// Initialize the font, and check if it is an exact match

14
tests/auto/qhash/tst_qhash.cpp
View file

@ -340,19 +340,19 @@ void tst_QHash::insert1()
{
const Hash hash2 = hash;
Hash::const_iterator it1 = hash2.find(1);
Hash::const_iterator it1 = hash2.constFind(1);
QVERIFY(it1 != hash2.end());
QVERIFY(it1.key() == 1);
QVERIFY(it1.value() == hello);
QVERIFY(*it1 == hello);
Hash::const_iterator it2 = hash2.find(2);
Hash::const_iterator it2 = hash2.constFind(2);
QVERIFY(it1 != it2);
QVERIFY(it1 != hash2.end());
QVERIFY(it2 != hash2.end());
int count = 0;
it1 = hash2.begin();
it1 = hash2.constBegin();
while (it1 != hash2.end()) {
count++;
++it1;
@ -360,8 +360,8 @@ void tst_QHash::insert1()
QVERIFY(count == 2);
count = 0;
it1 = hash.begin();
while (it1 != hash.end()) {
it1 = hash.constBegin();
while (it1 != hash.constEnd()) {
count++;
++it1;
}
@ -571,9 +571,9 @@ void tst_QHash::find()
map1.insertMulti(4, compareString);
}
QHash<int, QString>::const_iterator it=map1.find(4);
QHash<int, QString>::const_iterator it=map1.constFind(4);
for(i = 9; i > 2 && it != map1.end() && it.key() == 4; --i) {
for(i = 9; i > 2 && it != map1.constEnd() && it.key() == 4; --i) {
compareString = testString.arg(i);
QVERIFY(it.value() == compareString);
++it;