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 @@ -6,3 +6,3 @@ * 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 @@ -20,3 +20,4 @@ #include "today.h" -#include <opie/oapplicationfactory.h> + +#include <opie2/oapplicationfactory.h> 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 @@ -15,3 +15,3 @@ DEPENDPATH += $(OPIEDIR)/include \ -LIBS+= -lqpe -lopie +LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002, 2003 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -17,2 +17,3 @@ #include "datebookevent.h" + #include <qpe/config.h> @@ -21,3 +22,3 @@ -#include <opie/odevice.h> +#include <opie2/odevice.h> 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002, 2003 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -19,5 +19,7 @@ -#include <opie/oclickablelabel.h> +#include <opie2/oclickablelabel.h> + #include <qpe/datebookdb.h> +using namespace Opie; 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,2 +1 @@ - /* @@ -4,3 +3,3 @@ * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -17,4 +16,2 @@ - - #include "datebookplugin.h" 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 @@ -19,8 +19,8 @@ -#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> 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -19,2 +19,5 @@ +#include "datebookpluginconfigbase.h" + +#include <opie2/todayconfigwidget.h> @@ -23,5 +26,5 @@ -#include <opie/todayconfigwidget.h> -#include "datebookpluginconfigbase.h" + + 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -37,3 +37,3 @@ QRESULT DatebookPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterfa return QS_FALSE; - + return QS_OK; 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -19,3 +19,3 @@ -#include <opie/todayplugininterface.h> +#include <opie2/todayplugininterface.h> 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -102,4 +102,4 @@ void DatebookPluginWidget::getDates() { 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. @@ -108,8 +108,8 @@ void DatebookPluginWidget::getDates() { || ( ( (*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() ) ) + ) { 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 @@ -19,2 +19,8 @@ +#include "datebookevent.h" + +#include <opie2/oclickablelabel.h> + +#include <qpe/datebookdb.h> + #include <qlayout.h> @@ -23,6 +29,3 @@ -#include <qpe/datebookdb.h> -#include <opie/oclickablelabel.h> - -#include "datebookevent.h" +using namespace Opie; 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 @@ -13,3 +13,3 @@ DEPENDPATH += $(OPIEDIR)/include \ -LIBS+= -lqpe -lopie +LIBS+= -lqpe -lopiecore2 -opiepim2 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 @@ -20,2 +20,7 @@ +#include "mailpluginwidget.h" + +#include <opie2/todayplugininterface.h> +#include <opie2/todayconfigwidget.h> + #include <qwidget.h> @@ -23,6 +28,4 @@ -#include <opie/todayplugininterface.h> -#include <opie/todayconfigwidget.h> -#include "mailpluginwidget.h" + 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -40,3 +40,3 @@ QRESULT MailPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface * return QS_FALSE; - + return QS_OK; 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -19,3 +19,3 @@ -#include <opie/todayplugininterface.h> +#include <opie2/todayplugininterface.h> 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 @@ -15,2 +15,3 @@ ***************************************************************************/ +#include "mailpluginwidget.h" @@ -19,4 +20,2 @@ -#include "mailpluginwidget.h" - MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) 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 @@ -21,3 +21,5 @@ -#include <opie/oclickablelabel.h> +#include <opie2/oclickablelabel.h> + +using namespace Opie; 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 @@ -16,3 +16,3 @@ DEPENDPATH += $(OPIEDIR)/include \ -LIBS+= -lqpe -lopie +LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -16,4 +16,2 @@ - - #include "todoplugin.h" @@ -21,3 +19,2 @@ - TodolistPlugin::TodolistPlugin() { 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002,2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -19,2 +19,8 @@ + +#include "todopluginwidget.h" + +#include <opie2/oclickablelabel.h> +#include <opie2/todayplugininterface.h> + #include <qstring.h> @@ -23,6 +29,3 @@ -#include <opie/oclickablelabel.h> -#include <opie/todayplugininterface.h> - -#include "todopluginwidget.h" +using namespace Opie; 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 @@ -19,7 +19,7 @@ -#include <qspinbox.h> +#include "todopluginconfigbase.h" -#include <opie/todayconfigwidget.h> +#include <opie2/todayconfigwidget.h> -#include "todopluginconfigbase.h" +#include <qspinbox.h> 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -38,3 +38,3 @@ QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterfa return QS_FALSE; - + return QS_OK; 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -19,3 +19,3 @@ -#include <opie/todayplugininterface.h> +#include <opie2/todayplugininterface.h> 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 @@ -31,3 +31,3 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) } - todo = new OTodoAccess(); + todo = new OPimTodoAccess(); todo->load(); 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 @@ -21,5 +21,6 @@ -#include <opie/otodoaccess.h> -#include <opie/oclickablelabel.h> +#include <opie2/otodoaccess.h> +#include <opie2/oclickablelabel.h> +using namespace Opie; @@ -43,5 +44,5 @@ private: - OTodoAccess *todo; - OTodoAccess::List m_list; - OTodoAccess::List::Iterator m_it; + OPimTodoAccess *todo; + OPimTodoAccess::List m_list; + OPimTodoAccess::List::Iterator m_it; 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -16,4 +16,2 @@ - - #define QTOPIA_INTERNAL_LANGLIST 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003,2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -15,4 +15,2 @@ ***************************************************************************/ - - #ifndef TODAY_H @@ -20,6 +18,2 @@ -#include <qscrollview.h> -#include <qvbox.h> - -#include <qpe/qlibrary.h> @@ -28,7 +22,13 @@ -#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; 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 @@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2 @@ -14 +14,2 @@ 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002, 2003 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -18,7 +18,6 @@ -#include <qvbox.h> -#include <qwhatsthis.h> - #include <qpe/resource.h> +#include <qvbox.h> +#include <qwhatsthis.h> 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -19,4 +19,5 @@ +#include <opie2/oclickablelabel.h> + #include <qlayout.h> -#include <opie/oclickablelabel.h> @@ -30,2 +31,5 @@ class QBoxLayout; +using namespace Opie; + + class TodayBase : public QWidget @@ -41,3 +45,3 @@ public: QVBoxLayout* layout; - OClickableLabel* OwnerField; + Opie::OClickableLabel* OwnerField; QLabel* Frame; @@ -49,5 +53,2 @@ public: -protected: - - }; 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002, 2003 by Maximilian Reiß + * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org 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 @@ -3,3 +3,3 @@ * - * copyright : (c) 2002,2003 by Maximilian Reiß + * copyright : (c) 2002,2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org @@ -19,2 +19,6 @@ +#include "todayconfigmiscbase.h" + +#include <opie2/otabwidget.h> + #include <qvariant.h> @@ -22,6 +26,2 @@ #include <qlistview.h> -#include <opie/otabwidget.h> - - -#include "todayconfigmiscbase.h" |