6 files changed, 42 insertions, 31 deletions

diff --git a/kabc/plugins/qtopia/qtopia.pro b/kabc/plugins/qtopia/qtopia.pro
index 64d1abc..d91a2e3 100644
--- a/kabc/plugins/qtopia/qtopia.pro
+++ b/kabc/plugins/qtopia/qtopia.pro
@@ -5,3 +5,3 @@ include( ../../../variables.pri )
 
-TARGET = microkabc_qtopia
+TARGET = xmicrokabc_qtopia
 
@@ -10,4 +10,4 @@ INCLUDEPATH += ../.. ../../.. ../../../kabc ../../../microkde ../../../microkde/
 DESTDIR = ../../../bin
-#LIBS += -lmicrokde 
-#LIBS += -lkamicrokabc
+#LIBS += -lxmicrokde 
+#LIBS += -lxkamicrokabc
 
@@ -38,6 +38,10 @@ OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+QT +=  
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index 700057b..4b174b2 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -3,3 +3,3 @@ CONFIG += qt warn_on
 
-TARGET = microkabc_qtopia
+TARGET = xmicrokabc_qtopia
 
@@ -10,4 +10,4 @@ MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lxmicrokde 
+LIBS += -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index 9693a68..9b3903b 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
@@ -36,3 +36,5 @@ $Id$
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 //#include <.h>
@@ -73,4 +75,4 @@ QString QtopiaConverter::categoriesToNumber( const QStringList &list, const QStr
     QStringList dummy;
-    QValueList<OpieCategories>::ConstIterator catIt;
-    QValueList<OpieCategories> categories = m_edit->categories();
+    Q3ValueList<OpieCategories>::ConstIterator catIt;
+    Q3ValueList<OpieCategories> categories = m_edit->categories();
     bool found = false;
@@ -194,3 +196,3 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
             if ( date.isValid() )
-              adr.setBirthday( date );
+              adr.setBirthday( (QDateTime)date );
 
@@ -319,3 +321,3 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
 
-bool QtopiaConverter::addresseeToQtopia( const Addressee &ab, QTextStream *stream )
+bool QtopiaConverter::addresseeToQtopia( const Addressee &ab, Q3TextStream *stream )
 {
@@ -486,5 +488,5 @@ void CategoryEdit::save(const QString& fileName)const{
     QString endl = "\n";
-    if ( file.open( IO_WriteOnly ) ) {
-        QTextStream stream( &file );
-        stream.setEncoding( QTextStream::UnicodeUTF8 );
+    if ( file.open( QIODevice::WriteOnly ) ) {
+        Q3TextStream stream( &file );
+        stream.setEncoding( Q3TextStream::UnicodeUTF8 );
         stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
@@ -492,3 +494,3 @@ void CategoryEdit::save(const QString& fileName)const{
         stream << "<Categories>" << endl;
-        for ( QValueList<OpieCategories>::ConstIterator it = m_categories.begin();
+        for ( Q3ValueList<OpieCategories>::ConstIterator it = m_categories.begin();
               it != m_categories.end(); ++it )
@@ -539,3 +541,3 @@ void CategoryEdit::parse( const QString &tempFile ){
     QFile f( tempFile );
-    if ( !f.open( IO_ReadOnly ) )
+    if ( !f.open( QIODevice::ReadOnly ) )
         return;
@@ -589,3 +591,3 @@ QString CategoryEdit::categoryById( const QString &id,  const QString &app )cons
 {
-    QValueList<OpieCategories>::ConstIterator it;
+    Q3ValueList<OpieCategories>::ConstIterator it;
     QString category;
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
@@ -30,2 +30,5 @@ $Id$
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3TextStream>
 
@@ -78,3 +81,3 @@ class OpieCategories {
         void clear();
-        QValueList<OpieCategories> categories()const {  return m_categories; };
+        Q3ValueList<OpieCategories> categories()const {  return m_categories; };
     private:
@@ -85,3 +88,3 @@ class OpieCategories {
         QMap<int, bool> ids; // from tt Qtopia::UidGen
-        QValueList<OpieCategories> m_categories;
+        Q3ValueList<OpieCategories> m_categories;
     };
@@ -119,3 +122,3 @@ public:
    */
-  bool addresseeToQtopia( const Addressee &ab, QTextStream *stream );
+  bool addresseeToQtopia( const Addressee &ab, Q3TextStream *stream );
 
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 79ddaea..a36eb8f 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -33,3 +33,3 @@ $Id$
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfileinfo.h>
@@ -158,3 +158,3 @@ bool ResourceQtopia::load()
   QFile file( fileName() );
-  if ( !file.open(IO_ReadOnly ) ) {
+  if ( !file.open(QIODevice::ReadOnly ) ) {
     return false;
@@ -205,8 +205,8 @@ bool ResourceQtopia::save( Ticket *ticket )
     QFile file( fileName() );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         return false;
     }
-    QTextStream ts( &file );
-    QTextStream *stream = &ts;
-    stream->setEncoding( QTextStream::UnicodeUTF8 );
+    Q3TextStream ts( &file );
+    Q3TextStream *stream = &ts;
+    stream->setEncoding( Q3TextStream::UnicodeUTF8 );
     *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>" << endl;
@@ -262,3 +262,3 @@ bool ResourceQtopia::lock( const QString &lockfileName )
   QFile file( mLockUniqueName );
-  file.open( IO_WriteOnly );
+  file.open( QIODevice::WriteOnly );
   file.close();
diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
index d5d6141..42fd428 100644
--- a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
+++ b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
@@ -29,2 +29,4 @@ $Id$
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
@@ -48,3 +50,3 @@ ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent,  const char* name )
 {
-  QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0,
+  Q3GridLayout *mainLayout = new Q3GridLayout( this, 1, 2, 0,
       KDialog::spacingHint() );