summaryrefslogtreecommitdiff
authordrw <drw>2004-03-25 23:00:40 (UTC)
committer drw <drw>2004-03-25 23:00:40 (UTC)
commit03091cd727701bdb2aa6ac623cd606131546d686 (patch) (unidiff)
tree76b818f6893fd0030071427d5a1efb0273921195
parentad160e97db39536ac42acdd3f2f98d1e49ae1f75 (diff)
downloadopie-03091cd727701bdb2aa6ac623cd606131546d686.zip
opie-03091cd727701bdb2aa6ac623cd606131546d686.tar.gz
opie-03091cd727701bdb2aa6ac623cd606131546d686.tar.bz2
libopie -> libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/addressbook/addressbook.pro10
-rw-r--r--core/pim/today/plugins/addressbook/addressplugin.h12
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginconfig.cpp10
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginconfig.h12
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginimpl.h2
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.cpp92
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.h16
-rw-r--r--core/pim/today/plugins/addressbook/config.in2
-rw-r--r--core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control2
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
@@ -4,16 +4,16 @@ CONFIG += qt plugin release
4 4
5# Input 5# Input
6HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h \ 6HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h \
7 addresspluginwidget.h 7 addresspluginwidget.h
8SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \ 8SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \
9 addresspluginwidget.cpp 9 addresspluginwidget.cpp
10 10
11INCLUDEPATH += $(OPIEDIR)/include \ 11INCLUDEPATH += $(OPIEDIR)/include \
12 ../ ../library 12 ../ ../library
13DEPENDPATH += $(OPIEDIR)/include \ 13DEPENDPATH += $(OPIEDIR)/include \
14 ../ ../library 14 ../ ../library
15 15
16LIBS+= -lqpe -lopie 16LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 -lqtaux2
17 17
18DESTDIR = $(OPIEDIR)/plugins/today 18DESTDIR = $(OPIEDIR)/plugins/today
19TARGET = todayaddressbookplugin 19TARGET = todayaddressbookplugin
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
@@ -19,13 +19,13 @@
19#ifndef ADDRESSBOOK_PLUGIN_H 19#ifndef ADDRESSBOOK_PLUGIN_H
20#define ADDRESSBOOK_PLUGIN_H 20#define ADDRESSBOOK_PLUGIN_H
21 21
22#include <qstring.h> 22#include "addresspluginwidget.h"
23#include <qwidget.h>
24 23
25#include <opie/oclickablelabel.h> 24#include <opie2/oclickablelabel.h>
26#include <opie/todayplugininterface.h> 25#include <opie2/todayplugininterface.h>
27 26
28#include "addresspluginwidget.h" 27#include <qstring.h>
28#include <qwidget.h>
29 29
30class AddressBookPlugin : public TodayPluginObject { 30class AddressBookPlugin : public TodayPluginObject {
31 31
@@ -45,7 +45,7 @@ public:
45 void reinitialize(); 45 void reinitialize();
46 46
47 private: 47 private:
48 AddressBookPluginWidget* m_abWidget; 48 AddressBookPluginWidget* m_abWidget;
49}; 49};
50 50
51#endif 51#endif
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
@@ -86,14 +86,14 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char*
86 QHBox *box5 = new QHBox( this ); 86 QHBox *box5 = new QHBox( this );
87 QLabel* colorLabel2 = new QLabel( box5, "" ); 87 QLabel* colorLabel2 = new QLabel( box5, "" );
88 colorLabel2->setText( tr( "Set Headline Color: " ) ); 88 colorLabel2->setText( tr( "Set Headline Color: " ) );
89 headlineColor = new OColorButton( box5, black , "headlineColor" ); 89 headlineColor = new Opie::OColorButton( box5, black , "headlineColor" );
90 QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) ); 90 QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) );
91 QHBox *box6 = new QHBox( this ); 91 QHBox *box6 = new QHBox( this );
92 92
93 // Entry color settings 93 // Entry color settings
94 QLabel* colorLabel3= new QLabel( box6, "" ); 94 QLabel* colorLabel3= new QLabel( box6, "" );
95 colorLabel3->setText( tr( "Set Entry Color: " ) ); 95 colorLabel3->setText( tr( "Set Entry Color: " ) );
96 entryColor = new OColorButton( box6, black , "entryColor" ); 96 entryColor = new Opie::OColorButton( box6, black , "entryColor" );
97 QWhatsThis::add( entryColor , tr( "This color will be used for shown birthdays/anniversaries !" ) ); 97 QWhatsThis::add( entryColor , tr( "This color will be used for shown birthdays/anniversaries !" ) );
98 98
99 // Urgent color settings 99 // Urgent color settings
@@ -104,7 +104,7 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char*
104 SpinUrgentClip->setMaxValue( 200 ); 104 SpinUrgentClip->setMaxValue( 200 );
105 QLabel* colorLabel6 = new QLabel( box7, "" ); 105 QLabel* colorLabel6 = new QLabel( box7, "" );
106 colorLabel6->setText( tr( " days: " ) ); 106 colorLabel6->setText( tr( " days: " ) );
107 urgentColor = new OColorButton( box7, red , "urgentColor" ); 107 urgentColor = new Opie::OColorButton( box7, red , "urgentColor" );
108 QWhatsThis::add( urgentColor , tr( "This urgent color will be used if we are close to the event !" ) ); 108 QWhatsThis::add( urgentColor , tr( "This urgent color will be used if we are close to the event !" ) );
109 QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) ); 109 QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) );
110 110
@@ -142,7 +142,7 @@ void AddressBookPluginConfig::readConfig() {
142 142
143 m_showBirthdayButton->setChecked( cfg.readBoolEntry( "showBirthdays", true ) ); 143 m_showBirthdayButton->setChecked( cfg.readBoolEntry( "showBirthdays", true ) );
144 m_showAnniversaryButton->setChecked( cfg.readBoolEntry( "showAnniversaries", true ) ); 144 m_showAnniversaryButton->setChecked( cfg.readBoolEntry( "showAnniversaries", true ) );
145 145
146} 146}
147 147
148 148
@@ -157,7 +157,7 @@ void AddressBookPluginConfig::writeConfig() {
157 cfg.writeEntry( "dayslookahead", m_daysLookAhead ); 157 cfg.writeEntry( "dayslookahead", m_daysLookAhead );
158 m_urgentDays = SpinUrgentClip->value(); 158 m_urgentDays = SpinUrgentClip->value();
159 if ( m_urgentDays > m_daysLookAhead ) 159 if ( m_urgentDays > m_daysLookAhead )
160 m_urgentDays = m_daysLookAhead; 160 m_urgentDays = m_daysLookAhead;
161 cfg.writeEntry( "urgentdays", m_urgentDays ); 161 cfg.writeEntry( "urgentdays", m_urgentDays );
162 162
163 m_entryColor = entryColor->color().name(); 163 m_entryColor = entryColor->color().name();
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
@@ -19,13 +19,13 @@
19#ifndef ADDRESSBOOK_PLUGIN_CONFIG_H 19#ifndef ADDRESSBOOK_PLUGIN_CONFIG_H
20#define ADDRESSBOOK_PLUGIN_CONFIG_H 20#define ADDRESSBOOK_PLUGIN_CONFIG_H
21 21
22#include <opie2/todayconfigwidget.h>
23#include <opie2/ocolorbutton.h>
24
22#include <qwidget.h> 25#include <qwidget.h>
23#include <qspinbox.h> 26#include <qspinbox.h>
24#include <qradiobutton.h> 27#include <qradiobutton.h>
25 28
26#include <opie/todayconfigwidget.h>
27#include <opie/ocolorbutton.h>
28
29class AddressBookPluginConfig : public TodayConfigWidget { 29class AddressBookPluginConfig : public TodayConfigWidget {
30 Q_OBJECT 30 Q_OBJECT
31 31
@@ -46,9 +46,9 @@ private:
46 QSpinBox* SpinBoxClip; 46 QSpinBox* SpinBoxClip;
47 QSpinBox* SpinDaysClip; 47 QSpinBox* SpinDaysClip;
48 QSpinBox* SpinUrgentClip; 48 QSpinBox* SpinUrgentClip;
49 OColorButton* entryColor; 49 Opie::OColorButton* entryColor;
50 OColorButton* headlineColor; 50 Opie::OColorButton* headlineColor;
51 OColorButton* urgentColor; 51 Opie::OColorButton* urgentColor;
52 QRadioButton* m_showBirthdayButton; 52 QRadioButton* m_showBirthdayButton;
53 QRadioButton* m_showAnniversaryButton; 53 QRadioButton* m_showAnniversaryButton;
54 54
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
@@ -19,7 +19,7 @@
19#ifndef ADDRESSBOOK_PLUGIN_IMPL_H 19#ifndef ADDRESSBOOK_PLUGIN_IMPL_H
20#define ADDRESSBOOK_PLUGIN_IMPL_H 20#define ADDRESSBOOK_PLUGIN_IMPL_H
21 21
22#include <opie/todayplugininterface.h> 22#include <opie2/todayplugininterface.h>
23 23
24class AddressBookPlugin; 24class AddressBookPlugin;
25 25
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
@@ -19,9 +19,9 @@
19#include "addresspluginwidget.h" 19#include "addresspluginwidget.h"
20 20
21 21
22#include <qpe/config.h> 22#include <opie2/opimcontact.h>
23 23
24#include <opie/ocontact.h> 24#include <qpe/config.h>
25 25
26AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent, const char* name ) 26AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent, const char* name )
27 : QWidget( parent, name ) { 27 : QWidget( parent, name ) {
@@ -35,10 +35,10 @@ AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent, const char*
35 delete m_contactdb; 35 delete m_contactdb;
36 } 36 }
37 37
38 m_contactdb = new OContactAccess("addressplugin"); 38 m_contactdb = new Opie::OPimContactAccess("addressplugin");
39 39
40 connect( m_contactdb, SIGNAL( signalChanged(const OContactAccess*) ), 40 connect( m_contactdb, SIGNAL( signalChanged(const Opie::OPimContactAccess*) ),
41 this, SLOT( refresh(const OContactAccess*) ) ); 41 this, SLOT( refresh(const Opie::OPimContactAccess*) ) );
42 42
43 43
44 readConfig(); 44 readConfig();
@@ -49,7 +49,7 @@ AddressBookPluginWidget::~AddressBookPluginWidget() {
49 delete m_contactdb; 49 delete m_contactdb;
50} 50}
51 51
52void AddressBookPluginWidget::refresh( const OContactAccess* ) 52void AddressBookPluginWidget::refresh( const Opie::OPimContactAccess* )
53{ 53{
54 qWarning(" AddressBookPluginWidget::Database was changed externally ! "); 54 qWarning(" AddressBookPluginWidget::Database was changed externally ! ");
55 m_contactdb->reload(); 55 m_contactdb->reload();
@@ -86,15 +86,15 @@ void AddressBookPluginWidget::getAddress() {
86 } 86 }
87 87
88 if ( ! addressLabel ) { 88 if ( ! addressLabel ) {
89 addressLabel = new OClickableLabel( this ); 89 addressLabel = new Opie::Ui::OClickableLabel( this );
90 connect( addressLabel, SIGNAL( clicked() ), this, SLOT( startAddressBook() ) ); 90 connect( addressLabel, SIGNAL( clicked() ), this, SLOT( startAddressBook() ) );
91 layoutTodo->addWidget( addressLabel ); 91 layoutTodo->addWidget( addressLabel );
92 } 92 }
93 93
94 QString output; 94 QString output;
95 95
96 // Check whether the database provide the search option.. 96 // Check whether the database provide the search option..
97 if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ 97 if ( !m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDiff ) ){
98 // Libopie seems to be old.. 98 // Libopie seems to be old..
99 output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" ); 99 output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" );
100 addressLabel->setText( output ); 100 addressLabel->setText( output );
@@ -110,14 +110,14 @@ void AddressBookPluginWidget::getAddress() {
110 lookAheadDate.toString().latin1() ); 110 lookAheadDate.toString().latin1() );
111 } 111 }
112 112
113 if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ 113 if ( m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDiff ) ){
114 114
115 115
116 OContact querybirthdays; 116 Opie::OPimContact querybirthdays;
117 querybirthdays.setBirthday( lookAheadDate ); 117 querybirthdays.setBirthday( lookAheadDate );
118 118
119 m_list = m_contactdb->queryByExample( querybirthdays, 119 m_list = m_contactdb->queryByExample( querybirthdays,
120 OContactAccess::DateDiff ); 120 Opie::OPimContactAccess::DateDiff );
121 if ( m_list.count() > 0 ){ 121 if ( m_list.count() > 0 ){
122 output = "<font color=" + m_headlineColor + ">" 122 output = "<font color=" + m_headlineColor + ">"
123 + QObject::tr( "Next birthdays in <b> %1 </b> days:" ) 123 + QObject::tr( "Next birthdays in <b> %1 </b> days:" )
@@ -125,31 +125,31 @@ void AddressBookPluginWidget::getAddress() {
125 + "</font> <br>"; 125 + "</font> <br>";
126 for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { 126 for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
127 if ( ammount++ < m_maxLinesTask ){ 127 if ( ammount++ < m_maxLinesTask ){
128 // Now we want to calculate how many days 128 // Now we want to calculate how many days
129 //until birthday. We have to set 129 //until birthday. We have to set
130 // the correct year to calculate the day diff... 130 // the correct year to calculate the day diff...
131 QDate destdate = (*m_it).birthday(); 131 QDate destdate = (*m_it).birthday();
132 destdate.setYMD( QDate::currentDate().year(), 132 destdate.setYMD( QDate::currentDate().year(),
133 destdate.month(), destdate.day() ); 133 destdate.month(), destdate.day() );
134 if ( QDate::currentDate().daysTo(destdate) < 0 ) 134 if ( QDate::currentDate().daysTo(destdate) < 0 )
135 destdate.setYMD( QDate::currentDate().year()+1, 135 destdate.setYMD( QDate::currentDate().year()+1,
136 destdate.month(), destdate.day() ); 136 destdate.month(), destdate.day() );
137 137
138 138
139 if ( QDate::currentDate().daysTo(destdate) < m_urgentDays ) 139 if ( QDate::currentDate().daysTo(destdate) < m_urgentDays )
140 output += "<font color=" + m_urgentColor + "><b>-" 140 output += "<font color=" + m_urgentColor + "><b>-"
141 + (*m_it).fullName() 141 + (*m_it).fullName()
142 + " (" 142 + " ("
143 + QString::number(QDate::currentDate() 143 + QString::number(QDate::currentDate()
144 .daysTo(destdate)) 144 .daysTo(destdate))
145 + " Days) </b></font><br>"; 145 + " Days) </b></font><br>";
146 146
147 else 147 else
148 output += "<font color=" + m_entryColor + "><b>-" 148 output += "<font color=" + m_entryColor + "><b>-"
149 + (*m_it).fullName() 149 + (*m_it).fullName()
150 + " (" 150 + " ("
151 + QString::number(QDate::currentDate() 151 + QString::number(QDate::currentDate()
152 .daysTo(destdate)) 152 .daysTo(destdate))
153 + " Days) </b></font><br>"; 153 + " Days) </b></font><br>";
154 } 154 }
155 } 155 }
@@ -160,14 +160,14 @@ void AddressBookPluginWidget::getAddress() {
160 + "</font> <br>"; 160 + "</font> <br>";
161 } 161 }
162 } 162 }
163 163
164 if ( m_showAnniversaries ){ 164 if ( m_showAnniversaries ){
165 // Define the query for anniversaries and start search.. 165 // Define the query for anniversaries and start search..
166 OContact queryanniversaries; 166 Opie::OPimContact queryanniversaries;
167 queryanniversaries.setAnniversary( lookAheadDate ); 167 queryanniversaries.setAnniversary( lookAheadDate );
168 168
169 m_list = m_contactdb->queryByExample( queryanniversaries, OContactAccess::DateDiff ); 169 m_list = m_contactdb->queryByExample( queryanniversaries, Opie::OPimContactAccess::DateDiff );
170 170
171 ammount = 0; 171 ammount = 0;
172 if ( m_list.count() > 0 ){ 172 if ( m_list.count() > 0 ){
173 output += "<font color=" + m_headlineColor + ">" 173 output += "<font color=" + m_headlineColor + ">"
@@ -176,33 +176,33 @@ void AddressBookPluginWidget::getAddress() {
176 + "</font> <br>"; 176 + "</font> <br>";
177 for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { 177 for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
178 if ( ammount++ < m_maxLinesTask ){ 178 if ( ammount++ < m_maxLinesTask ){
179 // Now we want to calculate how many days until anniversary. 179 // Now we want to calculate how many days until anniversary.
180 // We have to set the correct year to calculate the day diff... 180 // We have to set the correct year to calculate the day diff...
181 QDate destdate = (*m_it).anniversary(); 181 QDate destdate = (*m_it).anniversary();
182 destdate.setYMD( QDate::currentDate().year(), destdate.month(), 182 destdate.setYMD( QDate::currentDate().year(), destdate.month(),
183 destdate.day() ); 183 destdate.day() );
184 if ( QDate::currentDate().daysTo(destdate) < 0 ) 184 if ( QDate::currentDate().daysTo(destdate) < 0 )
185 destdate.setYMD( QDate::currentDate().year()+1, 185 destdate.setYMD( QDate::currentDate().year()+1,
186 destdate.month(), destdate.day() ); 186 destdate.month(), destdate.day() );
187 187
188 if ( QDate::currentDate().daysTo(destdate) < m_urgentDays ) 188 if ( QDate::currentDate().daysTo(destdate) < m_urgentDays )
189 output += "<font color=" + m_urgentColor + "><b>-" 189 output += "<font color=" + m_urgentColor + "><b>-"
190 + (*m_it).fullName() 190 + (*m_it).fullName()
191 + " (" 191 + " ("
192 + QString::number(QDate::currentDate() 192 + QString::number(QDate::currentDate()
193 .daysTo( destdate ) ) 193 .daysTo( destdate ) )
194 + " Days) </b></font><br>"; 194 + " Days) </b></font><br>";
195 else 195 else
196 output += "<font color=" + m_entryColor + "><b>-" 196 output += "<font color=" + m_entryColor + "><b>-"
197 + (*m_it).fullName() 197 + (*m_it).fullName()
198 + " (" 198 + " ("
199 + QString::number(QDate::currentDate() 199 + QString::number(QDate::currentDate()
200 .daysTo( destdate ) ) 200 .daysTo( destdate ) )
201 + " Days) </b></font><br>"; 201 + " Days) </b></font><br>";
202 } 202 }
203 } 203 }
204 } else { 204 } else {
205 output += "<font color=" + m_headlineColor + ">" 205 output += "<font color=" + m_headlineColor + ">"
206 + QObject::tr( "No anniversaries in <b> %1 </b> days!" ) 206 + QObject::tr( "No anniversaries in <b> %1 </b> days!" )
207 .arg( m_daysLookAhead ) 207 .arg( m_daysLookAhead )
208 + "</font> <br>"; 208 + "</font> <br>";
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
@@ -19,13 +19,13 @@
19#ifndef ADDRESSBOOK_PLUGIN_WIDGET_H 19#ifndef ADDRESSBOOK_PLUGIN_WIDGET_H
20#define ADDRESSBOOK_PLUGIN_WIDGET_H 20#define ADDRESSBOOK_PLUGIN_WIDGET_H
21 21
22#include <opie2/ocontactaccess.h>
23#include <opie2/oclickablelabel.h>
24
22#include <qstring.h> 25#include <qstring.h>
23#include <qwidget.h> 26#include <qwidget.h>
24#include <qlayout.h> 27#include <qlayout.h>
25 28
26#include <opie/ocontactaccess.h>
27#include <opie/oclickablelabel.h>
28
29 29
30class AddressBookPluginWidget : public QWidget { 30class AddressBookPluginWidget : public QWidget {
31 31
@@ -37,18 +37,18 @@ public:
37 37
38 void reinitialize(); 38 void reinitialize();
39public slots: 39public slots:
40 void refresh( const OContactAccess* db ); 40 void refresh( const Opie::OPimContactAccess* db );
41 41
42protected slots: 42protected slots:
43 void startAddressBook(); 43 void startAddressBook();
44 44
45private: 45private:
46 OClickableLabel* addressLabel; 46 Opie::Ui::OClickableLabel* addressLabel;
47 QVBoxLayout* layoutTodo; 47 QVBoxLayout* layoutTodo;
48 OContactAccess * m_contactdb; 48 Opie::OPimContactAccess * m_contactdb;
49 49
50 OContactAccess::List m_list; 50 Opie::OPimContactAccess::List m_list;
51 OContactAccess::List::Iterator m_it; 51 Opie::OPimContactAccess::List::Iterator m_it;
52 52
53 void readConfig(); 53 void readConfig();
54 void getAddress(); 54 void getAddress();
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 @@
1 config TODAY_ADDRESSBOOK 1 config TODAY_ADDRESSBOOK
2 boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)" 2 boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 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
@@ -4,7 +4,7 @@ Priority: optional
4Section: opie/plugins 4Section: opie/plugins
5Maintainer: Stefan Eilers <eilers.stefan@epost.de> 5Maintainer: Stefan Eilers <eilers.stefan@epost.de>
6Architecture: arm 6Architecture: arm
7Depends: libqte2, opie-today 7Depends: libqte2, opie-today, libopiecore2, libopieui2, libopiepim2, libopiedb2, libqtaux2
8Description: Addressbook plugin for Today 8Description: Addressbook plugin for Today
9 Displays upcoming Birthdays and Anniversaries 9 Displays upcoming Birthdays and Anniversaries
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $QPE_VERSION$EXTRAVERSION