initial public commit of qt4 portp1

author: Michael Krelin <hacker@klever.net> 2007-07-04 11:23:42 (UTC)
committer: Michael Krelin <hacker@klever.net> 2007-07-04 11:23:42 (UTC)
commit: a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff)
tree: 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /kabc/plugins
parent: 11edc920afe4f274c0964436633aa632c8288a40 (diff)
download: kdepimpi-p1.zip
kdepimpi-p1.tar.gz
kdepimpi-p1.tar.bz2
18 files changed, 92 insertions, 69 deletions
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
index 3e18594..9b3b894 100644
--- a/kabc/plugins/dir/dir.pro
+++ b/kabc/plugins/dir/dir.pro
@@ -1,36 +1,40 @@
        TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 include( ../../../variables.pri )
-TARGET = microkabc_dir
+TARGET = xmicrokabc_dir
 INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 DESTDIR = ../../../bin
-#LIBS += -lmicrokde -lmicrokabc
+#LIBS += -lxmicrokde -lxmicrokabc
 #LIBS += -L$(QPEDIR)/lib
 INTERFACES = \
 HEADERS = \
 resourcedir.h \
 resourcedirconfig.h
 
 SOURCES = \
 resourcedir.cpp \
 resourcedirconfig.cpp
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
+LIBS += ../../../bin/xmicrokdepim.lib
-LIBS += ../../../bin/microkcal.lib
+LIBS += ../../../bin/xmicrokcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
+#The following line was inserted by qt3to4
+QT +=  qt3support 
+#The following line was inserted by qt3to4
+QT += xml  
diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro
index cda4e2f..75332a0 100644
--- a/kabc/plugins/dir/dirE.pro
+++ b/kabc/plugins/dir/dirE.pro
@@ -1,21 +1,21 @@
        TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
-TARGET = microkabc_dir
+TARGET = xmicrokabc_dir
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 INTERFACES = \
 HEADERS = \
 resourcedir.h \
 resourcedirconfig.h
 
 SOURCES = \
 resourcedir.cpp \
 resourcedirconfig.cpp
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index c61664b..cc4afee 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -1,381 +1,381 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    This library is free software; you can redistribute it and/or
    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 <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qregexp.h>
 #include <qtimer.h>
 #include <qwidget.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 //US #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
 #include "addressbook.h"
 #include "formatfactory.h"
 #include "resourcedirconfig.h"
 #include "stdaddressbook.h"
 //US
 #include <qdir.h>
 #define NO_DIRWATCH
 #include "resourcedir.h"
 //#define ALLOW_LOCKING
 using namespace KABC;
 extern "C"
 #ifdef _WIN32_
 __declspec(dllexport)
 #else
 {
 #endif
 //US  void *init_kabc_dir()
  void *init_microkabc_dir()
  {
    return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
  }
 #ifndef _WIN32_
 }
 #endif
 ResourceDir::ResourceDir( const KConfig *config  )
    : Resource( config )
 {
  QString path;
  KConfig *cfg = (KConfig *)config;
  if ( cfg ) {
 #ifdef _WIN32_
      // we use plugins on win32. the group is stored in a static variable
      // such that group info not available on win32 plugins
      // to fix that, it would be a looooot of work
      if ( !cfg->tempGroup().isEmpty() )
          cfg->setGroup( cfg->tempGroup() );
 #endif
 //US     path = config->readEntry( "FilePath" );
     path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() );
 //US     mFormatName = config->readEntry( "FileFormat" );
     mFormatName = cfg->readEntry( "FileFormat", "vcard" );
  } else {
    path = StdAddressBook::directoryName();
    mFormatName = "vcard";
  }
  FormatFactory *factory = FormatFactory::self();
  mFormat = factory->format( mFormatName );
  if ( !mFormat ) {
    mFormatName = "vcard";
    mFormat = factory->format( mFormatName );
  }
 /*US
 //US  qDebug("ResourceDir::ResourceDir initialized with format %s ", mFormatName.latin1());
  if (mFormatName == "vcard")
    mFormat = new VCardFormatPlugin2();
  else if (mFormatName == "binary")
    mFormat = new BinaryFormat();
  else
    qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1());
 */
 #ifndef NO_DIRWATCH
  connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
  connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
  connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) );
 #endif
  setPath( path );
 }
 ResourceDir::~ResourceDir()
 {
  delete mFormat;
  mFormat = 0;
 }
 void ResourceDir::writeConfig( KConfig *config )
 {
    config->setGroup( "Resource_" + identifier() );
  Resource::writeConfig( config );
  config->writeEntry( "FilePath", mPath );
  config->writeEntry( "FileFormat", mFormatName );
 }
 Ticket *ResourceDir::requestSaveTicket()
 {
  
  if ( !addressBook() ) return 0;
 #ifdef ALLOW_LOCKING
  if ( !lock( mPath ) ) {
    
    return 0;
  }
 #endif
  return createTicket( this );
 }
 bool ResourceDir::doOpen()
 {
  QDir dir( mPath );
  if ( !dir.exists() ) { // no directory available
    return dir.mkdir( dir.path() );
  } else {
    QString testName = dir.entryList( QDir::Files )[0];
    if ( testName.isNull() || testName.isEmpty() ) // no file in directory
      return true;
    QFile file( mPath + "/" + testName );
-    if ( file.open( IO_ReadOnly ) )
+    if ( file.open( QIODevice::ReadOnly ) )
      return true;
    if ( file.size() == 0 )
      return true;
    bool ok = mFormat->checkFormat( &file );
    file.close();
    return ok;
  }
 }
 void ResourceDir::doClose()
 {
 }
 bool ResourceDir::load()
 {
  QDir dir( mPath );
  QStringList files = dir.entryList( QDir::Files );
  QStringList::Iterator it;
  bool ok = true;
  for ( it = files.begin(); it != files.end(); ++it ) {
    QFile file( mPath + "/" + (*it) );
-    if ( !file.open( IO_ReadOnly ) ) {
+    if ( !file.open( QIODevice::ReadOnly ) ) {
      addressBook()->error( i18n( "Unable to open file '%1' for reading" ).arg( file.name() ) );
      ok = false;
      continue;
    }
    if ( !mFormat->loadAll( addressBook(), this, &file ) )
      ok = false;
    file.close();
  }
  return ok;
 }
 bool ResourceDir::save( Ticket *ticket )
 {
  AddressBook::Iterator it;
  bool ok = true;
 #ifndef NO_DIRWATCH
  mDirWatch.stopScan();
 #endif
  for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
    if ( (*it).resource() != this || !(*it).changed() )
      continue;
    QFile file( mPath + "/" + (*it).uid() );
-    if ( !file.open( IO_WriteOnly ) ) {
+    if ( !file.open( QIODevice::WriteOnly ) ) {
      addressBook()->error( i18n( "Unable to open file '%1' for writing" ).arg( file.name() ) );
      continue;
    }
    mFormat->save( *it, &file );
    // mark as unchanged
    (*it).setChanged( false );
    file.close();
  }
 #ifndef NO_DIRWATCH
  mDirWatch.startScan();
 #endif
  delete ticket;
 #ifdef ALLOW_LOCKING
  unlock( mPath );
 #endif
  return ok;
 }
 bool ResourceDir::lock( const QString &path )
 {
 #ifdef ALLOW_LOCKING
  QString p = path;
 //US change the implementation how the lockfilename is getting created
 //US  p.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + p + ".lock" );
  KURL url(p);
  QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
  if ( QFile::exists( lockName ) ) return false;
  QString lockUniqueName;
  lockUniqueName = p + KApplication::randomString( 8 );
  url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
  mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
  // Create unique file
  QFile file( mLockUniqueName );
-  file.open( IO_WriteOnly );
+  file.open( QIODevice::WriteOnly );
  file.close();
  // Create lock file
  int result = 0;
 #ifndef _WIN32_
  result = ::link( QFile::encodeName( mLockUniqueName ),
                       QFile::encodeName( lockName ) );
 #endif
  if ( result == 0 ) {
    addressBook()->emitAddressBookLocked();
    return true;
  }
  // TODO: check stat
  return false;
 #else
  return true;
 #endif
 }
 void ResourceDir::unlock( const QString &path )
 {
 #ifdef ALLOW_LOCKING
  QString p = path;
 //US change the implementation how the lockfilename is getting created
 //US  p.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locate( "data", "kabc/lock/" + p + ".lock" );
  KURL url(p);
  QString lockName = locate( "data", "kabc/lock/" + url.fileName() + ".lock" );
  ::unlink( QFile::encodeName( lockName ) );
  QFile::remove( mLockUniqueName );
  addressBook()->emitAddressBookUnlocked();
 #else
  return;
 #endif
 }
 void ResourceDir::setPath( const QString &path )
 {
 #ifndef NO_DIRWATCH
  mDirWatch.stopScan();
  mDirWatch.removeDir( mPath );
  mPath = path;
  mDirWatch.addDir( mPath, true );
  mDirWatch.startScan();
 #else
  mPath = path;
 #endif
 //US simulate KDirWatch event
 //US  pathChanged();
 }
 QString ResourceDir::path() const
 {
  return mPath;
 }
 void ResourceDir::setFormat( const QString &format )
 {
  mFormatName = format;
  if ( mFormat )
    delete mFormat;
  FormatFactory *factory = FormatFactory::self();
  mFormat = factory->format( mFormatName );
 /*US
 qDebug("ResourceDir::setFormat initialized with format %s ", format.latin1());
  if (mFormatName == "vcard")
    mFormat = new VCardFormatPlugin2();
  else if (mFormatName == "binary")
    mFormat = new BinaryFormat();
  else
    qDebug("ResourceDir::setFormat format unknown !!! %s ", format.latin1());
 */
 }
 QString ResourceDir::format() const
 {
  return mFormatName;
 }
 void ResourceDir::pathChanged()
 {
  if ( !addressBook() )
    return;
  QString text( i18n( "Dir resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mPath ) );
  if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
    load();
    addressBook()->emitAddressBookChanged();
  }
 }
 void ResourceDir::removeAddressee( const Addressee& addr )
 {
    QFile::remove( mPath + "/" + addr.uid() );
 }
 void ResourceDir::cleanUp()
 {
  unlock( mPath );
 }
 //US #include "resourcedir.moc"
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/kabc/plugins/dir/resourcedirconfig.cpp
index 98d18fe..8fa48d0 100644
--- a/kabc/plugins/dir/resourcedirconfig.cpp
+++ b/kabc/plugins/dir/resourcedirconfig.cpp
@@ -1,123 +1,125 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    This library is free software; you can redistribute it and/or
    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 <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 //US #include "formatfactory.h"
 #include "resourcedir.h"
 #include "stdaddressbook.h"
 #include "resourcedirconfig.h"
 using namespace KABC;
 ResourceDirConfig::ResourceDirConfig( QWidget* parent,  const char* name )
    : KRES::ConfigWidget( parent, name )
 {
-  QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0, 
+  Q3GridLayout *mainLayout = new Q3GridLayout( this, 2, 2, 0, 
      KDialog::spacingHint() );
  QLabel *label = new QLabel( i18n( "Format:" ), this );
  mFormatBox = new KComboBox( this );
  mainLayout->addWidget( label, 0, 0 );
  mainLayout->addWidget( mFormatBox, 0, 1 );
  label = new QLabel( i18n( "Location:" ), this );
  mFileNameEdit = new KURLRequester( this );
 //US  mFileNameEdit->setMode( KFile::Directory );
  mainLayout->addWidget( label, 1, 0 );
  mainLayout->addWidget( mFileNameEdit, 1, 1 );
 /*US lets hardcode the formats instead of using a factory
  FormatFactory *factory = FormatFactory::self();
  QStringList formats = factory->formats();
  QStringList::Iterator it;
  for ( it = formats.begin(); it != formats.end(); ++it ) {
    FormatInfo *info = factory->info( *it );
    if ( info ) {
      mFormatTypes << (*it);
      mFormatBox->insertItem( info->nameLabel );
    }
  }
 */
  mFormatTypes << "vcard";
  mFormatTypes << "binary";
  mFormatBox->insertItem( "vcard" );
  mFormatBox->insertItem( "binary" );
  
  mInEditMode = false;
 }
 void ResourceDirConfig::setEditMode( bool value )
 {
  mFormatBox->setEnabled( !value );
  mInEditMode = value;
 }
 void ResourceDirConfig::loadSettings( KRES::Resource *res )
 {
 //US  ResourceDir *resource = dynamic_cast<ResourceDir*>( res );
  ResourceDir *resource = (ResourceDir*)( res );
  
  if ( !resource ) {
    kdDebug(5700) << "ResourceDirConfig::loadSettings(): cast failed" << endl;
    return;
  }
  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
  mFileNameEdit->setURL( resource->path() );
  if ( mFileNameEdit->url().isEmpty() )
    mFileNameEdit->setURL( KABC::StdAddressBook::directoryName() );
 }
 void ResourceDirConfig::saveSettings( KRES::Resource *res )
 {
 //US  ResourceDir *resource = dynamic_cast<ResourceDir*>( res );
  ResourceDir *resource = (ResourceDir*)( res );
  
  if ( !resource ) {
    kdDebug(5700) << "ResourceDirConfig::loadSettings(): cast failed" << endl;
    return;
  }
  if ( mInEditMode )
    resource->setFormat( mFormatTypes[ mFormatBox->currentItem() ] );
  resource->setPath( mFileNameEdit->url() );
 }
 //US #include "resourcedirconfig.moc"
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
index 2d17313..e4f1270 100644
--- a/kabc/plugins/file/file.pro
+++ b/kabc/plugins/file/file.pro
@@ -1,37 +1,41 @@
        TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 include( ../../../variables.pri )
-TARGET = microkabc_file
+TARGET = xmicrokabc_file
 INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 DESTDIR = ../../../bin
-#LIBS += -lmicrokde -lmicrokabc
+#LIBS += -lxmicrokde -lxmicrokabc
 #LIBS += -L$(QPEDIR)/lib
 INTERFACES = \
 HEADERS = \
 resourcefile.h \
 resourcefileconfig.h
 
 SOURCES = \
 resourcefile.cpp \
 resourcefileconfig.cpp
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
+LIBS += ../../../bin/xmicrokdepim.lib
-LIBS += ../../../bin/microkcal.lib
+LIBS += ../../../bin/xmicrokcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
+#The following line was inserted by qt3to4
+QT +=  qt3support 
+#The following line was inserted by qt3to4
+QT += xml  
diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro
index 16707e5..5044cd9 100644
--- a/kabc/plugins/file/fileE.pro
+++ b/kabc/plugins/file/fileE.pro
@@ -1,21 +1,21 @@
        TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
-TARGET = microkabc_file
+TARGET = xmicrokabc_file
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 INTERFACES = \
 HEADERS = \
 resourcefile.h \
 resourcefileconfig.h
 
 SOURCES = \
 resourcefile.cpp \
 resourcefileconfig.cpp
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index dad4571..3ed850c 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -1,485 +1,485 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    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 <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qtimer.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kglobalsettings.h>
 #include "formatfactory.h"
 #include "resource.h"
 #include "resourcefileconfig.h"
 #include "stdaddressbook.h"
 #define NO_DIRWATCH
 #include "resourcefile.h"
 //#define ALLOW_LOCKING
 using namespace KABC;
 extern "C"
 #ifdef _WIN32_
 __declspec(dllexport)
 #else
 {
 #endif
 //US  void *init_kabc_file()
  void *init_microkabc_file()
  {
    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
  }
 #ifndef _WIN32_
 }
 #endif
 ResourceFile::ResourceFile( const KConfig *config )
  : Resource( config ) , mFormat( 0 )
 {
  QString fileName, formatName, default_fileName;
  default_fileName = StdAddressBook::fileName();
  mLastBackupDate = -1;
  KConfig *cfg = (KConfig *)config;
  if ( cfg ) {
 #ifdef _WIN32_
      // we use plugins on win32. the group is stored in a static variable
      // such that group info not available on win32 plugins
      // to fix that, it would be a looooot of work
      if ( !cfg->tempGroup().isEmpty() )
          cfg->setGroup( cfg->tempGroup() );
 #endif
    fileName = cfg->readEntry( "FileName", default_fileName );
    formatName = cfg->readEntry( "FileFormat", "vcard" );
    mFamily =  cfg->readEntry( "ResourceName", "std" );
    mLastBackupDate = cfg->readNumEntry( "LastBackupDate", 0 );
  } else {
    fileName = default_fileName;
    formatName = "vcard";
  }
  init( fileName, formatName );
 }
 ResourceFile::ResourceFile( const QString &fileName ,
                            const QString &formatName )
  : Resource( 0 )
 {
 //  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   
    mLastBackupDate = -1;
  init( fileName, formatName );
 }
 void ResourceFile::init( const QString &fileName, const QString &formatName )
 {
  mFormatName = formatName;
  FormatFactory *factory = FormatFactory::self();
  mFormat = factory->format( mFormatName );
  if ( !mFormat ) {
    mFormatName = "vcard";
    mFormat = factory->format( mFormatName );
  }
 #ifndef NO_DIRWATCH
  connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
  connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
  connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 #endif
  QString localKdeDir;
    localKdeDir = readEnvPath("LOCALMICROKDEHOME");
    if ( ! localKdeDir.isEmpty() ) {
        qDebug("LOCALMICROKDEHOME is set to: %s",localKdeDir.latin1() );
        QFileInfo fi ( fileName );
        QString localname = localKdeDir + "/apps/kabc/" + fi.fileName ();
        QFileInfo fi2 ( localname );
        if ( ! fi2.exists() ||  mFamily == "sync_res" ) {
            if (  fi.exists() && mFamily == "sync_res") {
                qDebug("LOCAL mode SYNC mode using absolute file path ");
                setFileName( fileName );
                return;
            } else {
                KMessageBox::error(0,i18n("Addressbook resource file not found:\n '%1'.\nIn LOCAL mode only resource files in\n'%2'\nare supported.\n(i.e. in the dir ./apps/kabc/ relative to the kapi(.exe) binary.)\n\nIf you are starting KA/Pi for the very first time\nyou will get this error message as well.\nIt will create the missing file automatically for you.").arg(localname).arg(localKdeDir+"/apps/kabc/") );
                setFileName( localname );
                return;
            }
        } else {
            qDebug("Local resource file found. Changing filename to: %s",localname.latin1() );
            setFileName( localname );
            return;
        }
    }
    setFileName( fileName );
 }
 ResourceFile::~ResourceFile()
 {
  delete mFormat;
  mFormat = 0;
 }
 void ResourceFile::writeConfig( KConfig *config )
 {
    config->setGroup( "Resource_" + identifier() );
  Resource::writeConfig( config );
  config->writeEntry( "FileName", fileName() );
  config->writeEntry( "FileFormat", mFormatName );
 //    qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
 }
 Ticket *ResourceFile::requestSaveTicket()
 {
  kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl;
  if ( !addressBook() ) return 0;
 #ifdef ALLOW_LOCKING
  if ( !lock( mFileName ) ) {
      qDebug("unablt to lock file ");
    return 0;
  }
 #endif
  return createTicket( this );
 }
 bool ResourceFile::doOpen()
 {
  QFile file( fileName() );
  qDebug("ResourceFile::openfile %s ", fileName().latin1());
  if ( !file.exists() ) {
    // try to create the file
-    bool ok = file.open( IO_WriteOnly );
+    bool ok = file.open( QIODevice::WriteOnly );
    if ( ok )
      file.close();
    return ok;
  } else {
-    if ( !file.open( IO_ReadWrite ) )
+    if ( !file.open( QIODevice::ReadWrite ) )
      return false;
    if ( file.size() < 10 ) {
      file.close();
      return true;
    }
    bool ok = mFormat->checkFormat( &file );
    file.close();
    return ok;
  }
 }
 void ResourceFile::doClose()
 {
 }
 bool ResourceFile::load()
 {
  QFile file( fileName() );
-  if ( !file.open( IO_ReadOnly ) ) {
+  if ( !file.open( QIODevice::ReadOnly ) ) {
    addressBook()->error( i18n( "Unable to open file '%1'." ).arg( fileName() ) );
    return false;
  }
 //    qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1());
  return mFormat->loadAll( addressBook(), this, &file );
 }
 bool ResourceFile::save( Ticket *ticket )
 {
 //  qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
  // create backup file
  QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
 /*US we use a simpler method to create a backupfile
  (void) KSaveFile::backupFile( mFileName, QString::null
  ,extension );
  KSaveFile saveFile( mFileName );
  bool ok = false;
  if ( saveFile.status() == 0 && saveFile.file() )
  {
    mFormat->saveAll( addressBook(), this, saveFile.file() );
    ok = saveFile.close();
  }
 */
 //US ToDo: write backupfile
 #ifndef NO_DIRWATCH
  mDirWatch.stopScan();
 #endif
  if ( mLastBackupDate >= 0  && mFamily != "sync_res") {
      KConfig conf (locateLocal("config","microkdeglobalrc"));
      conf.setGroup( "BackupSettings" );
      bool b_enabled =   conf.readBoolEntry( "BackupEnabled" );
      if ( b_enabled ) {
          int num = conf.readNumEntry( "BackupNumbers" );
          int d_count = conf.readNumEntry( "BackupDayCount" );
          bool stdDir = conf.readBoolEntry( "BackupUseDefaultDir" );
          QString bupDir = conf.readEntry( "BackupDatadir" );
          QDate reference ( 2000,1,1 );
          int daysTo = reference.daysTo ( QDate::currentDate() ); 
          bool saveDate = false;
          if ( daysTo - d_count >= mLastBackupDate ) {
                qDebug("KA: Last backup was %d days ago ", daysTo - mLastBackupDate );
                if ( stdDir )
                    bupDir = KGlobalSettings::backupDataDir();
                int retval =  KApplication::createBackup(  fileName(), bupDir, num );
                if ( retval == 0 ) {
                    qDebug("KO: Backup cancelled. Will try again tomorrow ");
                    // retval == 0 : backup skipped for today, try again tomorrow
                    mLastBackupDate = daysTo - d_count+1;
                    saveDate = true;
                } else if ( retval == 1 ){
                    qDebug("KO: Backup created.");
                    // backup ok
                    mLastBackupDate =  daysTo;
                    saveDate = true;
                } else if ( retval == 2 ){
                    qDebug("KO: Backup globally cancelled.");
                    // backup globally cancelled
                    b_enabled = false;
                }
                if ( !b_enabled ) {
                    conf.writeEntry( "mBackupEnabled", false );
                }
                if ( saveDate ) {
                    KConfig config ( locateLocal("config","kabcrc") );
                    config.setGroup( "Resource_" + identifier() );
                    config.writeEntry( "LastBackupDate", mLastBackupDate );
                }
          }
      }
  }
  QFile info;
  info.setName( fileName() );
-  bool ok = info.open( IO_WriteOnly );
+  bool ok = info.open( QIODevice::WriteOnly );
  if ( ok ) {
    mFormat->saveAll( addressBook(), this, &info );
    info.close();
    ok = true;
  }
  else {
  }
  if ( !ok )
    addressBook()->error( i18n( "Unable to save file '%1'." ).arg( fileName() ) );
 #ifndef NO_DIRWATCH
  mDirWatch.startScan();
 #endif
  delete ticket;
 #ifdef ALLOW_LOCKING
  unlock( mFileName );
 #endif
  return ok;
 }
 bool ResourceFile::lock( const QString &fileName )
 {
 #ifdef ALLOW_LOCKING
  QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
  KURL url(fn);
  QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
  if (QFile::exists( lockName )) return false;
  QString lockUniqueName;
  lockUniqueName = fn + KApplication::randomString( 8 );
  url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
  mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
  kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
  // Create unique file
  QFile file( mLockUniqueName );
-  file.open( IO_WriteOnly );
+  file.open( QIODevice::WriteOnly );
  file.close();
  // Create lock file
  int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                       QFile::encodeName( lockName ) );
 #endif
  if ( result == 0 ) {
    addressBook()->emitAddressBookLocked();
    return true;
  }
  // TODO: check stat
  return false;
 #else
  return true;
 #endif
 }
 void ResourceFile::unlock( const QString &fileName )
 {
 #ifdef ALLOW_LOCKING
  QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
 //US  QString lockName = fn + ".lock";
  KURL url(fn);
  QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
  QFile::remove( lockName );
  QFile::remove( mLockUniqueName );
  addressBook()->emitAddressBookUnlocked();
 #else
  return;
 #endif
 }
 void ResourceFile::setFileName( const QString &fileName )
 {
 #ifndef NO_DIRWATCH
  mDirWatch.stopScan();
  mDirWatch.removeFile( mFileName );
  mFileName = fileName;
  mDirWatch.addFile( mFileName );
  mDirWatch.startScan();
 #else
  mFileName2 = fileName;
 #endif
 //US simulate KDirWatch event
 //US  fileChanged();
 }
 QString ResourceFile::fileName() const
 {
  return mFileName2;
 }
 void ResourceFile::setFormat( const QString &format )
 {
  mFormatName = format;
  delete mFormat;
  FormatFactory *factory = FormatFactory::self();
  mFormat = factory->format( mFormatName );
 /*US
 //qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1());
  if (mFormatName == "vcard") {
    mFormat = new VCardFormatPlugin2();
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
  }
  else if (mFormatName == "binary") {
    mFormat = new BinaryFormat();
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
  }
  else
    qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1());
 */
 }
 QString ResourceFile::format() const
 {
  return mFormatName;
 }
 void ResourceFile::fileChanged()
 {
  // There is a small theoretical chance that KDirWatch calls us before
  // we are fully constructed
  if (!addressBook())
    return;
  QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
  if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
    load();
    addressBook()->emitAddressBookChanged();
  }
 }
 void ResourceFile::removeAddressee( const Addressee &addr )
 {
  QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
  QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
  QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
 }
 void ResourceFile::cleanUp()
 {
  unlock( fileName() );
 }
 //US #include "resourcefile.moc"
diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/kabc/plugins/file/resourcefileconfig.cpp
index b63775d..70b0bac 100644
--- a/kabc/plugins/file/resourcefileconfig.cpp
+++ b/kabc/plugins/file/resourcefileconfig.cpp
@@ -1,144 +1,146 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    This library is free software; you can redistribute it and/or
    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 <qlabel.h>
 #include <qlayout.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 //US #include "formatfactory.h"
 #include <qfile.h>
 #include "resourcefile.h"
 #include "stdaddressbook.h"
 #include "resourcefileconfig.h"
 using namespace KABC;
 ResourceFileConfig::ResourceFileConfig( QWidget* parent,  const char* name )
    : ConfigWidget( parent, name )
 {
 //qDebug("ResourceFileConfig::ResourceFileConfig");
  
-  QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0,
+  Q3GridLayout *mainLayout = new Q3GridLayout( this, 2, 2, 0,
      KDialog::spacingHint() );
  QLabel *label = new QLabel( i18n( "Format:" ), this );
  mFormatBox = new KComboBox( this );
  mainLayout->addWidget( label, 0, 0 );
  mainLayout->addWidget( mFormatBox, 0, 1 );
  label = new QLabel( i18n( "Location:" ), this );
  mFileNameEdit = new KURLRequester( this );
  connect( mFileNameEdit, SIGNAL( textChanged( const QString & ) ),
           SLOT( checkFilePermissions( const QString & ) ) );
  mainLayout->addWidget( label, 1, 0 );
  mainLayout->addWidget( mFileNameEdit, 1, 1 );
 /*US lets hardcode the formats instead of using a factory
  FormatFactory *factory = FormatFactory::self();
  QStringList formats = factory->formats();
  QStringList::Iterator it;
  
  for ( it = formats.begin(); it != formats.end(); ++it ) {
    FormatInfo *info = factory->info( *it );
    if ( info ) {
      mFormatTypes << (*it);
      mFormatBox->insertItem( info->nameLabel );
    }
  }
 */  
  mFormatTypes << "vcard";
  mFormatTypes << "binary";
  mFormatBox->insertItem( "vcard" );
  mFormatBox->insertItem( "binary" );
  mInEditMode = false;
 }
 void ResourceFileConfig::setEditMode( bool value )
 {
  mFormatBox->setEnabled( !value );
  mInEditMode = value;
 }
 void ResourceFileConfig::loadSettings( KRES::Resource *res  )
 {
 //US  ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
  ResourceFile *resource = (ResourceFile*)( res );
  
  if ( !resource ) {
    kdDebug(5700) << "ResourceFileConfig::loadSettings(): cast failed" << endl;
    return;
  }
  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
  mFileNameEdit->setURL( resource->fileName() );
  if ( mFileNameEdit->url().isEmpty() )
    mFileNameEdit->setURL( KABC::StdAddressBook::fileName() );
 }
 void ResourceFileConfig::saveSettings( KRES::Resource *res )
 {
 //US  ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
  ResourceFile *resource = (ResourceFile*)( res );
  
  if ( !resource ) {
    kdDebug(5700) << "ResourceFileConfig::saveSettings(): cast failed" << endl;
    return;
  }
  if ( !mInEditMode )
    resource->setFormat( mFormatTypes[ mFormatBox->currentItem() ] );
  resource->setFileName( mFileNameEdit->url() );
 }
 void ResourceFileConfig::checkFilePermissions( const QString& fileName )
 {
  // If file exist but is not writeable...
 #ifdef _WIN32_
  QFileInfo fi ( QFile::encodeName( fileName ) );
  if ( fi.exists() )
       emit setReadOnly(!fi.isReadable() );
 #else
  if ( access( QFile::encodeName( fileName ), F_OK ) == 0 )
      emit setReadOnly( access( QFile::encodeName( fileName ), W_OK ) < 0 );
 #endif
 }
 //US #include "resourcefileconfig.moc"
diff --git a/kabc/plugins/ldap/ldapE.pro b/kabc/plugins/ldap/ldapE.pro
index 57b6f84..c56d24d 100644
--- a/kabc/plugins/ldap/ldapE.pro
+++ b/kabc/plugins/ldap/ldapE.pro
@@ -1,21 +1,21 @@
        TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
-TARGET = microkabc_ldap
+TARGET = xmicrokabc_ldap
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 INTERFACES = \
 HEADERS = \
 resourceldap.h \
 resourceldapconfig.h
 
 SOURCES = \
 resourceldap.cpp \
 resourceldapconfig.cpp
diff --git a/kabc/plugins/olaccess/olaccess.pro b/kabc/plugins/olaccess/olaccess.pro
index 9b95015..ad7e1ef 100644
--- a/kabc/plugins/olaccess/olaccess.pro
+++ b/kabc/plugins/olaccess/olaccess.pro
@@ -1,35 +1,35 @@
        TEMPLATE= lib
 CONFIG += qt warn_on
-TARGET = microkabc_olaccess
+TARGET = xmicrokabc_olaccess
 include( ../../../variables.pri )
 INCLUDEPATH += ../../.. ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 INTERFACES = \
 DESTDIR = ../../../bin
 HEADERS = \
 resourceolaccess.h \
 resourceolaccessconfig.h \
 olaccessconverter.h 
 
 SOURCES = \
 resourceolaccess.cpp \
 resourceolaccessconfig.cpp \
 olaccessconverter.cpp
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
+LIBS += ../../../bin/xmicrokdepim.lib
-LIBS += ../../../bin/microkcal.lib
+LIBS += ../../../bin/xmicrokcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro
index b7ecbc0..aa6b8ea 100644
--- a/kabc/plugins/opie/opieE.pro
+++ b/kabc/plugins/opie/opieE.pro
@@ -1,31 +1,31 @@
        TEMPLATE= lib
 CONFIG += qt warn_on
 #release debug
-TARGET = microkabc_opie
+TARGET = xmicrokabc_opie
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include $(OPIEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
+LIBS += -lxmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -L$(OPIEDIR)/lib
 LIBS += -lopie
 LIBS += -lqpe
 LIBS += -lqte
 INTERFACES = \
 HEADERS = \
 resourceopie.h \
 resourceopieconfig.h \
 opieconverter.h \
 
 SOURCES = \
 resourceopie.cpp \
 resourceopieconfig.cpp \
 opieconverter.cpp \
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
@@ -1,43 +1,47 @@
        TEMPLATE= lib
 CONFIG += qt warn_on release
 include( ../../../variables.pri )
-TARGET = microkabc_qtopia
+TARGET = xmicrokabc_qtopia
 INCLUDEPATH += ../.. ../../.. ../../../kabc ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources 
 DESTDIR = ../../../bin
-#LIBS += -lmicrokde 
+#LIBS += -lxmicrokde 
-#LIBS += -lkamicrokabc
+#LIBS += -lxkamicrokabc
 DEFINES += KAB_EMBEDDED  DESKTOP_VERSION
 INTERFACES = \
 HEADERS = \
 resourceqtopia.h \
 resourceqtopiaconfig.h \
 qtopiaconverter.h
 SOURCES = \
 resourceqtopia.cpp \
 resourceqtopiaconfig.cpp \
 qtopiaconverter.cpp 
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
+LIBS += ../../../bin/xmicrokdepim.lib
-LIBS += ../../../bin/microkcal.lib
+LIBS += ../../../bin/xmicrokcal.lib
-LIBS += ../../../bin/microkde.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
@@ -1,26 +1,26 @@
        TEMPLATE= lib
 CONFIG += qt warn_on
-TARGET = microkabc_qtopia
+TARGET = xmicrokabc_qtopia
 INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
+LIBS += -lxmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
 INTERFACES = \
 HEADERS = \
 resourceqtopia.h \
 resourceqtopiaconfig.h \
 qtopiaconverter.h
 SOURCES = \
 resourceqtopia.cpp \
 resourceqtopiaconfig.cpp \
 qtopiaconverter.cpp 
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
@@ -1,673 +1,675 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    This library is free software; you can redistribute it and/or
    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$
 */
 //US
 #include "kglobal.h"
 #include "klocale.h"
 #include "qtopiaconverter.h"
 #include <qfile.h>
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 //#include <.h>
 #include <libkdepim/ksyncprofile.h>
 using namespace KABC;
 QtopiaConverter::QtopiaConverter()
 {
    m_edit = 0;
 }
 QtopiaConverter::~QtopiaConverter()
 {
  deinit();
 }
 bool QtopiaConverter::init()
 {
    QString fn = QDir::homeDirPath() +"/Settings/Categories.xml";
    m_edit = new CategoryEdit( fn);
    return true;
 }
 void QtopiaConverter::deinit()
 {
  if (m_edit)
  {
    delete m_edit;
    m_edit = 0;
  }
 }
 QString QtopiaConverter::categoriesToNumber( const QStringList &list, const QString &app )
 {
 startover:
    QStringList dummy;
-    QValueList<OpieCategories>::ConstIterator catIt;
+    Q3ValueList<OpieCategories>::ConstIterator catIt;
-    QValueList<OpieCategories> categories = m_edit->categories();
+    Q3ValueList<OpieCategories> categories = m_edit->categories();
    bool found = false;
    for ( QStringList::ConstIterator listIt = list.begin(); listIt != list.end(); ++listIt ) {
        /* skip empty category name */
        if ( (*listIt).isEmpty() ) continue;
        found  = false;
        for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
            /*
             * We currently do not take app into account
             * if name matches and the id isn't already in dummy we'll add it
             */
            if ( (*catIt).name() == (*listIt) && !dummy.contains(( *catIt).id() )  ) { // the same name
                found= true;
                dummy << (*catIt).id();
            }
        }
        /* if not found and the category is not empty
         *
         * generate a new category and start over again
         * ugly goto to reiterate
         */
        if ( !found && !(*listIt).isEmpty() ){
            m_edit->addCategory( app, (*listIt) );  // generate a new category
            goto startover;
        }
    }
    return dummy.join(";");
 }
 // FROM TT timeconversion.cpp GPLed
 QDate QtopiaConverter::fromString( const QString &datestr )
 {
    if (datestr.isEmpty() )
        return QDate();
    int monthPos = datestr.find('.');
    int yearPos = datestr.find('.', monthPos+1 );
    if ( monthPos == -1 || yearPos == -1 ) {
        return QDate();
    }
    int d = datestr.left( monthPos ).toInt();
    int m = datestr.mid( monthPos+1, yearPos - monthPos - 1 ).toInt();
    int y = datestr.mid( yearPos+1 ).toInt();
    QDate date ( y,m,d );
    return date;
 }
 QDate QtopiaConverter::dateFromString( const QString& s )
 {
    QDate date;
    if ( s.isEmpty() )
        return date;
    // Be backward compatible to old Opie format:
    // Try to load old format. If it fails, try new ISO-Format!
    date = fromString ( s );
    if ( date.isValid() )
        return date;
    // Read ISO-Format (YYYYMMDD)
    int year = s.mid(0, 4).toInt();
    int month = s.mid(4,2).toInt();
    int day = s.mid(6,2).toInt();
    // do some quick sanity checking
    if ( year < 1900 || year > 3000 )
        return date;
    if ( month < 0 || month > 12 )
        return date;
    if ( day < 0 || day > 31 )
        return date;
    date.setYMD( year, month, day );
    if ( !date.isValid() )
        return QDate();
    return date;
 }
 QString QtopiaConverter::dateToString( const QDate &d )
 {
    if ( d.isNull() || !d.isValid() )
        return QString::null;
    // ISO format in year, month, day (YYYYMMDD); e.g. 20021231
    QString year = QString::number( d.year() );
    QString month = QString::number( d.month() );
    month = month.rightJustify( 2, '0' );
    QString day = QString::number( d.day() );
    day = day.rightJustify( 2, '0' );
    QString str = year + month + day;
    return str;
 }
 bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
 {
   { //LR
          
            adr.setUid(  el.attribute("Uid" ) );
            adr.setFamilyName( el.attribute( "LastName" ) );
            adr.setGivenName( el.attribute( "FirstName" ) );
            adr.setAdditionalName( el.attribute( "MiddleName" )  );
            adr.setSuffix( el.attribute( "Suffix" ) );
            adr.setNickName( el.attribute( "Nickname" ) );
            QDate date = dateFromString( el.attribute( "Birthday" ) );
            if ( date.isValid() )
-              adr.setBirthday( date );
+              adr.setBirthday( (QDateTime)date );
            adr.setRole( el.attribute( "JobTitle" ) );
            if ( !el.attribute( "FileAs" ).isEmpty() )
              adr.setFormattedName( el.attribute( "FileAs" ) );
            adr.setOrganization( el.attribute( "Company" ) );
            KABC::PhoneNumber businessPhoneNum( el.attribute( "BusinessPhone" ),
                                                KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref );
            KABC::PhoneNumber businessFaxNum( el.attribute( "BusinessFax" ),
                                              KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax );
            KABC::PhoneNumber businessMobile( el.attribute( "BusinessMobile" ),
                                              KABC::PhoneNumber::Car );
            KABC::PhoneNumber businessPager( el.attribute( "BusinessPager" ),
                                             KABC::PhoneNumber::Pager );
            if ( !businessPhoneNum.number().isEmpty() )
              adr.insertPhoneNumber( businessPhoneNum );
            if ( !businessFaxNum.number().isEmpty() )
              adr.insertPhoneNumber( businessFaxNum );
            if ( !businessMobile.number().isEmpty() )
              adr.insertPhoneNumber( businessMobile );
            if ( !businessPager.number().isEmpty() )
              adr.insertPhoneNumber( businessPager  );
            // Handle multiple mail addresses
            QString DefaultEmail = el.attribute( "DefaultEmail" );
            if ( !DefaultEmail.isEmpty() )
              adr.insertEmail( DefaultEmail, true ); // preferred
            QStringList Emails = QStringList::split(" ",el.attribute("Emails"));
            int i;
            for (i = 0;i < Emails.count();++i) {
                if ( Emails[i] != DefaultEmail )
                    adr.insertEmail( Emails[i], false );
            }
            KABC::PhoneNumber homePhoneNum( el.attribute( "HomePhone" ),
                                            KABC::PhoneNumber::Home | KABC::PhoneNumber::Pref);
            KABC::PhoneNumber homeFax( el.attribute( "HomeFax" ),
                                       KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax );
            KABC::PhoneNumber homeMobile( el.attribute( "HomeMobile" ),
                                          KABC::PhoneNumber::Cell );
            if ( !homePhoneNum.number().isEmpty() )
              adr.insertPhoneNumber( homePhoneNum );
            if ( !homeFax.number().isEmpty() )
              adr.insertPhoneNumber( homeFax );
            if ( !homeMobile.number().isEmpty() )
              adr.insertPhoneNumber( homeMobile );
            KABC::Address business( KABC::Address::Work );
            business.setStreet( el.attribute( "BusinessStreet" ) );
            business.setLocality( el.attribute( "BusinessCity"  ) );
            business.setRegion( el.attribute( "BusinessState" ) );
            business.setPostalCode( el.attribute( "BusinessZip" )  );
            business.setCountry( el.attribute( "BusinessCountry" ) );
            if ( !business.isEmpty() )
              adr.insertAddress( business );
            KABC::Address home( KABC::Address::Home );
            home.setStreet( el.attribute( "HomeStreet" ) );
            home.setLocality( el.attribute( "HomeCity" ) );
            home.setRegion( el.attribute( "HomeState" ) );
            home.setPostalCode( el.attribute( "HomeZip" ) );
            home.setCountry( el.attribute( "HomeCountry" ) );
            if ( !home.isEmpty() )
              adr.insertAddress( home );
            adr.setNickName( el.attribute( "Nickname" ) );
            adr.setNote( el.attribute( "Notes" ) );
            {
              QStringList categories = QStringList::split(";", el.attribute("Categories" ) );
              QString cat;
              QStringList added;
              for ( uint i = 0; i < categories.count(); i++ ) {
                cat = m_edit->categoryById( categories[ i ], "Contacts" );
                // if name is not empty and we did not add the
                // cat try to repair broken files
                if ( !cat.isEmpty() && !added.contains( cat ) ) {
                  adr.insertCategory( cat );
                  added << cat;
                }
              }
            }
            if ( !el.attribute( "Department" ).isEmpty() )
              adr.insertCustom( "KADDRESSBOOK", "X-Department",  el.attribute( "Department" ) );
            if ( !el.attribute( "HomeWebPage" ).isEmpty() )
              adr.insertCustom( "opie", "HomeWebPage", el.attribute( "HomeWebPage" ) );
            if ( !el.attribute( "Spouse" ).isEmpty() )
              adr.insertCustom( "KADDRESSBOOK", "X-SpousesName", el.attribute( "Spouse" ) );
            if ( !el.attribute( "Gender" ).isEmpty() ) {
                if ( el.attribute( "Gender" ) == "1" ) 
                    adr.insertCustom( "KADDRESSBOOK", "X-Gender", "male" );
                else if ( el.attribute( "Gender" ) == "2" ) 
                    adr.insertCustom( "KADDRESSBOOK", "X-Gender", "female" );
            }
            QDate ann = dateFromString( el.attribute( "Anniversary" ) );
            if ( ann.isValid() ) { 
                QString dt = KGlobal::locale()->formatDate(ann, true, KLocale::ISODate);
              adr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt );
            }
            if ( !el.attribute( "Children" ).isEmpty() )
              adr.insertCustom("KADDRESSBOOK", "X-Children", el.attribute("Children") );
            if ( !el.attribute( "Office" ).isEmpty() )
              adr.insertCustom("KADDRESSBOOK", "X-Office", el.attribute("Office") );
            if ( !el.attribute( "Profession" ).isEmpty() )
              adr.insertCustom("KADDRESSBOOK", "X-Profession", el.attribute("Profession") );
            if ( !el.attribute( "Assistant" ).isEmpty() )
              adr.insertCustom("KADDRESSBOOK", "X-AssistantsName", el.attribute("Assistant") );
            if ( !el.attribute( "Manager" ).isEmpty() )
              adr.insertCustom("KADDRESSBOOK", "X-ManagersName", el.attribute("Manager") );
            
          }
    return true;
 }
-bool QtopiaConverter::addresseeToQtopia( const Addressee &ab, QTextStream *stream )
+bool QtopiaConverter::addresseeToQtopia( const Addressee &ab, Q3TextStream *stream )
 {
            *stream << "<Contact ";
            *stream << "FirstName=\"" << escape(ab.givenName()) << "\" ";
            *stream << "MiddleName=\"" << escape(ab.additionalName()) << "\" ";
            *stream << "LastName=\"" << escape(ab.familyName()) << "\" ";
            *stream << "Suffix=\"" << escape(ab.suffix()) << "\" ";
            QString sortStr;
            sortStr = ab.formattedName();
            /* is formattedName is empty we use the assembled name as fallback */
            if (sortStr.isEmpty() )
                sortStr = ab.assembledName();
            *stream << "FileAs=\"" << escape(sortStr) << "\" ";
            *stream << "JobTitle=\"" << escape(ab.role()) << "\" ";
            *stream << "Department=\"" << escape(ab.custom( "KADDRESSBOOK", "X-Department" )) << "\" ";
            *stream << "Company=\"" << escape(ab.organization()) << "\" ";
            KABC::PhoneNumber businessPhoneNum = ab.phoneNumber(KABC::PhoneNumber::Work );
            *stream << "BusinessPhone=\"" << escape( businessPhoneNum.number() ) << "\" ";
            KABC::PhoneNumber businessFaxNum = ab.phoneNumber(KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax );
            *stream << "BusinessFax=\"" << escape( businessFaxNum.number() )<< "\" ";
            KABC::PhoneNumber businessMobile = ab.phoneNumber(KABC::PhoneNumber::Work | KABC::PhoneNumber::Cell );
            *stream << "BusinessMobile=\"" << escape( businessMobile.number() ) << "\" ";
            *stream << "DefaultEmail=\"" << escape( ab.preferredEmail() ) << "\" ";
            QStringList list = ab.emails();
            if ( list.count() > 0 ) {
                QStringList::Iterator it = list.begin();
                *stream << "Emails=\"" << escape( *it );
                while (++it != list.end())
                  *stream << ' ' << escape( *it );
                *stream << "\" ";
            }
            KABC::PhoneNumber homePhoneNum = ab.phoneNumber(KABC::PhoneNumber::Home );
            *stream << "HomePhone=\"" << escape( homePhoneNum.number() ) << "\" ";
            KABC::PhoneNumber homeFax = ab.phoneNumber( KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax );
            *stream << "HomeFax=\"" << escape( homeFax.number() ) << "\" ";
            KABC::PhoneNumber homeMobile = ab.phoneNumber( KABC::PhoneNumber::Cell );
            *stream << "HomeMobile=\"" << escape( homeMobile.number() ) << "\" ";
            KABC::Address business = ab.address(KABC::Address::Work  );
            *stream << "BusinessStreet=\"" << escape( business.street() ) << "\" ";
            *stream << "BusinessCity=\"" << escape( business.locality() ) << "\" ";
            *stream << "BusinessZip=\"" << escape( business.postalCode() ) << "\" ";
            *stream << "BusinessCountry=\"" << escape( business.country() ) << "\" ";
            *stream << "BusinessState=\"" << escape( business.region() ) << "\" ";
            //stream << "BusinessPager=\"" << << "\" ";
            *stream << "Office=\"" << escape( ab.custom( "KADDRESSBOOK",  "X-Office" ) ) << "\" ";
            *stream << "Profession=\"" << escape( ab.custom( "KADDRESSBOOK",  "X-Profession" ) ) << "\" ";
            *stream << "Assistant=\"" << escape( ab.custom( "KADDRESSBOOK",  "X-AssistantsName") ) << "\" ";
            *stream << "Manager=\"" << escape( ab.custom( "KADDRESSBOOK",  "X-ManagersName" ) ) << "\" ";
            KABC::Address home = ab.address( KABC::Address::Home );
            *stream << "HomeStreet=\"" << escape( home.street() ) << "\" ";
            *stream << "HomeCity=\"" <<  escape( home.locality() ) << "\" ";
            *stream << "HomeState=\"" <<  escape( home.region() ) << "\" ";
            *stream << "HomeZip=\"" <<  escape( home.postalCode() ) << "\" ";
            *stream << "HomeCountry=\"" << escape( home.country() ) << "\" ";
            *stream << "HomeWebPage=\"" << escape( ab.custom( "opie", "HomeWebPage" ) ) << "\" ";
            *stream << "Spouse=\"" << escape( ab.custom( "KADDRESSBOOK",  "X-SpousesName") ) << "\" ";
            QString gen = "0";
            if ( ab.custom( "KADDRESSBOOK",  "X-Gender") == "male" )
                gen = "1";
            else if ( ab.custom( "KADDRESSBOOK",  "X-Gender") == "female" )
                gen = "2";
            *stream << "Gender=\"" << escape( gen ) << "\" ";
            if ( ab.birthday().date().isValid() )
                *stream << "Birthday=\"" << escape( dateToString(ab.birthday().date() ) ) << "\" ";
            { 
                QDate ann = KGlobal::locale()->readDate( ab.custom("KADDRESSBOOK", "X-Anniversary" ), 
                                                    "%Y-%m-%d"); 
                if (ann.isValid() ) {
                    *stream << "Anniversary=\"" << escape( dateToString( ann )  ) << "\" ";
                }
            }
            *stream << "Nickname=\"" << escape( ab.nickName() ) << "\" ";
            *stream << "Children=\"" << escape( ab.custom("KADDRESSBOOK", "X-Children" ) ) << "\" ";
            *stream << "Notes=\"" << escape( ab.note() ) << "\" ";
            *stream << "Categories=\"" << categoriesToNumber( ab.categories(),  "Contacts") << "\" ";
            QString uid =  ab.uid();
            *stream << "Uid=\"" <<  uid << "\" ";
            //*stream << map.toString( "addressbook", uid );
            *stream << " />" << "\n";
    return true;
 }
 #if 0
 KTempFile* AddressBook::fromKDE( KSync::AddressBookSyncee *syncee, ExtraMap& map )
 {
  
 }
 QStringList AddressBook::attributes()const {
    QStringList lst;
    lst << "FirstName";
    lst << "MiddleName";
    lst << "LastName";
    lst << "Suffix";
    lst << "FileAs";
    lst << "JobTitle";
    lst << "Department";
    lst << "Company";
    lst << "BusinessPhone";
    lst << "BusinessFax";
    lst << "BusinessMobile";
    lst << "DefaultEmail";
    lst << "Emails";
    lst << "HomePhone";
    lst << "HomeFax";
    lst << "HomeMobile";
    lst << "BusinessStreet";
    lst << "BusinessCity";
    lst << "BusinessZip";
    lst << "BusinessCountry";
    lst << "BusinessState";
    lst << "Office";
    lst << "Profession";
    lst << "Assistant";
    lst << "Manager";
    lst << "HomeStreet";
    lst << "HomeCity";
    lst << "HomeState";
    lst << "HomeZip";
    lst << "HomeCountry";
    lst << "HomeWebPage";
    lst << "Spouse";
    lst << "Gender";
    lst << "Anniversary";
    lst << "Nickname";
    lst << "Children";
    lst << "Notes";
    lst << "Categories";
    lst << "Uid";
    lst << "Birthday";
    return lst;
 }
 #endif
 CategoryEdit::CategoryEdit(){
 }
 CategoryEdit::CategoryEdit(const QString &fileName){
    parse( fileName );
 }
 CategoryEdit::~CategoryEdit(){
 }
 void CategoryEdit::save(const QString& fileName)const{
    QFile file( fileName );
    QString endl = "\n";
-    if ( file.open( IO_WriteOnly ) ) {
+    if ( file.open( QIODevice::WriteOnly ) ) {
-        QTextStream stream( &file );
+        Q3TextStream stream( &file );
-        stream.setEncoding( QTextStream::UnicodeUTF8 );
+        stream.setEncoding( Q3TextStream::UnicodeUTF8 );
        stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
        stream << "<!DOCTYPE CategoryList>" << endl;
        stream << "<Categories>" << endl;
-        for ( QValueList<OpieCategories>::ConstIterator it = m_categories.begin();
+        for ( Q3ValueList<OpieCategories>::ConstIterator it = m_categories.begin();
              it != m_categories.end(); ++it )
        {
            stream << "<Category id=\""<< ( (*it).id() ) << "\" ";
            if ( !(*it).app().isEmpty() )
                stream << " app=\""<< ( (*it).app() ) <<  "\" ";
            stream << "name=\"" << ( (*it).name() ) << "\" ";
            stream << " />" << endl;
        }
        stream << "</Categories>" << endl;
        file.close();
    }
 }
 int CategoryEdit::addCategory( const QString &name, int id ){
    return addCategory( QString::null, name, id );
 }
 int CategoryEdit::addCategory( const QString &appName,  const QString &name,  int id ){
    if ( id == 0 ) {
        // code from tt
        //generate uid
        QDateTime dt = QDateTime::currentDateTime();
        id = -1 * (int) dt.secsTo( QDateTime(QDate( 2000,1,1)) );
        while ( ids.contains( id ) ){
            id += -1;
            if ( id > 0 )
                id = -1;
        }
    }
    ids.insert( id,  TRUE );
    OpieCategories categories(QString::number(id),  name,  appName);
    //pending FIXME LR m_categories.remove( categories);
    m_categories.append( categories);
    return id;
 }
 /*
 * we parse the simple Category File here
 * We also keep track of global Cats
 * and Of Organizer and Contact cats and then
 * we will add them to the kde side...
 */
 void CategoryEdit::parse( const QString &tempFile ){
    clear();
    QDomDocument doc( "mydocument" );
    QFile f( tempFile );
-    if ( !f.open( IO_ReadOnly ) )
+    if ( !f.open( QIODevice::ReadOnly ) )
        return;
    if ( !doc.setContent( &f ) ) {
        f.close();
        return;
    }
    f.close();
    QStringList global, contact, organizer;
    // print out the element names of all elements that are a direct child
    // of the outermost element.
    QDomElement docElem = doc.documentElement();
    QDomNode n = docElem.firstChild();
    if( docElem.nodeName() == QString::fromLatin1("Categories") ){
        while( !n.isNull() ) {
            QDomElement e = n.toElement(); // try to convert the node to an element.
            if( !e.isNull() ) { // the node was really an element.
                QString id = e.attribute("id" );
                QString app = e.attribute("app" );
                QString name = e.attribute("name");
                /*
                 * see where it belongs default to global
                 */
                if (app == QString::fromLatin1("Calendar") || app == QString::fromLatin1("Todo List") )
                    organizer.append( name );
                else if ( app == QString::fromLatin1("Contacts") )
                    contact.append( name );
                else
                    global.append( name );
                OpieCategories category( id, name, app );
                m_categories.append( category ); // cheater
            }
            n = n.nextSibling();
        }
    }
    updateKDE( "kaddressbookrc", global + contact );
    updateKDE( "korganizerrc", global + organizer );
 }
 void CategoryEdit::clear()
 {
    ids.clear();
    m_categories.clear();
 }
 QString CategoryEdit::categoryById( const QString &id,  const QString &app )const
 {
-    QValueList<OpieCategories>::ConstIterator it;
+    Q3ValueList<OpieCategories>::ConstIterator it;
    QString category;
    QString fallback;
    for( it = m_categories.begin(); it != m_categories.end(); ++it ){
        if( id.stripWhiteSpace() == (*it).id().stripWhiteSpace() ){
            if( app == (*it).app() ){
                category = (*it).name();
                break;
            }else{
                fallback = (*it).name();
            }
        }
    }
    return category.isEmpty() ? fallback : category;
 }
 QStringList CategoryEdit::categoriesByIds( const QStringList& ids,
                                           const QString& app) {
    QStringList list;
    QStringList::ConstIterator it;
    QString temp;
    for ( it = ids.begin(); it != ids.end(); ++it ) {
        temp = categoryById( (*it), app );
        if (!temp.isEmpty() )
            list << temp;
    }
    return list;
 }
 void CategoryEdit::updateKDE( const QString& configFile,  const QStringList& cats ) {
    KConfig conf(configFile);
    conf.setGroup("General");
    QStringList avail = conf.readListEntry("Custom Categories");
    for (QStringList::ConstIterator it = cats.begin(); it !=  cats.end(); ++it ) {
        if (!avail.contains( (*it) ) )
            avail << (*it);
    }
    conf.writeEntry("Custom Categories", avail );
 }
 OpieCategories::OpieCategories()
 {
 }
 OpieCategories::OpieCategories(const QString &id, const QString &name, const QString &app )
 {
    m_name = name;
    m_id = id;
    m_app = app;
 }
 OpieCategories::OpieCategories(const OpieCategories &op )
 {
    (*this) = op;
 }
 QString OpieCategories::id() const
 {
    return m_id;
 }
 QString OpieCategories::name() const
 {
    return m_name;
 }
 QString OpieCategories::app() const
 {
    return m_app;
 }
 OpieCategories &OpieCategories::operator=(const OpieCategories &op )
 {
    m_name = op.m_name;
    m_app = op.m_app;
    m_id = op.m_id;
    return (*this);
 }
 bool operator== (const OpieCategories& a,  const OpieCategories &b )
 {
    if ( a.id() == b.id() && a.name() == b.name() && a.app() == b.app() )
        return true;
    return false;
 }
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
@@ -1,133 +1,136 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    This library is free software; you can redistribute it and/or
    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$
 */
 #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> 
 #endif
 class Categories;
 namespace KABC {
 class OpieCategories {
 public:
    //friend class KSync::OpieSocket;
    friend bool operator== ( const OpieCategories &a, const OpieCategories &b );
    OpieCategories();
    OpieCategories(const QString &id, const QString &name, const QString &app );
    OpieCategories(const OpieCategories & );
    ~OpieCategories() {};
    OpieCategories &operator=(const OpieCategories & );
    QString id()const;
    QString name()const;
    QString app()const;
 private:
    QString m_name;
    QString m_app;
    QString m_id;
 };
 class CategoryEdit {
    public:
        CategoryEdit();
        CategoryEdit(const QString &fileName);
        ~CategoryEdit();
        void save(const QString&) const;
        int addCategory( const QString &name, int id = 0 );
        int addCategory(const QString &appName,  const QString &name,  int id = 0);
        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:
  /**
   * Constructor.
   */
  QtopiaConverter();
  /**
   * Destructor.
   */
  virtual ~QtopiaConverter();
  
  bool init();
  void deinit();
  
  /**
   * Converts a vcard string to an addressee.
   *
   * @param contact The qtopia contact.
   * @param addr    The addressee.
   */
  bool qtopiaToAddressee( const QDomElement& el, Addressee &adr );
  /**
   * 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& );
    QDate dateFromString( const QString& );
    QString dateToString( const QDate& );
  
    
 };
 }
 #endif
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
@@ -1,336 +1,336 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    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 <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include "resourceqtopiaconfig.h"
 #include "stdaddressbook.h"
 #include "qtopiaconverter.h"
 #include "resourceqtopia.h"
 using namespace KABC;
 extern "C"
 #ifdef _WIN32_
 __declspec(dllexport)
 #else
 {
 #endif
  void *init_microkabc_qtopia()
  {
    return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>();
  }
 #ifndef _WIN32_
 }
 #endif
 ResourceQtopia::ResourceQtopia( const KConfig *config  )
  : Resource( config ), mConverter (0)
 {
  // we can not choose the filename. Therefore use the default to display
  QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
  init( fileName );
 }
 ResourceQtopia::ResourceQtopia( const QString &fileName  )
  : Resource( 0 )
 {
  init( fileName );
 }
 void ResourceQtopia::init( const QString &fileName )
 {
 #ifdef _USE_DIRWATCH_
  connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
  connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
  connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 #endif
  setFileName( fileName );
 }
 ResourceQtopia::~ResourceQtopia()
 {
  if (mConverter != 0)
    delete mConverter;
 }
 void ResourceQtopia::writeConfig( KConfig *config )
 {
  Resource::writeConfig( config );
 }
 Ticket *ResourceQtopia::requestSaveTicket()
 {
  kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
  qDebug("ResourceQtopia::requestSaveTicket: %s", fileName().latin1());
  if ( !addressBook() ) return 0;
  if ( !lock( fileName() ) ) {
    kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '"
                  << fileName() << "'" << endl;
    return 0;
  }
  return createTicket( this );
 }
 bool ResourceQtopia::doOpen()
 {
  qDebug("ResourceQtopia::doOpen(): %s", fileName().latin1());
  if (mConverter == 0)
  {
    mConverter = new QtopiaConverter();
    bool res = mConverter->init();
    if ( !res )
    {
          QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file");
      qDebug(msg);
      return false;
    }
  }
  return true;
 }
 void ResourceQtopia::doClose()
 {
  qDebug("ResourceQtopia::doClose: %s", fileName().latin1());
 
  // it seems so, that deletion of access deletes backend as well
  //delete backend;
  return;
 }
 bool ResourceQtopia::load()
 {
  QFile file( fileName() );
-  if ( !file.open(IO_ReadOnly ) ) {
+  if ( !file.open(QIODevice::ReadOnly ) ) {
    return false;
  }
  QDomDocument doc("mydocument" );
  if ( !doc.setContent( &file ) ) {
    file.close();
    return false; 
  }
  bool res;
  QDomElement docElem = doc.documentElement( );
  QDomNode n =  docElem.firstChild();
  while ( !n.isNull() ) {
    QDomElement e = n.toElement();
    if ( !e.isNull() ) {
      if ( e.tagName() == QString::fromLatin1( "Contacts" ) ) { 
        QDomNode no = e.firstChild();
        while ( !no.isNull() ) {
          QDomElement el = no.toElement();
          if ( !el.isNull() ) {
              KABC::Addressee addressee;
              res = mConverter->qtopiaToAddressee( el,  addressee ); 
              if ( !addressee.isEmpty() && res )
                  {
                      addressee.setResource( this );
                      addressBook()->insertAddressee( addressee );
                  }
          }
          no = no.nextSibling();
        }
      }
    }
    n = n.nextSibling();
  }
  return true;
 }
 bool ResourceQtopia::save( Ticket *ticket )
 {
 #ifdef _USE_DIRWATCH_
    mDirWatch.stopScan();
 #endif
    KABC::AddressBook::Iterator it;
    bool res;  
    QFile file( fileName() );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
        return false;
    }
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
-    QTextStream *stream = &ts;
+    Q3TextStream *stream = &ts;
-    stream->setEncoding( QTextStream::UnicodeUTF8 );
+    stream->setEncoding( Q3TextStream::UnicodeUTF8 );
    *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>" << endl;
    *stream << " <Groups>" << endl;
    *stream << " </Groups>" << endl;
    *stream << " <Contacts> " << endl;
    // for all entries
    KABC::Addressee ab;
    for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
        KABC::Addressee addressee = (*it);
        res = mConverter->addresseeToQtopia( addressee, stream );
        if (!res == true)
            {
                qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
            }
    }
    *stream << "</Contacts>" << endl;
    *stream << "</AddressBook>" << endl;
    file.close();
 #ifdef _USE_DIRWATCH_  
    mDirWatch.startScan();
 #endif
    delete ticket;
    unlock( fileName() );
  return true; 
 }
 bool ResourceQtopia::lock( const QString &lockfileName )
 {
    //disabled
    return true;
  qDebug("ResourceQtopia::lock: %s", fileName().latin1());
  QString fn = lockfileName;
  KURL url(fn);
  QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
  if (QFile::exists( lockName ))
  {
    qDebug("ResourceOpie::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName().latin1());
    return false;
  }
  QString lockUniqueName;
  lockUniqueName = fn + KApplication::randomString( 8 );
  url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
  mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
  kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
  // Create unique file
  QFile file( mLockUniqueName );
-  file.open( IO_WriteOnly );
+  file.open( QIODevice::WriteOnly );
  file.close();
  // Create lock file
  int result = 0;
 #ifndef _WIN32_
  result = ::link( QFile::encodeName( mLockUniqueName ),
                       QFile::encodeName( lockName ) );
 #endif
  if ( result == 0 ) {
    addressBook()->emitAddressBookLocked();
    return true;
  }
  // TODO: check stat
  return false;
 }
 void ResourceQtopia::unlock( const QString &fileName )
 {
    //disabled
    return;
  qDebug("ResourceQtopia::unlock() %s", fileName.latin1());
  QString fn = fileName;
  KURL url(fn);
  QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
  QFile::remove( lockName );
  QFile::remove( mLockUniqueName );
  addressBook()->emitAddressBookUnlocked();
 }
 void ResourceQtopia::setFileName( const QString &newFileName )
 {
 #ifdef _USE_DIRWATCH_
  mDirWatch.stopScan();
 #endif
  mDirWatch.removeFile( fileName() );
  Resource::setFileName( newFileName );
  mDirWatch.addFile( fileName() );
 #ifdef _USE_DIRWATCH_
  mDirWatch.startScan();
 #endif
 }
 void ResourceQtopia::fileChanged()
 {
  // There is a small theoretical chance that KDirWatch calls us before
  // we are fully constructed
  if (!addressBook())
    return;
  QString text( i18n( "Qtopia resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
  if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
    load();
    addressBook()->emitAddressBookChanged();
  }
 }
 void ResourceQtopia::removeAddressee( const Addressee &addr )
 {
 }
 void ResourceQtopia::cleanUp()
 {
  unlock( fileName() );
 }
 //US #include "resourceqtopia.moc"
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
@@ -1,107 +1,109 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    This library is free software; you can redistribute it and/or
    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 <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 //#include <unistd.h>
 #include <qdir.h>
 #include <qfile.h>
 #include "resourceqtopia.h"
 #include "resourceqtopiaconfig.h"
 using namespace KABC;
 ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent,  const char* name )
    : ConfigWidget( parent, name )
 {
-  QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0,
+  Q3GridLayout *mainLayout = new Q3GridLayout( this, 1, 2, 0,
      KDialog::spacingHint() );
  QLabel *label = new QLabel( i18n( "Location:" ), this );
  mFileNameEdit = new KURLRequester( this );
  connect( mFileNameEdit, SIGNAL( textChanged( const QString & ) ),
           SLOT( checkFilePermissions( const QString & ) ) );
  mainLayout->addWidget( label, 0, 0 );
  mainLayout->addWidget( mFileNameEdit, 0, 1 );
 
 }
 void ResourceQtopiaConfig::loadSettings( KRES::Resource *res  )
 {
 //US  ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
  ResourceQtopia *resource = (ResourceQtopia*)( res );
  
  if ( !resource ) {
    kdDebug(5700) << "ResourceQtopiaConfig::loadSettings(): cast failed" << endl;
    return;
  }
  mFileNameEdit->setURL( resource->fileName() );
  if ( mFileNameEdit->url().isEmpty() )
    mFileNameEdit->setURL( QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml" );
  //US Qtopia resources are ReadOnly by definition
  emit setPersistentReadOnly( true );
  
  //US we can not choose the filename for the qtopia backend => make it readonly.
  mFileNameEdit->setEnabled( false );
  
 }
 void ResourceQtopiaConfig::saveSettings( KRES::Resource *res )
 {
 //US  ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
  ResourceQtopia *resource = (ResourceQtopia*)( res );
  
  if ( !resource ) {
    kdDebug(5700) << "ResourceQtopiaConfig::saveSettings(): cast failed" << endl;
    return;
  }
  resource->setFileName( mFileNameEdit->url() );
 }
 void ResourceQtopiaConfig::checkFilePermissions( const QString& fileName )
 {
  // If file exist but is not writeable...
 /*US  
  if ( access( QFile::encodeName( fileName ), F_OK ) == 0 )
      emit setReadOnly( access( QFile::encodeName( fileName ), W_OK ) < 0 );
 */
 }
 //US #include "resourceopieconfig.moc"
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index 23b0b76..7fc8ba8 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,35 +1,35 @@
        TEMPLATE= lib
 CONFIG += qt warn_on
-TARGET = microkabc_sharpdtm
+TARGET = xmicrokabc_sharpdtm
 INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
+LIBS += -lxmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lxmicrokabc
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokdepim
 LIBS += -lmicroqtcompat
 LIBS += -L$(QPEDIR)/lib
 LIBS += -ljpeg
 LIBS += -lqpe
 LIBS += -lqte
 LIBS += -lzdtm
 LIBS += -lsl
 INTERFACES = \
 HEADERS = \
 resourcesharpdtm.h \
 resourcesharpdtmconfig.h \
 sharpdtmconverter.h 
 
 SOURCES = \
 resourcesharpdtm.cpp \
 resourcesharpdtmconfig.cpp \
 sharpdtmconverter.cpp
author	Michael Krelin <hacker@klever.net>	2007-07-04 11:23:42 (UTC)
committer	Michael Krelin <hacker@klever.net>	2007-07-04 11:23:42 (UTC)
commit	a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff)
tree	8ee90d686081c52e7c69b5ce946e9b1a7d690001 /kabc/plugins
parent	11edc920afe4f274c0964436633aa632c8288a40 (diff)
download	kdepimpi-p1.zip kdepimpi-p1.tar.gz kdepimpi-p1.tar.bz2