summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/todo/config.in2
-rw-r--r--core/pim/todo/mainwindow.cpp98
-rw-r--r--core/pim/todo/mainwindow.h26
-rw-r--r--core/pim/todo/opie-todo.control2
-rw-r--r--core/pim/todo/otaskeditor.cpp16
-rw-r--r--core/pim/todo/otaskeditor.h18
-rw-r--r--core/pim/todo/quickedit.h10
-rw-r--r--core/pim/todo/quickeditimpl.cpp6
-rw-r--r--core/pim/todo/quickeditimpl.h4
-rw-r--r--core/pim/todo/smalltodo.h4
-rw-r--r--core/pim/todo/tableview.cpp18
-rw-r--r--core/pim/todo/tableview.h8
-rw-r--r--core/pim/todo/taskeditoralarms.cpp9
-rw-r--r--core/pim/todo/taskeditoralarms.h9
-rw-r--r--core/pim/todo/taskeditoroverview.cpp6
-rw-r--r--core/pim/todo/taskeditoroverview.h8
-rw-r--r--core/pim/todo/taskeditorstatus.cpp9
-rw-r--r--core/pim/todo/taskeditorstatus.h11
-rw-r--r--core/pim/todo/templatedialogimpl.cpp18
-rw-r--r--core/pim/todo/templatedialogimpl.h2
-rw-r--r--core/pim/todo/textviewshow.cpp2
-rw-r--r--core/pim/todo/textviewshow.h2
-rw-r--r--core/pim/todo/todo.pro2
-rw-r--r--core/pim/todo/todoedit.h6
-rw-r--r--core/pim/todo/todoeditor.cpp10
-rw-r--r--core/pim/todo/todoeditor.h8
-rw-r--r--core/pim/todo/todomanager.cpp20
-rw-r--r--core/pim/todo/todomanager.h38
-rw-r--r--core/pim/todo/todoshow.h6
-rw-r--r--core/pim/todo/todotemplatemanager.cpp32
-rw-r--r--core/pim/todo/todotemplatemanager.h11
-rw-r--r--core/pim/todo/todoview.cpp10
-rw-r--r--core/pim/todo/todoview.h20
33 files changed, 232 insertions, 219 deletions
diff --git a/core/pim/todo/config.in b/core/pim/todo/config.in
index 0b6af4c..45c4558 100644
--- a/core/pim/todo/config.in
+++ b/core/pim/todo/config.in
@@ -1,4 +1,4 @@
config TODO
boolean "opie-todo (a Todo-list manager)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index fc189bd..0613f2c 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -28,6 +28,20 @@
#include <unistd.h>
+#include <opie2/opimrecurrence.h>
+#include <opie2/opimnotifymanager.h>
+#include <opie2/otodoaccessvcal.h>
+#include <opie2/oapplicationfactory.h>
+
+#include <qpe/applnk.h>
+#include <qpe/config.h>
+#include <qpe/ir.h>
+#include <qpe/resource.h>
+#include <qpe/qpemessagebox.h>
+#include <qpe/alarmserver.h>
+#include <qpe/timestring.h>
+#include <qpe/qpeapplication.h>
+
#include <qmenubar.h>
#include <qmessagebox.h>
#include <qtoolbar.h>
@@ -41,22 +55,6 @@
#include <qlineedit.h>
#include <qwhatsthis.h>
-#include <qpe/applnk.h>
-#include <qpe/config.h>
-#include <qpe/ir.h>
-#include <qpe/resource.h>
-#include <qpe/qpemessagebox.h>
-#include <qpe/alarmserver.h>
-#include <qpe/timestring.h>
-#include <qpe/qpeapplication.h>
-
-#include <opie/orecur.h>
-#include <opie/opimnotifymanager.h>
-#include <opie/otodoaccessvcal.h>
-#include <opie/owidgetstack.h>
-
-#include <opie/oapplicationfactory.h>
-
#include "quickeditimpl.h"
#include "todotemplatemanager.h"
#include "templateeditor.h"
@@ -310,10 +308,10 @@ QPopupMenu* MainWindow::edit() {
QToolBar* MainWindow::toolbar() {
return m_tool;
}
-OTodoAccess::List MainWindow::list()const {
+OPimTodoAccess::List MainWindow::list()const {
return m_todoMgr.list();
}
-OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
+OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
int cat = 0;
if ( m_curCat != QWidget::tr("All Categories") )
cat = currentCatId();
@@ -331,7 +329,7 @@ OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
return m_todoMgr.sorted( asc, sortOrder, filter, cat );
}
-OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) {
+OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) {
int cat = 0;
if ( m_curCat != QWidget::tr("All Categories") )
cat = currentCatId();
@@ -341,7 +339,7 @@ OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) {
return m_todoMgr.sorted(asc, sortOrder, addFilter, cat );
}
-OTodo MainWindow::event( int uid ) {
+OPimTodo MainWindow::event( int uid ) {
return m_todoMgr.event( uid );
}
bool MainWindow::isSyncing()const {
@@ -433,14 +431,14 @@ void MainWindow::populateTemplates() {
void MainWindow::slotNewFromTemplate( int id ) {
QString name = m_template->text( id );
- OTodo event = templateManager()->templateEvent( name );
+ OPimTodo event = templateManager()->templateEvent( name );
event = currentEditor()->edit(this,
event );
if ( currentEditor()->accepted() ) {
/* assign new todo */
event.setUid( 1 );
- handleAlarms( OTodo(), event );
+ handleAlarms( OPimTodo(), event );
m_todoMgr.add( event );
currentView()->addEvent( event );
@@ -457,7 +455,7 @@ void MainWindow::slotDuplicate() {
QWidget::tr("Data can not be edited, currently syncing"));
return;
}
- OTodo ev = m_todoMgr.event( currentView()->current() );
+ OPimTodo ev = m_todoMgr.event( currentView()->current() );
/* let's generate a new uid */
ev.setUid(1);
m_todoMgr.add( ev );
@@ -478,7 +476,7 @@ void MainWindow::slotDelete() {
if (!QPEMessageBox::confirmDelete(this, QWidget::tr("Todo"), strName ) )
return;
- handleAlarms( m_todoMgr.event( currentView()->current() ), OTodo() );
+ handleAlarms( m_todoMgr.event( currentView()->current() ), OPimTodo() );
m_todoMgr.remove( currentView()->current() );
currentView()->removeEvent( currentView()->current() );
raiseCurrentView();
@@ -490,11 +488,11 @@ void MainWindow::slotDelete(int uid ) {
QWidget::tr("Data can not be edited, currently syncing"));
return;
}
- OTodo to = m_todoMgr.event(uid);
+ OPimTodo to = m_todoMgr.event(uid);
if (!QPEMessageBox::confirmDelete(this, QWidget::tr("Todo"), to.toShortText() ) )
return;
- handleAlarms(to, OTodo() );
+ handleAlarms(to, OPimTodo() );
m_todoMgr.remove( to.uid() );
currentView()->removeEvent( to.uid() );
raiseCurrentView();
@@ -597,11 +595,11 @@ void MainWindow::beamDone( Ir* ir) {
::unlink( beamfile );
}
void MainWindow::receiveFile( const QString& filename ) {
- OTodoAccessVCal* cal = new OTodoAccessVCal(filename );
+ OPimTodoAccessVCal* cal = new OPimTodoAccessVCal(filename );
- OTodoAccess acc( cal );
+ OPimTodoAccess acc( cal );
acc.load();
- OTodoAccess::List list = acc.allRecords();
+ OPimTodoAccess::List list = acc.allRecords();
if (list.count()){
@@ -610,7 +608,7 @@ void MainWindow::receiveFile( const QString& filename ) {
if ( QMessageBox::information(this, QWidget::tr("New Tasks"),
message, QMessageBox::Ok,
QMessageBox::Cancel ) == QMessageBox::Ok ) {
- OTodoAccess::List::Iterator it;
+ OPimTodoAccess::List::Iterator it;
for ( it = list.begin(); it != list.end(); ++it )
m_todoMgr.add( (*it) );
@@ -708,9 +706,9 @@ void MainWindow::slotEdit( int uid ) {
return;
}
- OTodo old_todo = m_todoMgr.event( uid );
+ OPimTodo old_todo = m_todoMgr.event( uid );
- OTodo todo = currentEditor()->edit(this, old_todo );
+ OPimTodo todo = currentEditor()->edit(this, old_todo );
/* if completed */
if ( currentEditor()->accepted() ) {
@@ -728,7 +726,7 @@ void MainWindow::slotUpdate1( int uid, const SmallTodo& ev) {
m_todoMgr.update( uid, ev );
}
*/
-void MainWindow::updateTodo( const OTodo& ev) {
+void MainWindow::updateTodo( const OPimTodo& ev) {
m_todoMgr.update( ev.uid() , ev );
}
/* The view changed it's configuration
@@ -746,7 +744,7 @@ void MainWindow::setReadAhead( uint count ) {
}
void MainWindow::slotQuickEntered() {
qWarning("entered");
- OTodo todo = quickEditor()->todo();
+ OPimTodo todo = quickEditor()->todo();
if (todo.isEmpty() )
return;
@@ -760,8 +758,8 @@ QuickEditBase* MainWindow::quickEditor() {
void MainWindow::slotComplete( int uid ) {
slotComplete( event(uid) );
}
-void MainWindow::slotComplete( const OTodo& todo ) {
- OTodo to = todo;
+void MainWindow::slotComplete( const OPimTodo& todo ) {
+ OPimTodo to = todo;
to.setCompleted( !to.isCompleted() );
to.setCompletedDate( QDate::currentDate() );
@@ -777,12 +775,12 @@ void MainWindow::slotComplete( const OTodo& todo ) {
* -zecke
*/
if ( to.hasRecurrence() && to.isCompleted() ) {
- OTodo to2( to );
+ OPimTodo to2( to );
/* the spinned off one won't recur anymore */
- to.setRecurrence( ORecur() );
+ to.setRecurrence( OPimRecurrence() );
- ORecur rec = to2.recurrence();
+ OPimRecurrence rec = to2.recurrence();
rec.setStart( to.dueDate() );
to2.setRecurrence( rec );
/*
@@ -825,7 +823,7 @@ void MainWindow::slotComplete( const OTodo& todo ) {
als.append( al );
}
to2.notifiers().setAlarms( als );
- handleAlarms( OTodo(), todo );
+ handleAlarms( OPimTodo(), todo );
}
to2.setCompletedDate( inval );
to2.setCompleted( false );
@@ -855,13 +853,13 @@ int MainWindow::create() {
m_todoMgr.load();
- OTodo todo = currentEditor()->newTodo( currentCatId(),
+ OPimTodo todo = currentEditor()->newTodo( currentCatId(),
this );
if ( currentEditor()->accepted() ) {
//todo.assignUid();
uid = todo.uid();
- handleAlarms( OTodo(), todo );
+ handleAlarms( OPimTodo(), todo );
m_todoMgr.add( todo );
currentView()->addEvent( todo );
@@ -880,7 +878,7 @@ bool MainWindow::remove( int uid ) {
if (m_syncing) return false;
/* argh need to get the whole OEvent... to disable alarms -zecke */
- handleAlarms( OTodo(), m_todoMgr.event( uid ) );
+ handleAlarms( OPimTodo(), m_todoMgr.event( uid ) );
return m_todoMgr.remove( uid );
}
@@ -890,9 +888,9 @@ void MainWindow::beam( int uid) {
::unlink( beamfile );
m_todoMgr.load();
- OTodo todo = event( uid );
- OTodoAccessVCal* cal = new OTodoAccessVCal(QString::fromLatin1(beamfile) );
- OTodoAccess acc( cal );
+ OPimTodo todo = event( uid );
+ OPimTodoAccessVCal* cal = new OPimTodoAccessVCal(QString::fromLatin1(beamfile) );
+ OPimTodoAccess acc( cal );
acc.load();
acc.add( todo );
acc.save();
@@ -913,10 +911,10 @@ void MainWindow::edit( int uid ) {
slotEdit( uid );
}
void MainWindow::add( const OPimRecord& rec) {
- if ( rec.rtti() != OTodo::rtti() ) return;
+ if ( rec.rtti() != OPimTodo::rtti() ) return;
m_todoMgr.load(); // might not be loaded
- const OTodo& todo = static_cast<const OTodo&>(rec);
+ const OPimTodo& todo = static_cast<const OPimTodo&>(rec);
m_todoMgr.add(todo );
currentView()->addEvent( todo );
@@ -969,7 +967,7 @@ namespace {
}
}
-void MainWindow::handleAlarms( const OTodo& oldTodo, const OTodo& newTodo) {
+void MainWindow::handleAlarms( const OPimTodo& oldTodo, const OPimTodo& newTodo) {
/*
* if oldTodo is not empty and has notifiers we need to find the deleted ones
*/
@@ -997,7 +995,7 @@ void MainWindow::handleAlarms( const OTodo& oldTodo, const OTodo& newTodo) {
void MainWindow::doAlarm( const QDateTime& dt, int uid ) {
m_todoMgr.load();
- OTodo todo = m_todoMgr.event( uid );
+ OPimTodo todo = m_todoMgr.event( uid );
if (!todo.hasNotifiers() ) return;
/*
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h
index fd0e1bd..6a7296b 100644
--- a/core/pim/todo/mainwindow.h
+++ b/core/pim/todo/mainwindow.h
@@ -31,9 +31,10 @@
#include <qlist.h>
-#include <opie/otodoaccess.h>
-#include <opie/otodo.h>
-#include <opie/opimmainwindow.h>
+#include <opie2/otodoaccess.h>
+#include <opie2/opimtodo.h>
+#include <opie2/opimmainwindow.h>
+#include <opie2/owidgetstack.h>
#include "smalltodo.h"
#include "todoview.h"
@@ -44,11 +45,12 @@ class QPopupMenu;
class QMenuBar;
class QToolBar;
class QAction;
-class OWidgetStack;
class Ir;
class QVBox;
class QLineEdit;
+using namespace Opie;
+
namespace Todo {
typedef TodoView View;
class TemplateManager;
@@ -69,7 +71,7 @@ namespace Todo {
const char* name = 0, WFlags fl = 0 );
~MainWindow();
- /** return a context menu for an OTodo */
+ /** return a context menu for an OPimTodo */
QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE );
QPopupMenu* options();
QPopupMenu* edit();
@@ -77,11 +79,11 @@ namespace Todo {
void updateList();
- OTodoAccess::List list()const;
- OTodoAccess::List sorted( bool asc, int sortOrder );
- OTodoAccess::List sorted( bool asc, int sortOrder, int addFilter );
+ OPimTodoAccess::List list()const;
+ OPimTodoAccess::List sorted( bool asc, int sortOrder );
+ OPimTodoAccess::List sorted( bool asc, int sortOrder, int addFilter );
- OTodo event(int uid );
+ OPimTodo event(int uid );
bool isSyncing()const;
bool showCompleted()const;
@@ -93,7 +95,7 @@ namespace Todo {
TemplateManager* templateManager();
QuickEditBase* quickEditor();
- void updateTodo( const OTodo& );
+ void updateTodo( const OPimTodo& );
void populateTemplates();
Editor* currentEditor();
void setReadAhead(uint count );
@@ -108,7 +110,7 @@ private slots:
private:
/* handle setting and removing alarms */
- void handleAlarms( const OTodo& oldTodo, const OTodo& newTodo );
+ void handleAlarms( const OPimTodo& oldTodo, const OPimTodo& newTodo );
void receiveFile( const QString& filename );
void connectBase( ViewBase* );
void initUI();
@@ -165,7 +167,7 @@ private slots:
void slotEdit(int);
void slotUpdate3( QWidget* );
void slotComplete( int uid );
- void slotComplete( const OTodo& ev );
+ void slotComplete( const OPimTodo& ev );
void slotNewFromTemplate(int id );
void slotNew();
void slotDuplicate();
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index 8ad50b2..3a65c04 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -4,7 +4,7 @@ Priority: optional
Section: opie/pim
Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal, libopie1, opie-pics
+Depends: task-opie-minimal, libopiecore2, libopieui2, libopiepim2, opie-pics
Description: Todo list manager
A Todo list manager for the Opie environment.
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/todo/otaskeditor.cpp b/core/pim/todo/otaskeditor.cpp
index 1ed20b4..ab1ce94 100644
--- a/core/pim/todo/otaskeditor.cpp
+++ b/core/pim/todo/otaskeditor.cpp
@@ -1,7 +1,5 @@
#include <qlayout.h>
-#include <opie/orecurrancewidget.h>
-
#include "taskeditoroverview.h"
#include "taskeditorstatus.h"
#include "taskeditoralarms.h"
@@ -13,7 +11,7 @@ OTaskEditor::OTaskEditor(int cur)
init();
init( cur );
}
-OTaskEditor::OTaskEditor( const OTodo& to)
+OTaskEditor::OTaskEditor( const OPimTodo& to)
: QDialog( 0, 0, TRUE, WStyle_ContextHelp ) {
init();
init( to );
@@ -22,18 +20,18 @@ OTaskEditor::~OTaskEditor() {
}
void OTaskEditor::init( int cur ) {
- OTodo to;
+ OPimTodo to;
to.setUid( 1 ); // generate a new uid
if ( cur != 0 )
to.setCategories( cur );
load(to);
}
-void OTaskEditor::init( const OTodo& to ) {
+void OTaskEditor::init( const OPimTodo& to ) {
load( to );
}
-OTodo OTaskEditor::todo()const{
+OPimTodo OTaskEditor::todo()const{
qWarning("saving!");
- OTodo to ( m_todo );
+ OPimTodo to ( m_todo );
m_overView->save( to );
m_stat->save( to );
to.setRecurrence( m_rec->recurrence() );
@@ -41,7 +39,7 @@ OTodo OTaskEditor::todo()const{
return to;
}
-void OTaskEditor::load(const OTodo& to) {
+void OTaskEditor::load(const OPimTodo& to) {
m_overView->load( to );
m_stat->load( to );
m_rec->setRecurrence( to.recurrence(), to.hasDueDate() ? to.dueDate() : QDate::currentDate() );
@@ -75,7 +73,7 @@ void OTaskEditor::init() {
// lbl->setText( tr("X-Ref") );
// m_tab->addTab( lbl, "todo/xref", tr("X-Ref") );
- m_rec = new ORecurranceWidget( true, QDate::currentDate(), this );
+ m_rec = new OPimRecurrenceWidget( true, QDate::currentDate(), this );
m_tab->addTab( m_rec, "repeat", tr("Recurrence") );
diff --git a/core/pim/todo/otaskeditor.h b/core/pim/todo/otaskeditor.h
index 2daae52..7068df8 100644
--- a/core/pim/todo/otaskeditor.h
+++ b/core/pim/todo/otaskeditor.h
@@ -3,20 +3,20 @@
#include <qdialog.h>
-#include <opie/otodo.h>
-#include <opie/otabwidget.h>
+#include <opie2/opimtodo.h>
+#include <opie2/otabwidget.h>
+#include <opie2/opimrecurrencewidget.h>
class TaskEditorOverView;
class TaskEditorStatus;
class TaskEditorAlarms;
-class ORecurranceWidget;
class QMultiLineEdit;
class OTaskEditor : public QDialog {
Q_OBJECT
public:
OTaskEditor(int cur);
- OTaskEditor( const OTodo& todo );
+ OTaskEditor( const OPimTodo& todo );
~OTaskEditor();
/*
@@ -24,11 +24,11 @@ public:
* power to 'preload' the dialog
*/
void init( int cur );
- void init( const OTodo& todo );
+ void init( const OPimTodo& todo );
- OTodo todo()const;
+ OPimTodo todo()const;
private:
- void load( const OTodo& );
+ void load( const OPimTodo& );
void init();
OTabWidget *m_tab;
@@ -36,8 +36,8 @@ private:
TaskEditorStatus *m_stat;
TaskEditorAlarms *m_alarm;
TaskEditorAlarms *m_remind;
- ORecurranceWidget *m_rec;
- OTodo m_todo;
+ OPimRecurrenceWidget *m_rec;
+ OPimTodo m_todo;
};
#endif
diff --git a/core/pim/todo/quickedit.h b/core/pim/todo/quickedit.h
index 5fe74fe..0c0c204 100644
--- a/core/pim/todo/quickedit.h
+++ b/core/pim/todo/quickedit.h
@@ -4,12 +4,14 @@
#include <qsignal.h>
#include <qwidget.h>
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
+
+using Opie::OPimTodo;
namespace Todo{
class MainWindow;
struct QuickEditBase {
- virtual OTodo todo()const = 0l;
+ virtual OPimTodo todo()const = 0l;
virtual QSignal* signal() = 0l;
virtual QWidget* widget() = 0l;
};
@@ -23,13 +25,13 @@ namespace Todo{
*/
/**
* Quick edit is meant to quickly enter
- * OTodos in a fast way
+ * OPimTodos in a fast way
*/
class QuickEdit : public QuickEditBase{
public:
QuickEdit(MainWindow* main );
virtual ~QuickEdit();
- //OTodo todo()const;
+ //OPimTodo todo()const;
QSignal* signal();
//QWidget* widget();
protected:
diff --git a/core/pim/todo/quickeditimpl.cpp b/core/pim/todo/quickeditimpl.cpp
index 1863ef4..cd0684f 100644
--- a/core/pim/todo/quickeditimpl.cpp
+++ b/core/pim/todo/quickeditimpl.cpp
@@ -4,7 +4,7 @@
#include <qpe/resource.h>
-#include <opie/oclickablelabel.h>
+#include <opie2/oclickablelabel.h>
#include "mainwindow.h"
#include "quickeditimpl.h"
@@ -62,14 +62,14 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible )
QuickEditImpl::~QuickEditImpl() {
}
-OTodo QuickEditImpl::todo()const {
+OPimTodo QuickEditImpl::todo()const {
return m_todo;
}
QWidget* QuickEditImpl::widget() {
return this;
}
void QuickEditImpl::slotEnter() {
- OTodo todo;
+ OPimTodo todo;
if (!m_edit->text().isEmpty() ) {
diff --git a/core/pim/todo/quickeditimpl.h b/core/pim/todo/quickeditimpl.h
index 89b94f8..d465dba 100644
--- a/core/pim/todo/quickeditimpl.h
+++ b/core/pim/todo/quickeditimpl.h
@@ -15,7 +15,7 @@ class QuickEditImpl : public QToolBar, public Todo::QuickEdit {
public:
QuickEditImpl( QWidget* parent, bool visible);
~QuickEditImpl();
- OTodo todo()const;
+ OPimTodo todo()const;
QWidget* widget();
private slots:
void slotEnter();
@@ -30,7 +30,7 @@ private:
QLabel* m_enter;
QLabel* m_more;
QPopupMenu* m_menu;
- OTodo m_todo;
+ OPimTodo m_todo;
bool m_visible;
QPixmap priority1;
diff --git a/core/pim/todo/smalltodo.h b/core/pim/todo/smalltodo.h
index 952ed04..963218e 100644
--- a/core/pim/todo/smalltodo.h
+++ b/core/pim/todo/smalltodo.h
@@ -37,8 +37,8 @@
namespace Todo {
/**
* SmallTodo holds everything necessary
- * to represent a OTodo without holding
- * everything from a OTodo
+ * to represent a OPimTodo without holding
+ * everything from a OPimTodo
*/
class SmallTodo {
public:
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index d980a24..5bbf880 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -37,7 +37,7 @@
#include <qpe/config.h>
#include <qpe/resource.h>
-#include <opie/orecur.h>
+#include <opie2/opimrecurrence.h>
#include "mainwindow.h"
//#include "tableitems.h"
@@ -184,7 +184,7 @@ int TableView::prev() {
}
QString TableView::currentRepresentation() {
- OTodo to = sorted()[currentRow()];
+ OPimTodo to = sorted()[currentRow()];
return to.summary().isEmpty() ? to.description().left(20) : to.summary() ;
}
/* show overdue */
@@ -204,7 +204,7 @@ void TableView::updateView( ) {
*/
todoWindow()->setReadAhead( 4 );
sort();
- OTodoAccess::List::Iterator it, end;
+ OPimTodoAccess::List::Iterator it, end;
it = sorted().begin();
end = sorted().end();
@@ -227,13 +227,13 @@ void TableView::updateView( ) {
m_enablePaint = true;
// int el = time.elapsed();
}
-void TableView::setTodo( int, const OTodo&) {
+void TableView::setTodo( int, const OPimTodo&) {
sort();
/* repaint */
repaint();
}
-void TableView::addEvent( const OTodo&) {
+void TableView::addEvent( const OPimTodo&) {
/* fix problems of not showing the 'Haken' */
updateView();
@@ -242,7 +242,7 @@ void TableView::addEvent( const OTodo&) {
* find the event
* and then replace the complete row
*/
-void TableView::replaceEvent( const OTodo& ev) {
+void TableView::replaceEvent( const OPimTodo& ev) {
addEvent( ev );
}
/*
@@ -388,7 +388,7 @@ void TableView::paintCell(QPainter* p, int row, int col, const QRect& cr, bool
p->save();
- OTodo task = sorted()[row];
+ OPimTodo task = sorted()[row];
// TODO - give user option for grid or bars?
@@ -497,7 +497,7 @@ void TableView::setCellContentFromEditor(int row, int col ) {
QWidget* wid = cellWidget(row, 1 );
if ( wid->inherits("QComboBox") ) {
int pri = ((QComboBox*)wid)->currentItem() + 1;
- OTodo todo = sorted()[row];
+ OPimTodo todo = sorted()[row];
if ( todo.priority() != pri ) {
todo.setPriority( pri );
TodoView::update( todo.uid(), todo );
@@ -508,7 +508,7 @@ void TableView::setCellContentFromEditor(int row, int col ) {
QWidget* wid = cellWidget(row, 2);
if ( wid->inherits("QLineEdit") ) {
QString text = ((QLineEdit*)wid)->text();
- OTodo todo = sorted()[row];
+ OPimTodo todo = sorted()[row];
if ( todo.summary() != text ) {
todo.setSummary( text );
TodoView::update( todo.uid(), todo );
diff --git a/core/pim/todo/tableview.h b/core/pim/todo/tableview.h
index 528ddc9..7f78255 100644
--- a/core/pim/todo/tableview.h
+++ b/core/pim/todo/tableview.h
@@ -56,9 +56,9 @@ namespace Todo {
void clear();
void showOverDue( bool );
void updateView();
- void setTodo( int uid, const OTodo& );
- void addEvent( const OTodo& event );
- void replaceEvent( const OTodo& );
+ void setTodo( int uid, const OPimTodo& );
+ void addEvent( const OPimTodo& event );
+ void replaceEvent( const OPimTodo& );
void removeEvent( int uid );
void setShowCompleted( bool );
void setShowDeadline( bool );
@@ -72,7 +72,7 @@ namespace Todo {
* we do our drawing ourselves
* because we don't want to have
* 40.000 QTableItems for 10.000
- * OTodos where we only show 10 at a time!
+ * OPimTodos where we only show 10 at a time!
*/
void paintCell(QPainter* p, int row, int col, const QRect&, bool );
private:
diff --git a/core/pim/todo/taskeditoralarms.cpp b/core/pim/todo/taskeditoralarms.cpp
index bcc40fe..930c94e 100644
--- a/core/pim/todo/taskeditoralarms.cpp
+++ b/core/pim/todo/taskeditoralarms.cpp
@@ -28,9 +28,8 @@
#include "taskeditoralarms.h"
-#include <opie/otodo.h>
-#include <opie/opimnotifymanager.h>
-#include <opie/otimepicker.h>
+#include <opie2/opimnotifymanager.h>
+#include <opie2/otimepicker.h>
#include <qpe/datebookmonth.h>
#include <qpe/resource.h>
@@ -122,7 +121,7 @@ void TaskEditorAlarms::slotDelete(){
}
-void TaskEditorAlarms::load( const OTodo& todo) {
+void TaskEditorAlarms::load( const OPimTodo& todo) {
lstAlarms->clear();
if (!todo.hasNotifiers() ) return;
@@ -136,7 +135,7 @@ void TaskEditorAlarms::load( const OTodo& todo) {
}
-void TaskEditorAlarms::save( OTodo& todo ) {
+void TaskEditorAlarms::save( OPimTodo& todo ) {
if (lstAlarms->childCount() <= 0 ) return;
OPimNotifyManager::Alarms alarms;
diff --git a/core/pim/todo/taskeditoralarms.h b/core/pim/todo/taskeditoralarms.h
index 0aa52cc..2379b0c 100644
--- a/core/pim/todo/taskeditoralarms.h
+++ b/core/pim/todo/taskeditoralarms.h
@@ -29,11 +29,14 @@
#ifndef TASKEDITORALARMS_H
#define TASKEDITORALARMS_H
+#include <opie2/opimtodo.h>
+
#include <qwidget.h>
class QListView;
class QListViewItem;
-class OTodo;
+
+using namespace Opie;
class AlarmItem;
class DateBookMonth;
@@ -48,8 +51,8 @@ public:
};
TaskEditorAlarms( QWidget* parent = 0, int type = Alarm, const char* name = 0, WFlags fl = 0 );
~TaskEditorAlarms();
- void load( const OTodo& );
- void save( OTodo& );
+ void load( const OPimTodo& );
+ void save( OPimTodo& );
private:
QPopupMenu* popup( int column );
void inlineSetDate( AlarmItem*, const QPoint& p );
diff --git a/core/pim/todo/taskeditoroverview.cpp b/core/pim/todo/taskeditoroverview.cpp
index 415dcf2..294acb9 100644
--- a/core/pim/todo/taskeditoroverview.cpp
+++ b/core/pim/todo/taskeditoroverview.cpp
@@ -28,7 +28,7 @@
#include "taskeditoroverview.h"
-#include <opie/orecur.h>
+//#include <opie2/opimrecurrence.h>
#include <qpe/categoryselect.h>
#include <qpe/datebookmonth.h>
@@ -127,7 +127,7 @@ TaskEditorOverView::~TaskEditorOverView()
{
}
-void TaskEditorOverView::load( const OTodo& todo )
+void TaskEditorOverView::load( const OPimTodo& todo )
{
// Description
cmbDesc->insertItem( todo.summary(), 0 );
@@ -148,7 +148,7 @@ void TaskEditorOverView::load( const OTodo& todo )
}
-void TaskEditorOverView::save( OTodo &todo )
+void TaskEditorOverView::save( OPimTodo &todo )
{
// Description
todo.setSummary( cmbDesc->currentText() );
diff --git a/core/pim/todo/taskeditoroverview.h b/core/pim/todo/taskeditoroverview.h
index d5f5125..89679f1 100644
--- a/core/pim/todo/taskeditoroverview.h
+++ b/core/pim/todo/taskeditoroverview.h
@@ -29,7 +29,7 @@
#ifndef TASKEDITOROVERVIEW_H
#define TASKEDITOROVERVIEW_H
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
#include <qpixmap.h>
#include <qwidget.h>
@@ -39,6 +39,8 @@ class QCheckBox;
class QComboBox;
class QMultiLineEdit;
+using namespace Opie;
+
class TaskEditorOverView : public QWidget
{
Q_OBJECT
@@ -53,8 +55,8 @@ public:
QCheckBox *ckbRecurrence;
QMultiLineEdit *mleNotes;
- void load( const OTodo & );
- void save( OTodo & );
+ void load( const OPimTodo & );
+ void save( OPimTodo & );
signals:
void recurranceEnabled( bool );
diff --git a/core/pim/todo/taskeditorstatus.cpp b/core/pim/todo/taskeditorstatus.cpp
index 98e3cea..367dd58 100644
--- a/core/pim/todo/taskeditorstatus.cpp
+++ b/core/pim/todo/taskeditorstatus.cpp
@@ -28,9 +28,8 @@
#include "taskeditorstatus.h"
-#include <opie/otodo.h>
-#include <opie/opimmaintainer.h>
-#include <opie/opimstate.h>
+#include <opie2/opimmaintainer.h>
+#include <opie2/opimstate.h>
#include <qpe/datebookmonth.h>
@@ -171,7 +170,7 @@ TaskEditorStatus::~TaskEditorStatus()
{
}
-void TaskEditorStatus::load( const OTodo &todo )
+void TaskEditorStatus::load( const OPimTodo &todo )
{
QDate date = QDate::currentDate();
QString str = TimeString::longDateString( date );
@@ -223,7 +222,7 @@ void TaskEditorStatus::load( const OTodo &todo )
// Maintainer - not implemented yet
}
-void TaskEditorStatus::save( OTodo &todo )
+void TaskEditorStatus::save( OPimTodo &todo )
{
QDate inval;
diff --git a/core/pim/todo/taskeditorstatus.h b/core/pim/todo/taskeditorstatus.h
index 3544200..97129f0 100644
--- a/core/pim/todo/taskeditorstatus.h
+++ b/core/pim/todo/taskeditorstatus.h
@@ -29,17 +29,20 @@
#ifndef TASKEDITORSTATUS_H
#define TASKEDITORSTATUS_H
+#include <opie2/opimtodo.h>
+
#include <qdatetime.h>
#include <qwidget.h>
class DateBookMonth;
-class OTodo;
class QCheckBox;
class QComboBox;
class QLabel;
class QPushButton;
class QToolButton;
+using namespace Opie;
+
/**
* This is the implementation of the Opie Task Editor Advanced tab
* it features the State!
@@ -68,14 +71,14 @@ public:
/*
* I could have a struct which returns a QWidget*
- * load and save to a OTodo
+ * load and save to a OPimTodo
* and use multiple inheretence with all other widgets
* and then simply iterate over the list of structs
* this way I could easily have plugins for the whole editor....
* but I do not do it -zecke
*/
- void load( const OTodo & );
- void save( OTodo & );
+ void load( const OPimTodo & );
+ void save( OPimTodo & );
private:
QDate m_start;
diff --git a/core/pim/todo/templatedialogimpl.cpp b/core/pim/todo/templatedialogimpl.cpp
index 63d8107..c9ad3d0 100644
--- a/core/pim/todo/templatedialogimpl.cpp
+++ b/core/pim/todo/templatedialogimpl.cpp
@@ -15,28 +15,28 @@ namespace {
public:
TemplateListItem( QListView*,
const QString& name,
- const OTodo& );
+ const OPimTodo& );
~TemplateListItem();
- OTodo event()const;
+ OPimTodo event()const;
QString text()const;
void setText(const QString& str );
- void setEvent( const OTodo& );
+ void setEvent( const OPimTodo& );
private:
QString m_name;
- OTodo m_ev;
+ OPimTodo m_ev;
};
/* implementation */
TemplateListItem::TemplateListItem( QListView* view,
const QString& text,
- const OTodo& ev )
+ const OPimTodo& ev )
: QListViewItem( view ), m_name( text ), m_ev( ev )
{
QListViewItem::setText(0, m_name );
}
TemplateListItem::~TemplateListItem() {}
- OTodo TemplateListItem::event() const {
+ OPimTodo TemplateListItem::event() const {
return m_ev;
}
QString TemplateListItem::text()const {
@@ -46,7 +46,7 @@ namespace {
QListViewItem::setText(0, str );
m_name = str;
}
- void TemplateListItem::setEvent( const OTodo& ev) {
+ void TemplateListItem::setEvent( const OPimTodo& ev) {
m_ev = ev;
}
}
@@ -72,7 +72,7 @@ TemplateDialogImpl::~TemplateDialogImpl() {
}
void TemplateDialogImpl::slotAdd() {
QString str = QWidget::tr("New Template %1").arg( listView()->childCount() );
- OTodo ev;
+ OPimTodo ev;
m_man->addEvent(str, ev);
new TemplateListItem( listView(), str, ev );
}
@@ -92,7 +92,7 @@ void TemplateDialogImpl::slotEdit() {
return;
TemplateListItem* item = static_cast<TemplateListItem*>( listView()->currentItem() );
- OTodo ev = m_win->currentEditor()->edit( m_win, item->event() );
+ OPimTodo ev = m_win->currentEditor()->edit( m_win, item->event() );
if ( m_win->currentEditor()->accepted() ) {
item->setEvent( ev );
m_man->removeEvent( item->text() );
diff --git a/core/pim/todo/templatedialogimpl.h b/core/pim/todo/templatedialogimpl.h
index f366c9e..cc78521 100644
--- a/core/pim/todo/templatedialogimpl.h
+++ b/core/pim/todo/templatedialogimpl.h
@@ -3,7 +3,7 @@
#include <qlistview.h>
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
#include "templatedialog.h"
diff --git a/core/pim/todo/textviewshow.cpp b/core/pim/todo/textviewshow.cpp
index 35ea74b..01e5810 100644
--- a/core/pim/todo/textviewshow.cpp
+++ b/core/pim/todo/textviewshow.cpp
@@ -11,7 +11,7 @@ TextViewShow::~TextViewShow() {
QString TextViewShow::type()const {
return QString::fromLatin1("TextViewShow");
}
-void TextViewShow::slotShow( const OTodo& ev ) {
+void TextViewShow::slotShow( const OPimTodo& ev ) {
setText( ev.toRichText() );
}
QWidget* TextViewShow::widget() {
diff --git a/core/pim/todo/textviewshow.h b/core/pim/todo/textviewshow.h
index 498de81..cc31522 100644
--- a/core/pim/todo/textviewshow.h
+++ b/core/pim/todo/textviewshow.h
@@ -10,7 +10,7 @@ namespace Todo {
~TextViewShow();
QString type()const;
- void slotShow( const OTodo& ev );
+ void slotShow( const OPimTodo& ev );
QWidget* widget();
protected:
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index 51cfde7..9267082 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -44,6 +44,6 @@ SOURCES = smalltodo.cpp \
TARGET = todolist
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2
include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/todo/todoedit.h b/core/pim/todo/todoedit.h
index 02800ca..4e89e93 100644
--- a/core/pim/todo/todoedit.h
+++ b/core/pim/todo/todoedit.h
@@ -1,7 +1,7 @@
#ifndef OPIE_TODO_EDIT_H
#define OPIE_TODO_EDIT_H
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
namespace Todo {
class Edit {
@@ -9,8 +9,8 @@ namespace Todo {
Edit();
virtual ~Edit();
- ToDoEvent newEvent( const OTodo& ) = 0;
- ToDoEvent editEvent( const OTodo& ) = 0;
+ ToDoEvent newEvent( const OPimTodo& ) = 0;
+ ToDoEvent editEvent( const OPimTodo& ) = 0;
};
};
diff --git a/core/pim/todo/todoeditor.cpp b/core/pim/todo/todoeditor.cpp
index 78aedd6..879d809 100644
--- a/core/pim/todo/todoeditor.cpp
+++ b/core/pim/todo/todoeditor.cpp
@@ -14,7 +14,7 @@ Editor::~Editor() {
delete m_self;
m_self = 0;
}
-OTodo Editor::newTodo( int cur,
+OPimTodo Editor::newTodo( int cur,
QWidget*) {
OTaskEditor *e = self();
@@ -28,22 +28,22 @@ OTodo Editor::newTodo( int cur,
}else
m_accepted = false;
- OTodo ev = e->todo();
+ OPimTodo ev = e->todo();
qWarning("Todo uid");
qWarning("Todo %s %d %d", ev.summary().latin1(), ev.progress(), ev.isCompleted() );
ev.setUid(1);
return ev;
}
-OTodo Editor::edit( QWidget *,
- const OTodo& todo ) {
+OPimTodo Editor::edit( QWidget *,
+ const OPimTodo& todo ) {
OTaskEditor *e = self();
e->init( todo );
e->setCaption( QObject::tr( "Edit Task" ) );
int ret = QPEApplication::execDialog( e );
- OTodo ev = e->todo();
+ OPimTodo ev = e->todo();
if ( ret == QDialog::Accepted )
m_accepted = true;
else
diff --git a/core/pim/todo/todoeditor.h b/core/pim/todo/todoeditor.h
index fe30634..bcfd205 100644
--- a/core/pim/todo/todoeditor.h
+++ b/core/pim/todo/todoeditor.h
@@ -1,7 +1,7 @@
#ifndef OPIE_TODO_EDITOR_H
#define OPIE_TODO_EDITOR_H
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
class OTaskEditor;
@@ -11,10 +11,10 @@ namespace Todo {
Editor();
~Editor();
- OTodo newTodo( int currentCatId,
+ OPimTodo newTodo( int currentCatId,
QWidget* par );
- OTodo edit( QWidget* par,
- const OTodo& ev = OTodo() );
+ OPimTodo edit( QWidget* par,
+ const OPimTodo& ev = OPimTodo() );
bool accepted()const;
diff --git a/core/pim/todo/todomanager.cpp b/core/pim/todo/todomanager.cpp
index 501cca7..21e1d0c 100644
--- a/core/pim/todo/todomanager.cpp
+++ b/core/pim/todo/todomanager.cpp
@@ -42,46 +42,46 @@ TodoManager::TodoManager( QObject *obj )
TodoManager::~TodoManager() {
delete m_db;
}
-OTodo TodoManager::event(int uid ) {
+OPimTodo TodoManager::event(int uid ) {
return m_db->find( uid );
}
void TodoManager::updateList() {
qWarning("update list");
m_list = m_db->allRecords();
}
-OTodoAccess::List TodoManager::list() const{
+OPimTodoAccess::List TodoManager::list() const{
return m_list;
}
-OTodoAccess::List TodoManager::sorted( bool asc, int so, int f, int cat ) {
+OPimTodoAccess::List TodoManager::sorted( bool asc, int so, int f, int cat ) {
return m_db->sorted( asc, so, f, cat );
}
-OTodoAccess::List::Iterator TodoManager::overDue() {
+OPimTodoAccess::List::Iterator TodoManager::overDue() {
int filter = 2 | 1;
m_list = m_db->sorted(m_asc, m_sortOrder, filter, m_ca );
m_it = m_list.begin();
return m_it;
}
-OTodoAccess::List::Iterator TodoManager::fromTo( const QDate& start,
+OPimTodoAccess::List::Iterator TodoManager::fromTo( const QDate& start,
const QDate& end ) {
m_list = m_db->effectiveToDos( start, end );
m_it = m_list.begin();
return m_it;
}
-OTodoAccess::List::Iterator TodoManager::query( const OTodo& ev, int query ) {
+OPimTodoAccess::List::Iterator TodoManager::query( const OPimTodo& ev, int query ) {
m_list = m_db->queryByExample( ev, query );
m_it = m_list.begin();
return m_it;
}
-OTodoAccess* TodoManager::todoDB() {
+OPimTodoAccess* TodoManager::todoDB() {
return m_db;
}
-void TodoManager::add( const OTodo& ev ) {
+void TodoManager::add( const OPimTodo& ev ) {
m_db->add( ev );
}
void TodoManager::update( int, const SmallTodo& ) {
}
-void TodoManager::update( int, const OTodo& ev) {
+void TodoManager::update( int, const OPimTodo& ev) {
m_db->replace( ev );
}
bool TodoManager::remove( int uid ) {
@@ -121,7 +121,7 @@ bool TodoManager::isLoaded()const {
}
void TodoManager::load() {
if (!m_db) {
- m_db = new OTodoAccess();
+ m_db = new OPimTodoAccess();
m_db->load();
}
}
diff --git a/core/pim/todo/todomanager.h b/core/pim/todo/todomanager.h
index 8544277..865b47b 100644
--- a/core/pim/todo/todomanager.h
+++ b/core/pim/todo/todomanager.h
@@ -29,17 +29,19 @@
#ifndef OPIE_TODO_MANAGER_H
#define OPIE_TODO_MANAGER_H
-#include <qarray.h>
-#include <qobject.h>
-#include <qstring.h>
+#include <opie2/opimtodo.h>
+#include <opie2/otodoaccess.h>
#include <qpe/categories.h>
-#include <opie/otodo.h>
-#include <opie/otodoaccess.h>
+#include <qarray.h>
+#include <qobject.h>
+#include <qstring.h>
#include "smalltodo.h"
+using Opie::OPimTodo;
+using Opie::OPimTodoAccess;
namespace Todo {
class TodoManager : public QObject{
@@ -52,17 +54,17 @@ namespace Todo {
QStringList categories()/*const*/;
int catId(const QString&);
- OTodo event(int uid );
+ OPimTodo event(int uid );
void updateList();
/** returns the iterator sorted if set sorted*/
- OTodoAccess::List list()const;
- OTodoAccess::List sorted( bool asc, int so, int f, int cat );
+ OPimTodoAccess::List list()const;
+ OPimTodoAccess::List sorted( bool asc, int so, int f, int cat );
- OTodoAccess::List::Iterator overDue();
- OTodoAccess::List::Iterator fromTo( const QDate& start,
+ OPimTodoAccess::List::Iterator overDue();
+ OPimTodoAccess::List::Iterator fromTo( const QDate& start,
const QDate& end );
- OTodoAccess::List::Iterator query( const OTodo& ev, int query );
+ OPimTodoAccess::List::Iterator query( const OPimTodo& ev, int query );
void setCategory( bool sort, int category = -1);
void setShowOverDue( bool show );
@@ -70,7 +72,7 @@ namespace Todo {
void setSortASC( bool );
void sort();
- OTodoAccess* todoDB();
+ OPimTodoAccess* todoDB();
bool saveAll();
@@ -79,9 +81,9 @@ namespace Todo {
void updateCategories();
public slots:
- void add( const OTodo& );
+ void add( const OPimTodo& );
void update( int uid, const SmallTodo& );
- void update( int uid, const OTodo& );
+ void update( int uid, const OPimTodo& );
bool remove( int uid );
void remove( const QArray<int>& );
@@ -94,10 +96,10 @@ namespace Todo {
void save();
private:
- OTodoAccess* m_db;
- OTodoAccess::List m_list;
- OTodoAccess::List::Iterator m_it;
- OTodoAccess::List m_sorted;
+ OPimTodoAccess* m_db;
+ OPimTodoAccess::List m_list;
+ OPimTodoAccess::List::Iterator m_it;
+ OPimTodoAccess::List m_sorted;
Categories m_cat;
int m_ca;
/* sort cat */
diff --git a/core/pim/todo/todoshow.h b/core/pim/todo/todoshow.h
index 2babe93..1eeadf8 100644
--- a/core/pim/todo/todoshow.h
+++ b/core/pim/todo/todoshow.h
@@ -31,7 +31,9 @@
#include <qstring.h>
#include <qwidget.h>
-#include <opie/otodo.h>
+#include <opie2/opimtodo.h>
+
+using Opie::OPimTodo;
namespace Todo {
class MainWindow;
@@ -46,7 +48,7 @@ namespace Todo {
TodoShow( MainWindow* win);
virtual ~TodoShow();
virtual QString type()const = 0;
- virtual void slotShow( const OTodo& ev ) = 0;
+ virtual void slotShow( const OPimTodo& ev ) = 0;
virtual QWidget* widget() = 0;
protected:
void escapeView();
diff --git a/core/pim/todo/todotemplatemanager.cpp b/core/pim/todo/todotemplatemanager.cpp
index 5b83f76..eeac51b 100644
--- a/core/pim/todo/todotemplatemanager.cpp
+++ b/core/pim/todo/todotemplatemanager.cpp
@@ -1,9 +1,9 @@
+#include <opie2/otodoaccess.h>
+#include <opie2/otodoaccessxml.h>
+
#include <qpe/config.h>
#include <qpe/global.h>
-#include <opie/otodoaccess.h>
-#include <opie/otodoaccessxml.h>
-
#include "todotemplatemanager.h"
@@ -17,15 +17,15 @@ TemplateManager::~TemplateManager() {
}
void TemplateManager::load() {
Config conf("todolist_templates");
- OTodoAccessXML *xml = new OTodoAccessXML( QString::fromLatin1("template"),
+ OPimTodoAccessXML *xml = new OPimTodoAccessXML( QString::fromLatin1("template"),
m_path );
- OTodoAccess todoDB(xml );
+ OPimTodoAccess todoDB(xml );
todoDB.load();
- OTodoAccess::List::Iterator it;
- OTodoAccess::List list = todoDB.allRecords();
+ OPimTodoAccess::List::Iterator it;
+ OPimTodoAccess::List list = todoDB.allRecords();
for ( it = list.begin(); it != list.end(); ++it ) {
- OTodo ev = (*it);
+ OPimTodo ev = (*it);
conf.setGroup( QString::number( ev.uid() ) );
QString str = conf.readEntry("Name", QString::null );
if (str.isEmpty() )
@@ -38,16 +38,16 @@ void TemplateManager::save() {
qWarning("Saving!!!!");
Config conf("todolist_templates");
- OTodoAccessXML *res = new OTodoAccessXML( "template",
+ OPimTodoAccessXML *res = new OPimTodoAccessXML( "template",
m_path );
- OTodoAccess db(res);
+ OPimTodoAccess db(res);
db.load();
db.clear();
- QMap<QString, OTodo>::Iterator it;
+ QMap<QString, OPimTodo>::Iterator it;
for ( it = m_templates.begin(); it != m_templates.end(); ++it ) {
- OTodo ev = it.data();
+ OPimTodo ev = it.data();
conf.setGroup( QString::number( ev.uid() ) );
qWarning("Name" + it.key() );
conf.writeEntry("Name", it.key() );
@@ -56,9 +56,9 @@ void TemplateManager::save() {
db.save();
}
void TemplateManager::addEvent( const QString& str,
- const OTodo& ev) {
+ const OPimTodo& ev) {
qWarning("AddEvent"+ str );
- OTodo todo = ev;
+ OPimTodo todo = ev;
if( ev.uid() == 0 )
todo.setUid(1); // generate a new uid
@@ -69,13 +69,13 @@ void TemplateManager::removeEvent( const QString& str ) {
}
QStringList TemplateManager::templates() const {
QStringList list;
- QMap<QString, OTodo>::ConstIterator it;
+ QMap<QString, OPimTodo>::ConstIterator it;
for (it = m_templates.begin(); it != m_templates.end(); ++it ) {
list << it.key();
}
return list;
}
-OTodo TemplateManager::templateEvent( const QString& templateName ) {
+OPimTodo TemplateManager::templateEvent( const QString& templateName ) {
return m_templates[templateName];
}
diff --git a/core/pim/todo/todotemplatemanager.h b/core/pim/todo/todotemplatemanager.h
index 387ced1..ee8aaaf 100644
--- a/core/pim/todo/todotemplatemanager.h
+++ b/core/pim/todo/todotemplatemanager.h
@@ -1,11 +1,12 @@
#ifndef OPIE_TODO_TEMPLATE_H
#define OPIE_TODO_TEMPLATE_H
+#include <opie2/opimtodo.h>
+
#include <qstring.h>
#include <qmap.h>
-#include <opie/otodo.h>
-
+using namespace Opie;
namespace Todo {
class TemplateManager {
@@ -15,14 +16,14 @@ namespace Todo {
void load();
void save();
QStringList templates()const;
- OTodo templateEvent( const QString& templateName );
+ OPimTodo templateEvent( const QString& templateName );
/* also replaces one */
- void addEvent( const QString&, const OTodo& );
+ void addEvent( const QString&, const OPimTodo& );
void removeEvent( const QString& );
private:
QString m_path;
- QMap<QString, OTodo> m_templates;
+ QMap<QString, OPimTodo> m_templates;
diff --git a/core/pim/todo/todoview.cpp b/core/pim/todo/todoview.cpp
index 31047cf..d99cf77 100644
--- a/core/pim/todo/todoview.cpp
+++ b/core/pim/todo/todoview.cpp
@@ -19,14 +19,14 @@ MainWindow* TodoView::todoWindow() {
return m_main;
}
-OTodo TodoView::event(int uid ) {
+OPimTodo TodoView::event(int uid ) {
return m_main->event( uid );
}
-OTodoAccess::List TodoView::list(){
+OPimTodoAccess::List TodoView::list(){
todoWindow()->updateList();
return todoWindow()->list();
}
-OTodoAccess::List TodoView::sorted()const{
+OPimTodoAccess::List TodoView::sorted()const{
return m_sort;
}
void TodoView::sort() {
@@ -46,7 +46,7 @@ void TodoView::setAscending( bool b ) {
void TodoView::update(int, const SmallTodo& ) {
//m_main->slotUpate1( uid, to );
}
-void TodoView::update(int , const OTodo& ev ) {
+void TodoView::update(int , const OPimTodo& ev ) {
m_main->updateTodo( ev );
}
void TodoView::showTodo( int uid ) {
@@ -61,7 +61,7 @@ void TodoView::remove( int uid ) {
void TodoView::complete( int uid ) {
m_main->slotComplete( uid );
}
-void TodoView::complete( const OTodo& ev ) {
+void TodoView::complete( const OPimTodo& ev ) {
m_main->slotComplete( ev );
}
void TodoView::removeQuery( int uid ) {
diff --git a/core/pim/todo/todoview.h b/core/pim/todo/todoview.h
index e5ed66f..a5ea9f5 100644
--- a/core/pim/todo/todoview.h
+++ b/core/pim/todo/todoview.h
@@ -34,10 +34,12 @@
#include <qvaluelist.h>
#include <qwidget.h>
-#include <opie/otodoaccess.h>
+#include <opie2/otodoaccess.h>
#include "smalltodo.h"
+using Opie::OPimTodo;
+using Opie::OPimTodoAccess;
namespace Todo {
class MainWindow;
@@ -68,8 +70,8 @@ namespace Todo {
*/
virtual void updateView() = 0;
- virtual void addEvent( const OTodo& ) = 0;
- virtual void replaceEvent( const OTodo& ) = 0;
+ virtual void addEvent( const OPimTodo& ) = 0;
+ virtual void replaceEvent( const OPimTodo& ) = 0;
virtual void removeEvent( int uid ) = 0;
virtual void setShowCompleted( bool ) = 0;
virtual void setShowDeadline( bool ) = 0;
@@ -104,9 +106,9 @@ namespace Todo {
protected:
MainWindow* todoWindow();
- OTodo event(int uid );
- OTodoAccess::List list();
- OTodoAccess::List sorted()const;
+ OPimTodo event(int uid );
+ OPimTodoAccess::List list();
+ OPimTodoAccess::List sorted()const;
void sort();
void sort(int sort );
void setSortOrder( int order );
@@ -119,15 +121,15 @@ namespace Todo {
void showTodo( int uid );
void edit( int uid );
void update(int uid, const SmallTodo& to );
- void update(int uid, const OTodo& ev);
+ void update(int uid, const OPimTodo& ev);
void remove( int uid );
/* will ask the user if the item should be deleted */
void removeQuery(int uid );
void complete( int uid );
- void complete( const OTodo& ev );
+ void complete( const OPimTodo& ev );
private:
MainWindow *m_main;
- OTodoAccess::List m_sort;
+ OPimTodoAccess::List m_sort;
bool m_asc : 1;
int m_sortOrder;
};