1 files changed, 13 insertions, 13 deletions

diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index b0d456d..ea387d6 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -21,5 +21,5 @@
 
-#include <qpe/config.h>
+#include <opie2/opimcontact.h>
 
-#include <opie/ocontact.h>
+#include <qpe/config.h>
 
@@ -37,6 +37,6 @@ AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent,  const char*
 
-    m_contactdb = new OContactAccess("addressplugin");
+    m_contactdb = new Opie::OPimContactAccess("addressplugin");
     
-    connect( m_contactdb, SIGNAL( signalChanged(const OContactAccess*) ),
-             this, SLOT( refresh(const OContactAccess*) ) );
+    connect( m_contactdb, SIGNAL( signalChanged(const Opie::OPimContactAccess*) ),
+             this, SLOT( refresh(const Opie::OPimContactAccess*) ) );
 
@@ -51,3 +51,3 @@ AddressBookPluginWidget::~AddressBookPluginWidget() {
 
-void AddressBookPluginWidget::refresh( const OContactAccess* )
+void AddressBookPluginWidget::refresh( const Opie::OPimContactAccess* )
 {
@@ -88,3 +88,3 @@ void AddressBookPluginWidget::getAddress() {
         if ( ! addressLabel ) {
-                addressLabel = new OClickableLabel( this );
+                addressLabel = new Opie::Ui::OClickableLabel( this );
                 connect( addressLabel, SIGNAL( clicked() ), this, SLOT( startAddressBook() ) );
@@ -96,3 +96,3 @@ void AddressBookPluginWidget::getAddress() {
         // Check whether the database provide the search option..
-    if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
+    if ( !m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDiff ) ){
                 // Libopie seems to be old..
@@ -112,6 +112,6 @@ void AddressBookPluginWidget::getAddress() {
 
-    if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
+    if ( m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDiff ) ){
 
 
-                OContact querybirthdays;
+                Opie::OPimContact querybirthdays;
                 querybirthdays.setBirthday( lookAheadDate );
@@ -119,3 +119,3 @@ void AddressBookPluginWidget::getAddress() {
                 m_list = m_contactdb->queryByExample( querybirthdays, 
-                                                      OContactAccess::DateDiff );
+                                                      Opie::OPimContactAccess::DateDiff );
                 if ( m_list.count() > 0 ){
@@ -165,6 +165,6 @@ void AddressBookPluginWidget::getAddress() {
                 // Define the query for anniversaries and start search..
-                OContact queryanniversaries;
+                Opie::OPimContact queryanniversaries;
                 queryanniversaries.setAnniversary( lookAheadDate );
                 
-                m_list = m_contactdb->queryByExample( queryanniversaries, OContactAccess::DateDiff );
+                m_list = m_contactdb->queryByExample( queryanniversaries, Opie::OPimContactAccess::DateDiff );