initial public commit of qt4 portp1

1 files changed, 6 insertions, 3 deletions

diff --git a/kabc/plugins/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h
index 744dd41..389926c 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.h
+++ b/kabc/plugins/qtopia/qtopiaconverter.h
@@ -25,12 +25,15 @@ $Id$
 */
 
 #ifndef KABC_QTOPIACONVERTER_H
 #define KABC_QTOPIACONVERTER_H
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3TextStream>
 
 #include "addressee.h"
 #ifdef DESKTOP_VERSION
 #include <qdom.h> 
 #else
 #include <xml/qdom.h> 
@@ -73,20 +76,20 @@ class OpieCategories {
         void parse( const QString &fileName );
 
         QString categoryById(const QString &id, const QString &app )const;
         QStringList categoriesByIds( const QStringList& ids,  const QString& app );
 
         void clear();
-        QValueList<OpieCategories> categories()const {  return m_categories; };
+        Q3ValueList<OpieCategories> categories()const {  return m_categories; };
     private:
         /**
          * this function will be used internally to update the kde categories...
          */
         void updateKDE( const QString& app,  const QStringList& categories );
         QMap<int, bool> ids; // from tt Qtopia::UidGen
-        QValueList<OpieCategories> m_categories;
+        Q3ValueList<OpieCategories> m_categories;
     };
 
 
 class QtopiaConverter
 {
 public:
@@ -114,13 +117,13 @@ public:
   /**
    * Converts an addressee to a vcard string.
    *
    * @param addr    The addressee.
    * @param contact The qtopia contact.
    */
-  bool addresseeToQtopia( const Addressee &ab, QTextStream *stream );
+  bool addresseeToQtopia( const Addressee &ab, Q3TextStream *stream );
 
   private:
   QString categoriesToNumber( const QStringList &list, const QString &app );
   QString escape( const QString& s){ return s;};
     CategoryEdit *m_edit;
     QDate fromString( const QString& );