1 files changed, 4 insertions, 50 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 2eb9ddf..93581e8 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -68,16 +68,4 @@
 
 #include "picker.h"
-static QString addressbookOldXMLFilename()
-{
-        QString filename = QPEApplication::documentDir() + "addressbook.xml";
-        return filename;
-}
-
-static QString addressbookXMLFilename()
-{
-        QString filename = Global::applicationFileName("addressbook",
-                                                       "addressbook.xml");
-        return filename;
-}
 
 static QString addressbookPersonalVCardName()
@@ -203,19 +191,4 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         
         // Create Views
-        
-        // This is safe to call without checking to see if it exists...
-        // not to mention it also does the necessary stuff for the
-        // journaling...
-        QString str = addressbookXMLFilename();
-        if ( str.isNull() ) {
-                QMessageBox::warning( 
-                                     this, 
-                                     tr("Out of Space"),
-                                     tr("There is not enough space to create\n"
-                                        "neccessary startup files.\n"
-                                        "\nFree up some space before\nentering data!")
-                                     );
-        }
-        
         listContainer = new QWidget( this );
         
@@ -231,9 +204,5 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         mView = 0;
         
-        abList->load( addressbookXMLFilename() );
-        if ( QFile::exists(addressbookOldXMLFilename()) ) {
-                abList->load( addressbookOldXMLFilename() );
-                QFile::remove(addressbookOldXMLFilename());
-        }
+        abList->load();
         
         pLabel = new LetterPicker( listContainer );
@@ -710,5 +679,5 @@ void AddressbookWindow::reload()
         syncing = FALSE;
         abList->clear();
-        abList->load( addressbookXMLFilename() );
+        abList->reload();
 }
 
@@ -716,5 +685,5 @@ void AddressbookWindow::flush()
 {
         syncing = TRUE;
-        abList->save( addressbookXMLFilename() );
+        abList->save();
 }
 
@@ -756,6 +725,5 @@ void AddressbookWindow::closeEvent( QCloseEvent *e )
 bool AddressbookWindow::save()
 {
-        QString str = addressbookXMLFilename();
-        if ( str.isNull() ) {
+        if ( !abList->save() ) {
                 if ( QMessageBox::critical( 0, tr("Out of space"),
                                             tr("Unable to save information.\n"
@@ -769,18 +737,4 @@ bool AddressbookWindow::save()
                 else
                         return FALSE;
-        } else {
-                if ( !abList->save( str ) ) {
-                        if ( QMessageBox::critical( 0, tr( "Out of space" ),
-                                                    tr("Unable to save information.\n"
-                                                       "Free up some space\n"
-                                                       "and try again.\n"
-                                                       "\nQuit anyway?"),
-                                                    QMessageBox::Yes|QMessageBox::Escape,
-                                                    QMessageBox::No|QMessageBox::Default )
-                             != QMessageBox::No )
-                                return TRUE;
-                        else
-                                return FALSE;
-                }
         }
         return TRUE;