Remove DECLARE_LIST( XMLAttributeList, XMLAttribute * )

l10ntools/inc/xmlparse.hxx

@@ -64,7 +64,6 @@ using namespace std;
 #define MAX_LANGUAGES               99
 
 
-//#define TESTDRIVER        /* use xml2gsi testclass */
 //-------------------------------------------------------------------------
 
 /** Holds data of Attributes
@@ -96,7 +95,7 @@ public:
     }
 };
 
-DECLARE_LIST( XMLAttributeList, XMLAttribute * )
+typedef ::std::vector< XMLAttribute* > XMLAttributeList;
 
 //-------------------------------------------------------------------------
 

l10ntools/layout/layoutparse.cxx

@@ -57,11 +57,11 @@ interestingAttributes( XMLAttributeList* lst )
 {
     std::vector<XMLAttribute*> interesting;
     if ( lst )
-        for ( ULONG i = 0; i < lst->Count(); i++ )
-            if ( lst->GetObject( i )->Equals( STRING( "id" ) ) )
-                interesting.insert( interesting.begin(), lst->GetObject( i ) );
-            else if ( ! BSTRING( *lst->GetObject( i ) ).CompareTo( "_", 1 ) )
-                interesting.push_back( lst->GetObject( i ) );
+        for ( size_t i = 0; i < lst->size(); i++ )
+            if ( (*lst)[ i ]->Equals( STRING( "id" ) ) )
+                interesting.insert( interesting.begin(), (*lst)[ i ] );
+            else if ( ! BSTRING( *(*lst)[ i ]).CompareTo( "_", 1 ) )
+                interesting.push_back( (*lst)[ i ] );
     return interesting;
 }
 

l10ntools/layout/tralay.cxx

@@ -166,9 +166,9 @@ void TranslateLayout::ParseCommandLine()
 static XMLAttribute*
 findAttribute( XMLAttributeList* lst, String const& name )
 {
-    for ( ULONG i = 0; i < lst->Count(); i++ )
-        if ( lst->GetObject( i )->Equals( name ) )
-            return lst->GetObject( i );
+    for ( size_t i = 0; i < lst->size(); i++ )
+        if ( (*lst)[ i ]->Equals( name ) )
+            return (*lst)[ i ];
     return 0;
 }
 
@@ -177,7 +177,17 @@ translateAttribute( XMLAttributeList* lst,
                     String const& name, String const& translation )
 {
     if ( XMLAttribute* a = findAttribute( lst, name ) )
-        return lst->Replace ( new XMLAttribute( name.Copy( 1 ), translation ), a );
+    {
+        for ( XMLAttributeList::iterator it = lst->begin(); it < lst->end(); ++it )
+        {
+            if ( *it == a )
+            {
+                delete *it;
+                *it = new XMLAttribute( name.Copy( 1 ), translation );
+                return *it;
+            }
+        }
+    }
     return 0;
 }