Browse Source

Run qt3to4.

git-svn-id: file:///var/svn/tigccpp/trunk@941 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 17 years ago
parent
commit
7cc5afdbfd

+ 2 - 2
ktigcc/assistant.cpp

@@ -31,7 +31,7 @@
 #include <qwidget.h>
 #include <qapplication.h>
 #include <qeventloop.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <unistd.h>
 
 AssistantClient::AssistantClient(QObject *parent, const QString &profile)
@@ -111,7 +111,7 @@ void AssistantClient::openAssistant(const QString &page)
       QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput,10);
     }
     if (!procIO) goto start_new;
-    QTextStream stream(static_cast<QIODevice *>(socket));
+    Q3TextStream stream(static_cast<QIODevice *>(socket));
     stream<<page<<'\n';
   }
 }

+ 6 - 6
ktigcc/colorlistitem.h

@@ -18,14 +18,14 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
 */
 
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpainter.h>
 #include <qstyle.h>
 
-class ColorListItem : public QListBoxItem {
+class ColorListItem : public Q3ListBoxItem {
   public:
-    ColorListItem(QListBox *listbox, const QColor &color)
-      : QListBoxItem(listbox), m_color(color) {}
+    ColorListItem(Q3ListBox *listbox, const QColor &color)
+      : Q3ListBoxItem(listbox), m_color(color) {}
     virtual ~ColorListItem() {}
     QColor color() {return m_color;}
     void setColor(const QColor &color) {m_color=color; listBox()->update();}
@@ -41,8 +41,8 @@ class ColorListItem : public QListBoxItem {
       if (inListBox && isCurrent())
         listBox()->style().drawPrimitive(QStyle::PE_FocusRect,painter,r,listBox()->colorGroup());
     }
-    virtual int height(const QListBox *) const {return 16;}
-    virtual int width(const QListBox *listBox) const {
+    virtual int height(const Q3ListBox *) const {return 16;}
+    virtual int width(const Q3ListBox *listBox) const {
       return listBox->contentsWidth();
     }
   private:

+ 28 - 26
ktigcc/completion.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qpair.h>
 #include <qpoint.h>
 #include <qregexp.h>
@@ -27,8 +27,10 @@
 #include <qdir.h>
 #include <qapplication.h>
 #include <qwidget.h>
-#include <qwidgetlist.h>
+#include <qwidget.h>
 #include <qevent.h>
+//Added by qt3to4:
+#include <Q3PopupMenu>
 #include <kmessagebox.h>
 #include <kate/view.h>
 #include <kate/document.h>
@@ -137,16 +139,16 @@ bool findSymbolInFile(const QString &symbol,
                                    symbolLine,systemHeader);
 }
 
-static void mergeCompletionEntries(QValueList<KTextEditor::CompletionEntry> &dest,
-                                   const QValueList<KTextEditor::CompletionEntry> &src)
+static void mergeCompletionEntries(Q3ValueList<KTextEditor::CompletionEntry> &dest,
+                                   const Q3ValueList<KTextEditor::CompletionEntry> &src)
 {
-  for (QValueList<KTextEditor::CompletionEntry>::ConstIterator it=src.begin();
+  for (Q3ValueList<KTextEditor::CompletionEntry>::ConstIterator it=src.begin();
        it!=src.end(); ++it)
     dest.append(*it);
 }
 
 static void completionEntriesForSystemHeaders(const QStringList &systemHeaders,
-                                              QValueList<KTextEditor::CompletionEntry> &result)
+                                              Q3ValueList<KTextEditor::CompletionEntry> &result)
 {
   for (QStringList::ConstIterator it=systemHeaders.begin();
        it!=systemHeaders.end(); ++it) {
@@ -165,7 +167,7 @@ static void completionEntriesForSystemHeaders(const QStringList &systemHeaders,
 static bool completionEntriesForFileRecursive(const QString &fileText,
                                               const QString &fileName,
                                               MainForm *mainForm,
-                                              QValueList<KTextEditor::CompletionEntry> &result)
+                                              Q3ValueList<KTextEditor::CompletionEntry> &result)
 {
   if (!projectCompletion.contains(fileName) || projectCompletion[fileName].dirty) {
     QFileInfo fileInfo(fileName);
@@ -194,31 +196,31 @@ static bool completionEntriesForFileRecursive(const QString &fileText,
 bool completionEntriesForFile(const QString &fileText,
                               const QString &fileName,
                               MainForm *mainForm,
-                              QValueList<KTextEditor::CompletionEntry> &result)
+                              Q3ValueList<KTextEditor::CompletionEntry> &result)
 {
   resetSearchedFlags();
   return completionEntriesForFileRecursive(fileText,fileName,mainForm,result);
 }
 
-static QValueList<KTextEditor::CompletionEntry> sortCompletionEntries(
-  const QValueList<KTextEditor::CompletionEntry> &entries)
+static Q3ValueList<KTextEditor::CompletionEntry> sortCompletionEntries(
+  const Q3ValueList<KTextEditor::CompletionEntry> &entries)
 {
-  QMap<QString,QValueList<KTextEditor::CompletionEntry> > map;
-  for (QValueList<KTextEditor::CompletionEntry>::ConstIterator it=entries.begin();
+  QMap<QString,Q3ValueList<KTextEditor::CompletionEntry> > map;
+  for (Q3ValueList<KTextEditor::CompletionEntry>::ConstIterator it=entries.begin();
        it!=entries.end(); ++it) {
     const KTextEditor::CompletionEntry &entry=*it;
-    QValueList<KTextEditor::CompletionEntry> &list=map[entry.text];
+    Q3ValueList<KTextEditor::CompletionEntry> &list=map[entry.text];
     if (list.find(entry)==list.end()) list.append(entry);
   }
-  QValueList<KTextEditor::CompletionEntry> result;
-  for (QMap<QString,QValueList<KTextEditor::CompletionEntry> >::ConstIterator
+  Q3ValueList<KTextEditor::CompletionEntry> result;
+  for (QMap<QString,Q3ValueList<KTextEditor::CompletionEntry> >::ConstIterator
        it=map.begin(); it!=map.end(); ++it)
     mergeCompletionEntries(result,*it);
   return result;
 }
 
 static QStringList prototypesForIdentifier(const QString &identifier,
-  const QValueList<KTextEditor::CompletionEntry> &entries)
+  const Q3ValueList<KTextEditor::CompletionEntry> &entries)
 {
   QStringList result;
   QStringList reservedIdentifiers=QStringList::split('\n',"__alignof__\n"
@@ -268,7 +270,7 @@ static QStringList prototypesForIdentifier(const QString &identifier,
                                                           "volatile\n"
                                                           "while\n");
   if (!reservedIdentifiers.contains(identifier)) {
-    for (QValueList<KTextEditor::CompletionEntry>::ConstIterator it=entries.begin();
+    for (Q3ValueList<KTextEditor::CompletionEntry>::ConstIterator it=entries.begin();
          it!=entries.end(); ++it) {
       const KTextEditor::CompletionEntry &entry=*it;
       if (entry.text==identifier) {
@@ -281,8 +283,8 @@ static QStringList prototypesForIdentifier(const QString &identifier,
       unsigned identifierLength=identifier.length();
       if (identifierLength>=4) {
         QString identifierUpper=identifier.upper();
-        QValueList<unsigned> distances;
-        for (QValueList<KTextEditor::CompletionEntry>::ConstIterator it=entries.begin();
+        Q3ValueList<unsigned> distances;
+        for (Q3ValueList<KTextEditor::CompletionEntry>::ConstIterator it=entries.begin();
              it!=entries.end(); ++it) {
           const KTextEditor::CompletionEntry &entry=*it;
           QString entryText=entry.text;
@@ -296,7 +298,7 @@ static QStringList prototypesForIdentifier(const QString &identifier,
             if (result.find(prototype)==result.end()) {
               // Sort by similarity. Smaller distances first.
               QStringList::Iterator it1=result.begin();
-              QValueList<unsigned>::Iterator it2=distances.begin();
+              Q3ValueList<unsigned>::Iterator it2=distances.begin();
               for (; it2!=distances.end() && *it2<=distance; ++it1,++it2);
               result.insert(it1,prototype);
               distances.insert(it2,distance);
@@ -317,7 +319,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];
-    QValueList<KTextEditor::CompletionEntry> &entries=completionInfo.entries;
+    Q3ValueList<KTextEditor::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) {
@@ -532,7 +534,7 @@ void saveSystemHeaderCompletion(void)
     config.setGroup(key);
     config.writeEntry("Included",completionInfo.includedSystem);
     unsigned i=0;
-    for (QValueList<KTextEditor::CompletionEntry>::ConstIterator it
+    for (Q3ValueList<KTextEditor::CompletionEntry>::ConstIterator it
          =completionInfo.entries.begin(); it!=completionInfo.entries.end();
          ++it, i++) {
       const KTextEditor::CompletionEntry &entry=*it;
@@ -553,11 +555,11 @@ void saveSystemHeaderCompletion(void)
 }
 
 TemplatePopup::TemplatePopup(Kate::View *parent)
-  : QPopupMenu(parent), view(parent)
+  : Q3PopupMenu(parent), view(parent)
 {
   connect(this,SIGNAL(activated(int)),this,SLOT(QPopupMenu_activated(int)));
   unsigned i=0;
-  for (QValueList<QPair<QString,QString> >::ConstIterator it=preferences.templates.begin();
+  for (Q3ValueList<QPair<QString,QString> >::ConstIterator it=preferences.templates.begin();
        it!=preferences.templates.end(); ++it, i++)
     insertItem((*it).first,i);
   QPoint pos=parent->cursorCoordinates();
@@ -600,7 +602,7 @@ CompletionPopup::CompletionPopup(Kate::View *parent, const QString &fileName,
   : QObject(parent), done(false), completionPopup(0)
 {
   connect(this,SIGNAL(closed()),receiver,SLOT(completionPopup_closed()));
-  QValueList<KTextEditor::CompletionEntry> entries;
+  Q3ValueList<KTextEditor::CompletionEntry> entries;
   if (!completionEntriesForFile(parent->getDoc()->text(),fileName,mainForm,
                                 entries)) {
     emit closed();
@@ -661,7 +663,7 @@ ArgHintPopup::ArgHintPopup(Kate::View *parent, const QString &fileName,
                            MainForm *mainForm)
   : QObject(parent), done(false), argHintPopup(0)
 {
-  QValueList<KTextEditor::CompletionEntry> entries;
+  Q3ValueList<KTextEditor::CompletionEntry> entries;
   if (!completionEntriesForFile(parent->getDoc()->text(),fileName,mainForm,
                                 entries)) {
     nothingFound:

+ 7 - 5
ktigcc/completion.h

@@ -21,11 +21,13 @@
 #pragma once
 
 #include <qobject.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qmap.h>
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <QEvent>
 #include <kate/view.h>
 
 struct CompletionInfo {
@@ -35,7 +37,7 @@ struct CompletionInfo {
   QStringList includedSystem;
   QStringList included;
   QMap<QString,unsigned> lineNumbers;
-  QValueList<KTextEditor::CompletionEntry> entries;
+  Q3ValueList<KTextEditor::CompletionEntry> entries;
 };
 
 // Maps file name to a CompletionInfo.
@@ -52,7 +54,7 @@ bool findSymbolInFile(const QString &symbol,
 bool completionEntriesForFile(const QString &fileText,
                               const QString &fileName,
                               MainForm *mainForm,
-                              QValueList<KTextEditor::CompletionEntry> &result);
+                              Q3ValueList<KTextEditor::CompletionEntry> &result);
 
 class QWidget;
 bool parseHelpSources(QWidget *parent, const QString &directory,
@@ -63,7 +65,7 @@ bool parseSystemHeaders(QWidget *parent, const QString &directory,
 void loadSystemHeaderCompletion(void);
 void saveSystemHeaderCompletion(void);
 
-class TemplatePopup : public QPopupMenu {
+class TemplatePopup : public Q3PopupMenu {
   Q_OBJECT
 
   public:

+ 7 - 4
ktigcc/errorlist.ui.h

@@ -31,18 +31,21 @@
 */
 
 #include <qevent.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <QFocusEvent>
+#include <QKeyEvent>
 
 void ErrorList::keyPressEvent(QKeyEvent *e)
 {
   if ((e->key()==Qt::Key_Insert || e->key()==Qt::Key_C)
-      && e->state()==Qt::ControlButton) {
+      && e->state()==Qt::ControlModifier) {
     // Copy selected errors to the clipboard.
-    QListViewItemIterator lvit(errorListView,QListViewItemIterator::Selected);
-    QListViewItem *errorItem;
+    Q3ListViewItemIterator lvit(errorListView,Q3ListViewItemIterator::Selected);
+    Q3ListViewItem *errorItem;
     QString clipboardText;
     for (errorItem=lvit.current();errorItem;errorItem=(++lvit).current()) {
       clipboardText.append(errorItem->text(0));

+ 2 - 2
ktigcc/ktigcc.cpp

@@ -29,7 +29,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <qtextcodec.h>
-#include <qiconset.h>
+#include <qicon.h>
 #include <qsize.h> 
 #include <kglobal.h>
 #include <kicontheme.h>
@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
   // Set the preferred large icon size so system toolbar icons don't get
   // annoying padding.
   int toolbarIconSize=KIconLoader().currentSize(KIcon::MainToolbar);
-  QIconSet::setIconSize(QIconSet::Large,QSize(toolbarIconSize,toolbarIconSize));
+  QIcon::setIconSize(QIcon::Large,QSize(toolbarIconSize,toolbarIconSize));
   // Readd the images KDE kindly removes...
   qCleanupImages_ktigcc();
   qInitImages_ktigcc();

+ 4 - 4
ktigcc/ktigcc.h

@@ -20,11 +20,11 @@
 */
 
 #include <cstddef>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <kconfig.h>
 #include <kaboutdata.h>
 #include <qstring.h>
-#include <qvaluevector.h>
+#include <q3valuevector.h>
 class AssistantClient;
 class QClipboard;
 class SourceFile;
@@ -48,7 +48,7 @@ extern const char *parg;
 extern AssistantClient *assistant;
 extern QClipboard *clipboard;
 extern QStringList findHistory, replacementHistory;
-extern QPtrList<SourceFile> sourceFiles;
+extern Q3PtrList<SourceFile> sourceFiles;
 extern tprSettings settings;
 extern tprLibOpts libopts;
 
@@ -61,7 +61,7 @@ struct Tool {
   QString workingDirectory;
   bool runInTerminal;
 };
-typedef QValueVector<Tool> Tools;
+typedef Q3ValueVector<Tool> Tools;
 extern Tools tools, tempTools;
 extern int toolIndex;
 extern bool disableViewEvents;

+ 4 - 3
ktigcc/ktigcc.pro

@@ -1,9 +1,9 @@
 TEMPLATE	= app
 LANGUAGE	= C++
 
-CONFIG	+= qt warn_on debug
+CONFIG	+= qt warn_on debug uic3
 
-QT += qt3support
+QT += xml qt3support
 
 LIBS	+= -lktexteditor -lkutils -lkdeui -lkdecore -lkio -lkparts -lDCOP
 
@@ -28,7 +28,8 @@ SOURCES	+= ktigcc.cpp \
 	completion.cpp \
 	assistant.cpp
 
-FORMS	= srcfilewin.ui \
+#The following line was changed from FORMS to FORMS3 by qt3to4
+FORMS3	= srcfilewin.ui \
 	projectoptions.ui \
 	programoptions.ui \
 	preferencesdlg.ui \

File diff suppressed because it is too large
+ 208 - 192
ktigcc/mainform.ui.h


+ 5 - 5
ktigcc/newsdlg.ui.h

@@ -38,7 +38,7 @@
 #include <kmessagebox.h>
 #include <qdatetime.h> 
 #include <qstring.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qcolor.h>
 #include <qpainter.h>
 #include <qpen.h>
@@ -46,11 +46,11 @@
 #include <cstring>
 #include "ktigcc.h"
 
-class ColoredListBoxText : public QListBoxText {
+class ColoredListBoxText : public Q3ListBoxText {
   public:
-    ColoredListBoxText(QListBox *listbox, const QString &text,
+    ColoredListBoxText(Q3ListBox *listbox, const QString &text,
                        const QColor &textColor)
-      : QListBoxText(listbox,text), color(textColor) {}
+      : Q3ListBoxText(listbox,text), color(textColor) {}
     virtual ~ColoredListBoxText() {}
   protected:
     virtual void paint(QPainter *painter) {
@@ -58,7 +58,7 @@ class ColoredListBoxText : public QListBoxText {
       QPen pen=oldPen;
       pen.setColor(color);
       painter->setPen(pen);
-      QListBoxText::paint(painter);
+      Q3ListBoxText::paint(painter);
       painter->setPen(oldPen);
     }
   private:

+ 3 - 1
ktigcc/parsing.cpp

@@ -30,6 +30,8 @@
 #include <qapplication.h>
 #include <qeventloop.h>
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kprocio.h>
 #include <kmessagebox.h>
 #include <unistd.h>
@@ -215,7 +217,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 (QValueList<KTextEditor::CompletionEntry>::ConstIterator it
+          for (Q3ValueList<KTextEditor::CompletionEntry>::ConstIterator it
                =result.entries.begin(); it!=result.entries.end(); ++it) {
             if ((*it).text==identifier) {
               alreadyKnown=true;

+ 2 - 2
ktigcc/parsing.h

@@ -21,7 +21,7 @@
 #pragma once
 
 #include <qstring.h>
-#include <qvaluevector.h>
+#include <q3valuevector.h>
 #include <qstringlist.h>
 #include "completion.h"
 
@@ -39,7 +39,7 @@ struct SourceFileFunction {
   int prototypeLine;
   int implementationLine;
 };
-class SourceFileFunctions : public QValueVector<SourceFileFunction> {
+class SourceFileFunctions : public Q3ValueVector<SourceFileFunction> {
   public:
     iterator find(const SourceFileFunction &item) {
       return qFind(begin(),end(),item);

+ 17 - 15
ktigcc/preferences.cpp

@@ -31,9 +31,11 @@
 #include <qcolor.h>
 #include <qfont.h>
 #include <qdom.h>
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qdir.h>
 #include <qpair.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kconfig.h>
 #include "ktigcc.h"
 #include "preferences.h"
@@ -95,7 +97,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
     (node).appendChild(child)
 
   bool allWordListsCaseInsensitive=TRUE;
-  for (QValueList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
+  for (Q3ValueList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
        it!=synprefs.wordLists.end(); ++it) {
     const Syn_WordList &wordList=*it;
     if (wordList.caseSensitive) allWordListsCaseInsensitive=FALSE;
@@ -112,7 +114,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
   CHILD_NODE(highlighting,root,"highlighting");
   CHILD_NODE(general,root,"general");
 
-  for (QValueList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
+  for (Q3ValueList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
        it!=synprefs.wordLists.end(); ++it) {
     const Syn_WordList &wordList=*it;
     CHILD_NODE(list,highlighting,"list");
@@ -147,7 +149,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
   ADD_ATTR(defaultContext,"name","Default");
   ADD_ATTR(defaultContext,"attribute","Normal");
   ADD_ATTR(defaultContext,"lineEndContext","#stay");
-  for (QValueList<Syn_CustomStyle>::ConstIterator it=synprefs.customStyles.begin();
+  for (Q3ValueList<Syn_CustomStyle>::ConstIterator it=synprefs.customStyles.begin();
        it!=synprefs.customStyles.end(); ++it) {
     const Syn_CustomStyle &customStyle=*it;
     switch (customStyle.beginning.length()) {
@@ -186,7 +188,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
         break;
     }
   }
-  for (QValueList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
+  for (Q3ValueList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
        it!=synprefs.wordLists.end(); ++it) {
     const Syn_WordList &wordList=*it;
     CHILD_NODE(detectWordList,defaultContext,"keyword");
@@ -244,7 +246,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
     ADD_ATTR(includeRules,"context","Default");
   }
 
-  for (QValueList<Syn_CustomStyle>::ConstIterator it=synprefs.customStyles.begin();
+  for (Q3ValueList<Syn_CustomStyle>::ConstIterator it=synprefs.customStyles.begin();
        it!=synprefs.customStyles.end(); ++it) {
     const Syn_CustomStyle &customStyle=*it;
     bool endsWithNewline=(customStyle.ending=="\n");
@@ -308,7 +310,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
       }
     }
     if (customStyle.switchable) {
-      for (QValueList<Syn_CustomStyle>::ConstIterator it2=synprefs.customStyles.begin();
+      for (Q3ValueList<Syn_CustomStyle>::ConstIterator it2=synprefs.customStyles.begin();
            it2!=synprefs.customStyles.end(); ++it2) {
         if (it2==it) continue;
         const Syn_CustomStyle &otherCustomStyle=*it2;
@@ -386,16 +388,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 (QValueList<QColor>::ConstIterator it=synprefs.parenthesisColors.begin();
+  for (Q3ValueList<QColor>::ConstIterator it=synprefs.parenthesisColors.begin();
        it!=synprefs.parenthesisColors.end(); ++it, i++) {
     DEF_ITEM_DATA(QString("Paren%1").arg(i),*it,synprefs.parenthesisStyle);
   }
-  for (QValueList<Syn_CustomStyle>::ConstIterator it=synprefs.customStyles.begin();
+  for (Q3ValueList<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 (QValueList<Syn_WordList>::ConstIterator it=synprefs.wordLists.begin();
+  for (Q3ValueList<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);
@@ -459,7 +461,7 @@ static bool checkSynHighlightVersion(const QString &internalName)
                       .arg(QDir::homeDirPath()).arg(internalName);
   QDomDocument doc("language");
   QFile file(xmlFileName);
-  if (!file.open(IO_ReadOnly))
+  if (!file.open(QIODevice::ReadOnly))
     return FALSE;
   if (!doc.setContent(&file)) {
     file.close();
@@ -546,7 +548,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 (QValueList<QColor>::ConstIterator it=(i=0,synprefs.parenthesisColors.begin());
+  for (Q3ValueList<QColor>::ConstIterator it=(i=0,synprefs.parenthesisColors.begin());
        it!=synprefs.parenthesisColors.end(); ++it, i++) {
     pconfig->writeEntry(QString("Parenthesis Color %1").arg(i),*it);
   }
@@ -554,7 +556,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 (QValueList<Syn_CustomStyle>::ConstIterator it=(i=0,synprefs.customStyles.begin());
+  for (Q3ValueList<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);
@@ -567,7 +569,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 (QValueList<Syn_WordList>::ConstIterator it=(i=0,synprefs.wordLists.begin());
+  for (Q3ValueList<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);
@@ -1848,7 +1850,7 @@ void savePreferences(void)
 
   // Coding
   unsigned i=0;
-  for (QValueList<QPair<QString,QString> >::ConstIterator it=preferences.templates.begin();
+  for (Q3ValueList<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);

+ 5 - 5
ktigcc/preferences.h

@@ -21,7 +21,7 @@
 
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qpair.h>
 #include <qcolor.h>
 #include <qfont.h>
@@ -63,12 +63,12 @@ typedef struct
   bool enabled;
   QColor numberColor;
   QColor symbolColor;
-  QValueList<QColor> parenthesisColors;
+  Q3ValueList<QColor> parenthesisColors;
   Syn_Style numberStyle;
   Syn_Style symbolStyle;
   Syn_Style parenthesisStyle;
-  QValueList<Syn_CustomStyle> customStyles;
-  QValueList<Syn_WordList> wordLists;
+  Q3ValueList<Syn_CustomStyle> customStyles;
+  Q3ValueList<Syn_WordList> wordLists;
 } Syn_SettingsForDoc;
 
 int SynToXML(Syn_SettingsForDoc &syn,const QString &destFileName);
@@ -114,7 +114,7 @@ typedef struct
   Syn_SettingsForDoc synQll;
 
   // Coding
-  QValueList<QPair<QString,QString> > templates;
+  Q3ValueList<QPair<QString,QString> > templates;
 
   // Used internally by the Preferences dialog
   bool haveA68k;

+ 63 - 63
ktigcc/preferencesdlg.ui.h

@@ -34,9 +34,9 @@
 
 #include <qcheckbox.h>
 #include <qradiobutton.h>
-#include <qaccel.h>
+#include <q3accel.h>
 #include <qcolor.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qapplication.h>
 #include <qeventloop.h>
 #include <qcursor.h>
@@ -70,12 +70,12 @@ class KRecentDirs {
 
 class RenamableKListViewItem : public KListViewItem {
   public:
-  RenamableKListViewItem(QListViewItem *parent, QString text)
+  RenamableKListViewItem(Q3ListViewItem *parent, QString text)
     : KListViewItem(parent, text)
   {
     setRenameEnabled(0,TRUE);
   }
-  RenamableKListViewItem(QListViewItem *parent, QListViewItem *after,
+  RenamableKListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after,
                          QString text)
     : KListViewItem(parent, after, text)
   {
@@ -94,11 +94,11 @@ class RenamableKListViewItem : public KListViewItem {
   }
 };
 
-class ListBoxTextPair : public QListBoxText {
+class ListBoxTextPair : public Q3ListBoxText {
   public:
-    ListBoxTextPair(QListBox *listbox, const QString &text,
+    ListBoxTextPair(Q3ListBox *listbox, const QString &text,
                     const QString &data)
-      : QListBoxText(listbox,text), m_data(data) {}
+      : Q3ListBoxText(listbox,text), m_data(data) {}
     virtual ~ListBoxTextPair() {}
     void setData(const QString &data) {m_data=data;}
     QString data() {return m_data;}
@@ -199,22 +199,22 @@ void Preferences::init()
   preferences.tempSynQll=preferences.synQll;
   syntaxLanguage_activated(syntaxLanguage->currentItem());
   syntaxListView->setSorting(-1);
-  syntaxListView->setColumnWidthMode(0,QListView::Maximum);
+  syntaxListView->setColumnWidthMode(0,Q3ListView::Maximum);
   syntaxListView->header()->hide();
   syntaxListView->setAlternateBackground(QColor());
-  QListViewItem *rootListItem=syntaxListView->firstChild();
-  QListViewItem *customStylesItem=rootListItem->firstChild();
+  Q3ListViewItem *rootListItem=syntaxListView->firstChild();
+  Q3ListViewItem *customStylesItem=rootListItem->firstChild();
   customStylesItem->setOpen(TRUE);
-  QListViewItem *wordListsItem=customStylesItem->nextSibling();
+  Q3ListViewItem *wordListsItem=customStylesItem->nextSibling();
   wordListsItem->setOpen(TRUE);
-  QAccel *syntaxListViewAccel=new QAccel(syntaxListView);
-  syntaxListViewAccel->insertItem(Key_Delete,0);
+  Q3Accel *syntaxListViewAccel=new Q3Accel(syntaxListView);
+  syntaxListViewAccel->insertItem(Qt::Key_Delete,0);
   connect(syntaxListViewAccel,SIGNAL(activated(int)),
           this,SLOT(syntaxListViewAccel_activated(int)));
 
   // Coding
   templateListBox->clear();
-  for (QValueList<QPair<QString,QString> >::ConstIterator it=preferences.templates.begin();
+  for (Q3ValueList<QPair<QString,QString> >::ConstIterator it=preferences.templates.begin();
        it!=preferences.templates.end(); ++it)
     new ListBoxTextPair(templateListBox,(*it).first,(*it).second);
   templateListBox->sort();
@@ -269,7 +269,7 @@ void Preferences::destroy()
 
     // Coding
     preferences.templates.clear();
-    for (QListBoxItem *item=templateListBox->firstItem(); item;
+    for (Q3ListBoxItem *item=templateListBox->firstItem(); item;
          item=item->next())
       preferences.templates.append(qMakePair(item->text(),
         static_cast<ListBoxTextPair *>(item)->data()));
@@ -316,26 +316,26 @@ void Preferences::syntaxLanguage_activated(int index)
   }
 
   syntaxEnabled->setChecked(preferences.syn->enabled);
-  QListViewItem *rootListItem=syntaxListView->firstChild();
-  QListViewItem *item, *nextItem;
-  QListViewItem *customStylesItem=rootListItem->firstChild();
+  Q3ListViewItem *rootListItem=syntaxListView->firstChild();
+  Q3ListViewItem *item, *nextItem;
+  Q3ListViewItem *customStylesItem=rootListItem->firstChild();
   for (item=customStylesItem->firstChild(); item; item=nextItem) {
     nextItem=item->nextSibling();
     delete item;
   }
-  item=static_cast<QListViewItem *>(NULL);
-  for (QValueList<Syn_CustomStyle>::ConstIterator it=
+  item=static_cast<Q3ListViewItem *>(NULL);
+  for (Q3ValueList<Syn_CustomStyle>::ConstIterator it=
          preferences.syn->customStyles.begin();
        it!=preferences.syn->customStyles.end(); ++it) {
     item=new RenamableKListViewItem(customStylesItem,item,(*it).name);
   }
-  QListViewItem *wordListsItem=customStylesItem->nextSibling();
+  Q3ListViewItem *wordListsItem=customStylesItem->nextSibling();
   for (item=wordListsItem->firstChild(); item; item=nextItem) {
     nextItem=item->nextSibling();
     delete item;
   }  
-  item=static_cast<QListViewItem *>(NULL);
-  for (QValueList<Syn_WordList>::ConstIterator it=
+  item=static_cast<Q3ListViewItem *>(NULL);
+  for (Q3ValueList<Syn_WordList>::ConstIterator it=
          preferences.syn->wordLists.begin();
        it!=preferences.syn->wordLists.end(); ++it) {
     item=new RenamableKListViewItem(wordListsItem,item,(*it).name);
@@ -355,7 +355,7 @@ void Preferences::syntaxEnabled_toggled(bool on)
   syntaxListView->setEnabled(on);
   newStyleButton->setEnabled(on);
   newListButton->setEnabled(on);
-  QListViewItem *selectedItem=syntaxListView->selectedItem();
+  Q3ListViewItem *selectedItem=syntaxListView->selectedItem();
   editButton->setEnabled(on&&selectedItem&&selectedItem->rtti()==0x716CC8);
 }
 
@@ -429,13 +429,13 @@ void Preferences::parenthesisColorsButton_clicked()
 {
   SelectColors selectColors(this);
   selectColors.colorList->clear();
-  for (QValueList<QColor>::ConstIterator it=preferences.syn->parenthesisColors.begin();
+  for (Q3ValueList<QColor>::ConstIterator it=preferences.syn->parenthesisColors.begin();
        it!=preferences.syn->parenthesisColors.end(); ++it)
     new ColorListItem(selectColors.colorList,*it);
   selectColors.exec();
   if (selectColors.result()==QDialog::Accepted) {
     preferences.syn->parenthesisColors.clear();
-    for (QListBoxItem *item=selectColors.colorList->firstItem(); item;
+    for (Q3ListBoxItem *item=selectColors.colorList->firstItem(); item;
          item=item->next())
       preferences.syn->parenthesisColors.append(
         static_cast<ColorListItem *>(item)->color());
@@ -467,20 +467,20 @@ void Preferences::parenthesisStyleButton_clicked()
 
 void Preferences::syntaxListView_selectionChanged()
 {
-  QListViewItem *selectedItem=syntaxListView->selectedItem();
+  Q3ListViewItem *selectedItem=syntaxListView->selectedItem();
   editButton->setEnabled(syntaxEnabled->isChecked()
                          && selectedItem && selectedItem->rtti()==0x716CC8);
 }
 
 #define unused_col col __attribute__((unused))
-void Preferences::syntaxListView_itemRenamed(QListViewItem *item, const QString &str, int unused_col)
+void Preferences::syntaxListView_itemRenamed(Q3ListViewItem *item, const QString &str, int unused_col)
 {
-  QListViewItem *rootListItem=syntaxListView->firstChild();
-  QListViewItem *customStylesItem=rootListItem->firstChild();
-  QListViewItem *wordListsItem=customStylesItem->nextSibling();
+  Q3ListViewItem *rootListItem=syntaxListView->firstChild();
+  Q3ListViewItem *customStylesItem=rootListItem->firstChild();
+  Q3ListViewItem *wordListsItem=customStylesItem->nextSibling();
   if (item->parent()==customStylesItem) {
-    QListViewItem *i;
-    QValueList<Syn_CustomStyle>::Iterator it;
+    Q3ListViewItem *i;
+    Q3ValueList<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());
@@ -489,8 +489,8 @@ void Preferences::syntaxListView_itemRenamed(QListViewItem *item, const QString
     else
       (*it).name=str;
   } else if (item->parent()==wordListsItem) {
-    QListViewItem *i;
-    QValueList<Syn_WordList>::Iterator it;
+    Q3ListViewItem *i;
+    Q3ValueList<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,14 +504,14 @@ void Preferences::syntaxListView_itemRenamed(QListViewItem *item, const QString
 void Preferences::syntaxListViewAccel_activated(int id)
 {
   if (!id) {
-    QListViewItem *currentItem=syntaxListView->currentItem();
+    Q3ListViewItem *currentItem=syntaxListView->currentItem();
     if (currentItem && currentItem->rtti()==0x716CC8) {
-      QListViewItem *rootListItem=syntaxListView->firstChild();
-      QListViewItem *customStylesItem=rootListItem->firstChild();
-      QListViewItem *wordListsItem=customStylesItem->nextSibling();
+      Q3ListViewItem *rootListItem=syntaxListView->firstChild();
+      Q3ListViewItem *customStylesItem=rootListItem->firstChild();
+      Q3ListViewItem *wordListsItem=customStylesItem->nextSibling();
       if (currentItem->parent()==customStylesItem) {
-        QListViewItem *i;
-        QValueList<Syn_CustomStyle>::Iterator it;
+        Q3ListViewItem *i;
+        Q3ValueList<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());
@@ -522,8 +522,8 @@ void Preferences::syntaxListViewAccel_activated(int id)
           preferences.syn->customStyles.remove(it);
         }
       } else if (currentItem->parent()==wordListsItem) {
-        QListViewItem *i;
-        QValueList<Syn_WordList>::Iterator it;
+        Q3ListViewItem *i;
+        Q3ValueList<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());
@@ -543,9 +543,9 @@ void Preferences::newStyleButton_clicked()
   Syn_CustomStyle newStyle;
   newStyle.name="New Style";
   preferences.syn->customStyles.append(newStyle);
-  QListViewItem *rootListItem=syntaxListView->firstChild();
-  QListViewItem *customStylesItem=rootListItem->firstChild();
-  QListViewItem *item=customStylesItem->firstChild();
+  Q3ListViewItem *rootListItem=syntaxListView->firstChild();
+  Q3ListViewItem *customStylesItem=rootListItem->firstChild();
+  Q3ListViewItem *item=customStylesItem->firstChild();
   while (item && item->nextSibling()) item=item->nextSibling();
   item=new RenamableKListViewItem(customStylesItem,item,newStyle.name);
   syntaxListView->setCurrentItem(item);
@@ -558,10 +558,10 @@ void Preferences::newListButton_clicked()
   Syn_WordList newList;
   newList.name="New List";
   preferences.syn->wordLists.append(newList);
-  QListViewItem *rootListItem=syntaxListView->firstChild();
-  QListViewItem *customStylesItem=rootListItem->firstChild();
-  QListViewItem *wordListsItem=customStylesItem->nextSibling();
-  QListViewItem *item=wordListsItem->firstChild();
+  Q3ListViewItem *rootListItem=syntaxListView->firstChild();
+  Q3ListViewItem *customStylesItem=rootListItem->firstChild();
+  Q3ListViewItem *wordListsItem=customStylesItem->nextSibling();
+  Q3ListViewItem *item=wordListsItem->firstChild();
   while (item && item->nextSibling()) item=item->nextSibling();
   item=new RenamableKListViewItem(wordListsItem,item,newList.name);
   syntaxListView->setCurrentItem(item);
@@ -575,14 +575,14 @@ static QColor tempColor;
 
 void Preferences::editButton_clicked()
 {
-  QListViewItem *currentItem=syntaxListView->currentItem();
+  Q3ListViewItem *currentItem=syntaxListView->currentItem();
   if (currentItem && currentItem->rtti()==0x716CC8) {
-    QListViewItem *rootListItem=syntaxListView->firstChild();
-    QListViewItem *customStylesItem=rootListItem->firstChild();
-    QListViewItem *wordListsItem=customStylesItem->nextSibling();
+    Q3ListViewItem *rootListItem=syntaxListView->firstChild();
+    Q3ListViewItem *customStylesItem=rootListItem->firstChild();
+    Q3ListViewItem *wordListsItem=customStylesItem->nextSibling();
     if (currentItem->parent()==customStylesItem) {
-      QListViewItem *i;
-      QValueList<Syn_CustomStyle>::Iterator it;
+      Q3ListViewItem *i;
+      Q3ValueList<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());
@@ -617,8 +617,8 @@ void Preferences::editButton_clicked()
         }
       }
     } else if (currentItem->parent()==wordListsItem) {
-      QListViewItem *i;
-      QValueList<Syn_WordList>::Iterator it;
+      Q3ListViewItem *i;
+      Q3ValueList<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());
@@ -680,8 +680,8 @@ void Preferences::editDialog_styleButton_clicked()
 
 void Preferences::clearSelectionButton_clicked()
 {
-  QListBoxItem *next;
-  for (QListBoxItem *item=templateListBox->firstItem(); item;
+  Q3ListBoxItem *next;
+  for (Q3ListBoxItem *item=templateListBox->firstItem(); item;
        item=next) {
     next=item->next();
     if (item->isSelected()) delete item;
@@ -691,7 +691,7 @@ void Preferences::clearSelectionButton_clicked()
 void Preferences::applyButton_clicked()
 {
   QString identifier=templateIdentifier->text();
-  QListBoxItem *item=templateListBox->findItem(identifier,Qt::ExactMatch);
+  Q3ListBoxItem *item=templateListBox->findItem(identifier,Qt::ExactMatch);
   if (item) {
     static_cast<ListBoxTextPair *>(item)->setData(templateCode->text());
   } else {
@@ -702,7 +702,7 @@ void Preferences::applyButton_clicked()
 
 void Preferences::templateListBox_selectionChanged()
 {
-  for (QListBoxItem *item=templateListBox->firstItem(); item;
+  for (Q3ListBoxItem *item=templateListBox->firstItem(); item;
        item=item->next()) {
     if (item->isSelected()) {
       clearSelectionButton->setEnabled(TRUE);
@@ -712,7 +712,7 @@ void Preferences::templateListBox_selectionChanged()
   clearSelectionButton->setEnabled(FALSE);
 }
 
-void Preferences::templateListBox_currentChanged(QListBoxItem *item)
+void Preferences::templateListBox_currentChanged(Q3ListBoxItem *item)
 {
   if (item) {
     templateIdentifier->setText(item->text());

+ 2 - 0
ktigcc/programoptions.ui.h

@@ -35,6 +35,8 @@
 #include <qevent.h>
 #include <qeventloop.h>
 #include <qtooltip.h>
+//Added by qt3to4:
+#include <QMouseEvent>
 #include "ktigcc.h"
 #include "tpr.h"
 #include "assistant.h"

+ 1 - 1
ktigcc/projectoptions.ui.h

@@ -31,7 +31,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
 */
 
-#include <qaccel.h>
+#include <q3accel.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
 #include <kprocess.h>

+ 8 - 5
ktigcc/srcfile.h

@@ -25,15 +25,18 @@
 #include "parsing.h"
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3PopupMenu>
+#include <QLabel>
 class MainForm;
 namespace Kate {
   class View;
 }
 class KReplaceWithSelectionS;
 class QLabel;
-class QPopupMenu;
+class Q3PopupMenu;
 class QClipboard;
-class QAccel;
+class Q3Accel;
 class KFindDialog;
 class KDirWatch;
 class FunctionDialog;
@@ -67,12 +70,12 @@ struct SourceFile : public SourceFileWindow {
   QLabel *colStatusLabel;
   QLabel *charsStatusLabel;
   QLabel *rightStatusLabel;
-  QPopupMenu *te_popup;
-  QAccel *accel;
+  Q3PopupMenu *te_popup;
+  Q3Accel *accel;
   KFindDialog *kfinddialog;
   unsigned findCurrentLine;
   KDirWatch *dirWatch;
-  QPopupMenu *findFunctionsPopup;
+  Q3PopupMenu *findFunctionsPopup;
   SourceFileFunctions sourceFileFunctions;
   FunctionDialog *functionDialog;
 };

+ 52 - 45
ktigcc/srcfilewin.ui.h

@@ -34,14 +34,21 @@
 #include <qstatusbar.h>
 #include <qtimer.h>
 #include <qdatetime.h>
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include <qdir.h>
 #include <qclipboard.h>
-#include <qaccel.h>
+#include <q3accel.h>
 #include <qeventloop.h>
 #include <qlayout.h>
 #include <qtoolbutton.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <q3mimefactory.h>
+#include <QResizeEvent>
+#include <Q3PopupMenu>
+#include <QEvent>
+#include <QCloseEvent>
 #include <kparts/factory.h>
 #include <klibloader.h>
 #include <kate/document.h>
@@ -94,8 +101,8 @@ enum {TIGCCOpenProjectFileFilter,TIGCCAddFilesFilter};
 #define CURRENT_VIEW (THIS->kateView)
 #define HL_MODE ((THIS->hlEnabled && *(THIS->hlEnabled))?THIS->hlMode:"None")
 
-#define LOAD_ICON(name) (QIconSet(KGlobal::iconLoader()->loadIcon((name),KIcon::Small),KGlobal::iconLoader()->loadIcon((name),KIcon::MainToolbar)))
-#define SYSICON(sysname,name) (preferences.useSystemIcons?KGlobal::iconLoader()->loadIcon((sysname),KIcon::Small):QPixmap::fromMimeSource((name)))
+#define LOAD_ICON(name) (QIcon(KGlobal::iconLoader()->loadIcon((name),KIcon::Small),KGlobal::iconLoader()->loadIcon((name),KIcon::MainToolbar)))
+#define SYSICON(sysname,name) (preferences.useSystemIcons?KGlobal::iconLoader()->loadIcon((sysname),KIcon::Small):qPixmapFromMimeSource((name)))
 
 #define SET_TEXT_SAFE(doc,text) do { \
     disableViewEvents=TRUE; \
@@ -153,12 +160,12 @@ class KReplaceWithSelectionS : public KReplace {
 
 void SourceFileWindow::initBase()
 {
-  setIcon(QPixmap::fromMimeSource("icon.png"));
-  KWin::setIcons(winId(),*(icon()),QPixmap::fromMimeSource("ktigcc.png"));
+  setIcon(qPixmapFromMimeSource("icon.png"));
+  KWin::setIcons(winId(),*(icon()),qPixmapFromMimeSource("ktigcc.png"));
   sourceFiles.append(THIS);
   THIS->dirWatch=new KDirWatch(this);
   setCaption(caption()+" - "+THIS->fileName);
-  THIS->te_popup = new QPopupMenu(this);
+  THIS->te_popup = new Q3PopupMenu(this);
   THIS->te_popup->insertItem("&Open file at cursor",0);
   THIS->te_popup->insertItem("&Find symbol declaration",1);
   THIS->te_popup->insertSeparator();
@@ -214,18 +221,18 @@ void SourceFileWindow::initBase()
   editCutAction->setEnabled(CURRENT_VIEW->getDoc()->hasSelection());
   editCopyAction->setEnabled(CURRENT_VIEW->getDoc()->hasSelection());
   editPasteAction->setEnabled(!clipboard->text().isNull());
-  THIS->accel=new QAccel(this);
-  THIS->accel->insertItem(ALT+Key_Backspace,0);
-  THIS->accel->insertItem(SHIFT+ALT+Key_Backspace,1);
-  THIS->accel->insertItem(SHIFT+Key_Delete,2);
-  THIS->accel->insertItem(CTRL+Key_Insert,3);
-  THIS->accel->insertItem(SHIFT+Key_Insert,4);
-  THIS->accel->insertItem(Key_F1,5);
-  THIS->accel->insertItem(Key_Enter,6);
-  THIS->accel->insertItem(Key_Return,7);
-  THIS->accel->insertItem(CTRL+Key_J,8);
-  THIS->accel->insertItem(CTRL+Key_Space,9);
-  THIS->accel->insertItem(CTRL+Key_M,10);
+  THIS->accel=new Q3Accel(this);
+  THIS->accel->insertItem(Qt::ALT+Qt::Key_Backspace,0);
+  THIS->accel->insertItem(Qt::SHIFT+Qt::ALT+Qt::Key_Backspace,1);
+  THIS->accel->insertItem(Qt::SHIFT+Qt::Key_Delete,2);
+  THIS->accel->insertItem(Qt::CTRL+Qt::Key_Insert,3);
+  THIS->accel->insertItem(Qt::SHIFT+Qt::Key_Insert,4);
+  THIS->accel->insertItem(Qt::Key_F1,5);
+  THIS->accel->insertItem(Qt::Key_Enter,6);
+  THIS->accel->insertItem(Qt::Key_Return,7);
+  THIS->accel->insertItem(Qt::CTRL+Qt::Key_J,8);
+  THIS->accel->insertItem(Qt::CTRL+Qt::Key_Space,9);
+  THIS->accel->insertItem(Qt::CTRL+Qt::Key_M,10);
   THIS->accel->setItemEnabled(0,!!(CURRENT_VIEW->getDoc()->undoCount()));
   THIS->accel->setItemEnabled(1,!!(CURRENT_VIEW->getDoc()->redoCount()));
   THIS->accel->setItemEnabled(2,CURRENT_VIEW->getDoc()->hasSelection());
@@ -251,11 +258,11 @@ void SourceFileWindow::initBase()
     editPasteAction->setIconSet(LOAD_ICON("editpaste"));
     findFindAction->setIconSet(LOAD_ICON("filefind"));
     if (KGlobal::iconLoader()->iconPath("stock-find-and-replace",KIcon::Small,TRUE).isEmpty()) {
-      QIconSet fileReplaceIconSet(QPixmap::fromMimeSource("filereplace.png"));
+      QIcon fileReplaceIconSet(qPixmapFromMimeSource("filereplace.png"));
       int smallSize=IconSize(KIcon::Small);
-      fileReplaceIconSet.setIconSize(QIconSet::Small,QSize(smallSize,smallSize));
+      fileReplaceIconSet.setIconSize(QIcon::Small,QSize(smallSize,smallSize));
       int largeSize=IconSize(KIcon::MainToolbar);
-      fileReplaceIconSet.setIconSize(QIconSet::Large,QSize(largeSize,largeSize));
+      fileReplaceIconSet.setIconSize(QIcon::Large,QSize(largeSize,largeSize));
       findReplaceAction->setIconSet(fileReplaceIconSet);
     } else
       findReplaceAction->setIconSet(LOAD_ICON("stock-find-and-replace"));
@@ -267,7 +274,7 @@ void SourceFileWindow::initBase()
   }
   QToolButton *findFunctionsButton=static_cast<QToolButton *>(toolBar
     ->child("findFunctionsAction_action_button","QToolButton",FALSE));
-  THIS->findFunctionsPopup=new QPopupMenu(findFunctionsButton);
+  THIS->findFunctionsPopup=new Q3PopupMenu(findFunctionsButton);
   connect(THIS->findFunctionsPopup,SIGNAL(aboutToShow()),
           this,SLOT(findFunctionsPopup_aboutToShow()));
   connect(THIS->findFunctionsPopup,SIGNAL(aboutToHide()),
@@ -375,7 +382,7 @@ void SourceFileWindow::accel_activated(int index)
       default: break;
     }
   } else if (index == 6 || index == 7) {
-    QKeyEvent *keyEvent=new QKeyEvent(QEvent::KeyPress,Key_Return,'\n',0,"\n");
+    QKeyEvent *keyEvent=new QKeyEvent(QEvent::KeyPress,Qt::Key_Return,'\n',0,"\n");
     QApplication::postEvent(focusWidget(),keyEvent);
   }
 }
@@ -594,11 +601,11 @@ void SourceFileWindow::applyPreferences()
     editPasteAction->setIconSet(LOAD_ICON("editpaste"));
     findFindAction->setIconSet(LOAD_ICON("filefind"));
     if (KGlobal::iconLoader()->iconPath("stock-find-and-replace",KIcon::Small,TRUE).isEmpty()) {
-      QIconSet fileReplaceIconSet(QPixmap::fromMimeSource("filereplace.png"));
+      QIcon fileReplaceIconSet(qPixmapFromMimeSource("filereplace.png"));
       int smallSize=IconSize(KIcon::Small);
-      fileReplaceIconSet.setIconSize(QIconSet::Small,QSize(smallSize,smallSize));
+      fileReplaceIconSet.setIconSize(QIcon::Small,QSize(smallSize,smallSize));
       int largeSize=IconSize(KIcon::MainToolbar);
-      fileReplaceIconSet.setIconSize(QIconSet::Large,QSize(largeSize,largeSize));
+      fileReplaceIconSet.setIconSize(QIcon::Large,QSize(largeSize,largeSize));
       findReplaceAction->setIconSet(fileReplaceIconSet);
     } else
       findReplaceAction->setIconSet(LOAD_ICON("stock-find-and-replace"));
@@ -608,22 +615,22 @@ void SourceFileWindow::applyPreferences()
     editIncreaseIndentAction->setIconSet(LOAD_ICON("indent"));
     editDecreaseIndentAction->setIconSet(LOAD_ICON("unindent"));
   } else {
-    fileSaveAction->setIconSet(QIconSet(QPixmap::fromMimeSource("02")));
-    fileAddToProjectAction->setIconSet(QIconSet(QPixmap::fromMimeSource("08")));
-    fileCompileAction->setIconSet(QIconSet(QPixmap::fromMimeSource("09")));
-    filePrintAction->setIconSet(QIconSet(QPixmap::fromMimeSource("03")));
-    filePrintQuicklyAction->setIconSet(QIconSet(QPixmap::fromMimeSource("03")));
-    editClearAction->setIconSet(QIconSet(QPixmap::fromMimeSource("04")));
-    editCutAction->setIconSet(QIconSet(QPixmap::fromMimeSource("05")));
-    editCopyAction->setIconSet(QIconSet(QPixmap::fromMimeSource("06")));
-    editPasteAction->setIconSet(QIconSet(QPixmap::fromMimeSource("07")));
-    findFindAction->setIconSet(QIconSet(QPixmap::fromMimeSource("13")));
-    findReplaceAction->setIconSet(QIconSet(QPixmap::fromMimeSource("14")));
-    editUndoAction->setIconSet(QIconSet(QPixmap::fromMimeSource("16")));
-    editRedoAction->setIconSet(QIconSet(QPixmap::fromMimeSource("17")));
-    findFunctionsAction->setIconSet(QIconSet(QPixmap::fromMimeSource("18")));
-    editIncreaseIndentAction->setIconSet(QIconSet(QPixmap::fromMimeSource("19")));
-    editDecreaseIndentAction->setIconSet(QIconSet(QPixmap::fromMimeSource("20")));
+    fileSaveAction->setIconSet(QIcon(qPixmapFromMimeSource("02")));
+    fileAddToProjectAction->setIconSet(QIcon(qPixmapFromMimeSource("08")));
+    fileCompileAction->setIconSet(QIcon(qPixmapFromMimeSource("09")));
+    filePrintAction->setIconSet(QIcon(qPixmapFromMimeSource("03")));
+    filePrintQuicklyAction->setIconSet(QIcon(qPixmapFromMimeSource("03")));
+    editClearAction->setIconSet(QIcon(qPixmapFromMimeSource("04")));
+    editCutAction->setIconSet(QIcon(qPixmapFromMimeSource("05")));
+    editCopyAction->setIconSet(QIcon(qPixmapFromMimeSource("06")));
+    editPasteAction->setIconSet(QIcon(qPixmapFromMimeSource("07")));
+    findFindAction->setIconSet(QIcon(qPixmapFromMimeSource("13")));
+    findReplaceAction->setIconSet(QIcon(qPixmapFromMimeSource("14")));
+    editUndoAction->setIconSet(QIcon(qPixmapFromMimeSource("16")));
+    editRedoAction->setIconSet(QIcon(qPixmapFromMimeSource("17")));
+    findFunctionsAction->setIconSet(QIcon(qPixmapFromMimeSource("18")));
+    editIncreaseIndentAction->setIconSet(QIcon(qPixmapFromMimeSource("19")));
+    editDecreaseIndentAction->setIconSet(QIcon(qPixmapFromMimeSource("20")));
   }
 }
 
@@ -1134,7 +1141,7 @@ void SourceFileWindow::updateSizes()
 
 void SourceFileWindow::resizeEvent(QResizeEvent *event)
 {
-  QMainWindow::resizeEvent(event);
+  Q3MainWindow::resizeEvent(event);
   if (event->size()==event->oldSize()) return;
   updateSizes();
 }

+ 33 - 31
ktigcc/tiemu_stub.cpp

@@ -10,14 +10,16 @@
 #include <dcopclient.h>
 
 #include <kdatastream.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 
-TiEmuDCOP_stub::TiEmuDCOP_stub( const QCString& app, const QCString& obj )
+TiEmuDCOP_stub::TiEmuDCOP_stub( const Q3CString& app, const Q3CString& obj )
   : DCOPStub( app, obj )
 {
 }
 
-TiEmuDCOP_stub::TiEmuDCOP_stub( DCOPClient* client, const QCString& app, const QCString& obj )
+TiEmuDCOP_stub::TiEmuDCOP_stub( DCOPClient* client, const Q3CString& app, const Q3CString& obj )
   : DCOPStub( client, app, obj )
 {
 }
@@ -35,10 +37,10 @@ bool TiEmuDCOP_stub::image_loaded()
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
+    Q3CString replyType;
     if ( dcopClient()->call( app(), obj(), "image_loaded()", data, replyType, replyData ) ) {
 	if ( replyType == "bool" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {
@@ -58,10 +60,10 @@ int TiEmuDCOP_stub::emulated_calc_type()
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
+    Q3CString replyType;
     if ( dcopClient()->call( app(), obj(), "emulated_calc_type()", data, replyType, replyData ) ) {
 	if ( replyType == "int" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {
@@ -81,10 +83,10 @@ int TiEmuDCOP_stub::emulated_hw_version()
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
+    Q3CString replyType;
     if ( dcopClient()->call( app(), obj(), "emulated_hw_version()", data, replyType, replyData ) ) {
 	if ( replyType == "int" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {
@@ -104,10 +106,10 @@ QString TiEmuDCOP_stub::emulated_os_version()
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
+    Q3CString replyType;
     if ( dcopClient()->call( app(), obj(), "emulated_os_version()", data, replyType, replyData ) ) {
 	if ( replyType == "QString" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {
@@ -127,10 +129,10 @@ bool TiEmuDCOP_stub::ready_for_transfers()
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
+    Q3CString replyType;
     if ( dcopClient()->call( app(), obj(), "ready_for_transfers()", data, replyType, replyData ) ) {
 	if ( replyType == "bool" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {
@@ -150,12 +152,12 @@ bool TiEmuDCOP_stub::send_file( QString arg0 )
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
-    QDataStream arg( data, IO_WriteOnly );
+    Q3CString replyType;
+    QDataStream arg( data, QIODevice::WriteOnly );
     arg << arg0;
     if ( dcopClient()->call( app(), obj(), "send_file(QString)", data, replyType, replyData ) ) {
 	if ( replyType == "bool" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {
@@ -175,12 +177,12 @@ bool TiEmuDCOP_stub::send_files( QStringList arg0 )
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
-    QDataStream arg( data, IO_WriteOnly );
+    Q3CString replyType;
+    QDataStream arg( data, QIODevice::WriteOnly );
     arg << arg0;
     if ( dcopClient()->call( app(), obj(), "send_files(QStringList)", data, replyType, replyData ) ) {
 	if ( replyType == "bool" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {
@@ -200,12 +202,12 @@ bool TiEmuDCOP_stub::debug_file( QString arg0 )
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
-    QDataStream arg( data, IO_WriteOnly );
+    Q3CString replyType;
+    QDataStream arg( data, QIODevice::WriteOnly );
     arg << arg0;
     if ( dcopClient()->call( app(), obj(), "debug_file(QString)", data, replyType, replyData ) ) {
 	if ( replyType == "bool" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {
@@ -225,12 +227,12 @@ bool TiEmuDCOP_stub::reset_calc( bool arg0 )
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
-    QDataStream arg( data, IO_WriteOnly );
+    Q3CString replyType;
+    QDataStream arg( data, QIODevice::WriteOnly );
     arg << arg0;
     if ( dcopClient()->call( app(), obj(), "reset_calc(bool)", data, replyType, replyData ) ) {
 	if ( replyType == "bool" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {
@@ -250,12 +252,12 @@ bool TiEmuDCOP_stub::execute_command( QString arg0 )
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
-    QDataStream arg( data, IO_WriteOnly );
+    Q3CString replyType;
+    QDataStream arg( data, QIODevice::WriteOnly );
     arg << arg0;
     if ( dcopClient()->call( app(), obj(), "execute_command(QString)", data, replyType, replyData ) ) {
 	if ( replyType == "bool" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {
@@ -275,10 +277,10 @@ bool TiEmuDCOP_stub::turn_calc_on()
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
+    Q3CString replyType;
     if ( dcopClient()->call( app(), obj(), "turn_calc_on()", data, replyType, replyData ) ) {
 	if ( replyType == "bool" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {
@@ -298,10 +300,10 @@ bool TiEmuDCOP_stub::enter_debugger()
 	return result;
     }
     QByteArray data, replyData;
-    QCString replyType;
+    Q3CString replyType;
     if ( dcopClient()->call( app(), obj(), "enter_debugger()", data, replyType, replyData ) ) {
 	if ( replyType == "bool" ) {
-	    QDataStream _reply_stream( replyData, IO_ReadOnly );
+	    QDataStream _reply_stream( replyData, QIODevice::ReadOnly );
 	    _reply_stream >> result;
 	    setStatus( CallSucceeded );
 	} else {

+ 4 - 2
ktigcc/tiemu_stub.h

@@ -11,6 +11,8 @@
 
 #include <dcopstub.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <dcopobject.h>
 #include <qobject.h>
 
@@ -18,8 +20,8 @@
 class TiEmuDCOP_stub : virtual public DCOPStub
 {
 public:
-    TiEmuDCOP_stub( const QCString& app, const QCString& id );
-    TiEmuDCOP_stub( DCOPClient* client, const QCString& app, const QCString& id );
+    TiEmuDCOP_stub( const Q3CString& app, const Q3CString& id );
+    TiEmuDCOP_stub( DCOPClient* client, const Q3CString& app, const Q3CString& id );
     explicit TiEmuDCOP_stub( const DCOPRef& ref );
     virtual bool image_loaded();
     virtual int emulated_calc_type();

+ 1 - 1
ktigcc/toolsdlg.ui.h

@@ -65,7 +65,7 @@ void ToolsDialog::editButton_clicked()
   toolProperties.exec();
   if (toolProperties.result()==QDialog::Accepted) {
     Tool &newTool=tempTools[toolIndex];
-    QListViewItem *toolItem=listView->selectedItem();
+    Q3ListViewItem *toolItem=listView->selectedItem();
     toolItem->setText(0,newTool.title);
     toolItem->setText(1,newTool.commandLine);
     toolItem->setText(2,newTool.workingDirectory);

+ 8 - 8
ktigcc/tpr.cpp

@@ -35,7 +35,7 @@
 #include <kaboutdata.h>
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qregexp.h>
 #include <qtextcodec.h>
 #include <qdir.h>
@@ -1320,8 +1320,8 @@ QStringList process_libopts(void)
    Build linker command line arguments
 */
 QStringList process_settings(const QString &prjNameUnicode,
-                             QCString &projectName, QCString &dataVarName,
-                             QCString &packFolder, QCString &packName)
+                             Q3CString &projectName, Q3CString &dataVarName,
+                             Q3CString &packFolder, Q3CString &packName)
 {
   QStringList args;
 
@@ -1332,7 +1332,7 @@ QStringList process_settings(const QString &prjNameUnicode,
       char *ti=ticonv_charset_utf16_to_ti(CALC_TI89,utf16);
       projectName=ti; // This is a hidden strdup (see QCString::operator=).
       g_free(ti);
-    } else projectName=QCString();
+    } else projectName=Q3CString();
   }
 
   // Split the PPG name into folder and file.
@@ -1352,7 +1352,7 @@ QStringList process_settings(const QString &prjNameUnicode,
       char *ti=ticonv_charset_utf16_to_ti(CALC_TI89,utf16);
       packFolder=ti; // This is a hidden strdup (see QCString::operator=).
       g_free(ti);
-    } else packFolder=QCString();
+    } else packFolder=Q3CString();
   }
 
   // Convert the PPG file name to the calculator charset.
@@ -1362,7 +1362,7 @@ QStringList process_settings(const QString &prjNameUnicode,
       char *ti=ticonv_charset_utf16_to_ti(CALC_TI89,utf16);
       packName=ti; // This is a hidden strdup (see QCString::operator=).
       g_free(ti);
-    } else packName=QCString();
+    } else packName=Q3CString();
   }
 
   if (settings.use_data_var && !settings.data_var.isEmpty()) {
@@ -1373,13 +1373,13 @@ QStringList process_settings(const QString &prjNameUnicode,
       char *ti=ticonv_charset_utf16_to_ti(CALC_TI89,utf16);
       dataVarName=ti; // This is a hidden strdup (see QCString::operator=).
       g_free(ti);
-    } else dataVarName=QCString();
+    } else dataVarName=Q3CString();
     if (!settings.copy_data_var) {
       args.append("--data-var-copy=never");
     } else if (!settings.copy_data_var_arc) {
       args.append("--data-var-copy=always");
     }
-  } else dataVarName=QCString();
+  } else dataVarName=Q3CString();
 
   if (settings.optimize_nops) {
     args.append("--optimize-nops");

+ 5 - 5
ktigcc/tpr.h

@@ -26,8 +26,8 @@
 class KURL;
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qcstring.h>
-#include <qvaluevector.h>
+#include <q3cstring.h>
+#include <q3valuevector.h>
 #include <qpair.h>
 
 /*Structure definitions from tprbuilder source; slightly modified
@@ -159,7 +159,7 @@ typedef struct
 
 enum {PATH_ERROR,PATH_NOTFOUND,PATH_FILE,PATH_FOLDER}; //return types for getPathType
 
-typedef QValueVector<QPair<unsigned,unsigned> > LineStartList;
+typedef Q3ValueVector<QPair<unsigned,unsigned> > LineStartList;
 
 const char *smartAscii(const QString &s);
 
@@ -187,5 +187,5 @@ int getPathType(const QString &thePath);
 
 QStringList process_libopts(void);
 QStringList process_settings(const QString &prjNameUnicode,
-                             QCString &projectName, QCString &dataVarName,
-                             QCString &packFolder, QCString &packName);
+                             Q3CString &projectName, Q3CString &dataVarName,
+                             Q3CString &packFolder, Q3CString &packName);

Some files were not shown because too many files changed in this diff