Browse Source

Change a few tabs which creeped in back to spaces.
Fix lineno not being incremented in getASMFunctions.
Fix i not being incremented in saveSystemHeaderCompletion.
Use foreach in sortCompletionEntries.


git-svn-id: file:///var/svn/tigccpp/trunk@1069 9552661e-59e3-4036-b4f2-dbe53926924f

kevinkofler 17 years ago
parent
commit
c3c93ee822
4 changed files with 12 additions and 13 deletions
  1. 7 8
      ktigcc/completion.cpp
  2. 3 3
      ktigcc/mainform.cpp
  3. 1 1
      ktigcc/parsing.cpp
  4. 1 1
      ktigcc/preferences.cpp

+ 7 - 8
ktigcc/completion.cpp

@@ -199,9 +199,8 @@ static QLinkedList<CompletionEntry> sortCompletionEntries(
     if (!list.contains(entry)) list.append(entry);
   }
   QLinkedList<CompletionEntry> result;
-  for (QMap<QString,QLinkedList<CompletionEntry> >::ConstIterator
-       it=map.begin(); it!=map.end(); ++it)
-    mergeCompletionEntries(result,*it);
+  foreach (const QLinkedList<CompletionEntry> &entries, map)
+    mergeCompletionEntries(result,entries);
   return result;
 }
 
@@ -303,7 +302,7 @@ bool parseHelpSources(QWidget *parent, const QString &directory,
     QLinkedList<CompletionEntry> &entries=completionInfo.entries;
     QDir hdrQdir(QFileInfo(qdir,header).filePath());
     QStringList hsfs=hdrQdir.entryList("*.hsf *.ref",QDir::Files);
-	foreach (const 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)
@@ -373,7 +372,7 @@ bool parseHelpSources(QWidget *parent, const QString &directory,
       if (description.isEmpty()) description=QString::null;
       entry.comment=description;
       if (isType) {
-		foreach (const QString &line, lines) {
+        foreach (const QString &line, lines) {
           if (line.startsWith("Subtype=")
               || (!line.isEmpty() && line[0]=='[' && line!="[Main]")) {
             if (line=="Subtype=Enumeration") {
@@ -403,7 +402,7 @@ bool parseHelpSources(QWidget *parent, const QString &directory,
                   } else {
                     foundDefinition:
                     QStringList enumItems=itemList.split(',',QString::SkipEmptyParts);
-					foreach (const QString &enumItem, enumItems) {
+                    foreach (const QString &enumItem, enumItems) {
                       CompletionEntry enumEntry;
                       int pos=enumItem.find('=');
                       if (pos>=0) {
@@ -514,13 +513,13 @@ void saveSystemHeaderCompletion(void)
     config.setGroup(key);
     config.writeEntry("Included",completionInfo.includedSystem);
     unsigned i=0;
-	foreach (const 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);
       config.writeEntry(QString("Entry %1 Postfix").arg(i),entry.postfix);
       config.writeEntry(QString("Entry %1 Comment").arg(i),entry.comment);
-      config.writeEntry(QString("Entry %1 User Data").arg(i),entry.userdata);
+      config.writeEntry(QString("Entry %1 User Data").arg(i++),entry.userdata);
     }
     config.writeEntry("Num Entries",i);
     config.setGroup(key+" Lines");

+ 3 - 3
ktigcc/mainform.cpp

@@ -2498,7 +2498,7 @@ void MainForm::filePreferences()
         }
       }
     }
-	foreach (SourceFile *sourceFile, sourceFiles) {
+    foreach (SourceFile *sourceFile, sourceFiles) {
       KTextEditor::HighlightingInterface *hliface
         =qobject_cast<KTextEditor::HighlightingInterface*>(
           sourceFile->kateView->document());
@@ -5654,7 +5654,7 @@ void MainForm::newFile(Q3ListViewItem *parent, QString text, const QPixmap &pixm
   
   suffix="";
   if (category==hFilesListItem)
-	suffix="h";
+    suffix="h";
   else if (category==cFilesListItem)
     suffix="c";
   else if (category==sFilesListItem)
@@ -6211,7 +6211,7 @@ void MainForm::closeEvent(QCloseEvent *e)
   if (compiling || savePrompt())
     e->ignore();
   else {
-	foreach (SourceFile *sourceFile, sourceFiles) {
+    foreach (SourceFile *sourceFile, sourceFiles) {
       if (sourceFile->savePrompt()) {
         e->ignore();
         return;

+ 1 - 1
ktigcc/parsing.cpp

@@ -115,7 +115,7 @@ SourceFileFunctions getASMFunctions(const QString &text)
       else
         break;
     }
-    if (line[col-1]==':') result.append(SourceFileFunction(identifier,-1,lineno));
+    if (line[col-1]==':') result.append(SourceFileFunction(identifier,-1,lineno++));
   }
   return result;
 }

+ 1 - 1
ktigcc/preferences.cpp

@@ -133,7 +133,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
           stringList.append(keyword);
       }
     }
-	foreach (QString keyword, stringList) {
+    foreach (QString keyword, stringList) {
       CHILD_NODE(item,list,"item");
       ADD_TEXT(item,keyword);
     }