| -rw-r--r-- | kabc/plugins/opie/resourceopie.cpp | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp index 3a40ea2..1436508 100644 --- a/kabc/plugins/opie/resourceopie.cpp +++ b/kabc/plugins/opie/resourceopie.cpp @@ -88,13 +88,12 @@ ResourceOpie::ResourceOpie( const QString &fileName ) void ResourceOpie::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 ); @@ -284,11 +283,8 @@ bool ResourceOpie::save( Ticket *ticket ) } bool ResourceOpie::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; QString fn = fileName; @@ -317,28 +313,25 @@ bool ResourceOpie::lock( const QString &fileName ) file.open( IO_WriteOnly ); file.close(); // 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 ) { addressBook()->emitAddressBookLocked(); return true; } // TODO: check stat return false; -*/ - - return true; } void ResourceOpie::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 @@ -350,26 +343,22 @@ void ResourceOpie::unlock( const QString &fileName ) QFile::remove( lockName ); QFile::remove( mLockUniqueName ); addressBook()->emitAddressBookUnlocked(); -*/ } void ResourceOpie::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 { @@ -387,13 +376,8 @@ void ResourceOpie::fileChanged() } void ResourceOpie::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() { |