1 files changed, 7 insertions, 7 deletions

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
@@ -18,14 +18,14 @@
  *
  */
 
 #ifndef CONTACTEDITOR_H
 #define CONTACTEDITOR_H
 
-#include <opie/ocontact.h>
-#include <opie/ocontactfields.h>
+#include <opie2/opimcontact.h>
+#include <opie2/opimcontactfields.h>
 
 #include <qpe/datebookmonth.h>
 
 #include <qdialog.h>
 #include <qlist.h>
 #include <qmap.h>
@@ -53,25 +53,25 @@ class CategorySelect;
 class QLabel;
 
 class ContactEditor : public QDialog {
         Q_OBJECT
 
         public:
-                        ContactEditor(const OContact &entry,
+                        ContactEditor(const Opie::OPimContact &entry,
                                 QWidget *parent = 0,
                                 const char *name = 0,
                                 WFlags fl = 0 );
                 ~ContactEditor();
                 void setNameFocus();
                 void setPersonalView( bool personal = true );
-                OContact entry() const { return ent; }
+                Opie::OPimContact entry() const { return ent; }
 
         public slots:
                 void slotNote();
                 void slotName();
-                void setEntry(const OContact &entry);
+                void setEntry(const Opie::OPimContact &entry);
 
         protected slots:
                 void accept();
 
         private:
                 void init();
@@ -110,15 +110,15 @@ class ContactEditor : public QDialog {
         private:
                 enum StackWidgets { TextField = 1, Combo };
                 int defaultEmailChooserPosition;
                 void populateDefaultEmailCmb();
                 void chooserChange( const QString&, int , QLineEdit*, int );
                 bool cmbChooserChange( int , QWidgetStack*, int );
-                OContactFields contactfields;
+                Opie::OPimContactFields contactfields;
 
-                OContact ent;
+                Opie::OPimContact ent;
 
                 QDialog *dlgNote;
                 QDialog *dlgName;
 
                 QList<QLineEdit> listValue;
                 QList<QLabel> listName;