summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-07-17 00:40:37 (UTC)
committer ulf69 <ulf69>2004-07-17 00:40:37 (UTC)
commitafdcf8b412f8831d0027aa54d7e8c652a84e02b7 (patch) (side-by-side diff)
tree27251e20427b3a99ab19b2285de47c6ff2daf66e
parentcb3782d17ea98a15acb158ea6dd18aa2600b08f8 (diff)
downloadkdepimpi-afdcf8b412f8831d0027aa54d7e8c652a84e02b7.zip
kdepimpi-afdcf8b412f8831d0027aa54d7e8c652a84e02b7.tar.gz
kdepimpi-afdcf8b412f8831d0027aa54d7e8c652a84e02b7.tar.bz2
code cleanup
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp67
1 files changed, 34 insertions, 33 deletions
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 7475685..7e10e46 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -66,7 +66,7 @@ ResourceQtopia::ResourceQtopia( const KConfig *config )
{
// we can not choose the filename. Therefore use the default to display
QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
-
+
init( fileName );
}
@@ -137,13 +137,13 @@ bool ResourceQtopia::doOpen()
//US bool ok = mFormat->checkFormat( &file );
bool ok = true;
-
+
file.close();
return ok;
}
*/
- return true;
+ return true;
}
void ResourceQtopia::doClose()
@@ -155,7 +155,7 @@ bool ResourceQtopia::load()
kdDebug(5700) << "ResourceQtopia::load(): '" << mFileName << "'" << endl;
// qDebug("ResourceQtopia::load: Try to load file() %s", mFileName.latin1());
-
+
AddressBookAccess* access = new AddressBookAccess();
if ( !access ) {
@@ -163,7 +163,7 @@ bool ResourceQtopia::load()
addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) );
return false;
}
-
+
bool res = false;
if (mConverter == 0)
{
@@ -171,24 +171,25 @@ bool ResourceQtopia::load()
res = mConverter->init();
if ( !res )
{
- 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" ) );
+ QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file");
+ qDebug(msg);
+ addressBook()->error( i18n( msg ) );
delete access;
return false;
}
}
-
- { //create a new scope
+
+ { //create a new scope
AddressBookIterator it(*access);
const PimContact* contact;
for (contact=it.toFirst(); it.current(); ++it) {
contact = it.current();
-
+
KABC::Addressee addressee;
-
- res = mConverter->qtopiaToAddressee( (*contact), addressee );
-
+
+ res = mConverter->qtopiaToAddressee( (*contact), addressee );
+
if ( !addressee.isEmpty() && res )
{
addressee.setResource( this );
@@ -196,7 +197,7 @@ bool ResourceQtopia::load()
}
}
}
-
+
delete access;
return true;
}
@@ -209,9 +210,9 @@ bool ResourceQtopia::save( Ticket *ticket )
// 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 );
@@ -225,30 +226,30 @@ bool ResourceQtopia::save( Ticket *ticket )
*/
/*US
-//US ToDo: write backupfile
+//US ToDo: write backupfile
QFile info;
info.setName( mFileName );
bool ok = info.open( IO_WriteOnly );
if ( ok ) {
//US mFormat->saveAll( addressBook(), this, &info );
-
+
info.close();
ok = true;
}
else {
-
+
}
-
+
if ( !ok )
addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
-
+
delete ticket;
unlock( mFileName );
-
+
return ok;
qDebug("ResourceQtopia::save has to be changed");
-*/
+*/
return true;
}
@@ -261,18 +262,18 @@ bool ResourceQtopia::lock( const QString &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);
+
+ KURL url(fn);
QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
-
+
kdDebug(5700) << "-- lock name: " << lockName << endl;
if (QFile::exists( lockName )) return false;
QString lockUniqueName;
lockUniqueName = fn + KApplication::randomString( 8 );
-
- url = lockUniqueName;
+
+ url = lockUniqueName;
//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
@@ -303,9 +304,9 @@ void ResourceQtopia::unlock( const QString &fileName )
//US fn.replace( QRegExp( "/" ), "_" );
//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
//US QString lockName = fn + ".lock";
- KURL url(fn);
+ KURL url(fn);
QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
-
+
QFile::remove( lockName );
QFile::remove( mLockUniqueName );
addressBook()->emitAddressBookUnlocked();
@@ -315,13 +316,13 @@ void ResourceQtopia::setFileName( const QString &fileName )
{
mDirWatch.stopScan();
mDirWatch.removeFile( mFileName );
-
+
mFileName = fileName;
mDirWatch.addFile( mFileName );
mDirWatch.startScan();
-//US simulate KDirWatch event
+//US simulate KDirWatch event
//US fileChanged();
}
@@ -336,7 +337,7 @@ void ResourceQtopia::fileChanged()
// 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( mFileName ) );
if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
load();