Diffstat (limited to 'core/pim/addressbook/addressbook.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 54 |
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 @@ -66,20 +66,8 @@ #include <qdatetime.h> #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() { QString filename = Global::applicationFileName("addressbook", @@ -201,23 +189,8 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); a->addTo( edit ); // 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 ); QVBoxLayout *vb = new QVBoxLayout( listContainer ); @@ -229,13 +202,9 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, connect( abList, SIGNAL(currentChanged(int,int)), this, SLOT(slotUpdateToolbar()) ); mView = 0; - abList->load( addressbookXMLFilename() ); - if ( QFile::exists(addressbookOldXMLFilename()) ) { - abList->load( addressbookOldXMLFilename() ); - QFile::remove(addressbookOldXMLFilename()); - } + abList->load(); pLabel = new LetterPicker( listContainer ); connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char))); vb->addWidget(pLabel); @@ -708,15 +677,15 @@ void AddressbookWindow::listIsEmpty( bool empty ) void AddressbookWindow::reload() { syncing = FALSE; abList->clear(); - abList->load( addressbookXMLFilename() ); + abList->reload(); } void AddressbookWindow::flush() { syncing = TRUE; - abList->save( addressbookXMLFilename() ); + abList->save(); } void AddressbookWindow::closeEvent( QCloseEvent *e ) @@ -754,10 +723,9 @@ 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" "Free up some space\n" "and try again.\n" @@ -767,22 +735,8 @@ bool AddressbookWindow::save() != QMessageBox::No ) return TRUE; 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; } |