summaryrefslogtreecommitdiffabout
path: root/kabc
authorulf69 <ulf69>2004-06-29 05:03:25 (UTC)
committer ulf69 <ulf69>2004-06-29 05:03:25 (UTC)
commit0538ac1cc17ad4249d27d686b4bc7e80663f475f (patch) (side-by-side diff)
treeabf571d0e2640bbb7ce14818a376ad980492ea05 /kabc
parent61ef87224517601f8754dd9da1b521a7b0094558 (diff)
downloadkdepimpi-0538ac1cc17ad4249d27d686b4bc7e80663f475f.zip
kdepimpi-0538ac1cc17ad4249d27d686b4bc7e80663f475f.tar.gz
kdepimpi-0538ac1cc17ad4249d27d686b4bc7e80663f475f.tar.bz2
*** empty log message ***
Diffstat (limited to 'kabc') (more/less context) (show whitespace changes)
-rw-r--r--kabc/stdaddressbook.cpp22
1 files changed, 3 insertions, 19 deletions
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index f9fc70b..8faaaef 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -21,32 +21,20 @@
/*
Enhanced Version of the file for platform independent KDE tools.
Copyright (c) 2004 Ulf Schenk
$Id$
*/
-#ifndef DESKTOP_VERSION
-#include <qpe/global.h>
-#else
-
-#include <qdir.h>
-#endif
-#ifdef KAB_EMBEDDED
-
-#include <stdlib.h>
-#else //KAB_EMBEDDED
+/*US
#include <stdlib.h>
-//US#include <kresources/manager.h>
#include <kapplication.h>
#include <kcrash.h>
#include <ksimpleconfig.h>
-
-
-#endif //KAB_EMBEDDED
+*/
#include "resource.h"
#include <kresources/manager.h>
#include <kdebug.h>
#include <klocale.h>
#include <kstaticdeleter.h>
@@ -65,13 +53,12 @@ QString StdAddressBook::fileName()
{
return locateLocal( "data", "kabc/std.vcf" );
}
QString StdAddressBook::directoryName()
{
- qDebug("StdAddressBook::directoryName() WILL FAIL OR NOT" );
return locateLocal( "data", "kabc/stdvcf" );
}
void StdAddressBook::handleCrash()
{
StdAddressBook::self()->cleanUp();
@@ -208,17 +195,14 @@ bool StdAddressBook::save()
return ok;
}
void StdAddressBook::close()
{
//US destructObject is not defined on my system???. Is setObject(0) the same ???
-#ifndef KAB_EMBEDDED
- addressBookDeleter.destructObject();
-#else //KAB_EMBEDDED
+//US addressBookDeleter.destructObject();
addressBookDeleter.setObject(0);
-#endif //KAB_EMBEDDED
}
void StdAddressBook::setAutomaticSave( bool enable )
{
mAutomaticSave = enable;