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
@@ -15,69 +15,56 @@
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 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
 
+/*US
 #include <stdlib.h>
-#else //KAB_EMBEDDED
 
-#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>
 #include <kstandarddirs.h>
 
 #include "stdaddressbook.h"
 
 using namespace KABC;
 
 StdAddressBook *StdAddressBook::mSelf = 0;
 bool StdAddressBook::mAutomaticSave = true;
 
 static KStaticDeleter<StdAddressBook> addressBookDeleter;
 
 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();
 }
 
 StdAddressBook *StdAddressBook::self()
 {
  
   if ( !mSelf )
@@ -202,29 +189,26 @@ bool StdAddressBook::save()
 
       if ( !ab->save( ticket ) )
         ok = false;
     }
   }
   
   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;
 }
 
 bool StdAddressBook::automaticSave()
 {
   return mAutomaticSave;
 }