summaryrefslogtreecommitdiffabout
path: root/kabc/plugins/qtopia
authorulf69 <ulf69>2004-08-02 23:23:36 (UTC)
committer ulf69 <ulf69>2004-08-02 23:23:36 (UTC)
commitd5358380edce9a2c39f3eea4df741a148338880c (patch) (side-by-side diff)
tree8f514a5e200ecfa3c5f4256d85606ade7c6b3093 /kabc/plugins/qtopia
parent464ed9d13592965a63b614a1f2902000eb26f1ae (diff)
downloadkdepimpi-d5358380edce9a2c39f3eea4df741a148338880c.zip
kdepimpi-d5358380edce9a2c39f3eea4df741a148338880c.tar.gz
kdepimpi-d5358380edce9a2c39f3eea4df741a148338880c.tar.bz2
changes that resources support writing and syncing
Diffstat (limited to 'kabc/plugins/qtopia') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp95
1 files changed, 35 insertions, 60 deletions
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index dc88272..4a35f19 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -51,3 +51,3 @@ $Id$
#include "qtopiaconverter.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
@@ -60,3 +60,3 @@ extern "C"
{
- return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, KRES::SyncWidget>();
+ return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, SyncPrefWidget>();
}
@@ -69,3 +69,2 @@ ResourceQtopia::ResourceQtopia( const KConfig *config, bool syncable )
QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
-
init( fileName );
@@ -76,3 +75,2 @@ ResourceQtopia::ResourceQtopia( const QString &fileName, bool syncable )
{
-// qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
init( fileName );
@@ -108,2 +106,4 @@ Ticket *ResourceQtopia::requestSaveTicket()
+ qDebug("ResourceQtopia::requestSaveTicket: %s", fileName().latin1());
+
if ( !addressBook() ) return 0;
@@ -130,3 +130,3 @@ bool ResourceQtopia::doOpen()
- bool res = false;
+
if (mConverter == 0)
@@ -134,3 +134,3 @@ bool ResourceQtopia::doOpen()
mConverter = new QtopiaConverter();
- res = mConverter->init();
+ bool res = mConverter->init();
if ( !res )
@@ -191,52 +191,29 @@ bool ResourceQtopia::save( Ticket *ticket )
{
-/*US
-// 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() );
+ qDebug("ResourceQtopia::save: %s", fileName().latin1());
-/*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
-//US ToDo: write backupfile
- QFile info;
- info.setName( mFileName );
- bool ok = info.open( IO_WriteOnly );
- if ( ok ) {
-//US mFormat->saveAll( addressBook(), this, &info );
+ KABC::AddressBook::Iterator it;
+ bool res;
- info.close();
- ok = true;
- }
- else {
+ for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
+ PimContact c;
+ KABC::Addressee addressee = (*it);
+ res = mConverter->addresseeToQtopia( *it, c );
+ if (res == true)
+ {
+ mAccess->addContact(c);
+// if (res == false)
+// qDebug("Unable to append Contact %s", c.fullName().latin1());
+ }
+ else
+ {
+ qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
+ }
}
- if ( !ok )
- addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
+// mAccess->addressBookUpdated();
delete ticket;
- unlock( mFileName );
-
- return ok;
-
- qDebug("ResourceQtopia::save has to be changed");
-
-
- access->save();
-
-*/
+ unlock( fileName() );
@@ -245,11 +222,9 @@ bool ResourceQtopia::save( Ticket *ticket )
-bool ResourceQtopia::lock( const QString &fileName )
+bool ResourceQtopia::lock( const QString &lockfileName )
{
- kdDebug(5700) << "ResourceQtopia::lock()" << endl;
+ qDebug("ResourceQtopia::lock: %s", fileName().latin1());
- QString fn = fileName;
+ kdDebug(5700) << "ResourceQtopia::lock()" << endl;
-//US change the implementation how the lockfilename is getting created
-//US fn.replace( QRegExp("/"), "_" );
-//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
+ QString fn = lockfileName;
@@ -276,5 +251,7 @@ bool ResourceQtopia::lock( const QString &fileName )
// Create lock file
- int result = ::link( QFile::encodeName( mLockUniqueName ),
+ int result = 0;
+#ifndef _WIN32_
+ result = ::link( QFile::encodeName( mLockUniqueName ),
QFile::encodeName( lockName ) );
-
+#endif
if ( result == 0 ) {
@@ -291,7 +268,5 @@ void ResourceQtopia::unlock( const QString &fileName )
{
+ qDebug("ResourceQtopia::unlock() %s", fileName.latin1());
+
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);