1 files changed, 7 insertions, 5 deletions

diff --git a/kabc/addresseelist.cpp b/kabc/addresseelist.cpp
index 097e162..e1ba1ce 100644
--- a/kabc/addresseelist.cpp
+++ b/kabc/addresseelist.cpp
@@ -7,49 +7,51 @@
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kdebug.h>
 //US
-#include <qtl.h>
+#include <q3tl.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 
 #include "addresseelist.h"
 #include "field.h"
 
 using namespace KABC;
 
 //
 //
 // Traits
 //
 //
 
 bool SortingTraits::Uid::eq( const Addressee &a1, const Addressee &a2 )
 {
   // locale awareness doesn't make sense sorting ids
   return ( QString::compare( a1.uid(), a2.uid() ) == 0 );
 }
 
 bool SortingTraits::Uid::lt( const Addressee &a1, const Addressee &a2 )
 {
   // locale awareness doesn't make sense sorting ids
   return ( QString::compare( a1.uid(), a2.uid() ) < 0 );
 }
@@ -100,68 +102,68 @@ bool SortingTraits::GivenName::eq( const Addressee &a1, const Addressee &a2 )
 {
 //US QString::localeAwareCompare is not available in my distribution. Redefine it to compare
   return ( QString::compare( a1.givenName(), a2.givenName() ) == 0 
            && QString::compare( a1.familyName(), a2.familyName() ) == 0 );
 }
 
 bool SortingTraits::GivenName::lt( const Addressee &a1, const Addressee &a2 )
 {
 //US QString::localeAwareCompare is not available in my distribution. Redefine it to compare
   int given = QString::compare( a1.givenName(), a2.givenName() );
   if ( 0 == given ) {
     return ( QString::compare( a1.familyName(), a2.familyName() ) < 0 );
   } else {
     return given < 0;
   }
 }
 
 //
 //
 // AddresseeList
 //
 //
 
 AddresseeList::AddresseeList()
-  : QValueList<Addressee>()
+  : Q3ValueList<Addressee>()
 {
   mReverseSorting = false;
   mActiveSortingCriterion = FormattedName;
   mActiveSortingField = 0;
 }
 
 AddresseeList::~AddresseeList()
 {
 }
 
 AddresseeList::AddresseeList( const AddresseeList &l )
-  : QValueList<Addressee>( l )
+  : Q3ValueList<Addressee>( l )
 {
   mReverseSorting = l.reverseSorting();
   mActiveSortingCriterion = l.sortingCriterion();
 }
 
-AddresseeList::AddresseeList( const QValueList<Addressee> &l )
-  : QValueList<Addressee>( l )
+AddresseeList::AddresseeList( const Q3ValueList<Addressee> &l )
+  : Q3ValueList<Addressee>( l )
 {
   mReverseSorting = false;
 }
 
 void AddresseeList::dump() const
 {
   kdDebug(5700) << "AddresseeList {" << endl;
   kdDebug(5700) << "reverse order: " << ( mReverseSorting ? "true" : "false" ) << endl;
 
   QString crit;
   if ( Uid == mActiveSortingCriterion ) {
     crit = "Uid";
   } else if ( Name == mActiveSortingCriterion ) {
     crit = "Name";
   } else if ( FormattedName == mActiveSortingCriterion ) {
     crit = "FormattedName";
   } else if ( FamilyName == mActiveSortingCriterion ) {
     crit = "FamilyName";
   } else if ( GivenName == mActiveSortingCriterion ) {
     crit = "GivenName";
   } else {
     crit = "unknown -- update dump method";
   }