author | harlekin <harlekin> | 2004-03-01 15:47:43 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-03-01 15:47:43 (UTC) |
commit | 87676b131aad1bfe979570a48107527db4040020 (patch) (side-by-side diff) | |
tree | 9f7ee88adc4b8987e8d3387e2370719078f7ff5e /core/pim/today/plugins/datebook | |
parent | c50e4c32d34a0550f167480b6306aac632fb201c (diff) | |
download | opie-87676b131aad1bfe979570a48107527db4040020.zip opie-87676b131aad1bfe979570a48107527db4040020.tar.gz opie-87676b131aad1bfe979570a48107527db4040020.tar.bz2 |
today plus datebook, mail, todolist plugins libopie1->libopie2
Diffstat (limited to 'core/pim/today/plugins/datebook') (more/less context) (ignore whitespace changes)
11 files changed, 38 insertions, 32 deletions
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; |