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

List:       kde-commits
Subject:    kdevelop/lib/sourceinfo
From:       Harald Fernengel <harald () trolltech ! com>
Date:       2003-01-07 2:38:50
[Download RAW message or body]

CVS commit by harald: 

also remove the duplicated structs and classes when saving files


  M +8 -4      classstore.cpp   1.22
  M +0 -2      parsedcontainer.cpp   1.16


--- kdevelop/lib/sourceinfo/classstore.cpp  #1.21:1.22
@@ -485,8 +485,12 @@ void ClassStore::removeWithReferences(co
     for (QMap<QString, ParsedScopeContainer*>::Iterator it = m_allScopes.begin(); it \
!= m_allScopes.end(); ++it)  removeWithReferences(fileName, *it);
-//    for (QMap<QString, ParsedClass*>::Iterator it = m_allClasses.begin(); it != \
                m_allClasses.end(); ++it)
-//        (*it)->removeWithReferences(fileName);
-//    for (QMap<QString, ParsedStruct*>::Iterator it = m_allStructs.begin(); it != \
                m_allStructs.end(); ++it)
-//        (*it)->removeWithReferences(fileName);
+    for (QMap<QString, ParsedClass*>::Iterator it = m_allClasses.begin(); it != \
m_allClasses.end(); ++it) { +        if ( (*it)->declaredInFile() == fileName )
+            m_allClasses.remove( it );
+    }
+    for (QMap<QString, ParsedStruct*>::Iterator it = m_allStructs.begin(); it != \
m_allStructs.end(); ++it) { +        if ( (*it)->declaredInFile() == fileName )
+            m_allStructs.remove( it );
+    }
     m_globalScope->removeWithReferences(fileName);
 }

--- kdevelop/lib/sourceinfo/parsedcontainer.cpp  #1.15:1.16
@@ -109,6 +109,4 @@ void ParsedContainer::addAttribute( Pars
         anAttribute->setDeclaredInScope( path() );
 
-    //qDebug( "ParsedContainer::addAttribute: " + anAttribute->asString() );
-
     attributes.insert( anAttribute->name(),  anAttribute );
 }


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