1 files changed, 19 insertions, 19 deletions

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();
 
@@ -23,3 +23,3 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
 	// Reset Widget Flags: This was not changeable by designer :(
-	setWFlags ( WStyle_ContextHelp );	
+	setWFlags ( WStyle_ContextHelp );
 
@@ -30,7 +30,7 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
 	m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) );
-	
+
 
 	// 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();
 
@@ -78,3 +78,3 @@ void ConfigDlg::slotItemAdd()
 		fieldListBox->insertItem( item );
-	}	
+	}
 }
@@ -88,8 +88,8 @@ void ConfigDlg::slotItemRemove()
 		fieldListBox->removeItem( i );
-	}	
+	}
 }
-    
+
 void ConfigDlg::setConfig( const AbConfig& cnf )
-{ 
-	m_config = cnf; 
+{
+	m_config = cnf;
 
@@ -107,3 +107,3 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
 		break;
-	case 1: 
+	case 1:
 		m_smallFont->setChecked( false );
@@ -112,3 +112,3 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
 		break;
-	case 2: 
+	case 2:
 		m_smallFont->setChecked( false );
@@ -126,5 +126,5 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
 }
-    
+
 AbConfig ConfigDlg::getConfig()
-{ 
+{
 	m_config.setUseRegExp( m_useRegExp->isOn() );