Diffstat (limited to 'core/pim/addressbook/contacteditor.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
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 ) { |