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
@@ -12,28 +12,29 @@
  * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  *
  * This is a rewrite of the abeditor.h file, modified to provide a more
  * intuitive interface to TrollTech's original Address Book editor.  This
  * is made to operate exactly in interface with the exception of name.
  *
  */
 
 #include "contacteditor.h"
 
+#include <opie2/opimcontact.h>
+
 #include <qpe/categoryselect.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
-#include <opie/ocontact.h>
 #include <qpe/resource.h>
 
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qtoolbutton.h>
 #include <qlistbox.h> 
 #include <qmessagebox.h> 
 #include <qwhatsthis.h>
 
@@ -42,25 +43,25 @@
 static inline bool containsAlphaNum( const QString &str );
 static inline bool constainsWhiteSpace( const QString &str );
 
 // helper functions, convert our comma delimited list to proper
 // file format...
 void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
                      QString &strAll );
 
 // helper convert from file format to comma delimited...
 void parseEmailTo( const QString &strDefaultEmail,
                    const QString &strOtherEmail, QString &strBack );
 
-        ContactEditor::ContactEditor(const OContact &entry,
+        ContactEditor::ContactEditor(const Opie::OPimContact &entry,
                                 QWidget *parent,
                                 const char *name,
                                 WFlags )
         : QDialog( parent, name, TRUE, WStyle_ContextHelp ),
           defaultEmailChooserPosition( -1 ),
           m_personalView ( false ),
           cmbDefaultEmail( 0 ),
           initializing ( false )
 {
 
         initializing = true;
 
@@ -78,39 +79,39 @@ ContactEditor::~ContactEditor() {
 void ContactEditor::init() {
         qWarning("init() START");
         
         uint i = 0;
 
         QStringList trlChooserNames;
 
         for (i = 0; i <= 6; i++) {
                 slHomeAddress.append( "" );
                 slBusinessAddress.append( "" );
         }
 
-        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 );
 
         // Ok, we have to remove elements from the list of dynamic entries
         // which are now stored in special (not dynamic) widgets..
         // Otherwise we will get problems with field assignments! (se)
         slDynamicEntries.remove("Anniversary");
         slDynamicEntries.remove("Birthday");
         slDynamicEntries.remove("Gender");
 
         // The same with translated fields.. But I will
         // 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] );
         trlDynamicEntries.remove( translMap[Qtopia::Birthday] );
         trlDynamicEntries.remove( translMap[Qtopia::Gender] );
 
         // Last Check to be sure..
         assert( slDynamicEntries.count() == trlDynamicEntries.count() );
         assert( slChooserNames.count() == trlChooserNames.count() );
 
         for (i = 0; i < slChooserNames.count(); i++)
           slChooserValues.append("");
 
 
@@ -569,26 +570,26 @@ void ContactEditor::init() {
         l = new QLabel( tr("Gender"), container );
         gl->addWidget( l, counter, 0 );
         cmbGender = new QComboBox( container );
         cmbGender->insertItem( "", 0 );
         cmbGender->insertItem( tr("Male"), 1);
         cmbGender->insertItem( tr("Female"), 2);
         gl->addWidget( cmbGender, counter, 1 );
 
         ++counter;
 
         // Create Labels and lineedit fields for every dynamic entry
         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 ) {
           
           if (((*it) == "Anniversary") || 
               ((*it) == "Birthday")|| ((*it) == "Gender")) continue;
 
           l = new QLabel( mapIdToStr[mapStrToID[*it]], container );
                 listName.append( l );
                 gl->addWidget( l, i, 0 );
                 QLineEdit *e = new QLineEdit( container );
                 listValue.append( e );
                 gl->addWidget( e, i, 1);
         }
@@ -1241,25 +1242,25 @@ void ContactEditor::cleanupFields() {
         txtChooserField3->setText("");
         txtAddress->setText("");
         txtCity->setText("");
         txtState->setText("");
         txtZip->setText("");
         QLineEdit *txtTmp = cmbCountry->lineEdit();
         txtTmp->setText("");
         txtTmp = cmbFileAs->lineEdit();
         txtTmp->setText("");
         
 }
 
-void ContactEditor::setEntry( const OContact &entry ) {
+void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
         
         initializing = true;
         
         // Cleanup and activate the general Page ..
         cleanupFields();
         tabMain->setCurrentPage( 0 );
         
         ent = entry;
         
         emails = QStringList(ent.emailList());
         defaultEmail = ent.defaultEmail();
         if (defaultEmail.isEmpty()) defaultEmail = emails[0];