author | drw <drw> | 2004-04-02 22:15:36 (UTC) |
---|---|---|
committer | drw <drw> | 2004-04-02 22:15:36 (UTC) |
commit | edd008d91ca57453601d0c2098936287d98975e6 (patch) (side-by-side diff) | |
tree | ffdc1d494333537e33a3ad0390f83968cb884966 | |
parent | 6f335843b89f60fe009b43a4134e9b3753fff974 (diff) | |
download | opie-edd008d91ca57453601d0c2098936287d98975e6.zip opie-edd008d91ca57453601d0c2098936287d98975e6.tar.gz opie-edd008d91ca57453601d0c2098936287d98975e6.tar.bz2 |
Use ODebug (another 35 down...) - all of core/pim is converted.
-rw-r--r-- | core/pim/todo/main.cpp | 4 | ||||
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 19 | ||||
-rw-r--r-- | core/pim/todo/opie-todo.control | 2 | ||||
-rw-r--r-- | core/pim/todo/otaskeditor.cpp | 4 | ||||
-rw-r--r-- | core/pim/todo/tableview.cpp | 34 | ||||
-rw-r--r-- | core/pim/todo/templatedialog.cpp | 10 | ||||
-rw-r--r-- | core/pim/todo/todoeditor.cpp | 5 | ||||
-rw-r--r-- | core/pim/todo/todomanager.cpp | 7 | ||||
-rw-r--r-- | core/pim/todo/todotemplatemanager.cpp | 7 | ||||
-rw-r--r-- | core/pim/todo/todoview.cpp | 6 |
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 @@ -15,34 +15,34 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "mainwindow.h" - +#include <opie2/odebug.h> #include <qpe/qpeapplication.h> void myMessages( QtMsgType, const char* ) { } int main( int argc, char **argv ) { qInstallMsgHandler( myMessages ); QPEApplication a( argc, argv ); QTime time; 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() ) ); a.showMainWidget(&mw); return a.exec(); } 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 @@ -23,16 +23,17 @@ If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <unistd.h> +#include <opie2/odebug.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> @@ -290,17 +291,17 @@ QPopupMenu* MainWindow::contextMenu( int , bool recur ) { */ if ( recur ) { ; // FIXME } return menu; } QPopupMenu* MainWindow::options() { - qWarning("Options"); + Opie::Core::owarn << "Options" << oendl; return m_options; } QPopupMenu* MainWindow::edit() { return m_edit; } QToolBar* MainWindow::toolbar() { return m_tool; } @@ -309,17 +310,17 @@ OPimTodoAccess::List MainWindow::list()const { } OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) { int cat = 0; if ( m_curCat != QWidget::tr("All Categories") ) cat = currentCatId(); 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; if (!m_completed ) filter |= 4; if (m_overdue) filter |= 2; @@ -368,17 +369,17 @@ void MainWindow::closeEvent( QCloseEvent* e ) { * so there is no need to flush */ if (m_syncing ) { e->accept(); return; } 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"), QWidget::tr("Todo was unable\n" "to save your changes.\n" "Free up some space\n" "and try again.\n" "\nQuit Anyway?"), @@ -531,17 +532,17 @@ void MainWindow::slotEdit() { } /* * set the category */ 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 ); if (c == 1 ) { m_curCat = QString::null; setCaption( QWidget::tr("Todo") + " - " + QWidget::tr("All Categories" ) ); }else if ( c == (int)m_catMenu->count() - 1 ) { @@ -675,17 +676,17 @@ void MainWindow::raiseCurrentView() { } void MainWindow::slotShowDue(bool ov) { m_overdue = ov; currentView()->showOverDue( ov ); raiseCurrentView(); } 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() ); } void MainWindow::slotShowNext() { int l = currentView()->next(); if (l!=0) slotShow(l); } @@ -734,17 +735,17 @@ void MainWindow::slotUpdate3( QWidget* ) { void MainWindow::updateList() { m_todoMgr.updateList(); } void MainWindow::setReadAhead( uint count ) { if (m_todoMgr.todoDB() ) m_todoMgr.todoDB()->setReadAhead( count ); } void MainWindow::slotQuickEntered() { - qWarning("entered"); + Opie::Core::owarn << "entered" << oendl; OPimTodo todo = quickEditor()->todo(); if (todo.isEmpty() ) return; m_todoMgr.add( todo ); currentView()->addEvent( todo ); raiseCurrentView(); } @@ -781,17 +782,17 @@ void MainWindow::slotComplete( const OPimTodo& todo ) { to2.setRecurrence( rec ); /* * if there is a next occurence * from the duedate of the last recurrance */ 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 ); /* add the old one cause it has a new UID here cause it was spin off */ m_todoMgr.add( to ); /* @@ -944,25 +945,25 @@ namespace { if (!found) nonMatching.append( (*oldIt) ); } return nonMatching; } 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 ); } } 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 ); } } } void MainWindow::handleAlarms( const OPimTodo& oldTodo, const OPimTodo& newTodo) { /* * if oldTodo is not empty and has notifiers we need to find the deleted ones 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 @@ -1,10 +1,10 @@ Package: opie-todo Files: plugins/application/libtodolist.so* bin/todolist apps/1Pim/todo.desktop Priority: optional Section: opie/pim 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 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,10 +1,12 @@ #include <qlayout.h> +#include <opie2/odebug.h> + #include "taskeditoroverview.h" #include "taskeditorstatus.h" #include "taskeditoralarms.h" #include "otaskeditor.h" using namespace Opie::Ui; using namespace Opie; @@ -28,17 +30,17 @@ void OTaskEditor::init( int cur ) { if ( cur != 0 ) to.setCategories( cur ); load(to); } 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 ); to.setRecurrence( m_rec->recurrence() ); m_alarm->save( to ); return 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 @@ -24,25 +24,26 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <stdlib.h> #include <cmath> #include <cctype> -#include <qcombobox.h> -#include <qlineedit.h> -#include <qtimer.h> -#include <qpopupmenu.h> +#include <opie2/odebug.h> +#include <opie2/opimrecurrence.h> #include <qpe/config.h> #include <qpe/resource.h> -#include <opie2/opimrecurrence.h> +#include <qcombobox.h> +#include <qlineedit.h> +#include <qtimer.h> +#include <qpopupmenu.h> #include "mainwindow.h" //#include "tableitems.h" #include "tableview.h" using namespace Todo; namespace { @@ -189,31 +190,31 @@ QString TableView::currentRepresentation() { } /* show overdue */ void TableView::showOverDue( bool ) { clear(); updateView(); } void TableView::updateView( ) { - qWarning("update view"); + Opie::Core::owarn << "update view" << oendl; m_row = false; static int id; id = startTimer(4000 ); /* FIXME we want one page to be read! * * Calculate that screensize */ todoWindow()->setReadAhead( 4 ); sort(); OPimTodoAccess::List::Iterator it, end; it = sorted().begin(); end = sorted().end(); - qWarning("setTodos"); + Opie::Core::owarn << "setTodos" << oendl; QTime time; time.start(); m_enablePaint = false; setUpdatesEnabled( false ); viewport()->setUpdatesEnabled( false ); setNumRows( it.count() ); if ( it.count() == 0 ) @@ -249,21 +250,21 @@ void TableView::replaceEvent( const OPimTodo& ev) { * re aligning table can be slow too * FIXME: look what performs better * either this or the old align table */ 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 hideColumn( 3 ); // Try to intelligently size columns // TODO - would use width() below, but doesn't have valid value at time of c'tor int col2width = 238; @@ -276,17 +277,17 @@ void TableView::setShowDeadline( bool b ) { if ( b ) { width = fontMetrics().boundingRect( horizontalHeader()->label( 3 ) ).width() + 8; setColumnWidth( 3, width ); col2width -= width; } setColumnWidth( 2, col2width ); } void TableView::setShowCategory( const QString& str) { - qWarning("setShowCategory"); + Opie::Core::owarn << "setShowCategory" << oendl; if ( str != m_oleCat || m_first ) updateView(); m_oleCat = str; m_first = false; } void TableView::clear() { @@ -341,40 +342,41 @@ 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(); } QWidget* TableView::widget() { return this; } /* * We need to overwrite sortColumn * because we want to sort whole row * based * We event want to set the setOrder * 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(); } void TableView::viewportPaintEvent( QPaintEvent* e) { if (m_enablePaint ) QTable::viewportPaintEvent( e ); } @@ -487,17 +489,17 @@ QWidget* TableView::createEditor(int row, int col, bool )const { return edit; } case 0: default: return 0l; } } 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") ) { int pri = ((QComboBox*)wid)->currentItem() + 1; OPimTodo todo = sorted()[row]; if ( todo.priority() != pri ) { todo.setPriority( pri ); TodoView::update( todo.uid(), todo ); @@ -523,17 +525,17 @@ void TableView::slotPriority() { /* * We'll use the TimerEvent to read ahead or to keep the cahce always * filled enough. * We will try to read ahead 4 items in both ways * up and down. On odd or even we will currentRow()+-4 or +-9 * */ void TableView::timerEvent( QTimerEvent* ) { -// qWarning("sorted %d", sorted().count() ); +// Opie::Core::owarn << "sorted " << sorted().count() << oendl; if (sorted().count() == 0 ) return; int row = currentRow(); if ( m_row ) { int ro = row-4; if (ro < 0 ) ro = 0; sorted()[ro]; @@ -571,17 +573,17 @@ void TableView::timerEvent( QTimerEvent* ) { * m_completeStrokeWidth criteria * WORKAROUND: strike through needs to strike through the same * row and two columns! */ 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] ); return; } QTable::contentsMouseReleaseEvent( e ); } void TableView::contentsMouseMoveEvent( QMouseEvent* e ) { 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,8 +1,10 @@ +#include <opie2/odebug.h> + #include <qpushbutton.h> #include <qhbox.h> #include <qlayout.h> #include <qlistview.h> #include <qlineedit.h> #include "templatedialog.h" @@ -44,19 +46,19 @@ TemplateDialog::~TemplateDialog() { } QListView* TemplateDialog::listView() { return m_list; } 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,8 +1,9 @@ +#include <opie2/odebug.h> #include <qpe/qpeapplication.h> #include "otaskeditor.h" #include "todoeditor.h" using namespace Opie; using namespace Todo; @@ -25,18 +26,18 @@ OPimTodo Editor::newTodo( int cur, int ret = QPEApplication::execDialog( e ); if ( QDialog::Accepted == ret ) { m_accepted = true; }else 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; } OPimTodo Editor::edit( QWidget *, const OPimTodo& todo ) { OTaskEditor *e = self(); e->init( todo ); 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 @@ -20,38 +20,41 @@ -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#include <opie2/odebug.h> + #include <qpe/categoryselect.h> #include "todomanager.h" using namespace Todo; TodoManager::TodoManager( QObject *obj ) : QObject( obj ) { m_db = 0l; 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; } 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{ return m_list; } OPimTodoAccess::List TodoManager::sorted( bool asc, int so, int f, int cat ) { return m_db->sorted( asc, so, f, cat ); } 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,8 +1,9 @@ +#include <opie2/odebug.h> #include <opie2/otodoaccess.h> #include <opie2/otodoaccessxml.h> #include <qpe/config.h> #include <qpe/global.h> #include "todotemplatemanager.h" @@ -30,39 +31,39 @@ void TemplateManager::load() { QString str = conf.readEntry("Name", QString::null ); if (str.isEmpty() ) continue; m_templates.insert( str, ev ); } } void TemplateManager::save() { - qWarning("Saving!!!!"); + Opie::Core::owarn << "Saving!!!!" << oendl; Config conf("todolist_templates"); OPimTodoAccessXML *res = new OPimTodoAccessXML( "template", m_path ); OPimTodoAccess db(res); db.load(); db.clear(); QMap<QString, OPimTodo>::Iterator it; 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 ); } db.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 m_templates.replace( str, todo ); } void TemplateManager::removeEvent( const QString& str ) { m_templates.remove( str ); 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,10 +1,12 @@ #include "mainwindow.h" +#include <opie2/odebug.h> + #include "todoview.h" using namespace Todo; TodoView::TodoView( MainWindow* win ) @@ -26,26 +28,26 @@ OPimTodoAccess::List TodoView::list(){ todoWindow()->updateList(); return todoWindow()->list(); } OPimTodoAccess::List TodoView::sorted()const{ return m_sort; } 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 ); } 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& ) { //m_main->slotUpate1( uid, to ); } void TodoView::update(int , const OPimTodo& ev ) { m_main->updateTodo( ev ); } |