Преглед изворни кода

Fix checks for duplicate file names involving separate source file windows.

git-svn-id: file:///var/svn/tigccpp/trunk@600 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler пре 18 година
родитељ
комит
89b9f99f37
1 измењених фајлова са 10 додато и 2 уклоњено
  1. 10 2
      ktigcc/mainform.ui.h

+ 10 - 2
ktigcc/mainform.ui.h

@@ -1409,11 +1409,19 @@ bool MainForm::openProject(const QString &fileName)
       caption.truncate(p);
     }
     
-    if (!checkFileName(fileName,extractAllFileNames())) {
+    if (extractAllFileNames().contains(fileName)) {
       KMessageBox::error(this,QString("The file \'%1\' is already included in the project.").arg(caption));
       return FALSE;
     }
-  
+    QPtrListIterator<SourceFile> sfit(sourceFiles);
+    SourceFile *sourceFile;
+    for (sourceFile=sfit.current();sourceFile;sourceFile=++sfit) {
+      if (!fileName.compare(sourceFile->fileName)) {
+        KWin::activateWindow(sourceFile->winId());
+        return FALSE;
+      }
+    }
+
     if (!suffix.compare("h"))
       category=hFilesListItem;
     else if (!suffix.compare("c"))