33 files changed, 237 insertions, 224 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 @@ -2,3 +2,3 @@ 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 @@ -29,4 +29,18 @@ #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> @@ -42,20 +56,4 @@ #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" @@ -311,8 +309,8 @@ 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") ) @@ -332,5 +330,5 @@ 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") ) @@ -342,5 +340,5 @@ 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 ); } @@ -434,5 +432,5 @@ 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 ); @@ -441,5 +439,5 @@ void MainWindow::slotNewFromTemplate( int id ) { /* assign new todo */ event.setUid( 1 ); - handleAlarms( OTodo(), event ); + handleAlarms( OPimTodo(), event ); m_todoMgr.add( event ); currentView()->addEvent( event ); @@ -458,5 +456,5 @@ void MainWindow::slotDuplicate() { return; } - OTodo ev = m_todoMgr.event( currentView()->current() ); + OPimTodo ev = m_todoMgr.event( currentView()->current() ); /* let's generate a new uid */ ev.setUid(1); @@ -479,5 +477,5 @@ void MainWindow::slotDelete() { return; - handleAlarms( m_todoMgr.event( currentView()->current() ), OTodo() ); + handleAlarms( m_todoMgr.event( currentView()->current() ), OPimTodo() ); m_todoMgr.remove( currentView()->current() ); currentView()->removeEvent( currentView()->current() ); @@ -491,9 +489,9 @@ void MainWindow::slotDelete(int uid ) { 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() ); @@ -598,9 +596,9 @@ void MainWindow::beamDone( Ir* ir) { } 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()){ @@ -611,5 +609,5 @@ void MainWindow::receiveFile( const QString& filename ) { 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) ); @@ -709,7 +707,7 @@ void MainWindow::slotEdit( int uid ) { } - 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 */ @@ -729,5 +727,5 @@ void MainWindow::slotUpdate1( int uid, const SmallTodo& ev) { } */ -void MainWindow::updateTodo( const OTodo& ev) { +void MainWindow::updateTodo( const OPimTodo& ev) { m_todoMgr.update( ev.uid() , ev ); } @@ -747,5 +745,5 @@ void MainWindow::setReadAhead( uint count ) { void MainWindow::slotQuickEntered() { qWarning("entered"); - OTodo todo = quickEditor()->todo(); + OPimTodo todo = quickEditor()->todo(); if (todo.isEmpty() ) return; @@ -761,6 +759,6 @@ 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() ); @@ -778,10 +776,10 @@ void MainWindow::slotComplete( const OTodo& todo ) { */ 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 ); @@ -826,5 +824,5 @@ void MainWindow::slotComplete( const OTodo& todo ) { } to2.notifiers().setAlarms( als ); - handleAlarms( OTodo(), todo ); + handleAlarms( OPimTodo(), todo ); } to2.setCompletedDate( inval ); @@ -856,5 +854,5 @@ int MainWindow::create() { - OTodo todo = currentEditor()->newTodo( currentCatId(), + OPimTodo todo = currentEditor()->newTodo( currentCatId(), this ); @@ -862,5 +860,5 @@ int MainWindow::create() { //todo.assignUid(); uid = todo.uid(); - handleAlarms( OTodo(), todo ); + handleAlarms( OPimTodo(), todo ); m_todoMgr.add( todo ); currentView()->addEvent( todo ); @@ -881,5 +879,5 @@ bool MainWindow::remove( int uid ) { /* 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 ); @@ -891,7 +889,7 @@ void MainWindow::beam( int uid) { 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 ); @@ -914,8 +912,8 @@ void MainWindow::edit( int 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 ); @@ -970,5 +968,5 @@ 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 @@ -998,5 +996,5 @@ 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 @@ -32,7 +32,8 @@ #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" @@ -45,9 +46,10 @@ class QMenuBar; class QToolBar; class QAction; -class OWidgetStack; class Ir; class QVBox; class QLineEdit; +using namespace Opie; + namespace Todo { typedef TodoView View; @@ -70,5 +72,5 @@ namespace Todo { ~MainWindow(); - /** return a context menu for an OTodo */ + /** return a context menu for an OPimTodo */ QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE ); QPopupMenu* options(); @@ -78,9 +80,9 @@ 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; @@ -94,5 +96,5 @@ namespace Todo { QuickEditBase* quickEditor(); - void updateTodo( const OTodo& ); + void updateTodo( const OPimTodo& ); void populateTemplates(); Editor* currentEditor(); @@ -109,5 +111,5 @@ 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* ); @@ -166,5 +168,5 @@ private slots: void slotUpdate3( QWidget* ); void slotComplete( int uid ); - void slotComplete( const OTodo& ev ); + void slotComplete( const OPimTodo& ev ); void slotNewFromTemplate(int id ); void slotNew(); 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 @@ -5,5 +5,5 @@ 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. 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,6 +1,4 @@ #include <qlayout.h> -#include <opie/orecurrancewidget.h> - #include "taskeditoroverview.h" #include "taskeditorstatus.h" @@ -14,5 +12,5 @@ OTaskEditor::OTaskEditor(int cur) init( cur ); } -OTaskEditor::OTaskEditor( const OTodo& to) +OTaskEditor::OTaskEditor( const OPimTodo& to) : QDialog( 0, 0, TRUE, WStyle_ContextHelp ) { init(); @@ -23,5 +21,5 @@ OTaskEditor::~OTaskEditor() { } void OTaskEditor::init( int cur ) { - OTodo to; + OPimTodo to; to.setUid( 1 ); // generate a new uid if ( cur != 0 ) @@ -29,10 +27,10 @@ void OTaskEditor::init( int 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 ); @@ -42,10 +40,10 @@ 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() ); m_alarm->load( to ); - + m_todo = to; } @@ -76,5 +74,5 @@ void OTaskEditor::init() { // 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 @@ -4,11 +4,11 @@ #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; @@ -17,5 +17,5 @@ class OTaskEditor : public QDialog { public: OTaskEditor(int cur); - OTaskEditor( const OTodo& todo ); + OTaskEditor( const OPimTodo& todo ); ~OTaskEditor(); @@ -25,9 +25,9 @@ public: */ 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(); @@ -37,6 +37,6 @@ private: TaskEditorAlarms *m_alarm; TaskEditorAlarms *m_remind; - ORecurranceWidget *m_rec; - OTodo m_todo; + OPimRecurrenceWidget *m_rec; + OPimTodo m_todo; }; 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 @@ -5,10 +5,12 @@ #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; @@ -24,5 +26,5 @@ namespace Todo{ /** * Quick edit is meant to quickly enter - * OTodos in a fast way + * OPimTodos in a fast way */ class QuickEdit : public QuickEditBase{ @@ -30,5 +32,5 @@ namespace Todo{ QuickEdit(MainWindow* main ); virtual ~QuickEdit(); - //OTodo todo()const; + //OPimTodo todo()const; QSignal* signal(); //QWidget* widget(); 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 @@ -5,5 +5,5 @@ #include <qpe/resource.h> -#include <opie/oclickablelabel.h> +#include <opie2/oclickablelabel.h> #include "mainwindow.h" @@ -63,5 +63,5 @@ QuickEditImpl::~QuickEditImpl() { } -OTodo QuickEditImpl::todo()const { +OPimTodo QuickEditImpl::todo()const { return m_todo; } @@ -70,5 +70,5 @@ QWidget* QuickEditImpl::widget() { } void QuickEditImpl::slotEnter() { - OTodo todo; + OPimTodo todo; 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 @@ -16,5 +16,5 @@ public: QuickEditImpl( QWidget* parent, bool visible); ~QuickEditImpl(); - OTodo todo()const; + OPimTodo todo()const; QWidget* widget(); private slots: @@ -31,5 +31,5 @@ private: QLabel* m_more; QPopupMenu* m_menu; - OTodo m_todo; + OPimTodo m_todo; bool m_visible; 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 @@ -38,6 +38,6 @@ 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 { 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 @@ -38,5 +38,5 @@ #include <qpe/resource.h> -#include <opie/orecur.h> +#include <opie2/opimrecurrence.h> #include "mainwindow.h" @@ -185,5 +185,5 @@ int TableView::prev() { } QString TableView::currentRepresentation() { - OTodo to = sorted()[currentRow()]; + OPimTodo to = sorted()[currentRow()]; return to.summary().isEmpty() ? to.description().left(20) : to.summary() ; } @@ -205,5 +205,5 @@ void TableView::updateView( ) { todoWindow()->setReadAhead( 4 ); sort(); - OTodoAccess::List::Iterator it, end; + OPimTodoAccess::List::Iterator it, end; it = sorted().begin(); end = sorted().end(); @@ -228,5 +228,5 @@ void TableView::updateView( ) { // int el = time.elapsed(); } -void TableView::setTodo( int, const OTodo&) { +void TableView::setTodo( int, const OPimTodo&) { sort(); @@ -234,5 +234,5 @@ void TableView::setTodo( int, const OTodo&) { repaint(); } -void TableView::addEvent( const OTodo&) { +void TableView::addEvent( const OPimTodo&) { /* fix problems of not showing the 'Haken' */ @@ -243,5 +243,5 @@ void TableView::addEvent( const OTodo&) { * and then replace the complete row */ -void TableView::replaceEvent( const OTodo& ev) { +void TableView::replaceEvent( const OPimTodo& ev) { addEvent( ev ); } @@ -389,5 +389,5 @@ 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? @@ -498,5 +498,5 @@ void TableView::setCellContentFromEditor(int row, int col ) { 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 ); @@ -509,5 +509,5 @@ void TableView::setCellContentFromEditor(int row, int col ) { if ( wid->inherits("QLineEdit") ) { QString text = ((QLineEdit*)wid)->text(); - OTodo todo = sorted()[row]; + OPimTodo todo = sorted()[row]; if ( todo.summary() != text ) { todo.setSummary( text ); 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 @@ -57,7 +57,7 @@ namespace Todo { 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 ); @@ -73,5 +73,5 @@ namespace Todo { * 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 ); 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 @@ -29,7 +29,6 @@ #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> @@ -123,5 +122,5 @@ void TaskEditorAlarms::slotDelete(){ } -void TaskEditorAlarms::load( const OTodo& todo) { +void TaskEditorAlarms::load( const OPimTodo& todo) { lstAlarms->clear(); if (!todo.hasNotifiers() ) return; @@ -137,5 +136,5 @@ void TaskEditorAlarms::load( const OTodo& todo) { } -void TaskEditorAlarms::save( OTodo& todo ) { +void TaskEditorAlarms::save( OPimTodo& todo ) { if (lstAlarms->childCount() <= 0 ) return; 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 @@ -30,9 +30,12 @@ #define TASKEDITORALARMS_H +#include <opie2/opimtodo.h> + #include <qwidget.h> class QListView; class QListViewItem; -class OTodo; + +using namespace Opie; class AlarmItem; @@ -49,6 +52,6 @@ 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 ); 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 @@ -29,5 +29,5 @@ #include "taskeditoroverview.h" -#include <opie/orecur.h> +//#include <opie2/opimrecurrence.h> #include <qpe/categoryselect.h> @@ -128,5 +128,5 @@ TaskEditorOverView::~TaskEditorOverView() } -void TaskEditorOverView::load( const OTodo& todo ) +void TaskEditorOverView::load( const OPimTodo& todo ) { // Description @@ -149,5 +149,5 @@ void TaskEditorOverView::load( const OTodo& todo ) } -void TaskEditorOverView::save( OTodo &todo ) +void TaskEditorOverView::save( OPimTodo &todo ) { // Description 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 @@ -30,5 +30,5 @@ #define TASKEDITOROVERVIEW_H -#include <opie/otodo.h> +#include <opie2/opimtodo.h> #include <qpixmap.h> @@ -40,6 +40,8 @@ class QComboBox; class QMultiLineEdit; +using namespace Opie; + class TaskEditorOverView : public QWidget -{ +{ Q_OBJECT @@ -54,6 +56,6 @@ public: QMultiLineEdit *mleNotes; - void load( const OTodo & ); - void save( OTodo & ); + void load( const OPimTodo & ); + void save( OPimTodo & ); signals: 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 @@ -29,7 +29,6 @@ #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> @@ -172,5 +171,5 @@ TaskEditorStatus::~TaskEditorStatus() } -void TaskEditorStatus::load( const OTodo &todo ) +void TaskEditorStatus::load( const OPimTodo &todo ) { QDate date = QDate::currentDate(); @@ -224,5 +223,5 @@ void TaskEditorStatus::load( const OTodo &todo ) } -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 @@ -30,9 +30,10 @@ #define TASKEDITORSTATUS_H +#include <opie2/opimtodo.h> + #include <qdatetime.h> #include <qwidget.h> class DateBookMonth; -class OTodo; class QCheckBox; class QComboBox; @@ -41,4 +42,6 @@ class QPushButton; class QToolButton; +using namespace Opie; + /** * This is the implementation of the Opie Task Editor Advanced tab @@ -48,5 +51,5 @@ class QToolButton; */ class TaskEditorStatus : public QWidget -{ +{ Q_OBJECT @@ -69,5 +72,5 @@ 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 @@ -75,6 +78,6 @@ public: * but I do not do it -zecke */ - void load( const OTodo & ); - void save( OTodo & ); + void load( const OPimTodo & ); + void save( OPimTodo & ); private: 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 @@ -16,14 +16,14 @@ namespace { 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; }; @@ -31,5 +31,5 @@ namespace { TemplateListItem::TemplateListItem( QListView* view, const QString& text, - const OTodo& ev ) + const OPimTodo& ev ) : QListViewItem( view ), m_name( text ), m_ev( ev ) { @@ -37,5 +37,5 @@ namespace { } TemplateListItem::~TemplateListItem() {} - OTodo TemplateListItem::event() const { + OPimTodo TemplateListItem::event() const { return m_ev; } @@ -47,5 +47,5 @@ namespace { m_name = str; } - void TemplateListItem::setEvent( const OTodo& ev) { + void TemplateListItem::setEvent( const OPimTodo& ev) { m_ev = ev; } @@ -73,5 +73,5 @@ 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 ); @@ -93,5 +93,5 @@ void TemplateDialogImpl::slotEdit() { 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 ); 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 @@ -4,5 +4,5 @@ #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 @@ -12,5 +12,5 @@ QString TextViewShow::type()const { return QString::fromLatin1("TextViewShow"); } -void TextViewShow::slotShow( const OTodo& ev ) { +void TextViewShow::slotShow( const OPimTodo& ev ) { setText( ev.toRichText() ); } 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 @@ -11,5 +11,5 @@ namespace Todo { QString type()const; - void slotShow( const OTodo& ev ); + void slotShow( const OPimTodo& ev ); QWidget* widget(); 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 @@ -45,5 +45,5 @@ 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 @@ -2,5 +2,5 @@ #define OPIE_TODO_EDIT_H -#include <opie/otodo.h> +#include <opie2/opimtodo.h> namespace Todo { @@ -10,6 +10,6 @@ namespace Todo { 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 @@ -15,5 +15,5 @@ Editor::~Editor() { m_self = 0; } -OTodo Editor::newTodo( int cur, +OPimTodo Editor::newTodo( int cur, QWidget*) { @@ -29,5 +29,5 @@ OTodo Editor::newTodo( int cur, 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() ); @@ -36,6 +36,6 @@ OTodo Editor::newTodo( int cur, return ev; } -OTodo Editor::edit( QWidget *, - const OTodo& todo ) { +OPimTodo Editor::edit( QWidget *, + const OPimTodo& todo ) { OTaskEditor *e = self(); e->init( todo ); @@ -44,5 +44,5 @@ OTodo Editor::edit( QWidget *, int ret = QPEApplication::execDialog( e ); - OTodo ev = e->todo(); + OPimTodo ev = e->todo(); if ( ret == QDialog::Accepted ) m_accepted = true; 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 @@ -2,5 +2,5 @@ #define OPIE_TODO_EDITOR_H -#include <opie/otodo.h> +#include <opie2/opimtodo.h> @@ -12,8 +12,8 @@ namespace Todo { ~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() ); 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 @@ -43,5 +43,5 @@ TodoManager::~TodoManager() { delete m_db; } -OTodo TodoManager::event(int uid ) { +OPimTodo TodoManager::event(int uid ) { return m_db->find( uid ); } @@ -50,11 +50,11 @@ void TodoManager::updateList() { 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 ); @@ -62,5 +62,5 @@ OTodoAccess::List::Iterator TodoManager::overDue() { 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 ); @@ -68,13 +68,13 @@ OTodoAccess::List::Iterator TodoManager::fromTo( const QDate& start, 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 ); } @@ -82,5 +82,5 @@ void TodoManager::update( int, const SmallTodo& ) { } -void TodoManager::update( int, const OTodo& ev) { +void TodoManager::update( int, const OPimTodo& ev) { m_db->replace( ev ); } @@ -122,5 +122,5 @@ 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 @@ -30,15 +30,17 @@ #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 { @@ -53,15 +55,15 @@ 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); @@ -71,5 +73,5 @@ namespace Todo { void sort(); - OTodoAccess* todoDB(); + OPimTodoAccess* todoDB(); bool saveAll(); @@ -80,7 +82,7 @@ namespace Todo { 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>& ); @@ -95,8 +97,8 @@ namespace Todo { 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; 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 @@ -32,5 +32,7 @@ #include <qwidget.h> -#include <opie/otodo.h> +#include <opie2/opimtodo.h> + +using Opie::OPimTodo; namespace Todo { @@ -47,5 +49,5 @@ namespace Todo { 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: 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,8 +1,8 @@ +#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" @@ -18,13 +18,13 @@ 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 ); @@ -39,14 +39,14 @@ void TemplateManager::save() { 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() ); @@ -57,10 +57,10 @@ void TemplateManager::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 - + todo.setUid(1); // generate a new uid + m_templates.replace( str, todo ); } @@ -70,5 +70,5 @@ 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(); @@ -77,5 +77,5 @@ QStringList TemplateManager::templates() const { 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 @@ -2,9 +2,10 @@ #define OPIE_TODO_TEMPLATE_H +#include <opie2/opimtodo.h> + #include <qstring.h> #include <qmap.h> -#include <opie/otodo.h> - +using namespace Opie; namespace Todo { @@ -16,12 +17,12 @@ namespace Todo { 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 @@ -20,12 +20,12 @@ MainWindow* TodoView::todoWindow() { } -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; } @@ -47,5 +47,5 @@ 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 ); } @@ -62,5 +62,5 @@ 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 ); } 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 @@ -35,8 +35,10 @@ #include <qwidget.h> -#include <opie/otodoaccess.h> +#include <opie2/otodoaccess.h> #include "smalltodo.h" +using Opie::OPimTodo; +using Opie::OPimTodoAccess; namespace Todo { @@ -69,6 +71,6 @@ 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; @@ -105,7 +107,7 @@ 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 ); @@ -120,13 +122,13 @@ namespace Todo { 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; |