[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdevelop/3.4/buildtools/custommakefiles
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2007-03-02 14:04:59
Message-ID: 1172844299.571025.12303.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 638568 by apaku:

Fix removal of multiple files with a common project path


 M  +4 -4      customprojectpart.cpp  


--- branches/kdevelop/3.4/buildtools/custommakefiles/customprojectpart.cpp \
#638567:638568 @@ -732,6 +732,8 @@
         }
         else if( m_sourceFiles.find( relpath ) != m_sourceFiles.end() )
         {
+            removedFiles << relpath;
+            m_sourceFiles.remove( relpath );
             QStringList paths = QStringList::split("/", relpath);
             QString lastsubentry = paths[paths.size()-1];
             paths.pop_back();
@@ -739,7 +741,7 @@
             {
                 QString dir = paths.join("/");
                 QStringList projectentries = projectFilesInDir(dir);
-                if( projectentries.size() == 1 &&  projectentries.first() == \
lastsubentry ) +                if( projectentries.size() == 0 )
                 {
                     removedFiles << dir;
                     m_sourceFiles.remove( dir );
@@ -748,8 +750,6 @@
                 lastsubentry = paths[paths.size()-1];
                 paths.pop_back();
             }
-            removedFiles << relpath;
-            m_sourceFiles.remove( relpath );
         }
     }
 
@@ -1371,7 +1371,7 @@
     {
         if ( *it != "." && *it != ".." )
         {
-            if ( project()->isProjectFile( URLUtil::canonicalPath( \
projectDirectory() + "/" + dir + "/" + *it ) ) ) +            if ( \
m_sourceFiles.find( dir + "/" + *it ) != m_sourceFiles.end() )  {
                 result << (*it);
             }


[prev in list] [next in list] [prev in thread] [next in thread]