initial public commit of qt4 portp1

1 files changed, 13 insertions, 11 deletions

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;