Browse Source

Updated to use QList / QLinkedList instead of the old Q3ValueList and Q3PtrList.

git-svn-id: file:///var/svn/tigccpp/trunk@1062 9552661e-59e3-4036-b4f2-dbe53926924f
konrad_m 17 years ago
parent
commit
04230b0401
7 changed files with 89 additions and 90 deletions
  1. 27 26
      ktigcc/completion.cpp
  2. 4 2
      ktigcc/completion.h
  3. 3 2
      ktigcc/ktigcc.h
  4. 25 33
      ktigcc/mainform.cpp
  5. 3 2
      ktigcc/parsing.cpp
  6. 15 14
      ktigcc/preferences.cpp
  7. 12 11
      ktigcc/preferencesdlg.cpp

+ 27 - 26
ktigcc/completion.cpp

@@ -2,6 +2,7 @@
    ktigcc - TIGCC IDE for KDE
 
    Copyright (C) 2006-2007 Kevin Kofler
+   Copyright (C) 2007 Konrad Meyer
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +20,7 @@
 */
 
 #include <QString>
-#include <Q3ValueList>
+#include <QLinkedList>
 #include <QPair>
 #include <QPoint>
 #include <QRegExp>
@@ -136,16 +137,16 @@ bool findSymbolInFile(const QString &symbol,
                                    symbolLine,systemHeader);
 }
 
-static void mergeCompletionEntries(Q3ValueList<CompletionEntry> &dest,
-                                   const Q3ValueList<CompletionEntry> &src)
+static void mergeCompletionEntries(QLinkedList<CompletionEntry> &dest,
+                                   const QLinkedList<CompletionEntry> &src)
 {
-  for (Q3ValueList<CompletionEntry>::ConstIterator it=src.begin();
+  for (QLinkedList<CompletionEntry>::ConstIterator it=src.begin();
        it!=src.end(); ++it)
     dest.append(*it);
 }
 
 static void completionEntriesForSystemHeaders(const QStringList &systemHeaders,
-                                              Q3ValueList<CompletionEntry> &result)
+                                              QLinkedList<CompletionEntry> &result)
 {
   for (QStringList::ConstIterator it=systemHeaders.begin();
        it!=systemHeaders.end(); ++it) {
@@ -164,7 +165,7 @@ static void completionEntriesForSystemHeaders(const QStringList &systemHeaders,
 static bool completionEntriesForFileRecursive(const QString &fileText,
                                               const QString &fileName,
                                               MainForm *mainForm,
-                                              Q3ValueList<CompletionEntry> &result)
+                                              QLinkedList<CompletionEntry> &result)
 {
   if (!projectCompletion.contains(fileName) || projectCompletion[fileName].dirty) {
     QFileInfo fileInfo(fileName);
@@ -193,31 +194,31 @@ static bool completionEntriesForFileRecursive(const QString &fileText,
 bool completionEntriesForFile(const QString &fileText,
                               const QString &fileName,
                               MainForm *mainForm,
-                              Q3ValueList<CompletionEntry> &result)
+                              QLinkedList<CompletionEntry> &result)
 {
   resetSearchedFlags();
   return completionEntriesForFileRecursive(fileText,fileName,mainForm,result);
 }
 
-static Q3ValueList<CompletionEntry> sortCompletionEntries(
-  const Q3ValueList<CompletionEntry> &entries)
+static QLinkedList<CompletionEntry> sortCompletionEntries(
+  const QLinkedList<CompletionEntry> &entries)
 {
-  QMap<QString,Q3ValueList<CompletionEntry> > map;
-  for (Q3ValueList<CompletionEntry>::ConstIterator it=entries.begin();
+  QMap<QString,QLinkedList<CompletionEntry> > map;
+  for (QLinkedList<CompletionEntry>::ConstIterator it=entries.begin();
        it!=entries.end(); ++it) {
     const CompletionEntry &entry=*it;
-    Q3ValueList<CompletionEntry> &list=map[entry.text];
-    if (list.find(entry)==list.end()) list.append(entry);
-  }
-  Q3ValueList<CompletionEntry> result;
-  for (QMap<QString,Q3ValueList<CompletionEntry> >::ConstIterator
+    QLinkedList<CompletionEntry> &list=map[entry.text];
+    if (list.find(entry)==list.end()) list.append(entry);  // TODO QLinkedList::find()
+  }                                                        // doesn't exist AFAICS
+  QLinkedList<CompletionEntry> result;
+  for (QMap<QString,QLinkedList<CompletionEntry> >::ConstIterator
        it=map.begin(); it!=map.end(); ++it)
     mergeCompletionEntries(result,*it);
   return result;
 }
 
 static QStringList prototypesForIdentifier(const QString &identifier,
-  const Q3ValueList<CompletionEntry> &entries)
+  const QLinkedList<CompletionEntry> &entries)
 {
   QStringList result;
   QStringList reservedIdentifiers=QString("__alignof__\n"
@@ -267,7 +268,7 @@ static QStringList prototypesForIdentifier(const QString &identifier,
                                           "volatile\n"
                                           "while\n").split('\n',QString::SkipEmptyParts);
   if (!reservedIdentifiers.contains(identifier)) {
-    for (Q3ValueList<CompletionEntry>::ConstIterator it=entries.begin();
+    for (QLinkedList<CompletionEntry>::ConstIterator it=entries.begin();
          it!=entries.end(); ++it) {
       const CompletionEntry &entry=*it;
       if (entry.text==identifier) {
@@ -280,8 +281,8 @@ static QStringList prototypesForIdentifier(const QString &identifier,
       unsigned identifierLength=identifier.length();
       if (identifierLength>=4) {
         QString identifierUpper=identifier.toUpper();
-        Q3ValueList<unsigned> distances;
-        for (Q3ValueList<CompletionEntry>::ConstIterator it=entries.begin();
+        QLinkedList<unsigned> distances;
+        for (QLinkedList<CompletionEntry>::ConstIterator it=entries.begin();
              it!=entries.end(); ++it) {
           const CompletionEntry &entry=*it;
           QString entryText=entry.text;
@@ -295,7 +296,7 @@ static QStringList prototypesForIdentifier(const QString &identifier,
             if (result.find(prototype)==result.end()) {
               // Sort by similarity. Smaller distances first.
               QStringList::Iterator it1=result.begin();
-              Q3ValueList<unsigned>::Iterator it2=distances.begin();
+              QLinkedList<unsigned>::Iterator it2=distances.begin();
               for (; it2!=distances.end() && *it2<=distance; ++it1,++it2);
               result.insert(it1,prototype);
               distances.insert(it2,distance);
@@ -316,7 +317,7 @@ bool parseHelpSources(QWidget *parent, const QString &directory,
   for (QStringList::ConstIterator it=headers.begin(); it!=headers.end(); ++it) {
     const QString &header=*it;
     CompletionInfo &completionInfo=sysHdrCompletion[header];
-    Q3ValueList<CompletionEntry> &entries=completionInfo.entries;
+    QLinkedList<CompletionEntry> &entries=completionInfo.entries;
     QDir hdrQdir(QFileInfo(qdir,header).filePath());
     QStringList hsfs=hdrQdir.entryList("*.hsf *.ref",QDir::Files);
     for (QStringList::ConstIterator it=hsfs.begin(); it!=hsfs.end(); ++it) {
@@ -540,7 +541,7 @@ void saveSystemHeaderCompletion(void)
     config.setGroup(key);
     config.writeEntry("Included",completionInfo.includedSystem);
     unsigned i=0;
-    for (Q3ValueList<CompletionEntry>::ConstIterator it
+    for (QLinkedList<CompletionEntry>::ConstIterator it
          =completionInfo.entries.begin(); it!=completionInfo.entries.end();
          ++it, i++) {
       const CompletionEntry &entry=*it;
@@ -565,7 +566,7 @@ TemplatePopup::TemplatePopup(KTextEditor::View *parent)
 {
   connect(this,SIGNAL(activated(int)),this,SLOT(QPopupMenu_activated(int)));
   unsigned i=0;
-  for (Q3ValueList<QPair<QString,QString> >::ConstIterator it=preferences.templates.begin();
+  for (QLinkedList<QPair<QString,QString> >::ConstIterator it=preferences.templates.begin();
        it!=preferences.templates.end(); ++it, i++)
     insertItem((*it).first,i);
   QPoint pos=parent->cursorPositionCoordinates();
@@ -608,7 +609,7 @@ CompletionPopup::CompletionPopup(KTextEditor::View *parent, const QString &fileN
   : QObject(parent), done(false), completionPopup(0)
 {
   connect(this,SIGNAL(closed()),receiver,SLOT(completionPopup_closed()));
-  Q3ValueList<CompletionEntry> entries;
+  QLinkedList<CompletionEntry> entries;
   if (!completionEntriesForFile(parent->document()->text(),fileName,mainForm,
                                 entries)) {
     emit closed();
@@ -674,7 +675,7 @@ ArgHintPopup::ArgHintPopup(KTextEditor::View *parent, const QString &fileName,
                            MainForm *mainForm)
   : QObject(parent), done(false), argHintPopup(0)
 {
-  Q3ValueList<CompletionEntry> entries;
+  QLinkedList<CompletionEntry> entries;
   if (!completionEntriesForFile(parent->document()->text(),fileName,mainForm,
                                 entries)) {
     nothingFound:

+ 4 - 2
ktigcc/completion.h

@@ -2,6 +2,7 @@
    ktigcc - TIGCC IDE for KDE
 
    Copyright (C) 2006-2007 Kevin Kofler
+   Copyright (C) 2007 Konrad Meyer
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,6 +27,7 @@
 #include <QString>
 #include <QStringList>
 #include <Q3ValueList>
+#include <QLinkedList>
 #include <QEvent>
 #include <ktexteditor/view.h>
 
@@ -56,7 +58,7 @@ struct CompletionInfo {
   QStringList includedSystem;
   QStringList included;
   QMap<QString,unsigned> lineNumbers;
-  Q3ValueList<CompletionEntry> entries;
+  QLinkedList<CompletionEntry> entries;
 };
 
 // Maps file name to a CompletionInfo.
@@ -73,7 +75,7 @@ bool findSymbolInFile(const QString &symbol,
 bool completionEntriesForFile(const QString &fileText,
                               const QString &fileName,
                               MainForm *mainForm,
-                              Q3ValueList<CompletionEntry> &result);
+                              QLinkedList<CompletionEntry> &result);
 
 class QWidget;
 bool parseHelpSources(QWidget *parent, const QString &directory,

+ 3 - 2
ktigcc/ktigcc.h

@@ -3,6 +3,7 @@
 
    Copyright (C) 2004-2007 Kevin Kofler
    Copyright (C) 2006 Joey Adams
+   Copyright (C) 2007 Konrad Meyer
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,7 +23,7 @@
 #pragma once
 
 #include <cstddef>
-#include <Q3PtrList>
+#include <QList>
 #include <kconfig.h>
 #include <kaboutdata.h>
 #include <QString>
@@ -50,7 +51,7 @@ extern const char *parg;
 extern QAssistantClient *assistant;
 extern QClipboard *clipboard;
 extern QStringList findHistory, replacementHistory;
-extern Q3PtrList<SourceFile> sourceFiles;
+extern QList<SourceFile *> sourceFiles;
 extern tprSettings settings;
 extern tprLibOpts libopts;
 

+ 25 - 33
ktigcc/mainform.cpp

@@ -1,8 +1,8 @@
-/*
-   ktigcc - TIGCC IDE for KDE
+/*ktigcc - TIGCC IDE for KDE
 
    Copyright (C) 2004-2007 Kevin Kofler
    Copyright (C) 2006 Joey Adams
+   Copyright (C) 2007 Konrad Meyer
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -91,6 +91,7 @@ class DnDListView : public K3ListView {
 #include <Q3ListBox>
 #include <QTimerEvent>
 #include <Q3PtrList>
+#include <QList>
 #include <QDragMoveEvent>
 #include <QDragLeaveEvent>
 #include <QKeyEvent>
@@ -99,7 +100,7 @@ class DnDListView : public K3ListView {
 #include <QDropEvent>
 #include <Q3PopupMenu>
 #include <QDragEnterEvent>
-#include <Q3ValueList>
+#include <QLinkedList>
 #include <QPixmap>
 #include <QMouseEvent>
 #include <QCloseEvent>
@@ -485,7 +486,7 @@ static KFindDialog *kfinddialog;
 QStringList findHistory, replacementHistory;
 static Q3ListViewItem *findCurrentDocument;
 static int findCurrentLine;
-Q3PtrList<SourceFile> sourceFiles;
+QList<SourceFile *> sourceFiles;
 static Q3PopupMenu *findFunctionsPopup;
 bool have_usb;
 Tools tools, tempTools;
@@ -974,9 +975,10 @@ bool MainForm::findSourceFile(bool &inProject, void *&srcFile, const QString &fi
       return TRUE;
     }
   }
-  Q3PtrListIterator<SourceFile> sfit(sourceFiles);
-  SourceFile *sourceFile;
-  for (sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
+//  QListIterator<SourceFile *> sfit(sourceFiles);
+//  SourceFile *sourceFile;
+//  for (sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
+  foreach (SourceFile *sourceFile, sourceFiles) {
     if (compareAbsPaths?fileName==sourceFile->fileName
                        :fileName==QFileInfo(sourceFile->fileName).fileName()) {
       inProject=FALSE;
@@ -1038,7 +1040,7 @@ void MainForm::init()
   te_popup->insertItem("&Decrease indent",10);
   connect(te_popup,SIGNAL(aboutToShow()),this,SLOT(te_popup_aboutToShow()));
   connect(te_popup,SIGNAL(activated(int)),this,SLOT(te_popup_activated(int)));
-  Q3ValueList<int> list;
+  QList<int> list;
   list.append(150);
   list.append(500);
   splitter->setSizes(list);
@@ -1292,7 +1294,7 @@ void MainForm::init()
 void MainForm::destroy()
 {
   while (!sourceFiles.isEmpty()) {
-    delete sourceFiles.getFirst();
+    delete sourceFiles.first();
   }
   if (kreplace) delete kreplace;
   if (kfinddialog) delete kfinddialog;
@@ -2058,9 +2060,7 @@ bool MainForm::openProject(const QString &fileName)
       KMessageBox::error(this,QString("The file \'%1\' is already included in the project.").arg(caption));
       return FALSE;
     }
-    Q3PtrListIterator<SourceFile> sfit(sourceFiles);
-    SourceFile *sourceFile;
-    for (sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
+    foreach (SourceFile *sourceFile, sourceFiles) {
       if (!fileName.compare(sourceFile->fileName)) {
         ACTIVATE_WINDOW(sourceFile->winId());
         return FALSE;
@@ -2444,8 +2444,7 @@ void MainForm::fileSave_fromto(const QString &lastProj,const QString &nextProj)
     addRecent(nextProj);
   }
   updateRightStatusLabel();
-  Q3PtrListIterator<SourceFile> sfit(sourceFiles);
-  for (SourceFile *sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
+  foreach (SourceFile *sourceFile, sourceFiles) {
     if (sourceFile->kateView->document()->isModified())
       sourceFile->fileSave();
   }
@@ -2501,9 +2500,7 @@ void MainForm::filePreferences()
         }
       }
     }
-    Q3PtrListIterator<SourceFile> sfit(sourceFiles);
-    SourceFile *sourceFile;
-    for (sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
+	foreach (SourceFile *sourceFile, sourceFiles) {
       KTextEditor::HighlightingInterface *hliface
         =qobject_cast<KTextEditor::HighlightingInterface*>(
           sourceFile->kateView->document());
@@ -2675,10 +2672,7 @@ void MainForm::filePreferences()
       }
     }
     // Apply the preferences to the source file windows.
-    sfit=Q3PtrListIterator<SourceFile>(sourceFiles);
-    for (sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
-      sourceFile->applyPreferences();
-    }
+    foreach (SourceFile *sourceFile, sourceFiles) sourceFile->applyPreferences();
     // Apply the preferences to the debug menu.
     debugPauseAction->setEnabled(!compiling&&preferences.linkTarget==LT_TIEMU);
     debugResetAction->setEnabled(!compiling&&preferences.linkTarget==LT_TIEMU);
@@ -3683,10 +3677,7 @@ void MainForm::startCompiling()
       return;
     }
   } else {
-    Q3PtrListIterator<SourceFile> sfit(sourceFiles);
-    for (SourceFile *sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
-      sourceFile->fileSave();
-    }
+    foreach (SourceFile *sourceFile, sourceFiles) sourceFile->fileSave();
   }
   fileNewMenu->menuAction()->setEnabled(FALSE);
   fileNewAction->setEnabled(FALSE);
@@ -3712,8 +3703,7 @@ void MainForm::startCompiling()
   debugRunAction->setEnabled(FALSE);
   debugPauseAction->setEnabled(FALSE);
   debugResetAction->setEnabled(FALSE);
-  Q3PtrListIterator<SourceFile> sfit(sourceFiles);
-  for (SourceFile *sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
+  foreach (SourceFile *sourceFile, sourceFiles) {
     sourceFile->fileAddToProjectAction->setEnabled(FALSE);
     sourceFile->fileCompileAction->setEnabled(FALSE);
   }
@@ -3772,8 +3762,9 @@ void MainForm::stopCompiling()
   stopCompilingFlag=FALSE;
   errorsCompilingFlag=FALSE;
   compiling=FALSE;
-  Q3PtrListIterator<SourceFile> sfit(sourceFiles);
-  for (SourceFile *sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
+//  QListIterator<SourceFile *> sfit(sourceFiles);
+//  for (SourceFile *sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
+  foreach (SourceFile *sourceFile, sourceFiles) {
     sourceFile->fileAddToProjectAction->setEnabled(TRUE);
     sourceFile->fileCompileAction->setEnabled(TRUE);
     sourceFile->fileCloseAction->setEnabled(TRUE);
@@ -6097,7 +6088,7 @@ void MainForm::fileTreeItemRenamed( Q3ListViewItem *item, const QString &newName
     return;
   if (item==rootListItem) {
     // validate name, fix if invalid
-    Q3ValueList<QChar> validInVarname;
+    QLinkedList<QChar> validInVarname;
     #define V(i) validInVarname.append(QChar(i))
     #define VR(m,n) for(unsigned i=m;i<=n;i++)V(i)
     VR(48,57); // 0..9
@@ -6224,9 +6215,10 @@ void MainForm::closeEvent(QCloseEvent *e)
   if (compiling || savePrompt())
     e->ignore();
   else {
-    Q3PtrListIterator<SourceFile> sfit(sourceFiles);
-    SourceFile *sourceFile;
-    for (sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
+//    QListIterator<SourceFile *> sfit(sourceFiles);
+//    SourceFile *sourceFile;
+//    for (sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
+	foreach (SourceFile *sourceFile, sourceFiles) {
       if (sourceFile->savePrompt()) {
         e->ignore();
         return;

+ 3 - 2
ktigcc/parsing.cpp

@@ -2,6 +2,7 @@
    ktigcc - TIGCC IDE for KDE
 
    Copyright (C) 2006-2007 Kevin Kofler
+   Copyright (C) 2007 Konrad Meyer
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,7 +31,7 @@
 #include <QApplication>
 #include <QEventLoop>
 #include <QDir>
-#include <Q3ValueList>
+#include <QLinkedList>
 #include <kprocio.h>
 #include <kmessagebox.h>
 #include <unistd.h>
@@ -227,7 +228,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) {
-          for (Q3ValueList<CompletionEntry>::ConstIterator it
+          for (QLinkedList<CompletionEntry>::ConstIterator it
                =result.entries.begin(); it!=result.entries.end(); ++it) {
             if ((*it).text==identifier) {
               alreadyKnown=true;

+ 15 - 14
ktigcc/preferences.cpp

@@ -3,6 +3,7 @@
 
    Copyright (C) 2004-2007 Kevin Kofler
    Copyright (C) 2006 Joey Adams
+   Copyright (C) 2007 Konrad Meyer
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -37,7 +38,7 @@
 #include <QDomText>
 #include <QDir>
 #include <QPair>
-#include <Q3ValueList>
+#include <QLinkedList>
 #include <kconfig.h>
 #include "ktigcc.h"
 #include "preferences.h"
@@ -100,7 +101,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
     (node).appendChild(child)
 
   bool allWordListsCaseInsensitive=TRUE;
-  for (Q3ValueList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
+  for (QLinkedList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
        it!=synprefs.wordLists.end(); ++it) {
     const Syn_WordList &wordList=*it;
     if (wordList.caseSensitive) allWordListsCaseInsensitive=FALSE;
@@ -117,7 +118,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
   CHILD_NODE(highlighting,root,"highlighting");
   CHILD_NODE(general,root,"general");
 
-  for (Q3ValueList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
+  for (QLinkedList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
        it!=synprefs.wordLists.end(); ++it) {
     const Syn_WordList &wordList=*it;
     CHILD_NODE(list,highlighting,"list");
@@ -152,7 +153,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
   ADD_ATTR(defaultContext,"name","Default");
   ADD_ATTR(defaultContext,"attribute","Normal");
   ADD_ATTR(defaultContext,"lineEndContext","#stay");
-  for (Q3ValueList<Syn_CustomStyle>::ConstIterator it=synprefs.customStyles.begin();
+  for (QLinkedList<Syn_CustomStyle>::ConstIterator it=synprefs.customStyles.begin();
        it!=synprefs.customStyles.end(); ++it) {
     const Syn_CustomStyle &customStyle=*it;
     switch (customStyle.beginning.length()) {
@@ -191,7 +192,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
         break;
     }
   }
-  for (Q3ValueList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
+  for (QLinkedList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
        it!=synprefs.wordLists.end(); ++it) {
     const Syn_WordList &wordList=*it;
     CHILD_NODE(detectWordList,defaultContext,"keyword");
@@ -249,7 +250,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
     ADD_ATTR(includeRules,"context","Default");
   }
 
-  for (Q3ValueList<Syn_CustomStyle>::ConstIterator it=synprefs.customStyles.begin();
+  for (QLinkedList<Syn_CustomStyle>::ConstIterator it=synprefs.customStyles.begin();
        it!=synprefs.customStyles.end(); ++it) {
     const Syn_CustomStyle &customStyle=*it;
     bool endsWithNewline=(customStyle.ending=="\n");
@@ -313,7 +314,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
       }
     }
     if (customStyle.switchable) {
-      for (Q3ValueList<Syn_CustomStyle>::ConstIterator it2=synprefs.customStyles.begin();
+      for (QLinkedList<Syn_CustomStyle>::ConstIterator it2=synprefs.customStyles.begin();
            it2!=synprefs.customStyles.end(); ++it2) {
         if (it2==it) continue;
         const Syn_CustomStyle &otherCustomStyle=*it2;
@@ -391,16 +392,16 @@ 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;
-  for (Q3ValueList<QColor>::ConstIterator it=synprefs.parenthesisColors.begin();
+  for (QLinkedList<QColor>::ConstIterator it=synprefs.parenthesisColors.begin();
        it!=synprefs.parenthesisColors.end(); ++it, i++) {
     DEF_ITEM_DATA(QString("Paren%1").arg(i),*it,synprefs.parenthesisStyle);
   }
-  for (Q3ValueList<Syn_CustomStyle>::ConstIterator it=synprefs.customStyles.begin();
+  for (QLinkedList<Syn_CustomStyle>::ConstIterator it=synprefs.customStyles.begin();
        it!=synprefs.customStyles.end(); ++it) {
     const Syn_CustomStyle &customStyle=*it;
     DEF_ITEM_DATA(customStyle.name,customStyle.color,customStyle.style);
   }
-  for (Q3ValueList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
+  for (QLinkedList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
        it!=synprefs.wordLists.end(); ++it) {
     const Syn_WordList &wordList=*it;
     DEF_ITEM_DATA(wordList.name,wordList.color,wordList.style);
@@ -550,7 +551,7 @@ static void saveSyntaxPreference(const Syn_SettingsForDoc &synprefs, const QStri
   pconfig->writeEntry("Enabled",synprefs.enabled);
   pconfig->writeEntry("Number Color",synprefs.numberColor);
   pconfig->writeEntry("Symbol Color",synprefs.symbolColor);
-  for (Q3ValueList<QColor>::ConstIterator it=(i=0,synprefs.parenthesisColors.begin());
+  for (QLinkedList<QColor>::ConstIterator it=(i=0,synprefs.parenthesisColors.begin());
        it!=synprefs.parenthesisColors.end(); ++it, i++) {
     pconfig->writeEntry(QString("Parenthesis Color %1").arg(i),*it);
   }
@@ -558,7 +559,7 @@ static void saveSyntaxPreference(const Syn_SettingsForDoc &synprefs, const QStri
   pconfig->writeEntry("Number Style",(unsigned)synprefs.numberStyle);
   pconfig->writeEntry("Symbol Style",(unsigned)synprefs.symbolStyle);
   pconfig->writeEntry("Parenthesis Style",(unsigned)synprefs.parenthesisStyle);
-  for (Q3ValueList<Syn_CustomStyle>::ConstIterator it=(i=0,synprefs.customStyles.begin());
+  for (QLinkedList<Syn_CustomStyle>::ConstIterator it=(i=0,synprefs.customStyles.begin());
        it!=synprefs.customStyles.end(); ++it, i++) {
     const Syn_CustomStyle &customStyle=*it;
     pconfig->writeEntry(QString("Custom Style %1 Name").arg(i),customStyle.name);
@@ -571,7 +572,7 @@ static void saveSyntaxPreference(const Syn_SettingsForDoc &synprefs, const QStri
     pconfig->writeEntry(QString("Custom Style %1 Style").arg(i),(unsigned)customStyle.style);
   }
   pconfig->writeEntry("Num Custom Styles",i);
-  for (Q3ValueList<Syn_WordList>::ConstIterator it=(i=0,synprefs.wordLists.begin());
+  for (QLinkedList<Syn_WordList>::ConstIterator it=(i=0,synprefs.wordLists.begin());
        it!=synprefs.wordLists.end(); ++it, i++) {
     const Syn_WordList &wordList=*it;
     pconfig->writeEntry(QString("Word List %1 Name").arg(i),wordList.name);
@@ -1850,7 +1851,7 @@ void savePreferences(void)
 
   // Coding
   unsigned i=0;
-  for (Q3ValueList<QPair<QString,QString> >::ConstIterator it=preferences.templates.begin();
+  for (QLinkedList<QPair<QString,QString> >::ConstIterator it=preferences.templates.begin();
        it!=preferences.templates.end(); ++it, i++) {
     pconfig->writeEntry(QString("Coding Template %1 Name").arg(i),(*it).first);
     pconfig->writeEntry(QString("Coding Template %1 Text").arg(i),(*it).second);

+ 12 - 11
ktigcc/preferencesdlg.cpp

@@ -2,6 +2,7 @@
    ktigcc - TIGCC IDE for KDE
 
    Copyright (C) 2006-2007 Kevin Kofler
+   Copyright (C) 2007 Konrad Meyer
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,7 +30,7 @@
 #include <QRadioButton>
 #include <Q3Accel>
 #include <QColor>
-#include <Q3ValueList>
+#include <QLinkedList>
 #include <QApplication>
 #include <QEventLoop>
 #include <QCursor>
@@ -208,7 +209,7 @@ void Preferences::init()
 
   // Coding
   templateListBox->clear();
-  for (Q3ValueList<QPair<QString,QString> >::ConstIterator it=preferences.templates.begin();
+  for (QLinkedList<QPair<QString,QString> >::ConstIterator it=preferences.templates.begin();
        it!=preferences.templates.end(); ++it)
     new ListBoxTextPair(templateListBox,(*it).first,(*it).second);
   templateListBox->sort();
@@ -317,7 +318,7 @@ void Preferences::syntaxLanguage_activated(int index)
     delete item;
   }
   item=static_cast<Q3ListViewItem *>(NULL);
-  for (Q3ValueList<Syn_CustomStyle>::ConstIterator it=
+  for (QLinkedList<Syn_CustomStyle>::ConstIterator it=
          preferences.syn->customStyles.begin();
        it!=preferences.syn->customStyles.end(); ++it) {
     item=new RenamableKListViewItem(customStylesItem,item,(*it).name);
@@ -328,7 +329,7 @@ void Preferences::syntaxLanguage_activated(int index)
     delete item;
   }  
   item=static_cast<Q3ListViewItem *>(NULL);
-  for (Q3ValueList<Syn_WordList>::ConstIterator it=
+  for (QLinkedList<Syn_WordList>::ConstIterator it=
          preferences.syn->wordLists.begin();
        it!=preferences.syn->wordLists.end(); ++it) {
     item=new RenamableKListViewItem(wordListsItem,item,(*it).name);
@@ -422,7 +423,7 @@ void Preferences::parenthesisColorsButton_clicked()
 {
   SelectColors selectColors(this);
   selectColors.colorList->clear();
-  for (Q3ValueList<QColor>::ConstIterator it=preferences.syn->parenthesisColors.begin();
+  for (QLinkedList<QColor>::ConstIterator it=preferences.syn->parenthesisColors.begin();
        it!=preferences.syn->parenthesisColors.end(); ++it)
     new ColorListItem(selectColors.colorList,*it);
   selectColors.exec();
@@ -473,7 +474,7 @@ void Preferences::syntaxListView_itemRenamed(Q3ListViewItem *item, const QString
   Q3ListViewItem *wordListsItem=customStylesItem->nextSibling();
   if (item->parent()==customStylesItem) {
     Q3ListViewItem *i;
-    Q3ValueList<Syn_CustomStyle>::Iterator it;
+    QLinkedList<Syn_CustomStyle>::Iterator it;
     for (it=preferences.syn->customStyles.begin(), i=customStylesItem->firstChild();
          i!=item && it!=preferences.syn->customStyles.end() && i;
          ++it, i=i->nextSibling());
@@ -483,7 +484,7 @@ void Preferences::syntaxListView_itemRenamed(Q3ListViewItem *item, const QString
       (*it).name=str;
   } else if (item->parent()==wordListsItem) {
     Q3ListViewItem *i;
-    Q3ValueList<Syn_WordList>::Iterator it;
+    QLinkedList<Syn_WordList>::Iterator it;
     for (it=preferences.syn->wordLists.begin(), i=wordListsItem->firstChild();
          i!=item && it!=preferences.syn->wordLists.end() && i;
          ++it, i=i->nextSibling());
@@ -504,7 +505,7 @@ void Preferences::syntaxListViewAccel_activated(int id)
       Q3ListViewItem *wordListsItem=customStylesItem->nextSibling();
       if (currentItem->parent()==customStylesItem) {
         Q3ListViewItem *i;
-        Q3ValueList<Syn_CustomStyle>::Iterator it;
+        QLinkedList<Syn_CustomStyle>::Iterator it;
         for (it=preferences.syn->customStyles.begin(), i=customStylesItem->firstChild();
              i!=currentItem && it!=preferences.syn->customStyles.end() && i;
              ++it, i=i->nextSibling());
@@ -516,7 +517,7 @@ void Preferences::syntaxListViewAccel_activated(int id)
         }
       } else if (currentItem->parent()==wordListsItem) {
         Q3ListViewItem *i;
-        Q3ValueList<Syn_WordList>::Iterator it;
+        QLinkedList<Syn_WordList>::Iterator it;
         for (it=preferences.syn->wordLists.begin(), i=wordListsItem->firstChild();
              i!=currentItem && it!=preferences.syn->wordLists.end() && i;
              ++it, i=i->nextSibling());
@@ -575,7 +576,7 @@ void Preferences::editButton_clicked()
     Q3ListViewItem *wordListsItem=customStylesItem->nextSibling();
     if (currentItem->parent()==customStylesItem) {
       Q3ListViewItem *i;
-      Q3ValueList<Syn_CustomStyle>::Iterator it;
+      QLinkedList<Syn_CustomStyle>::Iterator it;
       for (it=preferences.syn->customStyles.begin(), i=customStylesItem->firstChild();
            i!=currentItem && it!=preferences.syn->customStyles.end() && i;
            ++it, i=i->nextSibling());
@@ -612,7 +613,7 @@ void Preferences::editButton_clicked()
       }
     } else if (currentItem->parent()==wordListsItem) {
       Q3ListViewItem *i;
-      Q3ValueList<Syn_WordList>::Iterator it;
+      QLinkedList<Syn_WordList>::Iterator it;
       for (it=preferences.syn->wordLists.begin(), i=wordListsItem->firstChild();
            i!=currentItem && it!=preferences.syn->wordLists.end() && i;
            ++it, i=i->nextSibling());