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
@@ -1,4 +1,9 @@
 #include "configdlg.h"
 
+#include <opie2/opimcontact.h>
+#include "opie2/opimcontactfields.h"
+
+#include <qpe/resource.h>
+
 #include <qcheckbox.h>
 #include <qradiobutton.h>
@@ -6,13 +11,8 @@
 #include <qpushbutton.h>
 
-#include <qpe/resource.h>
-
-#include <opie/ocontact.h>
-#include "opie/ocontactfields.h"
-
 ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
         ConfigDlg_Base(parent, name, true )
 {
-        contFields = OContactFields::trfields();
+        contFields = Opie::OPimContactFields::trfields();
 
         // We add all Fields into the Listbox
@@ -22,5 +22,5 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
 
         // Reset Widget Flags: This was not changeable by designer :(
-                setWFlags ( WStyle_ContextHelp );
+        setWFlags ( WStyle_ContextHelp );
 
         // Set Pics to Buttons and Tabs
@@ -29,9 +29,9 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
         m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) );
         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();
 
         connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) );
@@ -77,5 +77,5 @@ void ConfigDlg::slotItemAdd()
                 qWarning("ADding %s", item.latin1());
                 fieldListBox->insertItem( item );
-                }
+        }
 }
 
@@ -87,10 +87,10 @@ void ConfigDlg::slotItemRemove()
         if ( i > 0 ) {
                 fieldListBox->removeItem( i );
-                }
+        }
 }
-    
+
 void ConfigDlg::setConfig( const AbConfig& cnf )
-{ 
-        m_config = cnf; 
+{
+        m_config = cnf;
 
         m_useRegExp->setChecked( m_config.useRegExp() );
@@ -106,10 +106,10 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
                 m_largeFont->setChecked( false );
                 break;
-        case 1: 
+        case 1:
                 m_smallFont->setChecked( false );
                 m_normalFont->setChecked( true );
                 m_largeFont->setChecked( false );
                 break;
-        case 2: 
+        case 2:
                 m_smallFont->setChecked( false );
                 m_normalFont->setChecked( false );
@@ -125,7 +125,7 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
         m_moveBars->setChecked( !m_config.fixedBars() );
 }
-    
+
 AbConfig ConfigDlg::getConfig()
-{ 
+{
         m_config.setUseRegExp( m_useRegExp->isOn() );
         m_config.setUseWildCards( m_useWildCard->isOn() );