Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some (but not all) build issues with strict iterators

Browse source 
those are some that I've encountered and have not been addressed in Qt5
as far as I can tell or do not apply to it at all (e.g. QCommandLineParser
which was borrowed from CopperSpice)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-05-28 19:39:07 +00:00
parent 428a9cf2bf
commit 08ca2b5cb6
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/tools/qcommandlineparser.cpp
View file

@ -705,7 +705,7 @@ QStringList QCommandLineParser::values(const QString &optionName) const
{ {
d->checkParsed("values"); d->checkParsed("values");
const NameHash_t::const_iterator it = d->nameHash.find(optionName); const NameHash_t::const_iterator it = d->nameHash.find(optionName);
if (it != d->nameHash.end()) { if (it != d->nameHash.constEnd()) {
const int optionOffset = *it; const int optionOffset = *it;
QStringList values = d->optionValuesHash.value(optionOffset); QStringList values = d->optionValuesHash.value(optionOffset);
if (values.isEmpty()) { if (values.isEmpty()) {

2
src/dbus/qdbusinternalfilters.cpp
View file

@ -393,7 +393,7 @@ QDBusMessage qDBusPropertySet(const QDBusConnectionPrivate::ObjectTreeNode &node
QDBusAdaptorConnector::AdaptorMap::ConstIterator it; QDBusAdaptorConnector::AdaptorMap::ConstIterator it;
it = qLowerBound(connector->adaptors.constBegin(), connector->adaptors.constEnd(), it = qLowerBound(connector->adaptors.constBegin(), connector->adaptors.constEnd(),
interface_name); interface_name);
if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface)) { if (it != connector->adaptors.constEnd() && interface_name == QLatin1String(it->interface)) {
return propertyWriteReply(msg, interface_name, property_name, return propertyWriteReply(msg, interface_name, property_name,
writeProperty(it->adaptor, property_name, value)); writeProperty(it->adaptor, property_name, value));
} }

8
src/shared/linguist/po.cpp
View file

@ -617,8 +617,8 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd)
item.isFuzzy = true; item.isFuzzy = true;
flags.removeOne(QLatin1String("qt-format")); flags.removeOne(QLatin1String("qt-format"));
TranslatorMessage::ExtraData::const_iterator it = TranslatorMessage::ExtraData::const_iterator it =
item.extra.find(QLatin1String("po-flags")); item.extra.constFind(QLatin1String("po-flags"));
if (it != item.extra.end()) if (it != item.extra.constEnd())
flags.prepend(*it); flags.prepend(*it);
if (!flags.isEmpty()) if (!flags.isEmpty())
item.extra[QLatin1String("po-flags")] = flags.join(QLatin1String(", ")); item.extra[QLatin1String("po-flags")] = flags.join(QLatin1String(", "));
@ -801,8 +801,8 @@ bool savePO(const Translator &translator, QIODevice &dev, ConversionData &cd)
if (msg.type() == TranslatorMessage::Unfinished && msg.isTranslated()) if (msg.type() == TranslatorMessage::Unfinished && msg.isTranslated())
flags.append(QLatin1String("fuzzy")); flags.append(QLatin1String("fuzzy"));
TranslatorMessage::ExtraData::const_iterator itr = TranslatorMessage::ExtraData::const_iterator itr =
msg.extras().find(QLatin1String("po-flags")); msg.extras().constFind(QLatin1String("po-flags"));
if (itr != msg.extras().end()) { if (itr != msg.extras().constEnd()) {
QStringList atoms = itr->split(QLatin1String(", ")); QStringList atoms = itr->split(QLatin1String(", "));
foreach (const QString &atom, atoms) foreach (const QString &atom, atoms)
if (atom.endsWith(str_format)) { if (atom.endsWith(str_format)) {

8
src/shared/qtpropertybrowser/qtpropertybrowser.cpp
View file

@ -1305,7 +1305,7 @@ void QtAbstractPropertyBrowserPrivate::createBrowserIndexes(QtProperty *property
QMap<QtBrowserItem *, QtBrowserItem *> parentToAfter; QMap<QtBrowserItem *, QtBrowserItem *> parentToAfter;
if (afterProperty) { if (afterProperty) {
QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it = QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it =
m_propertyToIndexes.find(afterProperty); m_propertyToIndexes.constFind(afterProperty);
if (it == m_propertyToIndexes.constEnd()) if (it == m_propertyToIndexes.constEnd())
return; return;
@ -1319,7 +1319,7 @@ void QtAbstractPropertyBrowserPrivate::createBrowserIndexes(QtProperty *property
} }
} else if (parentProperty) { } else if (parentProperty) {
QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it = QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it =
m_propertyToIndexes.find(parentProperty); m_propertyToIndexes.constFind(parentProperty);
if (it == m_propertyToIndexes.constEnd()) if (it == m_propertyToIndexes.constEnd())
return; return;
@ -1366,7 +1366,7 @@ void QtAbstractPropertyBrowserPrivate::removeBrowserIndexes(QtProperty *property
{ {
QList<QtBrowserItem *> toRemove; QList<QtBrowserItem *> toRemove;
QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it = QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it =
m_propertyToIndexes.find(property); m_propertyToIndexes.constFind(property);
if (it == m_propertyToIndexes.constEnd()) if (it == m_propertyToIndexes.constEnd())
return; return;
@ -1454,7 +1454,7 @@ void QtAbstractPropertyBrowserPrivate::slotPropertyDataChanged(QtProperty *prope
return; return;
QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it = QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it =
m_propertyToIndexes.find(property); m_propertyToIndexes.constFind(property);
if (it == m_propertyToIndexes.constEnd()) if (it == m_propertyToIndexes.constEnd())
return; return;

12
src/shared/qtpropertybrowser/qtvariantproperty.cpp
View file

@ -1413,12 +1413,12 @@ QVariant QtVariantPropertyManager::attributeValue(const QtProperty *property, co
return QVariant(); return QVariant();
QMap<int, QMap<QString, int> >::ConstIterator it = QMap<int, QMap<QString, int> >::ConstIterator it =
d_ptr->m_typeToAttributeToAttributeType.find(propType); d_ptr->m_typeToAttributeToAttributeType.constFind(propType);
if (it == d_ptr->m_typeToAttributeToAttributeType.constEnd()) if (it == d_ptr->m_typeToAttributeToAttributeType.constEnd())
return QVariant(); return QVariant();
QMap<QString, int> attributes = it.value(); QMap<QString, int> attributes = it.value();
QMap<QString, int>::ConstIterator itAttr = attributes.find(attribute); QMap<QString, int>::ConstIterator itAttr = attributes.constFind(attribute);
if (itAttr == attributes.constEnd()) if (itAttr == attributes.constEnd())
return QVariant(); return QVariant();
@ -1508,7 +1508,7 @@ QVariant QtVariantPropertyManager::attributeValue(const QtProperty *property, co
QStringList QtVariantPropertyManager::attributes(int propertyType) const QStringList QtVariantPropertyManager::attributes(int propertyType) const
{ {
QMap<int, QMap<QString, int> >::ConstIterator it = QMap<int, QMap<QString, int> >::ConstIterator it =
d_ptr->m_typeToAttributeToAttributeType.find(propertyType); d_ptr->m_typeToAttributeToAttributeType.constFind(propertyType);
if (it == d_ptr->m_typeToAttributeToAttributeType.constEnd()) if (it == d_ptr->m_typeToAttributeToAttributeType.constEnd())
return QStringList(); return QStringList();
return it.value().keys(); return it.value().keys();
@ -1527,12 +1527,12 @@ QStringList QtVariantPropertyManager::attributes(int propertyType) const
int QtVariantPropertyManager::attributeType(int propertyType, const QString &attribute) const int QtVariantPropertyManager::attributeType(int propertyType, const QString &attribute) const
{ {
QMap<int, QMap<QString, int> >::ConstIterator it = QMap<int, QMap<QString, int> >::ConstIterator it =
d_ptr->m_typeToAttributeToAttributeType.find(propertyType); d_ptr->m_typeToAttributeToAttributeType.constFind(propertyType);
if (it == d_ptr->m_typeToAttributeToAttributeType.constEnd()) if (it == d_ptr->m_typeToAttributeToAttributeType.constEnd())
return 0; return 0;
QMap<QString, int> attributes = it.value(); QMap<QString, int> attributes = it.value();
QMap<QString, int>::ConstIterator itAttr = attributes.find(attribute); QMap<QString, int>::ConstIterator itAttr = attributes.constFind(attribute);
if (itAttr == attributes.constEnd()) if (itAttr == attributes.constEnd())
return 0; return 0;
return itAttr.value(); return itAttr.value();
@ -1777,7 +1777,7 @@ void QtVariantPropertyManager::initializeProperty(QtProperty *property)
return; return;
QMap<int, QtAbstractPropertyManager *>::ConstIterator it = QMap<int, QtAbstractPropertyManager *>::ConstIterator it =
d_ptr->m_typeToPropertyManager.find(d_ptr->m_propertyType); d_ptr->m_typeToPropertyManager.constFind(d_ptr->m_propertyType);
if (it != d_ptr->m_typeToPropertyManager.constEnd()) { if (it != d_ptr->m_typeToPropertyManager.constEnd()) {
QtProperty *internProp = 0; QtProperty *internProp = 0;
if (!d_ptr->m_creatingSubProperties) { if (!d_ptr->m_creatingSubProperties) {