summaryrefslogtreecommitdiffabout
path: root/kabc/plugins/qtopia/resourceqtopia.cpp
Side-by-side diff
Diffstat (limited to 'kabc/plugins/qtopia/resourceqtopia.cpp') (more/less context) (show whitespace changes)
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp157
1 files changed, 49 insertions, 108 deletions
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 3d9d28b..4854197 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -24,7 +24,6 @@ Copyright (c) 2004 Ulf Schenk
$Id$
*/
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -33,7 +32,7 @@ $Id$
#include <qfile.h>
#include <qfileinfo.h>
#include <qregexp.h>
-#include <qtimer.h>
+//US #include <qtimer.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -42,17 +41,13 @@ $Id$
//US #include <ksavefile.h>
#include <kstandarddirs.h>
-//US #include "formatfactory.h"
-//US #include <qpe/qpeapplication.h>
+#include <qpe/pim/addressbookaccess.h>
-#include <opie/ocontactaccess.h>
-#include <opie/ocontactaccessbackend_xml.h>
-#include "resource.h"
#include "resourceqtopiaconfig.h"
#include "stdaddressbook.h"
-#include "opieconverter.h"
+#include "qtopiaconverter.h"
#include "resourceqtopia.h"
@@ -61,75 +56,56 @@ extern "C"
{
void *init_microkabc_qtopia()
{
- return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig>();
+ return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>();
}
}
-ResourceOpie::ResourceOpie( const KConfig *config )
+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";
- KConfig *cfg = (KConfig *)config;
- if ( cfg ) {
- fileName = cfg->readEntry( "FileName", fileName );
-
- }
-
-// qDebug("ResourceOpie::ResourceOpie : %s", fileName.latin1() );
-
init( fileName );
}
-ResourceOpie::ResourceOpie( const QString &fileName )
+ResourceQtopia::ResourceQtopia( const QString &fileName )
: Resource( 0 )
{
-// qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1());
+// qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
init( fileName );
}
-void ResourceOpie::init( const QString &fileName )
+void ResourceQtopia::init( const QString &fileName )
{
-/*US we have no KDirWatch. SO simulate the signals from inside the apropriate methods
connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
-*/
- //US opie addressbook is always readonly
-//US setReadOnly( true );
setFileName( fileName );
-
}
-ResourceOpie::~ResourceOpie()
+ResourceQtopia::~ResourceQtopia()
{
if (mConverter != 0)
delete mConverter;
+
}
-void ResourceOpie::writeConfig( KConfig *config )
+void ResourceQtopia::writeConfig( KConfig *config )
{
- //US opie addressbook is always readonly
-//US setReadOnly( true );
-
Resource::writeConfig( config );
-
- config->writeEntry( "FileName", mFileName );
-
-// qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
-
}
-Ticket *ResourceOpie::requestSaveTicket()
+Ticket *ResourceQtopia::requestSaveTicket()
{
- kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl;
+ kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
if ( !addressBook() ) return 0;
if ( !lock( mFileName ) ) {
- kdDebug(5700) << "ResourceOpie::requestSaveTicket(): Unable to lock file '"
+ kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '"
<< mFileName << "'" << endl;
return 0;
}
@@ -137,9 +113,8 @@ Ticket *ResourceOpie::requestSaveTicket()
}
-bool ResourceOpie::doOpen()
+bool ResourceQtopia::doOpen()
{
-// qDebug("ResourceOpie::doOpen() %s", mFileName.latin1());
/*US
QFile file( mFileName );
@@ -167,24 +142,20 @@ bool ResourceOpie::doOpen()
return ok;
}
*/
- qDebug("ResourceOpie::doOpen() has to be fixed - %s", mFileName.latin1());
return true;
}
-void ResourceOpie::doClose()
+void ResourceQtopia::doClose()
{
-// qDebug("ResourceOpie::doClose() %s", mFileName.latin1());
}
-bool ResourceOpie::load()
+bool ResourceQtopia::load()
{
-// qDebug("ResourceOpie::load() %s", mFileName.latin1());
- kdDebug(5700) << "ResourceOpie::load(): '" << mFileName << "'" << endl;
+ kdDebug(5700) << "ResourceQtopia::load(): '" << mFileName << "'" << endl;
- qDebug("ResourceOpie::load: Try to load file() %s", mFileName.latin1());
+// qDebug("ResourceQtopia::load: Try to load file() %s", mFileName.latin1());
- OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KDEPim/Pi", mFileName );
- OContactAccess* access = new OContactAccess("KDEPim/Pi", 0l, backend, false);
+ AddressBookAccess* access = new AddressBookAccess();
if ( !access ) {
qDebug("Unable to load file() %s", mFileName.latin1());
@@ -192,60 +163,52 @@ bool ResourceOpie::load()
return false;
}
- access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
-
bool res = false;
if (mConverter == 0)
{
- mConverter = new OpieConverter();
+ mConverter = new QtopiaConverter();
res = mConverter->init();
if ( !res )
{
- qDebug("Unable to initialize opie converter. Most likely a problem with the category file");
- addressBook()->error( i18n( "Unable to initialize opie converter. Most likely a problem with the category file" ) );
+ qDebug("Unable to initialize qtopia converter. Most likely a problem with the category file");
+ addressBook()->error( i18n( "Unable to initialize qtopia converter. Most likely a problem with the category file" ) );
delete access;
return false;
}
}
+ { //create a new scope
+ AddressBookIterator it(*access);
+ const PimContact* contact;
- OContactAccess::List::Iterator it;
- OContactAccess::List allList = access->allRecords();
- for ( it = allList.begin(); it != allList.end(); ++it )
- {
- OContact c = (*it);
+ for (contact=it.toFirst(); it.current(); ++it) {
+ contact = it.current();
KABC::Addressee addressee;
- res = mConverter->opieToAddressee( c, addressee );
+ res = mConverter->qtopiaToAddressee( (*contact), addressee );
if ( !addressee.isEmpty() && res )
{
addressee.setResource( this );
addressBook()->insertAddressee( addressee );
}
-
-// qDebug("found %s", c.fullName().latin1());
+ }
}
delete access;
- // it seems so, that deletion of access deletes backend as well
- //delete backend;
-
return true;
}
-bool ResourceOpie::save( Ticket *ticket )
+bool ResourceQtopia::save( Ticket *ticket )
{
- qDebug("ResourceOpie::save() has to be fixed - %s", mFileName.latin1());
/*US
-
- qDebug("ResourceOpie::save %s", mFileName.latin1());
- kdDebug(5700) << "ResourceOpie::save()" << endl;
+// qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
+ kdDebug(5700) << "ResourceQtopia::save()" << endl;
// 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
@@ -259,6 +222,7 @@ bool ResourceOpie::save( Ticket *ticket )
ok = saveFile.close();
}
*/
+
/*US
//US ToDo: write backupfile
QFile info;
@@ -282,19 +246,14 @@ bool ResourceOpie::save( Ticket *ticket )
return ok;
- qDebug("ResourceOpie::save has to be changed");
+ qDebug("ResourceQtopia::save has to be changed");
*/
return true;
-
}
-bool ResourceOpie::lock( const QString &fileName )
+bool ResourceQtopia::lock( const QString &fileName )
{
- qDebug("ResourceOpie::lock() has to be fixed - %s", mFileName.latin1());
-
-/*US
-// qDebug("ResourceOpie::lock() %s", fileName.latin1());
- kdDebug(5700) << "ResourceOpie::lock()" << endl;
+ kdDebug(5700) << "ResourceQtopia::lock()" << endl;
QString fn = fileName;
@@ -334,17 +293,10 @@ bool ResourceOpie::lock( const QString &fileName )
// TODO: check stat
return false;
-*/
-
- return true;
}
-void ResourceOpie::unlock( const QString &fileName )
+void ResourceQtopia::unlock( const QString &fileName )
{
- qDebug("ResourceOpie::unlock() has to be fixed - %s", mFileName.latin1());
-/*US
-// qDebug("ResourceOpie::unlock() %s", fileName.latin1());
-
QString fn = fileName;
//US change the implementation how the lockfilename is getting created
//US fn.replace( QRegExp( "/" ), "_" );
@@ -356,32 +308,28 @@ void ResourceOpie::unlock( const QString &fileName )
QFile::remove( lockName );
QFile::remove( mLockUniqueName );
addressBook()->emitAddressBookUnlocked();
-*/
}
-void ResourceOpie::setFileName( const QString &fileName )
+void ResourceQtopia::setFileName( const QString &fileName )
{
-/*US ToDo: no synchronization so far. Has to be changed in the future
mDirWatch.stopScan();
mDirWatch.removeFile( mFileName );
-*/
- mFileName = fileName;
+ mFileName = fileName;
-/*US ToDo: no synchronization so far. Has to be changed in the future
mDirWatch.addFile( mFileName );
mDirWatch.startScan();
-*/
+
//US simulate KDirWatch event
- fileChanged();
+//US fileChanged();
}
-QString ResourceOpie::fileName() const
+QString ResourceQtopia::fileName() const
{
return mFileName;
}
-void ResourceOpie::fileChanged()
+void ResourceQtopia::fileChanged()
{
// There is a small theoretical chance that KDirWatch calls us before
// we are fully constructed
@@ -391,20 +339,13 @@ void ResourceOpie::fileChanged()
addressBook()->emitAddressBookChanged();
}
-void ResourceOpie::removeAddressee( const Addressee &addr )
+void ResourceQtopia::removeAddressee( const Addressee &addr )
{
-/*US
- 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 ResourceOpie::cleanUp()
+void ResourceQtopia::cleanUp()
{
-// qDebug("ResourceOpie::cleanup() %s", mFileName.latin1());
-
unlock( mFileName );
}
-//US #include "resourceopie.moc"
+//US #include "resourceqtopia.moc"