author | zecke <zecke> | 2004-11-18 21:55:17 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-11-18 21:55:17 (UTC) |
commit | fdef8103e849b674c95d01785259e072bcfb5a4b (patch) (unidiff) | |
tree | 411432edf236f8858094598617383dea95c14c3a /core/pim/todo/tableview.cpp | |
parent | c94afa23120bb72709973ae4711106e6e502fe65 (diff) | |
download | opie-fdef8103e849b674c95d01785259e072bcfb5a4b.zip opie-fdef8103e849b674c95d01785259e072bcfb5a4b.tar.gz opie-fdef8103e849b674c95d01785259e072bcfb5a4b.tar.bz2 |
-Kill owarn statements from the code
-Kill magic numbers and use enum values
-rw-r--r-- | core/pim/todo/tableview.cpp | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp index b7458d8..221faca 100644 --- a/core/pim/todo/tableview.cpp +++ b/core/pim/todo/tableview.cpp | |||
@@ -138,7 +138,7 @@ TableView::TableView( MainWindow* window, QWidget* wid ) | |||
138 | setUpdatesEnabled( true ); | 138 | setUpdatesEnabled( true ); |
139 | viewport()->setUpdatesEnabled( true ); | 139 | viewport()->setUpdatesEnabled( true ); |
140 | viewport()->update(); | 140 | viewport()->update(); |
141 | setSortOrder( 0 ); | 141 | setSortOrder( Opie::OPimTodoAccess::Completed ); |
142 | setAscending( TRUE ); | 142 | setAscending( TRUE ); |
143 | m_first = true; | 143 | m_first = true; |
144 | 144 | ||
@@ -195,7 +195,6 @@ void TableView::showOverDue( bool ) { | |||
195 | } | 195 | } |
196 | 196 | ||
197 | void TableView::updateView( ) { | 197 | void TableView::updateView( ) { |
198 | owarn << "update view" << oendl; | ||
199 | m_row = false; | 198 | m_row = false; |
200 | static int id; | 199 | static int id; |
201 | id = startTimer(4000 ); | 200 | id = startTimer(4000 ); |
@@ -209,7 +208,6 @@ void TableView::updateView( ) { | |||
209 | it = sorted().begin(); | 208 | it = sorted().begin(); |
210 | end = sorted().end(); | 209 | end = sorted().end(); |
211 | 210 | ||
212 | owarn << "setTodos" << oendl; | ||
213 | QTime time; | 211 | QTime time; |
214 | time.start(); | 212 | time.start(); |
215 | m_enablePaint = false; | 213 | m_enablePaint = false; |
@@ -254,12 +252,10 @@ void TableView::replaceEvent( const OPimTodo& ev) { | |||
254 | void TableView::removeEvent( int ) { | 252 | void TableView::removeEvent( int ) { |
255 | updateView(); | 253 | updateView(); |
256 | } | 254 | } |
257 | void TableView::setShowCompleted( bool b) { | 255 | void TableView::setShowCompleted( bool ) { |
258 | owarn << "Show Completed " << b << oendl; | ||
259 | updateView(); | 256 | updateView(); |
260 | } | 257 | } |
261 | void TableView::setShowDeadline( bool b ) { | 258 | void TableView::setShowDeadline( bool b ) { |
262 | owarn << "Show Deadline " << b << oendl; | ||
263 | if ( b ) | 259 | if ( b ) |
264 | showColumn( 3 ); | 260 | showColumn( 3 ); |
265 | else | 261 | else |
@@ -282,7 +278,6 @@ void TableView::setShowDeadline( bool b ) { | |||
282 | setColumnWidth( 2, col2width ); | 278 | setColumnWidth( 2, col2width ); |
283 | } | 279 | } |
284 | void TableView::setShowCategory( const QString& str) { | 280 | void TableView::setShowCategory( const QString& str) { |
285 | owarn << "setShowCategory" << oendl; | ||
286 | if ( str != m_oleCat || m_first ) | 281 | if ( str != m_oleCat || m_first ) |
287 | updateView(); | 282 | updateView(); |
288 | 283 | ||
@@ -347,15 +342,12 @@ void TableView::slotClicked(int row, int col, int, | |||
347 | void TableView::slotPressed(int row, int col, int, | 342 | void TableView::slotPressed(int row, int col, int, |
348 | const QPoint& point) { | 343 | const QPoint& point) { |
349 | 344 | ||
350 | owarn << "pressed row " << row << " col " << col << " x:" << point.x() | ||
351 | << "+y:" << point.y() << oendl; | ||
352 | m_prevP = point; | 345 | m_prevP = point; |
353 | /* TextColumn column */ | 346 | /* TextColumn column */ |
354 | if ( col == 2 && cellGeometry( row, col ).contains( point ) ) | 347 | if ( col == 2 && cellGeometry( row, col ).contains( point ) ) |
355 | m_menuTimer->start( 750, TRUE ); | 348 | m_menuTimer->start( 750, TRUE ); |
356 | } | 349 | } |
357 | void TableView::slotValueChanged( int, int ) { | 350 | void TableView::slotValueChanged( int, int ) { |
358 | owarn << "Value Changed" << oendl; | ||
359 | } | 351 | } |
360 | void TableView::slotCurrentChanged(int, int ) { | 352 | void TableView::slotCurrentChanged(int, int ) { |
361 | m_menuTimer->stop(); | 353 | m_menuTimer->stop(); |
@@ -371,7 +363,22 @@ QWidget* TableView::widget() { | |||
371 | * to a sort() and update() | 363 | * to a sort() and update() |
372 | */ | 364 | */ |
373 | void TableView::sortColumn( int col, bool asc, bool ) { | 365 | void TableView::sortColumn( int col, bool asc, bool ) { |
374 | owarn << "bool " << asc << oendl; | 366 | switch(col) { |
367 | case 1: | ||
368 | col = Opie::OPimTodoAccess::Priority; | ||
369 | break; | ||
370 | case 2: | ||
371 | col = Opie::OPimTodoAccess::SortSummary; | ||
372 | break; | ||
373 | case 3: | ||
374 | col = Opie::OPimTodoAccess::Deadline; | ||
375 | break; | ||
376 | case 0: | ||
377 | default: | ||
378 | col = Opie::OPimTodoAccess::Completed; | ||
379 | break; | ||
380 | } | ||
381 | |||
375 | setSortOrder( col ); | 382 | setSortOrder( col ); |
376 | setAscending( asc ); | 383 | setAscending( asc ); |
377 | updateView(); | 384 | updateView(); |
@@ -494,7 +501,6 @@ QWidget* TableView::createEditor(int row, int col, bool )const { | |||
494 | } | 501 | } |
495 | } | 502 | } |
496 | void TableView::setCellContentFromEditor(int row, int col ) { | 503 | void TableView::setCellContentFromEditor(int row, int col ) { |
497 | owarn << "set cell content from editor" << oendl; | ||
498 | if ( col == 1 ) { | 504 | if ( col == 1 ) { |
499 | QWidget* wid = cellWidget(row, 1 ); | 505 | QWidget* wid = cellWidget(row, 1 ); |
500 | if ( wid->inherits("QComboBox") ) { | 506 | if ( wid->inherits("QComboBox") ) { |
@@ -530,7 +536,6 @@ void TableView::slotPriority() { | |||
530 | * | 536 | * |
531 | */ | 537 | */ |
532 | void TableView::timerEvent( QTimerEvent* ) { | 538 | void TableView::timerEvent( QTimerEvent* ) { |
533 | // Opie::Core::owarn << "sorted " << sorted().count() << oendl; | ||
534 | if (sorted().count() == 0 ) | 539 | if (sorted().count() == 0 ) |
535 | return; | 540 | return; |
536 | 541 | ||
@@ -578,7 +583,6 @@ void TableView::contentsMouseReleaseEvent( QMouseEvent* e) { | |||
578 | int row = rowAt(m_prevP.y()); | 583 | int row = rowAt(m_prevP.y()); |
579 | int colOld = columnAt(m_prevP.x() ); | 584 | int colOld = columnAt(m_prevP.x() ); |
580 | int colNew = columnAt(e->x() ); | 585 | int colNew = columnAt(e->x() ); |
581 | owarn << "colNew: " << colNew << " colOld: " << colOld << oendl; | ||
582 | if ( row == rowAt( e->y() ) && row != -1 && | 586 | if ( row == rowAt( e->y() ) && row != -1 && |
583 | colOld != colNew ) { | 587 | colOld != colNew ) { |
584 | TodoView::complete( sorted()[row] ); | 588 | TodoView::complete( sorted()[row] ); |