From edd008d91ca57453601d0c2098936287d98975e6 Mon Sep 17 00:00:00 2001 From: drw Date: Fri, 02 Apr 2004 22:15:36 +0000 Subject: Use ODebug (another 35 down...) - all of core/pim is converted. --- (limited to 'core/pim/todo') 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 @@ -20,7 +20,7 @@ #include "mainwindow.h" - +#include #include @@ -37,7 +37,7 @@ int main( int argc, char **argv ) time.start(); Todo::MainWindow mw; int t = time.elapsed(); - qWarning("QTime %d", t/1000 ); + Opie::Core::owarn << "QTime " << t/1000 << oendl; mw.setCaption( QObject::tr("Opie Todolist")); QObject::connect( &a, SIGNAL( flush() ), &mw, SLOT( slotFlush() ) ); QObject::connect( &a, SIGNAL( reload() ), &mw, SLOT( slotReload() ) ); 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 @@ -28,6 +28,7 @@ #include +#include #include #include #include @@ -295,7 +296,7 @@ QPopupMenu* MainWindow::contextMenu( int , bool recur ) { return menu; } QPopupMenu* MainWindow::options() { - qWarning("Options"); + Opie::Core::owarn << "Options" << oendl; return m_options; } QPopupMenu* MainWindow::edit() { @@ -314,7 +315,7 @@ OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) { if ( m_curCat == QWidget::tr("Unfiled") ) cat = -1; - qWarning(" Category %d %s", cat, m_curCat.latin1() ); + Opie::Core::owarn << " Category " << cat << " " << m_curCat << oendl; int filter = 1; @@ -373,7 +374,7 @@ void MainWindow::closeEvent( QCloseEvent* e ) { } bool quit = false; if ( m_todoMgr.saveAll() ){ - qWarning("saved"); + Opie::Core::owarn << "saved" << oendl; quit = true; }else { if ( QMessageBox::critical( this, QWidget::tr("Out of space"), @@ -536,7 +537,7 @@ void MainWindow::setCategory( int c) { if ( c <= 0 ) return; - qWarning("Iterating over cats %d", c ); + Opie::Core::owarn << "Iterating over cats " << c << oendl; for ( unsigned int i = 1; i < m_catMenu->count(); i++ ) m_catMenu->setItemChecked(i, c == (int)i ); @@ -680,7 +681,7 @@ void MainWindow::slotShowDue(bool ov) { } void MainWindow::slotShow( int uid ) { if ( uid == 0 ) return; - qWarning("slotShow"); + Opie::Core::owarn << "slotShow" << oendl; currentShow()->slotShow( event( uid ) ); m_stack->raiseWidget( currentShow()->widget() ); } @@ -739,7 +740,7 @@ void MainWindow::setReadAhead( uint count ) { m_todoMgr.todoDB()->setReadAhead( count ); } void MainWindow::slotQuickEntered() { - qWarning("entered"); + Opie::Core::owarn << "entered" << oendl; OPimTodo todo = quickEditor()->todo(); if (todo.isEmpty() ) return; @@ -786,7 +787,7 @@ void MainWindow::slotComplete( const OPimTodo& todo ) { QDate date; if ( to2.recurrence().nextOcurrence( to2.dueDate().addDays(1), date ) ) { int dayDiff = to.dueDate().daysTo( date ); - qWarning("day diff is %d", dayDiff ); + Opie::Core::owarn << "day diff is " << dayDiff << oendl; QDate inval; /* generate a new uid for the old record */ to.setUid( 1 ); @@ -949,7 +950,7 @@ namespace { void addAlarms( const OPimNotifyManager::Alarms& als, int uid ) { OPimNotifyManager::Alarms::ConstIterator it; 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 ); } @@ -957,7 +958,7 @@ namespace { void removeAlarms( const OPimNotifyManager::Alarms& als, int uid ) { OPimNotifyManager::Alarms::ConstIterator it; 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 @@ -4,7 +4,7 @@ Priority: optional Section: opie/pim Maintainer: Holger 'zecke' Freyther 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 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 a8349c1..55a3dd5 100644 --- a/core/pim/todo/otaskeditor.cpp +++ b/core/pim/todo/otaskeditor.cpp @@ -1,5 +1,7 @@ #include +#include + #include "taskeditoroverview.h" #include "taskeditorstatus.h" #include "taskeditoralarms.h" @@ -33,7 +35,7 @@ void OTaskEditor::init( const OPimTodo& to ) { load( to ); } OPimTodo OTaskEditor::todo()const{ - qWarning("saving!"); + Opie::Core::owarn << "saving!" << oendl; OPimTodo to ( m_todo ); m_overView->save( to ); m_stat->save( to ); 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 @@ -29,15 +29,16 @@ #include #include -#include -#include -#include -#include +#include +#include #include #include -#include +#include +#include +#include +#include #include "mainwindow.h" //#include "tableitems.h" @@ -194,7 +195,7 @@ void TableView::showOverDue( bool ) { } void TableView::updateView( ) { - qWarning("update view"); + Opie::Core::owarn << "update view" << oendl; m_row = false; static int id; id = startTimer(4000 ); @@ -208,7 +209,7 @@ void TableView::updateView( ) { it = sorted().begin(); end = sorted().end(); - qWarning("setTodos"); + Opie::Core::owarn << "setTodos" << oendl; QTime time; time.start(); m_enablePaint = false; @@ -254,11 +255,11 @@ void TableView::removeEvent( int ) { updateView(); } void TableView::setShowCompleted( bool b) { - qWarning("Show Completed %d" , b ); + Opie::Core::owarn << "Show Completed " << b << oendl; updateView(); } void TableView::setShowDeadline( bool b ) { - qWarning( "Show DeadLine %d" , b ); + Opie::Core::owarn << "Show Deadline " << b << oendl; if ( b ) showColumn( 3 ); else @@ -281,7 +282,7 @@ void TableView::setShowDeadline( bool b ) { setColumnWidth( 2, col2width ); } void TableView::setShowCategory( const QString& str) { - qWarning("setShowCategory"); + Opie::Core::owarn << "setShowCategory" << oendl; if ( str != m_oleCat || m_first ) updateView(); @@ -346,14 +347,15 @@ void TableView::slotClicked(int row, int col, int, void TableView::slotPressed(int row, int col, int, const QPoint& point) { - 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; /* TextColumn column */ if ( col == 2 && cellGeometry( row, col ).contains( point ) ) m_menuTimer->start( 750, TRUE ); } void TableView::slotValueChanged( int, int ) { - qWarning("Value Changed"); + Opie::Core::owarn << "Value Changed" << oendl; } void TableView::slotCurrentChanged(int, int ) { m_menuTimer->stop(); @@ -369,7 +371,7 @@ QWidget* TableView::widget() { * to a sort() and update() */ void TableView::sortColumn( int col, bool asc, bool ) { - qWarning("bool %d", asc ); + Opie::Core::owarn << "bool " << asc << oendl; setSortOrder( col ); setAscending( asc ); updateView(); @@ -492,7 +494,7 @@ 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 ) { QWidget* wid = cellWidget(row, 1 ); if ( wid->inherits("QComboBox") ) { @@ -528,7 +530,7 @@ void TableView::slotPriority() { * */ void TableView::timerEvent( QTimerEvent* ) { -// qWarning("sorted %d", sorted().count() ); +// Opie::Core::owarn << "sorted " << sorted().count() << oendl; if (sorted().count() == 0 ) return; @@ -576,7 +578,7 @@ void TableView::contentsMouseReleaseEvent( QMouseEvent* e) { int row = rowAt(m_prevP.y()); int colOld = columnAt(m_prevP.x() ); 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 && colOld != colNew ) { TodoView::complete( sorted()[row] ); 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,3 +1,5 @@ +#include + #include #include #include @@ -49,14 +51,14 @@ QLineEdit* TemplateDialog::edit() { return m_lne; } 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,3 +1,4 @@ +#include #include @@ -30,8 +31,8 @@ OPimTodo Editor::newTodo( int cur, m_accepted = false; 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); return ev; 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 @@ -25,6 +25,9 @@ Boston, MA 02111-1307, USA. */ + +#include + #include #include "todomanager.h" @@ -37,7 +40,7 @@ TodoManager::TodoManager( QObject *obj ) QTime time; time.start(); int el = time.elapsed(); - qWarning("QTimer for loading %d", el/1000 ); + Opie::Core::owarn << "QTimer for loading " << el/1000 << oendl; } TodoManager::~TodoManager() { delete m_db; @@ -46,7 +49,7 @@ OPimTodo TodoManager::event(int uid ) { return m_db->find( uid ); } void TodoManager::updateList() { - qWarning("update list"); + Opie::Core::owarn << "update lists" << oendl; m_list = m_db->allRecords(); } OPimTodoAccess::List TodoManager::list() const{ 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,3 +1,4 @@ +#include #include #include @@ -35,7 +36,7 @@ void TemplateManager::load() { } } void TemplateManager::save() { - qWarning("Saving!!!!"); + Opie::Core::owarn << "Saving!!!!" << oendl; Config conf("todolist_templates"); OPimTodoAccessXML *res = new OPimTodoAccessXML( "template", @@ -49,7 +50,7 @@ void TemplateManager::save() { for ( it = m_templates.begin(); it != m_templates.end(); ++it ) { OPimTodo ev = it.data(); conf.setGroup( QString::number( ev.uid() ) ); - qWarning("Name" + it.key() ); + Opie::Core::owarn << "Name " << it.key() << oendl; conf.writeEntry("Name", it.key() ); db.add( ev ); } @@ -57,7 +58,7 @@ void TemplateManager::save() { } void TemplateManager::addEvent( const QString& str, const OPimTodo& ev) { - qWarning("AddEvent"+ str ); + Opie::Core::owarn << "AddEvent " << str << oendl; OPimTodo todo = ev; if( ev.uid() == 0 ) todo.setUid(1); // generate a new uid 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 @@ -1,5 +1,7 @@ #include "mainwindow.h" +#include + #include "todoview.h" using namespace Todo; @@ -31,7 +33,7 @@ OPimTodoAccess::List TodoView::sorted()const{ } 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; } void TodoView::sort(int sort) { m_sort = todoWindow()->sorted(m_asc, m_sortOrder, sort ); @@ -40,7 +42,7 @@ void TodoView::setSortOrder( int order ) { m_sortOrder = order; } void TodoView::setAscending( bool b ) { - qWarning("setAscending %d", b ); + Opie::Core::owarn << "setAscending " << b << oendl; m_asc = b; } void TodoView::update(int, const SmallTodo& ) { -- cgit v0.9.0.2