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
@@ -10,55 +10,55 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "addresspluginwidget.h"
 
 
-#include <qpe/config.h>
+#include <opie2/opimcontact.h>
 
-#include <opie/ocontact.h>
+#include <qpe/config.h>
 
 AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent,  const char* name )
     : QWidget( parent, name ) {
 
     addressLabel = 0l;
     m_contactdb = 0l;
     layoutTodo = 0l;
 
     // Hä ? Nonsense ! (se)
     if ( m_contactdb ) {
         delete m_contactdb;
     }
 
-    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*) ) );
 
 
     readConfig();
     getAddress();
 }
 
 AddressBookPluginWidget::~AddressBookPluginWidget() {
     delete m_contactdb;
 }
 
-void AddressBookPluginWidget::refresh( const OContactAccess* )
+void AddressBookPluginWidget::refresh( const Opie::OPimContactAccess* )
 {
         qWarning(" AddressBookPluginWidget::Database was changed externally ! ");
         m_contactdb->reload();
         getAddress();
 }
 
 void AddressBookPluginWidget::reinitialize() {
         readConfig();
         getAddress();
 }
 
 void AddressBookPluginWidget::readConfig() {
@@ -77,56 +77,56 @@ void AddressBookPluginWidget::readConfig() {
 
 
 /**
  * Get the addresss
  */
 void AddressBookPluginWidget::getAddress() {
 
         if ( ! layoutTodo ){
                 layoutTodo = new QVBoxLayout( this );
         }
 
         if ( ! addressLabel ) {
-                addressLabel = new OClickableLabel( this );
+                addressLabel = new Opie::Ui::OClickableLabel( this );
                 connect( addressLabel, SIGNAL( clicked() ), this, SLOT( startAddressBook() ) );
                 layoutTodo->addWidget( addressLabel );
         }
         
         QString output;
 
         // 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..
                 output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" );
                 addressLabel->setText( output );
                 return;
         }
 
         // Define the query for birthdays and start search..
         QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead );
         int ammount = 0;
         if ( m_showBirthdays ){
                 qWarning("Searching from now (%s) until %s ! ",
                          QDate::currentDate().toString().latin1(),
                          lookAheadDate.toString().latin1() );
     }
 
-    if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
+    if ( m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDiff ) ){
 
 
-                OContact querybirthdays;
+                Opie::OPimContact querybirthdays;
                 querybirthdays.setBirthday( lookAheadDate );
                 
                 m_list = m_contactdb->queryByExample( querybirthdays, 
-                                                      OContactAccess::DateDiff );
+                                                      Opie::OPimContactAccess::DateDiff );
                 if ( m_list.count() > 0 ){
                         output = "<font color=" + m_headlineColor + ">"
                                 + QObject::tr( "Next birthdays in <b> %1 </b> days:" )
                                 .arg( m_daysLookAhead )
                                 + "</font> <br>";
                         for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
                                 if ( ammount++ < m_maxLinesTask ){
                                         // Now we want to calculate how many days 
                                         //until birthday. We have to set 
                                         // the correct year to calculate the day diff...
                                         QDate destdate = (*m_it).birthday();
                                         destdate.setYMD( QDate::currentDate().year(), 
@@ -154,28 +154,28 @@ void AddressBookPluginWidget::getAddress() {
                                 }
                         }
                 } else {
                         output = "<font color=" + m_headlineColor + ">"
                                 + QObject::tr( "No birthdays in <b> %1 </b> days!" )
                                 .arg( m_daysLookAhead )
                                 + "</font> <br>";
                 }
         }
                 
         if ( m_showAnniversaries ){
                 // 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 );
                 
                 ammount = 0;
                 if ( m_list.count() > 0 ){
                         output += "<font color=" + m_headlineColor + ">"
                                 + QObject::tr( "Next anniversaries in <b> %1 </b> days:" )
                                 .arg( m_daysLookAhead )
                                 + "</font> <br>";
                         for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
                                 if ( ammount++ < m_maxLinesTask ){
                                         // Now we want to calculate how many days until anniversary. 
                                         // We have to set the correct year to calculate the day diff...
                                         QDate destdate = (*m_it).anniversary();