10 files changed, 56 insertions, 42 deletions

diff --git a/core/pim/todo/main.cpp b/core/pim/todo/main.cpp
index 7763169..d070ff8 100644
--- a/core/pim/todo/main.cpp
+++ b/core/pim/todo/main.cpp
@@ -22,3 +22,3 @@
 
-
+#include <opie2/odebug.h>
 
@@ -39,3 +39,3 @@ int main( int argc, char **argv )
     int t = time.elapsed();
-    qWarning("QTime %d", t/1000 );
+    Opie::Core::owarn << "QTime " << t/1000 << oendl;
     mw.setCaption( QObject::tr("Opie Todolist"));
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index f0642c4..d552928 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -30,2 +30,3 @@
 
+#include <opie2/odebug.h>
 #include <opie2/opimrecurrence.h>
@@ -297,3 +298,3 @@ QPopupMenu* MainWindow::contextMenu( int , bool recur ) {
 QPopupMenu* MainWindow::options() {
-    qWarning("Options");
+    Opie::Core::owarn << "Options" << oendl;
     return m_options;
@@ -316,3 +317,3 @@ OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
 
-    qWarning(" Category %d %s",  cat, m_curCat.latin1() );
+    Opie::Core::owarn << " Category " << cat << " " << m_curCat << oendl;
 
@@ -375,3 +376,3 @@ void MainWindow::closeEvent( QCloseEvent* e ) {
     if ( m_todoMgr.saveAll() ){
-        qWarning("saved");
+        Opie::Core::owarn << "saved" << oendl;
         quit = true;
@@ -538,3 +539,3 @@ void MainWindow::setCategory( int c) {
 
-    qWarning("Iterating over cats %d", c );
+    Opie::Core::owarn << "Iterating over cats " << c << oendl;
     for ( unsigned int i = 1; i < m_catMenu->count(); i++ )
@@ -682,3 +683,3 @@ void MainWindow::slotShow( int uid ) {
     if ( uid == 0 ) return;
-    qWarning("slotShow");
+    Opie::Core::owarn << "slotShow" << oendl;
     currentShow()->slotShow( event( uid ) );
@@ -741,3 +742,3 @@ void MainWindow::setReadAhead( uint count ) {
 void MainWindow::slotQuickEntered() {
-    qWarning("entered");
+    Opie::Core::owarn << "entered" << oendl;
     OPimTodo todo = quickEditor()->todo();
@@ -788,3 +789,3 @@ void MainWindow::slotComplete( const OPimTodo& todo ) {
             int dayDiff = to.dueDate().daysTo( date );
-            qWarning("day diff is %d", dayDiff );
+            Opie::Core::owarn << "day diff is " << dayDiff << oendl;
             QDate inval;
@@ -951,3 +952,3 @@ namespace {
         for ( it = als.begin(); it != als.end(); ++it ) {
-            qWarning("Adding alarm for %s", (*it).dateTime().toString().latin1() );
+            Opie::Core::owarn << "Adding alarm for " << (*it).dateTime().toString() << oendl;
             AlarmServer::addAlarm( (*it).dateTime(), "QPE/Application/todolist", "alarm(QDateTime,int)", uid );
@@ -959,3 +960,3 @@ namespace {
         for ( it = als.begin(); it != als.end(); ++it ) {
-            qWarning("Removinf alarm for %s",  (*it).dateTime().toString().latin1() );
+            Opie::Core::owarn << "Removinf alarm for " << (*it).dateTime().toString() << oendl;
             AlarmServer::deleteAlarm( (*it).dateTime(), "QPE/Application/todolist", "alarm(QDateTime,int)", uid );
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index 47c2b67..3a65c04 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -6,3 +6,3 @@ Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal, libopiecore2, libopieui2, libopiepim2, opie-pics, libopiedb2
+Depends: task-opie-minimal, libopiecore2, libopieui2, libopiepim2, opie-pics
 Description: Todo list manager
diff --git a/core/pim/todo/otaskeditor.cpp b/core/pim/todo/otaskeditor.cpp
index a8349c1..55a3dd5 100644
--- a/core/pim/todo/otaskeditor.cpp
+++ b/core/pim/todo/otaskeditor.cpp
@@ -2,2 +2,4 @@
 
+#include <opie2/odebug.h>
+
 #include "taskeditoroverview.h"
@@ -35,3 +37,3 @@ void OTaskEditor::init( const OPimTodo& to ) {
 OPimTodo OTaskEditor::todo()const{
-    qWarning("saving!");
+    Opie::Core::owarn << "saving!" << oendl;
     OPimTodo to ( m_todo );
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index 0d298f4..0b1c579 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -31,6 +31,4 @@
 
-#include <qcombobox.h>
-#include <qlineedit.h>
-#include <qtimer.h>
-#include <qpopupmenu.h>
+#include <opie2/odebug.h>
+#include <opie2/opimrecurrence.h>
 
@@ -39,3 +37,6 @@
 
-#include <opie2/opimrecurrence.h>
+#include <qcombobox.h>
+#include <qlineedit.h>
+#include <qtimer.h>
+#include <qpopupmenu.h>
 
@@ -196,3 +197,3 @@ void TableView::showOverDue( bool ) {
 void TableView::updateView( ) {
-    qWarning("update view");
+    Opie::Core::owarn << "update view" << oendl;
     m_row = false;
@@ -210,3 +211,3 @@ void TableView::updateView( ) {
 
-    qWarning("setTodos");
+    Opie::Core::owarn << "setTodos" << oendl;
     QTime time;
@@ -256,3 +257,3 @@ void TableView::removeEvent( int ) {
 void TableView::setShowCompleted( bool b) {
-    qWarning("Show Completed %d" , b );
+    Opie::Core::owarn << "Show Completed " << b << oendl;
     updateView();
@@ -260,3 +261,3 @@ void TableView::setShowCompleted( bool b) {
 void TableView::setShowDeadline( bool b ) {
-    qWarning( "Show DeadLine %d" , b );
+    Opie::Core::owarn << "Show Deadline " << b << oendl;
     if ( b )
@@ -283,3 +284,3 @@ void TableView::setShowDeadline( bool b ) {
 void TableView::setShowCategory( const QString& str) {
-    qWarning("setShowCategory");
+    Opie::Core::owarn << "setShowCategory" << oendl;
     if ( str != m_oleCat || m_first )
@@ -348,3 +349,4 @@ void TableView::slotPressed(int row, int col, int,
 
-    qWarning("pressed row %d  col %d   x:%d+y:%d", row,col,point.x(),point.y() );
+    Opie::Core::owarn << "pressed row " << row << "  col " << col << "   x:" << point.x()
+                      << "+y:" << point.y() << oendl;
     m_prevP = point;
@@ -355,3 +357,3 @@ void TableView::slotPressed(int row, int col, int,
 void TableView::slotValueChanged( int, int ) {
-    qWarning("Value Changed");
+    Opie::Core::owarn << "Value Changed" << oendl;
 }
@@ -371,3 +373,3 @@ QWidget* TableView::widget() {
 void TableView::sortColumn( int col, bool asc, bool ) {
-    qWarning("bool %d", asc );
+    Opie::Core::owarn << "bool " << asc << oendl;
     setSortOrder( col );
@@ -494,3 +496,3 @@ QWidget* TableView::createEditor(int row, int col, bool )const {
 void TableView::setCellContentFromEditor(int row, int col ) {
-    qWarning("set cell content from editor");
+    Opie::Core::owarn << "set cell content from editor" << oendl;
     if ( col == 1 ) {
@@ -530,3 +532,3 @@ void TableView::slotPriority() {
 void TableView::timerEvent( QTimerEvent*  ) {
-//    qWarning("sorted %d", sorted().count() );
+//    Opie::Core::owarn << "sorted " << sorted().count() << oendl;
     if (sorted().count() == 0 )
@@ -578,3 +580,3 @@ void TableView::contentsMouseReleaseEvent( QMouseEvent* e) {
     int colNew = columnAt(e->x() );
-    qWarning("colNew: %d colOld: %d", colNew, colOld );
+    Opie::Core::owarn << "colNew: "  << colNew << " colOld: " << colOld << oendl;
     if ( row == rowAt( e->y() ) && row != -1 &&
diff --git a/core/pim/todo/templatedialog.cpp b/core/pim/todo/templatedialog.cpp
index 8dfbd0b..32327a6 100644
--- a/core/pim/todo/templatedialog.cpp
+++ b/core/pim/todo/templatedialog.cpp
@@ -1 +1,3 @@
+#include <opie2/odebug.h>
+
 #include <qpushbutton.h>
@@ -51,12 +53,12 @@ QLineEdit* TemplateDialog::edit() {
 void TemplateDialog::slotAdd() {
-    qWarning("Not Implemented here");
+    Opie::Core::owarn << "Not Implemented here" << oendl;
 }
 void TemplateDialog::slotRemove() {
-    qWarning("Not Implemented here");
+    Opie::Core::owarn << "Not Implemented here" << oendl;
 }
 void TemplateDialog::slotEdit() {
-    qWarning("Not Implemented here");
+    Opie::Core::owarn << "Not Implemented here" << oendl;
 }
 void TemplateDialog::slotReturn() {
-    qWarning("Not Implemented here");
+    Opie::Core::owarn << "Not Implemented here" << oendl;
 }
diff --git a/core/pim/todo/todoeditor.cpp b/core/pim/todo/todoeditor.cpp
index 4b5ecb1..7857d52 100644
--- a/core/pim/todo/todoeditor.cpp
+++ b/core/pim/todo/todoeditor.cpp
@@ -1 +1,2 @@
+#include <opie2/odebug.h>
 
@@ -32,4 +33,4 @@ OPimTodo Editor::newTodo( int cur,
     OPimTodo ev = e->todo();
-    qWarning("Todo uid");
-    qWarning("Todo %s %d %d", ev.summary().latin1(), ev.progress(), ev.isCompleted() );
+    Opie::Core::owarn << "Todo uid" << oendl;
+    Opie::Core::owarn << "Todo " << ev.summary() << " " << ev.progress() << " " << ev.isCompleted() << oendl;
     ev.setUid(1);
diff --git a/core/pim/todo/todomanager.cpp b/core/pim/todo/todomanager.cpp
index 21e1d0c..7826747 100644
--- a/core/pim/todo/todomanager.cpp
+++ b/core/pim/todo/todomanager.cpp
@@ -27,2 +27,5 @@
 */
+
+#include <opie2/odebug.h>
+
 #include <qpe/categoryselect.h>
@@ -39,3 +42,3 @@ TodoManager::TodoManager( QObject *obj )
     int el = time.elapsed();
-    qWarning("QTimer for loading %d", el/1000 );
+    Opie::Core::owarn << "QTimer for loading " << el/1000 << oendl;
 }
@@ -48,3 +51,3 @@ OPimTodo TodoManager::event(int uid ) {
 void TodoManager::updateList() {
-    qWarning("update list");
+    Opie::Core::owarn << "update lists" << oendl;
     m_list = m_db->allRecords();
diff --git a/core/pim/todo/todotemplatemanager.cpp b/core/pim/todo/todotemplatemanager.cpp
index eeac51b..0b20d5a 100644
--- a/core/pim/todo/todotemplatemanager.cpp
+++ b/core/pim/todo/todotemplatemanager.cpp
@@ -1 +1,2 @@
+#include <opie2/odebug.h>
 #include <opie2/otodoaccess.h>
@@ -37,3 +38,3 @@ void TemplateManager::load() {
 void TemplateManager::save() {
-    qWarning("Saving!!!!");
+    Opie::Core::owarn << "Saving!!!!" << oendl;
     Config conf("todolist_templates");
@@ -51,3 +52,3 @@ void TemplateManager::save() {
         conf.setGroup( QString::number( ev.uid() ) );
-        qWarning("Name" + it.key() );
+        Opie::Core::owarn << "Name " << it.key() << oendl;
         conf.writeEntry("Name", it.key() );
@@ -59,3 +60,3 @@ void TemplateManager::addEvent( const QString& str,
                                 const OPimTodo& ev) {
-    qWarning("AddEvent"+  str );
+    Opie::Core::owarn << "AddEvent " << str << oendl;
     OPimTodo todo = ev;
diff --git a/core/pim/todo/todoview.cpp b/core/pim/todo/todoview.cpp
index d99cf77..03e1060 100644
--- a/core/pim/todo/todoview.cpp
+++ b/core/pim/todo/todoview.cpp
@@ -2,2 +2,4 @@
 
+#include <opie2/odebug.h>
+
 #include "todoview.h"
@@ -33,3 +35,3 @@ void TodoView::sort() {
     m_sort = todoWindow()->sorted(m_asc,m_sortOrder );
-    qWarning("m_sort.count() = %d", m_sort.count() );
+    Opie::Core::owarn << "m_sort.count() = " << m_sort.count() << oendl;
 }
@@ -42,3 +44,3 @@ void TodoView::setSortOrder( int order ) {
 void TodoView::setAscending( bool b ) {
-    qWarning("setAscending %d", b );
+    Opie::Core::owarn << "setAscending " << b << oendl;
     m_asc = b;