Diffstat (limited to 'core/pim/addressbook/addressbook.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 8a5f9d5..9ae66d1 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -25,6 +25,6 @@ -#include <opie/ofileselector.h> -#include <opie/ofiledialog.h> -#include <opie/ocontact.h> -#include <opie/ocontactaccessbackend_vcard.h> +#include <opie2/ofileselector.h> +#include <opie2/ofiledialog.h> +#include <opie2/opimcontact.h> +#include <opie2/ocontactaccessbackend_vcard.h> @@ -319,3 +319,3 @@ void AddressbookWindow::slotSetFont( int size ) void AddressbookWindow::importvCard() { - QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this ); + QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/");//,"", "*", this ); if(!str.isEmpty() ){ @@ -328,10 +328,10 @@ void AddressbookWindow::exportvCard() qWarning(" void AddressbookWindow::exportvCard()"); - QString filename = OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this ); + QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this ); if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){ qWarning(" Save to file %s, (%d)", filename.latin1(), filename.length()-1 ); - OContact curCont = m_abView->currentEntry(); + Opie::OPimContact curCont = m_abView->currentEntry(); if ( !curCont.isEmpty() ){ - OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, + Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, filename ); - OContactAccess* access = new OContactAccess ( "addressbook_exp", QString::null , vcard_backend, true ); + Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook_exp", QString::null , vcard_backend, true ); if ( access ){ @@ -373,6 +373,6 @@ void AddressbookWindow::setDocument( const QString &filename ) - OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, + Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, filename ); - OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); - OContactAccess::List allList = access->allRecords(); + Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); + Opie::OPimContactAccess::List allList = access->allRecords(); qWarning( "Found number of contacts in File: %d", allList.count() ); @@ -386,3 +386,3 @@ void AddressbookWindow::setDocument( const QString &filename ) bool doAsk = true; - OContactAccess::List::Iterator it; + Opie::OPimContactAccess::List::Iterator it; for ( it = allList.begin(); it != allList.end(); ++it ){ @@ -435,3 +435,3 @@ void AddressbookWindow::slotUpdateToolbar() { - OContact ce = m_abView->currentEntry(); + Opie::OPimContact ce = m_abView->currentEntry(); actionMail->setEnabled( !ce.defaultEmail().isEmpty() ); @@ -441,3 +441,3 @@ void AddressbookWindow::slotListNew() { - OContact cnt; + Opie::OPimContact cnt; if( !syncing ) { @@ -460,3 +460,3 @@ void AddressbookWindow::slotListDelete() if(!syncing) { - OContact tmpEntry = m_abView ->currentEntry(); + Opie::OPimContact tmpEntry = m_abView ->currentEntry(); @@ -527,3 +527,3 @@ void AddressbookWindow::writeMail() { - OContact c = m_abView -> currentEntry(); + Opie::OPimContact c = m_abView -> currentEntry(); QString name = c.fileAs(); @@ -567,3 +567,3 @@ void AddressbookWindow::slotBeam() QString beamFilename; - OContact c; + Opie::OPimContact c; if ( actionPersonal->isOn() ) { @@ -572,7 +572,7 @@ void AddressbookWindow::slotBeam() return; // can't beam a non-existent file - OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, + Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, beamFilename ); - OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); - OContactAccess::List allList = access->allRecords(); - OContactAccess::List::Iterator it = allList.begin(); // Just take first + Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); + Opie::OPimContactAccess::List allList = access->allRecords(); + Opie::OPimContactAccess::List::Iterator it = allList.begin(); // Just take first c = *it; @@ -584,5 +584,5 @@ void AddressbookWindow::slotBeam() c = m_abView -> currentEntry(); - OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, + Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, beamfile ); - OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); + Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); access->add( c ); @@ -654,3 +654,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) - OContact cnt; + Opie::OPimContact cnt; QString fn, mn, ln; @@ -724,3 +724,3 @@ void AddressbookWindow::editEntry( EntryMode entryMode ) { - OContact entry; + Opie::OPimContact entry; if ( !abEditor ) { @@ -740,3 +740,3 @@ void AddressbookWindow::editEntry( EntryMode entryMode ) if ( entryMode == NewEntry ) { - OContact insertEntry = abEditor->entry(); + Opie::OPimContact insertEntry = abEditor->entry(); insertEntry.assignUid(); @@ -745,3 +745,3 @@ void AddressbookWindow::editEntry( EntryMode entryMode ) } else { - OContact replEntry = abEditor->entry(); + Opie::OPimContact replEntry = abEditor->entry(); @@ -759,3 +759,3 @@ void AddressbookWindow::editPersonal() { - OContact entry; + Opie::OPimContact entry; |