Remove DECLARE_LIST( SvMetaClassList, SvMetaClass* )

1 files changed, 18 insertions, 16 deletions

diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 025338bdd7..1ccbf99c65 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -565,10 +565,11 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, SvULongs& rSuperList,
                             const ByteString & rPrefix, SvIdlDataBase& rBase)
 {
     // Wurde diese Klasse schon geschrieben ?
-    if ( rClassList.GetPos(this) != LIST_ENTRY_NOTFOUND )
-        return;
+    for ( size_t i = 0, n = rClassList.size(); i < n ; ++i )
+        if ( rClassList[ i ] == this )
+            return;
 
-    rClassList.Insert(this, LIST_APPEND);
+    rClassList.push_back( this );
 
     // alle direkten Attribute schreiben
     ULONG n;
@@ -630,22 +631,23 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, SvULongs& rSuperList,
 void SvMetaClass::FillClasses( SvMetaClassList & rList )
 {
     // Bin ich noch nicht drin ?
-    if ( rList.GetPos(this) == LIST_ENTRY_NOTFOUND )
-    {
-        rList.Insert(this, LIST_APPEND);
+    for ( size_t i = 0, n = rList.size(); i < n; ++i )
+        if ( rList[ i ] == this )
+            return;
 
-        // Meine Imports
-        for( ULONG n = 0; n < aClassList.Count(); n++ )
-        {
-            SvClassElement * pEle = aClassList.GetObject( n );
-            SvMetaClass * pCl = pEle->GetClass();
-            pCl->FillClasses( rList );
-        }
+    rList.push_back( this );
 
-        // Meine Superklasse
-        if( aSuperClass.Is() )
-            aSuperClass->FillClasses( rList );
+    // Meine Imports
+    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    {
+        SvClassElement * pEle = aClassList.GetObject( n );
+        SvMetaClass * pCl = pEle->GetClass();
+        pCl->FillClasses( rList );
     }
+
+    // Meine Superklasse
+    if( aSuperClass.Is() )
+        aSuperClass->FillClasses( rList );
 }