author | drw <drw> | 2004-03-25 23:40:52 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-25 23:40:52 (UTC) |
commit | 98721c16aa480c4a160d3492462cb8f0de783268 (patch) (side-by-side diff) | |
tree | 2be8dcd6cf985d98912cbb18e5d23e4b567396ff /core | |
parent | 03091cd727701bdb2aa6ac623cd606131546d686 (diff) | |
download | opie-98721c16aa480c4a160d3492462cb8f0de783268.zip opie-98721c16aa480c4a160d3492462cb8f0de783268.tar.gz opie-98721c16aa480c4a160d3492462cb8f0de783268.tar.bz2 |
libopie -> libopie2
-rw-r--r-- | core/pim/addressbook/ablabel.cpp | 12 | ||||
-rw-r--r-- | core/pim/addressbook/ablabel.h | 14 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 25 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.h | 19 | ||||
-rw-r--r-- | core/pim/addressbook/abview.cpp | 32 | ||||
-rw-r--r-- | core/pim/addressbook/abview.h | 23 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 58 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.pro | 2 | ||||
-rw-r--r-- | core/pim/addressbook/config.in | 2 | ||||
-rw-r--r-- | core/pim/addressbook/configdlg.cpp | 16 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 21 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.h | 14 | ||||
-rw-r--r-- | core/pim/addressbook/main.cpp | 4 | ||||
-rw-r--r-- | core/pim/addressbook/opie-addressbook.control | 2 |
14 files changed, 123 insertions, 121 deletions
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp index 076e2e0..70a66a0 100644 --- a/core/pim/addressbook/ablabel.cpp +++ b/core/pim/addressbook/ablabel.cpp @@ -34,3 +34,3 @@ AbLabel::~AbLabel() -void AbLabel::setContacts( const OContactAccess::List& viewList ) +void AbLabel::setContacts( const Opie::OPimContactAccess::List& viewList ) { @@ -50,3 +50,3 @@ int AbLabel::currentEntry_UID() { - OContact contact = currentEntry(); + Opie::OPimContact contact = currentEntry(); @@ -58,3 +58,3 @@ int AbLabel::currentEntry_UID() -OContact AbLabel::currentEntry() +Opie::OPimContact AbLabel::currentEntry() { @@ -63,3 +63,3 @@ OContact AbLabel::currentEntry() else - return OContact(); + return Opie::OPimContact(); } @@ -111,3 +111,3 @@ void AbLabel::keyPressEvent( QKeyEvent *e ) --m_itCurContact; - if ( *m_itCurContact != OContact() ) + if ( *m_itCurContact != Opie::OPimContact() ) sync(); @@ -128,3 +128,3 @@ void AbLabel::keyPressEvent( QKeyEvent *e ) ++m_itCurContact; - if ( *m_itCurContact != OContact() ) + if ( *m_itCurContact != Opie::OPimContact() ) sync(); diff --git a/core/pim/addressbook/ablabel.h b/core/pim/addressbook/ablabel.h index 80336dc..8d7f2ac 100644 --- a/core/pim/addressbook/ablabel.h +++ b/core/pim/addressbook/ablabel.h @@ -22,6 +22,6 @@ -#include <opie/ocontact.h> -#include <qtextview.h> +#include <opie2/opimcontact.h> +#include <opie2/ocontactaccess.h> -#include <opie/ocontactaccess.h> +#include <qtextview.h> @@ -36,3 +36,3 @@ public: // Set the contacts - void setContacts( const OContactAccess::List& viewList ); + void setContacts( const Opie::OPimContactAccess::List& viewList ); @@ -45,3 +45,3 @@ public: // - OContact currentEntry(); + Opie::OPimContact currentEntry(); @@ -55,4 +55,4 @@ protected: private: - OContactAccess::List m_viewList; - OContactAccess::List::Iterator m_itCurContact; + Opie::OPimContactAccess::List m_viewList; + Opie::OPimContactAccess::List::Iterator m_itCurContact; diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index 29f4383..cd77b13 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp @@ -22,2 +22,4 @@ +#include <opie2/opimrecordlist.h> + #include <qpe/timestring.h> @@ -25,5 +27,2 @@ -#include <opie/orecordlist.h> - - #include "abtable.h" @@ -153,3 +152,3 @@ void AbTable::init() -void AbTable::setContacts( const OContactAccess::List& viewList ) +void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) { @@ -163,3 +162,3 @@ void AbTable::setContacts( const OContactAccess::List& viewList ) - OContactAccess::List::Iterator it; + Opie::OPimContactAccess::List::Iterator it; setNumRows( m_viewList.count() ); @@ -189,3 +188,3 @@ bool AbTable::selectContact( int UID ) int rows = numRows(); - OContact* foundContact = 0l; + Opie::OPimContact* foundContact = 0l; bool found = false; @@ -215,5 +214,5 @@ bool AbTable::selectContact( int UID ) #if 0 -void AbTable::insertIntoTable( const OContact& cnt, int row ) +void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row ) { - qWarning( "void AbTable::insertIntoTable( const OContact& cnt, %d )", row ); + qWarning( "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, %d )", row ); QString strName; @@ -274,3 +273,3 @@ void AbTable::resort() -OContact AbTable::currentEntry() +Opie::OPimContact AbTable::currentEntry() { @@ -396,3 +395,3 @@ void AbTable::moveTo( char c ) // Useless.. Nobody uses it .. (se) -QString AbTable::findContactName( const OContact &entry ) +QString AbTable::findContactName( const Opie::OPimContact &entry ) { @@ -552,3 +551,3 @@ QStringList AbTable::choiceSelection(int /*index*/) const for (each row) { - OContact *c = contactForRow(row); + Opie::OPimContact *c = contactForRow(row); if ( text(row,2) == selname ) { @@ -633,3 +632,3 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) - OContact act_contact = m_viewList[row]; + Opie::OPimContact act_contact = m_viewList[row]; @@ -686,3 +685,3 @@ void AbTable::rowHeightChanged( int row ) } -ContactItem AbTable::findContactContact( const OContact &entry, int /* row */ ) +ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* row */ ) { diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h index b9ebe27..927a5a9 100644 --- a/core/pim/addressbook/abtable.h +++ b/core/pim/addressbook/abtable.h @@ -24,5 +24,6 @@ +#include <opie2/opimcontact.h> +#include <opie2/ocontactaccess.h> + #include <qpe/categories.h> -#include <opie/ocontact.h> -#include <opie/ocontactaccess.h> @@ -85,3 +86,3 @@ public: // Set the contacts shown in the table - void setContacts( const OContactAccess::List& viewList ); + void setContacts( const Opie::OPimContactAccess::List& viewList ); @@ -94,3 +95,3 @@ public: // Get the current selected entry - OContact currentEntry(); + Opie::OPimContact currentEntry(); @@ -99,3 +100,3 @@ public: - // QString findContactName( const OContact &entry ); + // QString findContactName( const Opie::OPimContact &entry ); @@ -137,4 +138,4 @@ protected slots: private: - // void insertIntoTable( const OContact &cnt, int row ); - ContactItem findContactContact( const OContact &entry, int row ); + // void insertIntoTable( const Opie::OPimContact &cnt, int row ); + ContactItem findContactContact( const Opie::OPimContact &entry, int row ); void fitColumns(); @@ -147,3 +148,3 @@ private: bool asc; - // QMap<AbTableItem*, OContact> contactList; + // QMap<AbTableItem*, Opie::OPimContact> contactList; QValueList<int> intFields; @@ -154,3 +155,3 @@ private: - OContactAccess::List m_viewList; + Opie::OPimContactAccess::List m_viewList; diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp index 8d61582..aa242b7 100644 --- a/core/pim/addressbook/abview.cpp +++ b/core/pim/addressbook/abview.cpp @@ -18,3 +18,3 @@ -#include <qlayout.h> +#include <opie2/ocontactaccessbackend_vcard.h> @@ -22,3 +22,3 @@ -#include <opie/ocontactaccessbackend_vcard.h> +#include <qlayout.h> @@ -55,3 +55,3 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): // Load default database and handle syncing myself.. ! - m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false ); + m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false ); m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available @@ -106,3 +106,3 @@ void AbView::setView( Views view ) -void AbView::addEntry( const OContact &newContact ) +void AbView::addEntry( const Opie::OPimContact &newContact ) { @@ -120,3 +120,3 @@ void AbView::removeEntry( const int UID ) -void AbView::replaceEntry( const OContact &contact ) +void AbView::replaceEntry( const Opie::OPimContact &contact ) { @@ -128,5 +128,5 @@ void AbView::replaceEntry( const OContact &contact ) -OContact AbView::currentEntry() +Opie::OPimContact AbView::currentEntry() { - OContact currentContact; + Opie::OPimContact currentContact; @@ -230,3 +230,3 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) - OContact query; + Opie::OPimContact query; if ( c == 0 ){ @@ -237,3 +237,3 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) // ignore the request .. - if ( ! m_contactdb->hasQuerySettings( OContactAccess::WildCards | OContactAccess::IgnoreCase ) ){ + if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ) ){ return; @@ -253,3 +253,3 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) } - m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards | OContactAccess::IgnoreCase ); + m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ); if ( m_curr_category != -1 ) @@ -291,5 +291,5 @@ void AbView::showPersonal( bool personal ) - OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, + Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, addressbookPersonalVCardName() ); - m_contactdb = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); + m_contactdb = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); @@ -403,6 +403,6 @@ void AbView::clearForCategory() { - OContactAccess::List::Iterator it; + Opie::OPimContactAccess::List::Iterator it; // Now remove all contacts with wrong category if any category selected - OContactAccess::List allList = m_list; + Opie::OPimContactAccess::List allList = m_list; if ( m_curr_category != -1 ){ @@ -418,5 +418,5 @@ void AbView::clearForCategory() -bool AbView::contactCompare( const OContact &cnt, int category ) +bool AbView::contactCompare( const Opie::OPimContact &cnt, int category ) { - // qWarning ("bool AbView::contactCompare( const OContact &cnt, %d )", category); + // qWarning ("bool AbView::contactCompare( const Opie::OPimContact &cnt, %d )", category); diff --git a/core/pim/addressbook/abview.h b/core/pim/addressbook/abview.h index 49bb4be..b8c8a08 100644 --- a/core/pim/addressbook/abview.h +++ b/core/pim/addressbook/abview.h @@ -3,8 +3,9 @@ -#include <qwidget.h> -#include <qwidgetstack.h> +#include <opie2/opimcontact.h> +#include <opie2/ocontactaccess.h> #include <qpe/categories.h> -#include <opie/ocontact.h> -#include <opie/ocontactaccess.h> + +#include <qwidget.h> +#include <qwidgetstack.h> @@ -39,6 +40,6 @@ public: // Add Entry and put to current - void addEntry( const OContact &newContact ); + void addEntry( const Opie::OPimContact &newContact ); void removeEntry( const int UID ); - void replaceEntry( const OContact &contact ); - OContact currentEntry(); + void replaceEntry( const Opie::OPimContact &contact ); + Opie::OPimContact currentEntry(); @@ -64,3 +65,3 @@ private: void clearForCategory(); - bool contactCompare( const OContact &cnt, int category ); + bool contactCompare( const Opie::OPimContact &cnt, int category ); void parseName( const QString& name, QString *first, QString *middle, @@ -76,5 +77,5 @@ private: - OContactAccess* m_contactdb; - OContactAccess* m_storedDB; - OContactAccess::List m_list; + Opie::OPimContactAccess* m_contactdb; + Opie::OPimContactAccess* m_storedDB; + Opie::OPimContactAccess::List m_list; 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; diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro index afd3b92..05f02c3 100644 --- a/core/pim/addressbook/addressbook.pro +++ b/core/pim/addressbook/addressbook.pro @@ -25,3 +25,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 diff --git a/core/pim/addressbook/config.in b/core/pim/addressbook/config.in index 3377763..7ecf14c 100644 --- a/core/pim/addressbook/config.in +++ b/core/pim/addressbook/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp index dee0f11..6c98b5d 100644 --- a/core/pim/addressbook/configdlg.cpp +++ b/core/pim/addressbook/configdlg.cpp @@ -2,2 +2,7 @@ +#include <opie2/opimcontact.h> +#include "opie2/opimcontactfields.h" + +#include <qpe/resource.h> + #include <qcheckbox.h> @@ -7,7 +12,2 @@ -#include <qpe/resource.h> - -#include <opie/ocontact.h> -#include "opie/ocontactfields.h" - ConfigDlg::ConfigDlg( QWidget *parent, const char *name): @@ -15,3 +15,3 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name): { - contFields = OContactFields::trfields(); + contFields = Opie::OPimContactFields::trfields(); @@ -33,4 +33,4 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name): // Get the translation maps between Field ID and translated strings - m_mapStrToID = OContactFields::trFieldsToId(); - m_mapIDToStr = OContactFields::idToTrFields(); + m_mapStrToID = Opie::OPimContactFields::trFieldsToId(); + m_mapIDToStr = Opie::OPimContactFields::idToTrFields(); diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 8acf570..534666d 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp @@ -23,2 +23,4 @@ +#include <opie2/opimcontact.h> + #include <qpe/categoryselect.h> @@ -26,3 +28,2 @@ #include <qpe/qpedialog.h> -#include <opie/ocontact.h> #include <qpe/resource.h> @@ -53,3 +54,3 @@ void parseEmailTo( const QString &strDefaultEmail, -ContactEditor::ContactEditor( const OContact &entry, +ContactEditor::ContactEditor( const Opie::OPimContact &entry, QWidget *parent, @@ -89,6 +90,6 @@ void ContactEditor::init() { - trlChooserNames = OContactFields::trphonefields( false ); - slChooserNames = OContactFields::untrphonefields( false ); - slDynamicEntries = OContactFields::untrdetailsfields( false ); - trlDynamicEntries = OContactFields::trdetailsfields( false ); + trlChooserNames = Opie::OPimContactFields::trphonefields( false ); + slChooserNames = Opie::OPimContactFields::untrphonefields( false ); + slDynamicEntries = Opie::OPimContactFields::untrdetailsfields( false ); + trlDynamicEntries = Opie::OPimContactFields::trdetailsfields( false ); @@ -103,3 +104,3 @@ void ContactEditor::init() { // use the translation map to avoid mismatches.. - QMap<int, QString> translMap = OContactFields::idToTrFields(); + QMap<int, QString> translMap = Opie::OPimContactFields::idToTrFields(); trlDynamicEntries.remove( translMap[Qtopia::Anniversary] ); @@ -580,4 +581,4 @@ void ContactEditor::init() { QStringList::ConstIterator it = slDynamicEntries.begin(); - QMap<QString, int> mapStrToID = OContactFields::untrFieldsToId(); - QMap<int, QString> mapIdToStr = OContactFields::idToTrFields(); + QMap<QString, int> mapStrToID = Opie::OPimContactFields::untrFieldsToId(); + QMap<int, QString> mapIdToStr = Opie::OPimContactFields::idToTrFields(); for (i = counter; it != slDynamicEntries.end(); i++, ++it ) { @@ -1252,3 +1253,3 @@ void ContactEditor::cleanupFields() { -void ContactEditor::setEntry( const OContact &entry ) { +void ContactEditor::setEntry( const Opie::OPimContact &entry ) { diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h index 72d14a9..1b86e6f 100644 --- a/core/pim/addressbook/contacteditor.h +++ b/core/pim/addressbook/contacteditor.h @@ -23,4 +23,4 @@ -#include <opie/ocontact.h> -#include <opie/ocontactfields.h> +#include <opie2/opimcontact.h> +#include <opie2/opimcontactfields.h> @@ -58,3 +58,3 @@ class ContactEditor : public QDialog { public: - ContactEditor( const OContact &entry, + ContactEditor( const Opie::OPimContact &entry, QWidget *parent = 0, @@ -65,3 +65,3 @@ class ContactEditor : public QDialog { void setPersonalView( bool personal = true ); - OContact entry() const { return ent; } + Opie::OPimContact entry() const { return ent; } @@ -70,3 +70,3 @@ class ContactEditor : public QDialog { void slotName(); - void setEntry(const OContact &entry); + void setEntry(const Opie::OPimContact &entry); @@ -115,5 +115,5 @@ class ContactEditor : public QDialog { bool cmbChooserChange( int , QWidgetStack*, int ); - OContactFields contactfields; + Opie::OPimContactFields contactfields; - OContact ent; + Opie::OPimContact ent; diff --git a/core/pim/addressbook/main.cpp b/core/pim/addressbook/main.cpp index 47d370a..660fae6 100644 --- a/core/pim/addressbook/main.cpp +++ b/core/pim/addressbook/main.cpp @@ -23,5 +23,5 @@ -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> -OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> ) +OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<AddressbookWindow> ) diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control index 2d30dc5..18a3791 100644 --- a/core/pim/addressbook/opie-addressbook.control +++ b/core/pim/addressbook/opie-addressbook.control @@ -7,3 +7,3 @@ Maintainer: Stefan Eilers <eilers.stefan@epost.de> Architecture: arm -Depends: task-opie-minimal, libopie1, opie-pics +Depends: task-opie-minimal, opie-pics, libopiecore2, libopieui2, libopiepim2, libopiedb2 Description: Contacts |