From 6fee9f9fe93868f3c31a42ef821c6f0aa97c531b Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sun, 6 Jan 2008 21:45:23 +0000 Subject: [PATCH] microoptimization use const & for foreach "iterators" when the "iterator" is an object to avoid a call to the copy-constructor svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=758094 --- keduvocdocument/keduvocexpression.cpp | 2 +- keduvocdocument/keduvockvtml2writer.cpp | 8 ++++---- keduvocdocument/keduvockvtmlcompability.cpp | 2 +- keduvocdocument/keduvockvtmlwriter.cpp | 8 ++++---- keduvocdocument/keduvocmultiplechoice.cpp | 2 +- libscience/element.cpp | 4 ++-- libscience/tests/xmlreadingtest.cpp | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/keduvocdocument/keduvocexpression.cpp b/keduvocdocument/keduvocexpression.cpp index 3131c23..e7b0c04 100644 --- a/keduvocdocument/keduvocexpression.cpp +++ b/keduvocdocument/keduvocexpression.cpp @@ -70,7 +70,7 @@ KEduVocExpression::KEduVocExpression( const QString & expression ) KEduVocExpression::KEduVocExpression( const QStringList & translations) : d( new KEduVocExpressionPrivate( this ) ) { - foreach ( QString translation, translations ) { + foreach ( const QString &translation, translations ) { setTranslation(d->m_translations.count(), translation); } } diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp index faaa60d..dca6256 100644 --- a/keduvocdocument/keduvockvtml2writer.cpp +++ b/keduvocdocument/keduvockvtml2writer.cpp @@ -329,7 +329,7 @@ bool KEduVocKvtml2Writer::writeWordTypes( QDomElement &typesElement, KEduVocWord bool KEduVocKvtml2Writer::writeTenses( QDomElement &tensesElement ) { - foreach( QString tense, m_doc->tenseDescriptions() ) { + foreach( const QString &tense, m_doc->tenseDescriptions() ) { if ( !( tense.isNull() ) ) { tensesElement.appendChild( newTextElement( KVTML_TENSE, tense ) ); } @@ -417,7 +417,7 @@ kDebug() << "write tranlation:" << translation->text(); } // - foreach( QString usage, translation->usages() ) { + foreach( const QString &usage, translation->usages() ) { translationElement.appendChild( newTextElement( KVTML_USAGE, usage ) ); } @@ -449,7 +449,7 @@ kDebug() << "write tranlation:" << translation->text(); } // conjugation - foreach ( QString tense, translation->conjugationTenses() ) { + foreach ( const QString &tense, translation->conjugationTenses() ) { QDomElement thisElement = m_domDoc.createElement( KVTML_CONJUGATION ); writeConjugation( thisElement, translation->conjugation(tense), tense ); translationElement.appendChild( thisElement ); @@ -523,7 +523,7 @@ bool KEduVocKvtml2Writer::writeMultipleChoice( QDomElement &multipleChoiceElemen */ { - foreach ( QString choice, translation->multipleChoice() ) { + foreach ( const QString &choice, translation->multipleChoice() ) { multipleChoiceElement.appendChild( newTextElement( KVTML_CHOICE, choice ) ); } return true; diff --git a/keduvocdocument/keduvockvtmlcompability.cpp b/keduvocdocument/keduvockvtmlcompability.cpp index 54dd549..1475dc8 100644 --- a/keduvocdocument/keduvockvtmlcompability.cpp +++ b/keduvocdocument/keduvockvtmlcompability.cpp @@ -238,7 +238,7 @@ void KEduVocKvtmlCompability::setupWordTypes(KEduVocWordType * parent) << i18nc( "The grammatical type of a word", "Preposition" ) << i18nc( "The grammatical type of an entry", "Question" ); - foreach (QString typeName, wordTypeNames) { + foreach (const QString &typeName, wordTypeNames) { KEduVocWordType* wordType = new KEduVocWordType(typeName, parent); parent->appendChildContainer(wordType); m_userdefinedTypeCounter++; diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp index 3dc0f9e..9a69881 100644 --- a/keduvocdocument/keduvockvtmlwriter.cpp +++ b/keduvocdocument/keduvockvtmlwriter.cpp @@ -419,7 +419,7 @@ bool KEduVocKvtmlWriter::writeType( QDomElement &domElementParent ) QDomElement domElementType = m_domDoc.createElement(KV_TYPE_GRP); int count = 1; - foreach(QString type, m_doc->typeDescriptions()) + foreach(const QString &type, m_doc->typeDescriptions()) { if (!(type.isNull()) ) { @@ -447,7 +447,7 @@ bool KEduVocKvtmlWriter::writeTense( QDomElement &domElementParent ) QDomElement domElementTense = m_domDoc.createElement( KV_TENSE_GRP ); int count = 1; - foreach( QString tense, m_doc->tenseDescriptions() ) { + foreach( const QString &tense, m_doc->tenseDescriptions() ) { if ( !( tense.isNull() ) ) { QDomElement domElementDesc = m_domDoc.createElement( KV_TENSE_DESC ); QDomText domTextDesc = m_domDoc.createTextNode( tense ); @@ -475,7 +475,7 @@ bool KEduVocKvtmlWriter::writeUsage( QDomElement &domElementParent ) QDomElement domElementUsage = m_domDoc.createElement(KV_USAGE_GRP); int count = 1; - foreach(QString usage, m_doc->usageDescriptions()) + foreach(const QString &usage, m_doc->usageDescriptions()) { if (!(usage.isNull())) { @@ -668,7 +668,7 @@ bool KEduVocKvtmlWriter::writeConjugEntry( QDomElement &domElementParent, KEduVo // curr_conjug.cleanUp(); QDomElement domElementConjug = m_domDoc.createElement( KV_CONJUG_GRP ); - foreach ( QString tense, translation.conjugationTenses() ) { + foreach ( const QString &tense, translation.conjugationTenses() ) { QDomElement domElementType = m_domDoc.createElement( KV_CON_TYPE ); domElementType.setAttribute( KV_CON_NAME, m_compability.oldTense(tense) ); diff --git a/keduvocdocument/keduvocmultiplechoice.cpp b/keduvocdocument/keduvocmultiplechoice.cpp index a6e76ad..45d93d0 100644 --- a/keduvocdocument/keduvocmultiplechoice.cpp +++ b/keduvocdocument/keduvocmultiplechoice.cpp @@ -45,7 +45,7 @@ KEduVocMultipleChoice::KEduVocMultipleChoice( const KEduVocMultipleChoice &other KEduVocMultipleChoice::KEduVocMultipleChoice( const QStringList &choices ) : d( new KEduVocMultipleChoicePrivate ) { - foreach ( QString choice, choices ) { + foreach ( const QString &choice, choices ) { // use appendChoice to check for empty entries appendChoice(choice); } diff --git a/libscience/element.cpp b/libscience/element.cpp index 1324a55..c186433 100644 --- a/libscience/element.cpp +++ b/libscience/element.cpp @@ -29,7 +29,7 @@ Element::Element() QVariant Element::dataAsVariant( ChemicalDataObject::BlueObelisk type ) const { - foreach( ChemicalDataObject o, dataList ) { + foreach( const ChemicalDataObject &o, dataList ) { if ( o.type() == type ) return o.value(); } @@ -38,7 +38,7 @@ QVariant Element::dataAsVariant( ChemicalDataObject::BlueObelisk type ) const QString Element::dataAsString(ChemicalDataObject::BlueObelisk type) const { - foreach( ChemicalDataObject o, dataList ) { + foreach( const ChemicalDataObject &o, dataList ) { if ( o.type() == type ) return o.valueAsString(); } diff --git a/libscience/tests/xmlreadingtest.cpp b/libscience/tests/xmlreadingtest.cpp index 8221d4b..0970ded 100644 --- a/libscience/tests/xmlreadingtest.cpp +++ b/libscience/tests/xmlreadingtest.cpp @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) QList list = e->data(); //Test: give me all data available - foreach( ChemicalDataObject o, list ){ + foreach( const ChemicalDataObject &o, list ){ QString unit = o.unitAsString(); if ( unit == "bo:noUnit" ) unit = ""; -- 2.47.3