libopie -> libopie2

9 files changed, 39 insertions, 39 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
@@ -4,18 +4,18 @@ CONFIG += qt plugin release
 
 # Input
 HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h  \
 	addresspluginwidget.h
 SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \
 	addresspluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
 		../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
 		../ ../library
 
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 -lqtaux2
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todayaddressbookplugin
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -10,31 +10,31 @@
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef ADDRESSBOOK_PLUGIN_H
 #define ADDRESSBOOK_PLUGIN_H
 
-#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>
 
 class AddressBookPlugin : public TodayPluginObject {
 
 public:
     AddressBookPlugin();
     ~AddressBookPlugin();
 
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
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
@@ -77,43 +77,43 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     SpinDaysClip->setMaxValue( 200 );
     QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) );
 
 //     QHBox *box4 = new QHBox( this );
 
 //     QLabel* colorLabel = new QLabel( box4, "" );
 //     colorLabel->setText( tr( "To activate settings: Restart application !" ) );
 
 
     QHBox *box5 = new QHBox( this );
     QLabel* colorLabel2 = new QLabel( box5, "" );
     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 !" ) );
     QHBox *box6 = new QHBox( this );
 
     // Entry color settings
     QLabel* colorLabel3= new QLabel( box6, "" );
     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 !" ) );
 
     // Urgent color settings
     QHBox *box7 = new QHBox( this );
     QLabel* colorLabel5 = new QLabel( box7, "" );
     colorLabel5->setText( tr( "Set Urgent\nColor if below " ) );
     SpinUrgentClip = new QSpinBox( box7, "SpinDays" );
     SpinUrgentClip->setMaxValue( 200 );
     QLabel* colorLabel6 = new QLabel( box7, "" );
     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 !" ) );
     QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) );
 
 
     //layout->addWidget( box4 );
     layout->addWidget( box1 );
     //layout->addWidget( box2 );
     layout->addWidget( box3 );
     layout->addWidget( box5 );
     layout->addWidget( box6 );
     layout->addWidget( box7 );
 
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
@@ -10,54 +10,54 @@
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef ADDRESSBOOK_PLUGIN_CONFIG_H
 #define ADDRESSBOOK_PLUGIN_CONFIG_H
 
+#include <opie2/todayconfigwidget.h>
+#include <opie2/ocolorbutton.h>
+
 #include <qwidget.h>
 #include <qspinbox.h>
 #include <qradiobutton.h>
 
-#include <opie/todayconfigwidget.h>
-#include <opie/ocolorbutton.h>
-
 class AddressBookPluginConfig : public TodayConfigWidget {
     Q_OBJECT
 
 public:
 
     AddressBookPluginConfig( QWidget *parent,  const char *name );
     ~AddressBookPluginConfig();
 
 private:
     /**
      * if changed then save
      */
     bool changed();
     void readConfig();
     void writeConfig();
 
     QSpinBox* SpinBox2;
     QSpinBox* SpinBoxClip;
     QSpinBox* SpinDaysClip;
     QSpinBox* SpinUrgentClip;
-    OColorButton* entryColor;
-    OColorButton* headlineColor;
-    OColorButton* urgentColor;
+    Opie::OColorButton* entryColor;
+    Opie::OColorButton* headlineColor;
+    Opie::OColorButton* urgentColor;
     QRadioButton* m_showBirthdayButton;
     QRadioButton* m_showAnniversaryButton;
 
     // how many lines should be showed in the AddressBook section
     int m_max_lines_task;
     // clip the lines after X chars
     int m_maxCharClip;
     // How many days look ahead
     int m_daysLookAhead;
     // Days until urgent color is used
     int m_urgentDays;
     // Entry Color
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
@@ -10,25 +10,25 @@
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef ADDRESSBOOK_PLUGIN_IMPL_H
 #define ADDRESSBOOK_PLUGIN_IMPL_H
 
-#include <opie/todayplugininterface.h>
+#include <opie2/todayplugininterface.h>
 
 class AddressBookPlugin;
 
 class AddressBookPluginImpl : public TodayPluginInterface{
 
 public:
     AddressBookPluginImpl();
     virtual ~AddressBookPluginImpl();
 
     QRESULT queryInterface( const QUuid &,  QUnknownInterface** );
     Q_REFCOUNT
 
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();
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
@@ -10,54 +10,54 @@
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef ADDRESSBOOK_PLUGIN_WIDGET_H
 #define ADDRESSBOOK_PLUGIN_WIDGET_H
 
+#include <opie2/ocontactaccess.h>
+#include <opie2/oclickablelabel.h>
+
 #include <qstring.h>
 #include <qwidget.h>
 #include <qlayout.h>
 
-#include <opie/ocontactaccess.h>
-#include <opie/oclickablelabel.h>
-
 
 class AddressBookPluginWidget : public QWidget {
 
     Q_OBJECT
 
 public:
     AddressBookPluginWidget( QWidget *parent,  const char *name );
     ~AddressBookPluginWidget();
 
     void reinitialize();
 public slots:
-    void refresh( const OContactAccess* db ); 
+    void refresh( const Opie::OPimContactAccess* db );
 
 protected slots:
     void  startAddressBook();
 
 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;
 
     void readConfig();
     void getAddress();
     int m_maxLinesTask;
     int m_maxCharClip;
     int m_daysLookAhead;
     int m_urgentDays;
     QString m_entryColor;
     QString m_headlineColor;
     QString m_urgentColor;
     bool m_showBirthdays;
     bool m_showAnniversaries;
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
@@ -1,4 +1,4 @@
   config TODAY_ADDRESSBOOK
     boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)"
     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
@@ -1,10 +1,10 @@
 Package: opie-today-addressbookplugin
 Files: plugins/today/libtodayaddressbookplugin.so*
 Priority: optional
 Section: opie/plugins
 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
  Displays upcoming Birthdays and Anniversaries
 Version: $QPE_VERSION$EXTRAVERSION