9 files changed, 79 insertions, 79 deletions

diff --git a/core/pim/today/plugins/addressbook/addressbook.pro b/core/pim/today/plugins/addressbook/addressbook.pro
index cf0ff97..e65f31e 100644
--- a/core/pim/today/plugins/addressbook/addressbook.pro
+++ b/core/pim/today/plugins/addressbook/addressbook.pro
@@ -6,12 +6,12 @@ CONFIG += qt plugin release
 HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h  \
-        addresspluginwidget.h
+    addresspluginwidget.h
 SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \
-        addresspluginwidget.cpp
+    addresspluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
-                ../ ../library
+        ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
-                ../ ../library
+        ../ ../library
 
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 -lqtaux2
 
diff --git a/core/pim/today/plugins/addressbook/addressplugin.h b/core/pim/today/plugins/addressbook/addressplugin.h
index 0b3b065..e664d5f 100644
--- a/core/pim/today/plugins/addressbook/addressplugin.h
+++ b/core/pim/today/plugins/addressbook/addressplugin.h
@@ -21,9 +21,9 @@
 
-#include <qstring.h>
-#include <qwidget.h>
+#include "addresspluginwidget.h"
 
-#include <opie/oclickablelabel.h>
-#include <opie/todayplugininterface.h>
+#include <opie2/oclickablelabel.h>
+#include <opie2/todayplugininterface.h>
 
-#include "addresspluginwidget.h"
+#include <qstring.h>
+#include <qwidget.h>
 
@@ -47,3 +47,3 @@ public:
  private:
-    AddressBookPluginWidget* m_abWidget; 
+    AddressBookPluginWidget* m_abWidget;
 };
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
index 8c55937..81bb8fd 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
@@ -88,3 +88,3 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     colorLabel2->setText( tr( "Set Headline Color: " ) );
-    headlineColor = new OColorButton( box5, black , "headlineColor" );
+    headlineColor = new Opie::OColorButton( box5, black , "headlineColor" );
     QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) );
@@ -95,3 +95,3 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     colorLabel3->setText( tr( "Set Entry Color: " ) );
-    entryColor = new OColorButton( box6, black , "entryColor" );
+    entryColor = new Opie::OColorButton( box6, black , "entryColor" );
     QWhatsThis::add( entryColor , tr( "This color will be used for shown birthdays/anniversaries !" ) );
@@ -106,3 +106,3 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     colorLabel6->setText( tr( " days: " ) );
-    urgentColor = new OColorButton( box7, red , "urgentColor" );
+    urgentColor = new Opie::OColorButton( box7, red , "urgentColor" );
     QWhatsThis::add( urgentColor , tr( "This urgent color will be used if we are close to the event !" ) );
@@ -144,3 +144,3 @@ void AddressBookPluginConfig::readConfig() {
     m_showAnniversaryButton->setChecked( cfg.readBoolEntry( "showAnniversaries", true ) );
-                                  
+
 }
@@ -159,3 +159,3 @@ void AddressBookPluginConfig::writeConfig() {
     if ( m_urgentDays > m_daysLookAhead )
-            m_urgentDays = m_daysLookAhead;
+        m_urgentDays = m_daysLookAhead;
     cfg.writeEntry( "urgentdays", m_urgentDays );
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.h b/core/pim/today/plugins/addressbook/addresspluginconfig.h
index 5626e5d..e065ca2 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.h
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.h
@@ -21,2 +21,5 @@
 
+#include <opie2/todayconfigwidget.h>
+#include <opie2/ocolorbutton.h>
+
 #include <qwidget.h>
@@ -25,5 +28,2 @@
 
-#include <opie/todayconfigwidget.h>
-#include <opie/ocolorbutton.h>
-
 class AddressBookPluginConfig : public TodayConfigWidget {
@@ -48,5 +48,5 @@ private:
     QSpinBox* SpinUrgentClip;
-    OColorButton* entryColor;
-    OColorButton* headlineColor;
-    OColorButton* urgentColor;
+    Opie::OColorButton* entryColor;
+    Opie::OColorButton* headlineColor;
+    Opie::OColorButton* urgentColor;
     QRadioButton* m_showBirthdayButton;
diff --git a/core/pim/today/plugins/addressbook/addresspluginimpl.h b/core/pim/today/plugins/addressbook/addresspluginimpl.h
index bf321da..9716787 100644
--- a/core/pim/today/plugins/addressbook/addresspluginimpl.h
+++ b/core/pim/today/plugins/addressbook/addresspluginimpl.h
@@ -21,3 +21,3 @@
 
-#include <opie/todayplugininterface.h>
+#include <opie2/todayplugininterface.h>
 
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");
-    
-    connect( m_contactdb, SIGNAL( signalChanged(const OContactAccess*) ),
-             this, SLOT( refresh(const OContactAccess*) ) );
+    m_contactdb = new Opie::OPimContactAccess("addressplugin");
+
+    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() ) );
@@ -92,3 +92,3 @@ void AddressBookPluginWidget::getAddress() {
         }
-        
+
         QString output;
@@ -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,10 +112,10 @@ void AddressBookPluginWidget::getAddress() {
 
-    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 );
+
+                m_list = m_contactdb->queryByExample( querybirthdays,
+                                                      Opie::OPimContactAccess::DateDiff );
                 if ( m_list.count() > 0 ){
@@ -127,27 +127,27 @@ void AddressBookPluginWidget::getAddress() {
                                 if ( ammount++ < m_maxLinesTask ){
-                                        // Now we want to calculate how many days 
-                                        //until birthday. We have to set 
+                                        // 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(), 
+                                        destdate.setYMD( QDate::currentDate().year(),
                                                          destdate.month(), destdate.day() );
                                         if ( QDate::currentDate().daysTo(destdate) < 0 )
-                                                destdate.setYMD( QDate::currentDate().year()+1, 
+                                                destdate.setYMD( QDate::currentDate().year()+1,
                                                                  destdate.month(), destdate.day() );
 
-                                        
+
                                         if ( QDate::currentDate().daysTo(destdate) < m_urgentDays )
-                                                output += "<font color=" + m_urgentColor + "><b>-" 
-                                                        + (*m_it).fullName() 
-                                                        + " (" 
+                                                output += "<font color=" + m_urgentColor + "><b>-"
+                                                        + (*m_it).fullName()
+                                                        + " ("
                                                         + QString::number(QDate::currentDate()
-                                                                          .daysTo(destdate)) 
+                                                                          .daysTo(destdate))
                                                         + " Days) </b></font><br>";
-                                        
+
                                         else
-                                                output += "<font color=" + m_entryColor + "><b>-" 
-                                                        + (*m_it).fullName() 
-                                                        + " (" 
+                                                output += "<font color=" + m_entryColor + "><b>-"
+                                                        + (*m_it).fullName()
+                                                        + " ("
                                                         + QString::number(QDate::currentDate()
-                                                                          .daysTo(destdate)) 
+                                                                          .daysTo(destdate))
                                                         + " Days) </b></font><br>";
@@ -162,10 +162,10 @@ void AddressBookPluginWidget::getAddress() {
         }
-                
+
         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;
@@ -178,9 +178,9 @@ void AddressBookPluginWidget::getAddress() {
                                 if ( ammount++ < m_maxLinesTask ){
-                                        // Now we want to calculate how many days until anniversary. 
+                                        // 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();
-                                        destdate.setYMD( QDate::currentDate().year(), destdate.month(), 
+                                        destdate.setYMD( QDate::currentDate().year(), destdate.month(),
                                                          destdate.day() );
                                         if ( QDate::currentDate().daysTo(destdate) < 0 )
-                                                destdate.setYMD( QDate::currentDate().year()+1, 
+                                                destdate.setYMD( QDate::currentDate().year()+1,
                                                                  destdate.month(), destdate.day() );
@@ -188,14 +188,14 @@ void AddressBookPluginWidget::getAddress() {
                                         if ( QDate::currentDate().daysTo(destdate) < m_urgentDays )
-                                                output += "<font color=" + m_urgentColor + "><b>-" 
-                                                        + (*m_it).fullName() 
-                                                        + " (" 
+                                                output += "<font color=" + m_urgentColor + "><b>-"
+                                                        + (*m_it).fullName()
+                                                        + " ("
                                                         + QString::number(QDate::currentDate()
-                                                                          .daysTo( destdate ) ) 
+                                                                          .daysTo( destdate ) )
                                                         + " Days) </b></font><br>";
                                         else
-                                                output += "<font color=" + m_entryColor + "><b>-" 
-                                                        + (*m_it).fullName() 
-                                                        + " (" 
+                                                output += "<font color=" + m_entryColor + "><b>-"
+                                                        + (*m_it).fullName()
+                                                        + " ("
                                                         + QString::number(QDate::currentDate()
-                                                                          .daysTo( destdate ) ) 
+                                                                          .daysTo( destdate ) )
                                                         + " Days) </b></font><br>";
@@ -204,3 +204,3 @@ void AddressBookPluginWidget::getAddress() {
                 } else {
-                        output += "<font color=" + m_headlineColor + ">" 
+                        output += "<font color=" + m_headlineColor + ">"
                                 + QObject::tr( "No anniversaries in <b> %1 </b> days!" )
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.h b/core/pim/today/plugins/addressbook/addresspluginwidget.h
index b0e3811..b1c690d 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.h
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.h
@@ -21,2 +21,5 @@
 
+#include <opie2/ocontactaccess.h>
+#include <opie2/oclickablelabel.h>
+
 #include <qstring.h>
@@ -25,5 +28,2 @@
 
-#include <opie/ocontactaccess.h>
-#include <opie/oclickablelabel.h>
-
 
@@ -39,3 +39,3 @@ public:
 public slots:
-    void refresh( const OContactAccess* db ); 
+    void refresh( const Opie::OPimContactAccess* db );
 
@@ -45,8 +45,8 @@ protected slots:
 private:
-    OClickableLabel* addressLabel;
+    Opie::Ui::OClickableLabel* addressLabel;
     QVBoxLayout* layoutTodo;
-    OContactAccess * m_contactdb;
+    Opie::OPimContactAccess * m_contactdb;
 
-    OContactAccess::List m_list;
-    OContactAccess::List::Iterator m_it;
+    Opie::OPimContactAccess::List m_list;
+    Opie::OPimContactAccess::List::Iterator m_it;
 
diff --git a/core/pim/today/plugins/addressbook/config.in b/core/pim/today/plugins/addressbook/config.in
index aad6fc7..cf61a0e 100644
--- a/core/pim/today/plugins/addressbook/config.in
+++ b/core/pim/today/plugins/addressbook/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX
diff --git a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
index d40691a..2fd1435 100644
--- a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
+++ b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
@@ -6,3 +6,3 @@ Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 Architecture: arm
-Depends: libqte2, opie-today
+Depends: libqte2, opie-today, libopiecore2, libopieui2, libopiepim2, libopiedb2, libqtaux2
 Description: Addressbook plugin for Today