33 files changed, 109 insertions, 98 deletions
diff --git a/core/pim/today/main.cpp b/core/pim/today/main.cpp index d4ec3ce..974c050 100644 --- a/core/pim/today/main.cpp +++ b/core/pim/today/main.cpp @@ -1,13 +1,13 @@ /* * main.cpp * * --------------------- * * begin : Sun 10 17:20:00 CEST 2002 - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : max.reiss@gmx.de * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -15,9 +15,10 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "today.h" -#include <opie/oapplicationfactory.h> + +#include <opie2/oapplicationfactory.h> OPIE_EXPORT_APP( OApplicationFactory<Today> ) diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro index 413aa47..798c981 100644 --- a/core/pim/today/plugins/datebook/datebook.pro +++ b/core/pim/today/plugins/datebook/datebook.pro @@ -10,13 +10,13 @@ INTERFACES = datebookpluginconfigbase.ui INCLUDEPATH += $(OPIEDIR)/include \ ../ ../library DEPENDPATH += $(OPIEDIR)/include \ ../ ../library -LIBS+= -lqpe -lopie +LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 DESTDIR = $(OPIEDIR)/plugins/today TARGET = todaydatebookplugin TRANSLATIONS = ../../../../../i18n/de/libtodaydatebookplugin.ts \ ../../../../../i18n/nl/libtodaydatebookplugin.ts \ diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index e19a690..9a820f2 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp @@ -1,10 +1,10 @@ /* * datebookevent.cpp * - * copyright : (c) 2002, 2003 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -12,17 +12,18 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "datebookevent.h" + #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/calendar.h> -#include <opie/odevice.h> +#include <opie2/odevice.h> using namespace Opie; DateBookEvent::DateBookEvent(const EffectiveEvent &ev, QWidget* parent, bool show_location, diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h index 1a090e3..e2ee077 100644 --- a/core/pim/today/plugins/datebook/datebookevent.h +++ b/core/pim/today/plugins/datebook/datebookevent.h @@ -1,10 +1,10 @@ /* * datebookplugin.h * - * copyright : (c) 2002, 2003 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -14,15 +14,17 @@ * * ***************************************************************************/ #ifndef DATEBOOKEVENT_PLUGIN_H #define DATEBOOKEVENT_PLUGIN_H -#include <opie/oclickablelabel.h> +#include <opie2/oclickablelabel.h> + #include <qpe/datebookdb.h> +using namespace Opie; class DateBookEvent: public OClickableLabel { Q_OBJECT public: diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp index 8dfa52f..f46806f 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.cpp +++ b/core/pim/today/plugins/datebook/datebookplugin.cpp @@ -1,25 +1,22 @@ - /* * datebookplugin.cpp * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * 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 "datebookplugin.h" #include "datebookpluginconfig.h" DatebookPlugin::DatebookPlugin() { } diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h index 890c59b..631d6a3 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.h +++ b/core/pim/today/plugins/datebook/datebookplugin.h @@ -14,18 +14,18 @@ * * ***************************************************************************/ #ifndef DATEBOOK_PLUGIN_H #define DATEBOOK_PLUGIN_H -#include <qguardedptr.h> +#include "datebookpluginwidget.h" -#include <opie/oclickablelabel.h> -#include <opie/todayplugininterface.h> +#include <opie2/oclickablelabel.h> +#include <opie2/todayplugininterface.h> -#include "datebookpluginwidget.h" +#include <qguardedptr.h> class DatebookPlugin : public TodayPluginObject { public: DatebookPlugin(); ~DatebookPlugin(); diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp index 8ead40d..5fd5221 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp @@ -1,10 +1,10 @@ /* * datebookpluginconfig.cpp * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h index 2d303fc..4f4e3f1 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.h +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h @@ -1,10 +1,10 @@ /* * datebookpluginconfig.h * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -14,19 +14,22 @@ * * ***************************************************************************/ #ifndef DATEBOOK_PLUGIN_CONFIG_H #define DATEBOOK_PLUGIN_CONFIG_H +#include "datebookpluginconfigbase.h" + +#include <opie2/todayconfigwidget.h> #include <qcheckbox.h> #include <qspinbox.h> -#include <opie/todayconfigwidget.h> -#include "datebookpluginconfigbase.h" + + class DatebookPluginConfig : public TodayConfigWidget { Q_OBJECT diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp index 6baffb9..ee250db 100644 --- a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp @@ -1,10 +1,10 @@ /* * datebookpluginimpl.cpp * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -32,13 +32,13 @@ TodayPluginObject* DatebookPluginImpl::guiPart() { QRESULT DatebookPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { *iface = 0; if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { *iface = this, (*iface)->addRef(); }else return QS_FALSE; - + return QS_OK; } Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( DatebookPluginImpl ); diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.h b/core/pim/today/plugins/datebook/datebookpluginimpl.h index 7c19e59..d34dd6d 100644 --- a/core/pim/today/plugins/datebook/datebookpluginimpl.h +++ b/core/pim/today/plugins/datebook/datebookpluginimpl.h @@ -1,10 +1,10 @@ /* * datebookpluginimpl.h * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -14,13 +14,13 @@ * * ***************************************************************************/ #ifndef DATEBOOK_PLUGIN_IMPL_H #define DATEBOOK_PLUGIN_IMPL_H -#include <opie/todayplugininterface.h> +#include <opie2/todayplugininterface.h> class DatebookPlugin; class DatebookPluginImpl : public TodayPluginInterface{ public: diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp index 1b11d1b..b6707df 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp @@ -1,10 +1,10 @@ /* * datebookpluginwidget.cpp * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -97,24 +97,24 @@ void DatebookPluginWidget::getDates() { if ( !m_onlyLater ) { count++; DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine ); m_eventsList.append( l ); l->show(); QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); - } else { - if ( ( QDateTime::currentDateTime() <= (*it).event().end() ) + } else { + if ( ( QDateTime::currentDateTime() <= (*it).event().end() ) // Show events which span over many days and are not elapsed. || ( ( (*it).event().start().date() != date ) && ( QDateTime::currentDateTime() <= (*it).event().end() ) ) // Show repeated event for today that is not elapsed. || ( ( (*it).event().repeatType() != Event::NoRepeat ) - && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() ) - && ( QTime::currentTime() < (*it).event().start().time() ) ) ) + && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() ) + && ( QTime::currentTime() < (*it).event().start().time() ) ) ) // Show repeated event for next days. || ( ( (*it).event().repeatType() != Event::NoRepeat ) - && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) ) - ) + && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) ) + ) { count++; // show only later appointments DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine ); m_eventsList.append( l ); l->show(); diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h index 8988073..68af323 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.h +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h @@ -14,20 +14,23 @@ * * ***************************************************************************/ #ifndef DATEBOOK_PLUGIN_WIDGET_H #define DATEBOOK_PLUGIN_WIDGET_H +#include "datebookevent.h" + +#include <opie2/oclickablelabel.h> + +#include <qpe/datebookdb.h> + #include <qlayout.h> #include <qguardedptr.h> #include <qlist.h> -#include <qpe/datebookdb.h> -#include <opie/oclickablelabel.h> - -#include "datebookevent.h" +using namespace Opie; class DatebookPluginWidget : public QWidget { Q_OBJECT public: diff --git a/core/pim/today/plugins/mail/mail.pro b/core/pim/today/plugins/mail/mail.pro index 70c484d..1c3555b 100644 --- a/core/pim/today/plugins/mail/mail.pro +++ b/core/pim/today/plugins/mail/mail.pro @@ -8,13 +8,13 @@ SOURCES = mailplugin.cpp mailpluginimpl.cpp mailpluginwidget.cpp INCLUDEPATH += $(OPIEDIR)/include \ ../ ../library DEPENDPATH += $(OPIEDIR)/include \ ../ ../library -LIBS+= -lqpe -lopie +LIBS+= -lqpe -lopiecore2 -opiepim2 DESTDIR = $(OPIEDIR)/plugins/today TARGET = todaymailplugin TRANSLATIONS = ../../../../../i18n/de/libtodaymailplugin.ts \ ../../../../../i18n/nl/libtodaymailplugin.ts \ diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h index 7d6d5e8..1edffef 100644 --- a/core/pim/today/plugins/mail/mailplugin.h +++ b/core/pim/today/plugins/mail/mailplugin.h @@ -15,19 +15,22 @@ ***************************************************************************/ #ifndef MAIL_PLUGIN_H #define MAIL_PLUGIN_H +#include "mailpluginwidget.h" + +#include <opie2/todayplugininterface.h> +#include <opie2/todayconfigwidget.h> + #include <qwidget.h> #include <qguardedptr.h> -#include <opie/todayplugininterface.h> -#include <opie/todayconfigwidget.h> -#include "mailpluginwidget.h" + class MailPlugin : public TodayPluginObject { public: MailPlugin(); ~MailPlugin(); diff --git a/core/pim/today/plugins/mail/mailpluginimpl.cpp b/core/pim/today/plugins/mail/mailpluginimpl.cpp index dfd3a64..fac27f4 100644 --- a/core/pim/today/plugins/mail/mailpluginimpl.cpp +++ b/core/pim/today/plugins/mail/mailpluginimpl.cpp @@ -1,10 +1,10 @@ /* * mailpluginimpl.cpp * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -35,13 +35,13 @@ TodayPluginObject* MailPluginImpl::guiPart() { QRESULT MailPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { *iface = 0; if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { *iface = this, (*iface)->addRef(); }else return QS_FALSE; - + return QS_OK; } Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( MailPluginImpl ); diff --git a/core/pim/today/plugins/mail/mailpluginimpl.h b/core/pim/today/plugins/mail/mailpluginimpl.h index 72e1760..35b3805 100644 --- a/core/pim/today/plugins/mail/mailpluginimpl.h +++ b/core/pim/today/plugins/mail/mailpluginimpl.h @@ -1,10 +1,10 @@ /* * mailpluginimpl.h * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -14,13 +14,13 @@ * * ***************************************************************************/ #ifndef MAIL_PLUGIN_IMPL_H #define MAIL_PLUGIN_IMPL_H -#include <opie/todayplugininterface.h> +#include <opie2/todayplugininterface.h> class MailPlugin; class MailPluginImpl : public TodayPluginInterface{ public: diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp index feecd81..4194270 100644 --- a/core/pim/today/plugins/mail/mailpluginwidget.cpp +++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp @@ -10,18 +10,17 @@ * 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 "mailpluginwidget.h" #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> -#include "mailpluginwidget.h" - MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) : QWidget(parent, name ) { m_mailLabel = 0l; m_layout = 0l; diff --git a/core/pim/today/plugins/mail/mailpluginwidget.h b/core/pim/today/plugins/mail/mailpluginwidget.h index 6d16d2c..0ad8738 100644 --- a/core/pim/today/plugins/mail/mailpluginwidget.h +++ b/core/pim/today/plugins/mail/mailpluginwidget.h @@ -16,13 +16,15 @@ #ifndef MAIL_PLUGIN_WIDGET_H #define MAIL_PLUGIN_WIDGET_H #include <qlayout.h> -#include <opie/oclickablelabel.h> +#include <opie2/oclickablelabel.h> + +using namespace Opie; class MailPluginWidget : public QWidget { Q_OBJECT public: diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro index 095247f..8f2f898 100644 --- a/core/pim/today/plugins/todolist/todolist.pro +++ b/core/pim/today/plugins/todolist/todolist.pro @@ -11,13 +11,13 @@ INTERFACES= todopluginconfigbase.ui INCLUDEPATH += $(OPIEDIR)/include \ ../ ../library DEPENDPATH += $(OPIEDIR)/include \ ../ ../library -LIBS+= -lqpe -lopie +LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 DESTDIR = $(OPIEDIR)/plugins/today TARGET = todaytodolistplugin TRANSLATIONS = ../../../../../i18n/de/libtodaytodolistplugin.ts \ ../../../../../i18n/nl/libtodaytodolistplugin.ts \ diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp index 801de9d..5783814 100644 --- a/core/pim/today/plugins/todolist/todoplugin.cpp +++ b/core/pim/today/plugins/todolist/todoplugin.cpp @@ -1,28 +1,25 @@ /* * todoplugin.cpp * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * 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 "todoplugin.h" #include "todopluginconfig.h" - TodolistPlugin::TodolistPlugin() { } TodolistPlugin::~TodolistPlugin() { delete (TodolistPluginWidget*)m_widget; } diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h index f68162f..bea15d5 100644 --- a/core/pim/today/plugins/todolist/todoplugin.h +++ b/core/pim/today/plugins/todolist/todoplugin.h @@ -1,10 +1,10 @@ /* * todoplugin.h * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002,2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -14,20 +14,23 @@ * * ***************************************************************************/ #ifndef TODOLIST_PLUGIN_H #define TODOLIST_PLUGIN_H + +#include "todopluginwidget.h" + +#include <opie2/oclickablelabel.h> +#include <opie2/todayplugininterface.h> + #include <qstring.h> #include <qguardedptr.h> #include <qwidget.h> -#include <opie/oclickablelabel.h> -#include <opie/todayplugininterface.h> - -#include "todopluginwidget.h" +using namespace Opie; class TodolistPlugin : public TodayPluginObject { public: TodolistPlugin(); ~TodolistPlugin(); diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h index a2d7d2c..7040369 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.h +++ b/core/pim/today/plugins/todolist/todopluginconfig.h @@ -14,17 +14,17 @@ * * ***************************************************************************/ #ifndef TODOLIST_PLUGIN_CONFIG_H #define TODOLIST_PLUGIN_CONFIG_H -#include <qspinbox.h> +#include "todopluginconfigbase.h" -#include <opie/todayconfigwidget.h> +#include <opie2/todayconfigwidget.h> -#include "todopluginconfigbase.h" +#include <qspinbox.h> class TodolistPluginConfig : public TodayConfigWidget { Q_OBJECT public: diff --git a/core/pim/today/plugins/todolist/todopluginimpl.cpp b/core/pim/today/plugins/todolist/todopluginimpl.cpp index 639587f..1a6189f 100644 --- a/core/pim/today/plugins/todolist/todopluginimpl.cpp +++ b/core/pim/today/plugins/todolist/todopluginimpl.cpp @@ -1,10 +1,10 @@ /* * todopluginimpl.cpp * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -33,13 +33,13 @@ TodayPluginObject* TodolistPluginImpl::guiPart() { QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { *iface = 0; if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { *iface = this, (*iface)->addRef(); }else return QS_FALSE; - + return QS_OK; } Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( TodolistPluginImpl ); diff --git a/core/pim/today/plugins/todolist/todopluginimpl.h b/core/pim/today/plugins/todolist/todopluginimpl.h index ca62fdb..f9b0b37 100644 --- a/core/pim/today/plugins/todolist/todopluginimpl.h +++ b/core/pim/today/plugins/todolist/todopluginimpl.h @@ -1,10 +1,10 @@ /* * todopluginimpl.h * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -14,13 +14,13 @@ * * ***************************************************************************/ #ifndef TODOLIST_PLUGIN_IMPL_H #define TODOLIST_PLUGIN_IMPL_H -#include <opie/todayplugininterface.h> +#include <opie2/todayplugininterface.h> class TodolistPlugin; class TodolistPluginImpl : public TodayPluginInterface{ public: diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp index 0364f94..567c70f 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.cpp +++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp @@ -26,13 +26,13 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) layoutTodo = 0l; todoLabel = 0l; if ( todo ) { delete todo; } - todo = new OTodoAccess(); + todo = new OPimTodoAccess(); todo->load(); if ( layoutTodo ) { delete layoutTodo; } layoutTodo = new QVBoxLayout( this ); diff --git a/core/pim/today/plugins/todolist/todopluginwidget.h b/core/pim/today/plugins/todolist/todopluginwidget.h index 9cac43d..a020cf4 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.h +++ b/core/pim/today/plugins/todolist/todopluginwidget.h @@ -16,15 +16,16 @@ #ifndef TODOLIST_PLUGIN_WIDGET_H #define TODOLIST_PLUGIN_WIDGET_H #include <qlayout.h> -#include <opie/otodoaccess.h> -#include <opie/oclickablelabel.h> +#include <opie2/otodoaccess.h> +#include <opie2/oclickablelabel.h> +using namespace Opie; class TodolistPluginWidget : public QWidget { Q_OBJECT public: @@ -38,15 +39,15 @@ protected slots: void startTodolist(); private: OClickableLabel *todoLabel; QVBoxLayout* layoutTodo; - OTodoAccess *todo; - OTodoAccess::List m_list; - OTodoAccess::List::Iterator m_it; + OPimTodoAccess *todo; + OPimTodoAccess::List m_list; + OPimTodoAccess::List::Iterator m_it; void readConfig(); void getTodo(); int m_maxLinesTask; int m_maxCharClip; }; diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index c83a5df..b55a4a7 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -1,24 +1,22 @@ /* * today.cpp * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * 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. * * * ***************************************************************************/ - - #define QTOPIA_INTERNAL_LANGLIST #include "today.h" #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> diff --git a/core/pim/today/today.h b/core/pim/today/today.h index bf2293a..972731c 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h @@ -1,39 +1,39 @@ /* * today.h * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * 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 TODAY_H #define TODAY_H -#include <qscrollview.h> -#include <qvbox.h> - -#include <qpe/qlibrary.h> #include "todayconfig.h" #include "todaybase.h" -#include <opie/todayplugininterface.h> +#include <opie2/todayplugininterface.h> +#include <opie2/oclickablelabel.h> -class QVBoxLayout; -class OClickableLabel; +#include <qpe/qlibrary.h> + +#include <qscrollview.h> +#include <qvbox.h> +using namespace Opie; + +class QVBoxLayout; class Today : public TodayBase { Q_OBJECT public: diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro index 2968e6a..b55a812 100644 --- a/core/pim/today/today.pro +++ b/core/pim/today/today.pro @@ -3,12 +3,13 @@ CONFIG += qt warn on release quick-app HEADERS = today.h todaybase.h todayconfig.h SOURCES = today.cpp todaybase.cpp todayconfig.cpp main.cpp INTERFACES = todayconfigmiscbase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2 TARGET = today include ( $(OPIEDIR)/include.pro ) } + diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index f2958ad..14cdfd9 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp @@ -1,10 +1,10 @@ /* * todaybase.cpp * - * copyright : (c) 2002, 2003 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -13,17 +13,16 @@ * (at your option) any later version. * * * ***************************************************************************/ #include "todaybase.h" -#include <qvbox.h> -#include <qwhatsthis.h> - #include <qpe/resource.h> +#include <qvbox.h> +#include <qwhatsthis.h> TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) : QWidget( parent, name, WStyle_ContextHelp ) { QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h index b0b2e14..b737351 100644 --- a/core/pim/today/todaybase.h +++ b/core/pim/today/todaybase.h @@ -1,10 +1,10 @@ /* * todaybase.h * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -14,42 +14,43 @@ * * ***************************************************************************/ #ifndef TODAYBASE_H #define TODAYBASE_H +#include <opie2/oclickablelabel.h> + #include <qlayout.h> -#include <opie/oclickablelabel.h> class QVBox; class QGridLayout; class QFrame; class QLabel; class QPushButton; class QBoxLayout; +using namespace Opie; + + class TodayBase : public QWidget { Q_OBJECT public: TodayBase( QWidget* parent = 0, const char* name = 0, WFlags = 0 ); ~TodayBase(); QFrame* Frame4; QPushButton* DatesButton; QVBoxLayout* layout; - OClickableLabel* OwnerField; + Opie::OClickableLabel* OwnerField; QLabel* Frame; QLabel* DateLabel; QFrame* Frame15; QLabel* Opiezilla; QLabel* TodayLabel; OClickableLabel* ConfigButton; -protected: - - }; #endif diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index 9ced0d8..5c51515 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp @@ -1,10 +1,10 @@ /* * todayconfig.cpp * - * copyright : (c) 2002, 2003 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h index 0a7687c..3b585c9 100644 --- a/core/pim/today/todayconfig.h +++ b/core/pim/today/todayconfig.h @@ -1,10 +1,10 @@ /* * todayconfig.h * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -14,19 +14,19 @@ * * ***************************************************************************/ #ifndef TODAYCONFIG_H #define TODAYCONFIG_H +#include "todayconfigmiscbase.h" + +#include <opie2/otabwidget.h> + #include <qvariant.h> #include <qdialog.h> #include <qlistview.h> -#include <opie/otabwidget.h> - - -#include "todayconfigmiscbase.h" class QCheckBox; class QLabel; class QSpinBox; class QTabWidget; |