Browse Source

Changed foreach (T foo, bar) to foreach (const T &foo, bar) or foreach (T &foo, bar) where appropriate.

git-svn-id: file:///var/svn/tigccpp/trunk@1067 9552661e-59e3-4036-b4f2-dbe53926924f
konrad_m 17 years ago
parent
commit
5d63360173
4 changed files with 35 additions and 43 deletions
  1. 19 23
      ktigcc/completion.cpp
  2. 3 3
      ktigcc/parsing.cpp
  3. 11 15
      ktigcc/preferences.cpp
  4. 2 2
      ktigcc/preferencesdlg.cpp

+ 19 - 23
ktigcc/completion.cpp

@@ -60,7 +60,7 @@ static void findSymbolInSystemHeaders(const QString &symbol,
                                       unsigned &symbolLine,
                                       bool &systemHeader)
 {
-  foreach (QString headerName, systemHeaders) {
+  foreach (const QString &headerName, systemHeaders) {
     // Avoid infinite recursion.
     if (systemHeaderCompletion.contains(headerName)
         && !systemHeaderCompletion[headerName].searched) {
@@ -106,7 +106,7 @@ static bool findSymbolInFileRecursive(const QString &symbol,
     symbolLine=completionInfo.lineNumbers[symbol];
     return true;
   }
-  foreach (QString headerName, completionInfo.included) {
+  foreach (const QString &headerName, completionInfo.included) {
     QString headerText=mainForm->textForHeader(headerName);
     if (!headerText.isNull()) {
       if (!findSymbolInFile(symbol,headerText,headerName,mainForm,symbolFile,
@@ -136,13 +136,13 @@ bool findSymbolInFile(const QString &symbol,
 static void mergeCompletionEntries(QLinkedList<CompletionEntry> &dest,
                                    const QLinkedList<CompletionEntry> &src)
 {
-  foreach (CompletionEntry entry, src) dest.append(entry);
+  foreach (const CompletionEntry &entry, src) dest.append(entry);
 }
 
 static void completionEntriesForSystemHeaders(const QStringList &systemHeaders,
                                               QLinkedList<CompletionEntry> &result)
 {
-  foreach (QString headerName, systemHeaders) {
+  foreach (const QString &headerName, systemHeaders) {
     // Avoid infinite recursion.
     if (systemHeaderCompletion.contains(headerName)
         && !systemHeaderCompletion[headerName].searched) {
@@ -172,7 +172,7 @@ static bool completionEntriesForFileRecursive(const QString &fileText,
   completionInfo.searched=true;
   mergeCompletionEntries(result,completionInfo.entries);
   completionEntriesForSystemHeaders(completionInfo.includedSystem,result);
-  foreach (QString headerName, completionInfo.included) {
+  foreach (const QString &headerName, completionInfo.included) {
     QString headerText=mainForm->textForHeader(headerName);
     if (!headerText.isNull())
       if (!completionEntriesForFile(headerText,headerName,mainForm,result))
@@ -194,7 +194,7 @@ static QLinkedList<CompletionEntry> sortCompletionEntries(
   const QLinkedList<CompletionEntry> &entries)
 {
   QMap<QString,QLinkedList<CompletionEntry> > map;
-  foreach (CompletionEntry entry, entries) {
+  foreach (const CompletionEntry &entry, entries) {
     QLinkedList<CompletionEntry> &list=map[entry.text];
     if (!list.contains(entry)) list.append(entry);
   }
@@ -256,7 +256,7 @@ static QStringList prototypesForIdentifier(const QString &identifier,
                                           "volatile\n"
                                           "while\n").split('\n',QString::SkipEmptyParts);
   if (!reservedIdentifiers.contains(identifier)) {
-    foreach (CompletionEntry entry, entries) {
+    foreach (const CompletionEntry &entry, entries) {
       if (entry.text==identifier) {
         QString prototype=entry.prefix+' '+entry.text+entry.postfix;
         if (result.find(prototype)==result.end()) result.append(prototype);
@@ -268,7 +268,7 @@ static QStringList prototypesForIdentifier(const QString &identifier,
       if (identifierLength>=4) {
         QString identifierUpper=identifier.toUpper();
         QLinkedList<unsigned> distances;
-        foreach (CompletionEntry entry, entries) {
+        foreach (const CompletionEntry &entry, entries) {
           QString entryText=entry.text;
           unsigned entryTextLength=entryText.length();
           unsigned minLength=qMin(identifierLength,entryTextLength);
@@ -298,12 +298,12 @@ bool parseHelpSources(QWidget *parent, const QString &directory,
 {
   QDir qdir(directory);
   QStringList headers=qdir.entryList("*.h",QDir::Dirs);
-  foreach (QString header, headers) {
+  foreach (const QString &header, headers) {
     CompletionInfo &completionInfo=sysHdrCompletion[header];
     QLinkedList<CompletionEntry> &entries=completionInfo.entries;
     QDir hdrQdir(QFileInfo(qdir,header).filePath());
     QStringList hsfs=hdrQdir.entryList("*.hsf *.ref",QDir::Files);
-	foreach (QString hsf, hsfs) {
+	foreach (const QString &hsf, hsfs) {
       QString fileText=loadFileText(QFileInfo(hdrQdir,hsf).filePath());
       if (fileText.isNull()) {
         KMessageBox::error(parent,QString("Can't open \'%1/%2\'.").arg(header)
@@ -324,14 +324,14 @@ bool parseHelpSources(QWidget *parent, const QString &directory,
       }
       CompletionEntry entry;
       QStringList lines=fileText.split('\n');
-      foreach (QString line, lines) {
+      foreach (const QString &line, lines) {
         if (line.startsWith("Name=")) {
           entry.text=line.mid(5);
           break;
         }
       }
       bool isType=false;
-      foreach (QString line, lines) {
+      foreach (const QString &line, lines) {
         if (line.startsWith("Type=")) {
           QString hsfType=line.mid(5);
           if (hsfType=="Type") isType=true;
@@ -345,7 +345,7 @@ bool parseHelpSources(QWidget *parent, const QString &directory,
       QRegExp comments("/\\*.*\\*/");
       comments.setMinimal(true);
       QString definition;
-      foreach (QString line, lines) {
+      foreach (const QString &line, lines) {
         if (line.startsWith("Definition=")) {
           definition=line.mid(11);
           definition.remove(comments);
@@ -373,8 +373,7 @@ bool parseHelpSources(QWidget *parent, const QString &directory,
       if (description.isEmpty()) description=QString::null;
       entry.comment=description;
       if (isType) {
-        for (QStringList::ConstIterator it=lines.begin(); it!=lines.end(); ++it) {
-          const QString &line=*it;
+		foreach (const QString &line, lines) {
           if (line.startsWith("Subtype=")
               || (!line.isEmpty() && line[0]=='[' && line!="[Main]")) {
             if (line=="Subtype=Enumeration") {
@@ -385,8 +384,7 @@ bool parseHelpSources(QWidget *parent, const QString &directory,
                 if (pos2>=0) {
                   QString itemList=definition.mid(pos1,pos2-pos1);
                   if (itemList=="...") {
-                    for (QStringList::ConstIterator it=lines.begin(); it!=lines.end(); ++it) {
-                      const QString &line=*it;
+                    foreach (const QString &line, lines) {
                       if (line.startsWith("Real Definition=")) {
                         QString realDefinition=line.mid(16);
                         realDefinition.remove(comments);
@@ -405,9 +403,7 @@ bool parseHelpSources(QWidget *parent, const QString &directory,
                   } else {
                     foundDefinition:
                     QStringList enumItems=itemList.split(',',QString::SkipEmptyParts);
-                    for (QStringList::ConstIterator it=enumItems.begin();
-                         it!=enumItems.end(); ++it) {
-                      const QString &enumItem=*it;
+					foreach (const QString &enumItem, enumItems) {
                       CompletionEntry enumEntry;
                       int pos=enumItem.find('=');
                       if (pos>=0) {
@@ -445,7 +441,7 @@ bool parseSystemHeaders(QWidget *parent, const QString &directory,
 {
   QDir qdir(directory);
   QStringList headers=qdir.entryList("*.h",QDir::Files);
-  foreach (QString header, headers) {
+  foreach (const QString &header, headers) {
     QString fileText=loadFileText(QFileInfo(qdir,header).filePath());
     if (fileText.isNull()) {
       KMessageBox::error(parent,QString("Can't open \'%1\'.").arg(header));
@@ -480,7 +476,7 @@ void loadSystemHeaderCompletion(void)
       KMessageBox::Notify|KMessageBox::AllowLink);
   }
   systemHeaderCompletion.clear();
-  foreach (QString key, groupList) {
+  foreach (const QString &key, groupList) {
     if (key.endsWith(" Lines")) continue;
     CompletionInfo completionInfo;
     config.setGroup(key);
@@ -518,7 +514,7 @@ void saveSystemHeaderCompletion(void)
     config.setGroup(key);
     config.writeEntry("Included",completionInfo.includedSystem);
     unsigned i=0;
-	foreach (CompletionEntry entry, completionInfo.entries) {
+	foreach (const CompletionEntry &entry, completionInfo.entries) {
       config.writeEntry(QString("Entry %1 Type").arg(i),entry.type);
       config.writeEntry(QString("Entry %1 Text").arg(i),entry.text);
       config.writeEntry(QString("Entry %1 Prefix").arg(i),entry.prefix);

+ 3 - 3
ktigcc/parsing.cpp

@@ -104,7 +104,7 @@ SourceFileFunctions getASMFunctions(const QString &text)
   QStringList lines=text.split('\n');
   unsigned lineno=0;
   SourceFileFunctions result;
-  foreach (QString line, lines) {
+  foreach (const QString &line, lines) {
     if (line.isEmpty()) continue;
     QString identifier;
     unsigned col=0, l=line.length();
@@ -129,7 +129,7 @@ CompletionInfo parseFileCompletion(const QString &fileText,
   QStringList lines=fileText.split('\n',QString::SkipEmptyParts);
   bool inComment=false;
   bool isSystemHeader=pathInProject.isNull();
-  foreach (QString line, lines) {
+  foreach (const QString &line, lines) {
     if (!inComment) {
       QString strippedLine=line.trimmed();
       if (strippedLine.startsWith("#include")) {
@@ -226,7 +226,7 @@ CompletionInfo parseFileCompletion(const QString &fileText,
         // better information extracted from the .hsf files. However, .hsf files
         // obviously don't contain line number information.
         if (isSystemHeader) {
-          foreach (CompletionEntry entry, result.entries) {
+          foreach (const CompletionEntry &entry, result.entries) {
             if (entry.text == identifier) {
               alreadyKnown=true;
               break;

+ 11 - 15
ktigcc/preferences.cpp

@@ -101,7 +101,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
     (node).appendChild(child)
 
   bool allWordListsCaseInsensitive=TRUE;
-  foreach (Syn_WordList wordList, synprefs.wordLists)
+  foreach (const Syn_WordList &wordList, synprefs.wordLists)
     if (wordList.caseSensitive) allWordListsCaseInsensitive=FALSE;
 
   ADD_ATTR(root,"name","TIGCC "+name);
@@ -115,9 +115,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
   CHILD_NODE(highlighting,root,"highlighting");
   CHILD_NODE(general,root,"general");
 
-  for (QLinkedList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
-       it!=synprefs.wordLists.end(); ++it) {
-    const Syn_WordList &wordList=*it;
+  foreach (const Syn_WordList &wordList, synprefs.wordLists) {
     CHILD_NODE(list,highlighting,"list");
     ADD_ATTR(list,"name",wordList.name);
     QStringList stringList;
@@ -126,9 +124,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
     else {
       // This is really ugly. Why can't Kate allow me to specify
       // case-sensitivity per word list?
-      for (QStringList::ConstIterator it=wordList.list.begin();
-           it!=wordList.list.end(); ++it) {
-        const QString &keyword=*it;
+      foreach (const QString &keyword, wordList.list) {
         // This is bad, but I need to cap time, memory and disk space
         // requirements somewhere.
         if (keyword.length()<=10)
@@ -148,7 +144,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
   ADD_ATTR(defaultContext,"name","Default");
   ADD_ATTR(defaultContext,"attribute","Normal");
   ADD_ATTR(defaultContext,"lineEndContext","#stay");
-  foreach (Syn_CustomStyle customStyle, synprefs.customStyles) {
+  foreach (const Syn_CustomStyle &customStyle, synprefs.customStyles) {
     switch (customStyle.beginning.length()) {
       case 0: // Ignore these ones altogether.
         break;
@@ -185,7 +181,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
         break;
     }
   }
-  foreach (Syn_WordList wordList, synprefs.wordLists) {
+  foreach (const Syn_WordList &wordList, synprefs.wordLists) {
     CHILD_NODE(detectWordList,defaultContext,"keyword");
     ADD_ATTR(detectWordList,"attribute",wordList.name);
     ADD_ATTR(detectWordList,"context","#stay");
@@ -383,11 +379,11 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
   DEF_ITEM_DATA("Number",synprefs.numberColor,synprefs.numberStyle);
   DEF_ITEM_DATA("Symbol",synprefs.symbolColor,synprefs.symbolStyle);
   unsigned i=0;
-  foreach (QColor color, synprefs.parenthesisColors)
+  foreach (const QColor &color, synprefs.parenthesisColors)
     DEF_ITEM_DATA(QString("Paren%1").arg(i++),color,synprefs.parenthesisStyle);
-  foreach (Syn_CustomStyle customStyle, synprefs.customStyles)
+  foreach (const Syn_CustomStyle &customStyle, synprefs.customStyles)
     DEF_ITEM_DATA(customStyle.name,customStyle.color,customStyle.style);
-  foreach (Syn_WordList wordList, synprefs.wordLists)
+  foreach (const Syn_WordList &wordList, synprefs.wordLists)
     DEF_ITEM_DATA(wordList.name,wordList.color,wordList.style);
   #undef DEF_ITEM_DATA
 
@@ -535,14 +531,14 @@ static void saveSyntaxPreference(const Syn_SettingsForDoc &synprefs, const QStri
   pconfig->writeEntry("Number Color",synprefs.numberColor);
   pconfig->writeEntry("Symbol Color",synprefs.symbolColor);
   i=0;
-  foreach (QColor color, synprefs.parenthesisColors)
+  foreach (const QColor &color, synprefs.parenthesisColors)
     pconfig->writeEntry(QString("Parenthesis Color %1").arg(i++),color);
   pconfig->writeEntry("Num Parenthesis Colors",i);
   pconfig->writeEntry("Number Style",(unsigned)synprefs.numberStyle);
   pconfig->writeEntry("Symbol Style",(unsigned)synprefs.symbolStyle);
   pconfig->writeEntry("Parenthesis Style",(unsigned)synprefs.parenthesisStyle);
   i=0;
-  foreach (Syn_CustomStyle customStyle, synprefs.customStyles) {
+  foreach (const Syn_CustomStyle &customStyle, synprefs.customStyles) {
     pconfig->writeEntry(QString("Custom Style %1 Name").arg(i),customStyle.name);
     pconfig->writeEntry(QString("Custom Style %1 Beginning").arg(i),customStyle.beginning);
     pconfig->writeEntry(QString("Custom Style %1 Ending").arg(i),customStyle.ending);
@@ -554,7 +550,7 @@ static void saveSyntaxPreference(const Syn_SettingsForDoc &synprefs, const QStri
   }
   pconfig->writeEntry("Num Custom Styles",i);
   i=0;
-  foreach (Syn_WordList wordList, synprefs.wordLists) {
+  foreach (const Syn_WordList &wordList, synprefs.wordLists) {
     pconfig->writeEntry(QString("Word List %1 Name").arg(i),wordList.name);
     pconfig->writeEntry(QString("Word List %1 List").arg(i),wordList.list);
     pconfig->writeEntry(QString("Word List %1 Color").arg(i),wordList.color);

+ 2 - 2
ktigcc/preferencesdlg.cpp

@@ -329,7 +329,7 @@ void Preferences::syntaxLanguage_activated(int index)
     delete item;
   }  
   item=static_cast<Q3ListViewItem *>(NULL);
-  foreach (Syn_WordList wlist, preferences.syn->wordLists)
+  foreach (const Syn_WordList &wlist, preferences.syn->wordLists)
     item=new RenamableKListViewItem(wordListsItem,item,wlist.name);
 }
 
@@ -420,7 +420,7 @@ void Preferences::parenthesisColorsButton_clicked()
 {
   SelectColors selectColors(this);
   selectColors.colorList->clear();
-  foreach (QColor color, preferences.syn->parenthesisColors)
+  foreach (const QColor &color, preferences.syn->parenthesisColors)
     new ColorListItem(selectColors.colorList,color);
   selectColors.exec();
   if (selectColors.result()==QDialog::Accepted) {