From b5222dd7a607f78235b1ea39fea0f95a9c08ccd3 Mon Sep 17 00:00:00 2001 From: zautrix Date: Wed, 30 Mar 2005 11:55:53 +0000 Subject: fixes --- (limited to 'kabc/plugins') diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index dc5932f..4ab7f02 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -55,7 +55,6 @@ $Id$ //#define ALLOW_LOCKING - using namespace KABC; extern "C" @@ -98,6 +97,9 @@ ResourceFile::ResourceFile( const QString &fileName , : Resource( 0 ) { // qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); + + + init( fileName, formatName ); } @@ -118,6 +120,21 @@ void ResourceFile::init( const QString &fileName, const QString &formatName ) 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() ); + + + + + } + qDebug("RESOURCE: %s ", fileName.latin1()); + + + setFileName( fileName ); } @@ -133,7 +150,7 @@ void ResourceFile::writeConfig( KConfig *config ) config->setGroup( "Resource_" + identifier() ); Resource::writeConfig( config ); - config->writeEntry( "FileName", mFileName ); + config->writeEntry( "FileName", fileName() ); config->writeEntry( "FileFormat", mFormatName ); // qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1()); @@ -158,8 +175,8 @@ Ticket *ResourceFile::requestSaveTicket() bool ResourceFile::doOpen() { - QFile file( mFileName ); - qDebug("ResourceFile::openfile %s ", mFileName.latin1()); + QFile file( fileName() ); + qDebug("ResourceFile::openfile %s ", fileName().latin1()); if ( !file.exists() ) { // try to create the file @@ -191,9 +208,9 @@ void ResourceFile::doClose() bool ResourceFile::load() { - QFile file( mFileName ); + QFile file( fileName() ); if ( !file.open( IO_ReadOnly ) ) { - addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) ); + addressBook()->error( i18n( "Unable to open file '%1'." ).arg( fileName() ) ); return false; } @@ -229,7 +246,7 @@ bool ResourceFile::save( Ticket *ticket ) mDirWatch.stopScan(); #endif QFile info; - info.setName( mFileName ); + info.setName( fileName() ); bool ok = info.open( IO_WriteOnly ); if ( ok ) { mFormat->saveAll( addressBook(), this, &info ); @@ -242,7 +259,7 @@ bool ResourceFile::save( Ticket *ticket ) } if ( !ok ) - addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) ); + addressBook()->error( i18n( "Unable to save file '%1'." ).arg( fileName() ) ); #ifndef NO_DIRWATCH mDirWatch.startScan(); #endif @@ -334,7 +351,7 @@ void ResourceFile::setFileName( const QString &fileName ) mDirWatch.addFile( mFileName ); mDirWatch.startScan(); #else - mFileName = fileName; + mFileName2 = fileName; #endif //US simulate KDirWatch event @@ -343,7 +360,7 @@ void ResourceFile::setFileName( const QString &fileName ) QString ResourceFile::fileName() const { - return mFileName; + return mFileName2; } void ResourceFile::setFormat( const QString &format ) @@ -382,7 +399,7 @@ void ResourceFile::fileChanged() return; - QString text( i18n( "File resource '%1'
has been changed by third party.
Do you want to reload?").arg( mFileName ) ); + QString text( i18n( "File resource '%1'
has been changed by third party.
Do you want to reload?").arg( fileName() ) ); if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) { load(); addressBook()->emitAddressBookChanged(); @@ -398,7 +415,7 @@ void ResourceFile::removeAddressee( const Addressee &addr ) void ResourceFile::cleanUp() { - unlock( mFileName ); + unlock( fileName() ); } //US #include "resourcefile.moc" diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h index b4421b2..dd38a9d 100644 --- a/kabc/plugins/file/resourcefile.h +++ b/kabc/plugins/file/resourcefile.h @@ -147,7 +147,7 @@ protected: void unlock( const QString &fileName ); private: - QString mFileName; + QString mFileName2; QString mFormatName; FormatPlugin *mFormat; -- cgit v0.9.0.2