Quellcode durchsuchen

Run remove-qt3-support.pl.

git-svn-id: file:///var/svn/tigccpp/trunk@1017 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler vor 17 Jahren
Ursprung
Commit
1fbf21cc80
3 geänderte Dateien mit 12 neuen und 12 gelöschten Zeilen
  1. 4 4
      ktigcc/completion.cpp
  2. 6 6
      ktigcc/mainform.cpp
  3. 2 2
      ktigcc/preferences.cpp

+ 4 - 4
ktigcc/completion.cpp

@@ -93,7 +93,7 @@ static bool findSymbolInFileRecursive(const QString &symbol,
   systemHeader=false;
   if (!projectCompletion.contains(fileName) || projectCompletion[fileName].dirty) {
     QFileInfo fileInfo(fileName);
-    QString pathInProject=fileInfo.isRelative()?fileInfo.dirPath():".";
+    QString pathInProject=fileInfo.isRelative()?fileInfo.path():".";
     CompletionInfo completionInfo=parseFileCompletion(fileText,pathInProject);
     if (completionInfo.dirty) return false;
     projectCompletion.insert(fileName,completionInfo);
@@ -168,7 +168,7 @@ static bool completionEntriesForFileRecursive(const QString &fileText,
 {
   if (!projectCompletion.contains(fileName) || projectCompletion[fileName].dirty) {
     QFileInfo fileInfo(fileName);
-    QString pathInProject=fileInfo.isRelative()?fileInfo.dirPath():".";
+    QString pathInProject=fileInfo.isRelative()?fileInfo.path():".";
     CompletionInfo completionInfo=parseFileCompletion(fileText,pathInProject);
     if (completionInfo.dirty) return false;
     projectCompletion.insert(fileName,completionInfo);
@@ -279,7 +279,7 @@ static QStringList prototypesForIdentifier(const QString &identifier,
       // Try approximate matching.
       unsigned identifierLength=identifier.length();
       if (identifierLength>=4) {
-        QString identifierUpper=identifier.upper();
+        QString identifierUpper=identifier.toUpper();
         Q3ValueList<unsigned> distances;
         for (Q3ValueList<CompletionEntry>::ConstIterator it=entries.begin();
              it!=entries.end(); ++it) {
@@ -288,7 +288,7 @@ static QStringList prototypesForIdentifier(const QString &identifier,
           unsigned entryTextLength=entryText.length();
           unsigned minLength=qMin(identifierLength,entryTextLength);
           unsigned i=0;
-          for (; i<minLength && identifierUpper[i]==entryText[i].upper(); i++);
+          for (; i<minLength && identifierUpper[i]==entryText[i].toUpper(); i++);
           unsigned distance=minLength-i;
           if (distance<=(minLength>>1)) {
             QString prototype=entryText+"? "+entry.prefix+' '+entry.postfix;

+ 6 - 6
ktigcc/mainform.cpp

@@ -730,7 +730,7 @@ class ErrorListItem : public K3ListViewItem {
       mainForm(pMainForm), errorType(errType)
   {
     QString errMessage=errMsg.trimmed();
-    if (!errMessage.isEmpty()) errMessage[0]=errMessage[0].upper();
+    if (!errMessage.isEmpty()) errMessage[0]=errMessage[0].toUpper();
     switch(errType) {
       case etError:
         setPixmap(0,SYSICON("messagebox_critical","error.png"));
@@ -3942,7 +3942,7 @@ void MainForm::procio_readReady()
                           || line.contains("previously implicitly declared",FALSE))))
                 break;
               // ld-tigcc statistics start here, don't display them as errors.
-              if (line.lower()=="target calculators:") {
+              if (line.toLower()=="target calculators:") {
                 ldTigccStatPhase=1;
                 break;
               }
@@ -3963,7 +3963,7 @@ void MainForm::procio_readReady()
                                     errorLine,errorColumn);
                 } else {
                   QString errorMessage;
-                  if (errorFile.lower()=="error"||errorFile.lower()=="warning") {
+                  if (errorFile.toLower()=="error"||errorFile.toLower()=="warning") {
                     errorFile=QString::null;
                     errorMessage=line;
                   } else {
@@ -4139,7 +4139,7 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
       }
       if (!projectFileName.isEmpty()) {
         objectFile.prepend('/');
-        objectFile.prepend(QFileInfo(projectFileName).dirPath(TRUE));
+        objectFile.prepend(QFileInfo(projectFileName).absolutePath());
       }
     }
     QString asmFile=objectFile;
@@ -4178,7 +4178,7 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
     QString tempAsmFile=tempObjectFile;
     tempObjectFile.append(".o");
     tempAsmFile.append(".s");
-    QString fileDir=QFileInfo(fileName).dirPath(TRUE);
+    QString fileDir=QFileInfo(fileName).absolutePath();
     QDir qdir;
     if (category==asmFilesListItem) {
       // Assemble A68k file
@@ -4400,7 +4400,7 @@ void MainForm::linkProject()
   QString projectBaseName=projectFileName;
   if (projectBaseName.endsWith(".tpr",FALSE))
     projectBaseName.truncate(projectBaseName.length()-4);
-  QString projectDir=QFileInfo(projectFileName).dirPath(TRUE);
+  QString projectDir=QFileInfo(projectFileName).absolutePath();
   statusBar()->message(QString("Linking Project \'%1\'...")
                        .arg(QFileInfo(projectFileName).baseName()));
   if (settings.archive) {

+ 2 - 2
ktigcc/preferences.cpp

@@ -62,8 +62,8 @@ static void genAllCaseVariants(QString keyword, unsigned pos,
   if (c.isNull())
     stringList.append(keyword);
   else {
-    QChar upper=c.upper();
-    QChar lower=c.lower();
+    QChar upper=c.toUpper();
+    QChar lower=c.toLower();
     if (lower==upper)
       genAllCaseVariants(keyword,pos+1,stringList);
     else {