summaryrefslogtreecommitdiff
authorzecke <zecke>2004-04-04 21:35:02 (UTC)
committer zecke <zecke>2004-04-04 21:35:02 (UTC)
commit4da953f1ef0349acc5b86ee15b9e3005dabc319f (patch) (side-by-side diff)
tree89d73beecf627948657e43557a3e5d02739a8e13
parentf664b509b5e622ab74560fb74093175e50b2790c (diff)
downloadopie-4da953f1ef0349acc5b86ee15b9e3005dabc319f.zip
opie-4da953f1ef0349acc5b86ee15b9e3005dabc319f.tar.gz
opie-4da953f1ef0349acc5b86ee15b9e3005dabc319f.tar.bz2
fix up owarn usage
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/todo/mainwindow.cpp42
-rw-r--r--core/pim/todo/otaskeditor.cpp1
-rw-r--r--core/pim/todo/tableview.cpp20
-rw-r--r--core/pim/todo/templatedialog.cpp4
-rw-r--r--core/pim/todo/todoeditor.cpp2
-rw-r--r--core/pim/todo/todomanager.cpp4
-rw-r--r--core/pim/todo/todotemplatemanager.cpp3
-rw-r--r--core/pim/todo/todoview.cpp4
8 files changed, 36 insertions, 44 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index d552928..924fde1 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -58,12 +58,12 @@
#include "textviewshow.h"
#include "todoeditor.h"
#include "mainwindow.h"
-using namespace Opie::Core;
+using Opie::Core::OApplicationFactory;
OPIE_EXPORT_APP( OApplicationFactory<Todo::MainWindow> )
- using namespace Opie;
+using namespace Opie;
using namespace Todo;
MainWindow::MainWindow( QWidget* parent,
const char* name, WFlags )
@@ -295,9 +295,9 @@ QPopupMenu* MainWindow::contextMenu( int , bool recur ) {
return menu;
}
QPopupMenu* MainWindow::options() {
- Opie::Core::owarn << "Options" << oendl;
+ owarn << "Options" << oendl;
return m_options;
}
QPopupMenu* MainWindow::edit() {
return m_edit;
@@ -314,9 +314,9 @@ OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
cat = currentCatId();
if ( m_curCat == QWidget::tr("Unfiled") )
cat = -1;
- Opie::Core::owarn << " Category " << cat << " " << m_curCat << oendl;
+ owarn << " Category " << cat << " " << m_curCat << oendl;
int filter = 1;
if (!m_completed )
@@ -373,9 +373,9 @@ void MainWindow::closeEvent( QCloseEvent* e ) {
return;
}
bool quit = false;
if ( m_todoMgr.saveAll() ){
- Opie::Core::owarn << "saved" << oendl;
+ owarn << "saved" << oendl;
quit = true;
}else {
if ( QMessageBox::critical( this, QWidget::tr("Out of space"),
QWidget::tr("Todo was unable\n"
@@ -536,9 +536,9 @@ void MainWindow::slotEdit() {
void MainWindow::setCategory( int c) {
if ( c <= 0 ) return;
- Opie::Core::owarn << "Iterating over cats " << c << oendl;
+ 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 ) {
@@ -599,19 +599,19 @@ void MainWindow::receiveFile( const QString& filename ) {
OPimTodoAccess::List list = acc.allRecords();
if (list.count()){
- QString message = QWidget::tr("<P>%1 new tasks arrived.<p>Would you like to add them to your Todolist?").arg(list.count() );
+ QString message = QWidget::tr("<P>%1 new tasks arrived.<p>Would you like to add them to your Todolist?").arg(list.count() );
- if ( QMessageBox::information(this, QWidget::tr("New Tasks"),
- message, QMessageBox::Ok,
- QMessageBox::Cancel ) == QMessageBox::Ok ) {
- OPimTodoAccess::List::Iterator it;
- for ( it = list.begin(); it != list.end(); ++it )
- m_todoMgr.add( (*it) );
+ if ( QMessageBox::information(this, QWidget::tr("New Tasks"),
+ message, QMessageBox::Ok,
+ QMessageBox::Cancel ) == QMessageBox::Ok ) {
+ OPimTodoAccess::List::Iterator it;
+ for ( it = list.begin(); it != list.end(); ++it )
+ m_todoMgr.add( (*it) );
- currentView()->updateView();
- }
+ currentView()->updateView();
+ }
}
}
void MainWindow::slotFlush() {
@@ -680,9 +680,11 @@ void MainWindow::slotShowDue(bool ov) {
raiseCurrentView();
}
void MainWindow::slotShow( int uid ) {
if ( uid == 0 ) return;
- Opie::Core::owarn << "slotShow" << oendl;
+
+
+ owarn << "slotShow" << oendl;
currentShow()->slotShow( event( uid ) );
m_stack->raiseWidget( currentShow()->widget() );
}
void MainWindow::slotShowNext() {
@@ -739,9 +741,9 @@ void MainWindow::setReadAhead( uint count ) {
if (m_todoMgr.todoDB() )
m_todoMgr.todoDB()->setReadAhead( count );
}
void MainWindow::slotQuickEntered() {
- Opie::Core::owarn << "entered" << oendl;
+ owarn << "entered" << oendl;
OPimTodo todo = quickEditor()->todo();
if (todo.isEmpty() )
return;
@@ -786,9 +788,9 @@ void MainWindow::slotComplete( const OPimTodo& todo ) {
*/
QDate date;
if ( to2.recurrence().nextOcurrence( to2.dueDate().addDays(1), date ) ) {
int dayDiff = to.dueDate().daysTo( date );
- Opie::Core::owarn << "day diff is " << dayDiff << oendl;
+ owarn << "day diff is " << dayDiff << oendl;
QDate inval;
/* generate a new uid for the old record */
to.setUid( 1 );
@@ -949,17 +951,17 @@ namespace {
}
void addAlarms( const OPimNotifyManager::Alarms& als, int uid ) {
OPimNotifyManager::Alarms::ConstIterator it;
for ( it = als.begin(); it != als.end(); ++it ) {
- Opie::Core::owarn << "Adding alarm for " << (*it).dateTime().toString() << oendl;
+ 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 ) {
- Opie::Core::owarn << "Removinf alarm for " << (*it).dateTime().toString() << oendl;
+ 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/otaskeditor.cpp b/core/pim/todo/otaskeditor.cpp
index 55a3dd5..bbc177d 100644
--- a/core/pim/todo/otaskeditor.cpp
+++ b/core/pim/todo/otaskeditor.cpp
@@ -34,9 +34,8 @@ void OTaskEditor::init( int cur ) {
void OTaskEditor::init( const OPimTodo& to ) {
load( to );
}
OPimTodo OTaskEditor::todo()const{
- Opie::Core::owarn << "saving!" << oendl;
OPimTodo to ( m_todo );
m_overView->save( to );
m_stat->save( to );
to.setRecurrence( m_rec->recurrence() );
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index 0b1c579..b7458d8 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -194,9 +194,9 @@ void TableView::showOverDue( bool ) {
updateView();
}
void TableView::updateView( ) {
- Opie::Core::owarn << "update view" << oendl;
+ owarn << "update view" << oendl;
m_row = false;
static int id;
id = startTimer(4000 );
/* FIXME we want one page to be read!
@@ -208,9 +208,9 @@ void TableView::updateView( ) {
OPimTodoAccess::List::Iterator it, end;
it = sorted().begin();
end = sorted().end();
- Opie::Core::owarn << "setTodos" << oendl;
+ owarn << "setTodos" << oendl;
QTime time;
time.start();
m_enablePaint = false;
setUpdatesEnabled( false );
@@ -254,13 +254,13 @@ void TableView::replaceEvent( const OPimTodo& ev) {
void TableView::removeEvent( int ) {
updateView();
}
void TableView::setShowCompleted( bool b) {
- Opie::Core::owarn << "Show Completed " << b << oendl;
+ owarn << "Show Completed " << b << oendl;
updateView();
}
void TableView::setShowDeadline( bool b ) {
- Opie::Core::owarn << "Show Deadline " << b << oendl;
+ owarn << "Show Deadline " << b << oendl;
if ( b )
showColumn( 3 );
else
hideColumn( 3 );
@@ -281,9 +281,9 @@ void TableView::setShowDeadline( bool b ) {
}
setColumnWidth( 2, col2width );
}
void TableView::setShowCategory( const QString& str) {
- Opie::Core::owarn << "setShowCategory" << oendl;
+ owarn << "setShowCategory" << oendl;
if ( str != m_oleCat || m_first )
updateView();
m_oleCat = str;
@@ -346,17 +346,17 @@ void TableView::slotClicked(int row, int col, int,
}
void TableView::slotPressed(int row, int col, int,
const QPoint& point) {
- Opie::Core::owarn << "pressed row " << row << " col " << col << " x:" << point.x()
+ 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 ) {
- Opie::Core::owarn << "Value Changed" << oendl;
+ owarn << "Value Changed" << oendl;
}
void TableView::slotCurrentChanged(int, int ) {
m_menuTimer->stop();
}
@@ -370,9 +370,9 @@ QWidget* TableView::widget() {
* We event want to set the setOrder
* to a sort() and update()
*/
void TableView::sortColumn( int col, bool asc, bool ) {
- Opie::Core::owarn << "bool " << asc << oendl;
+ owarn << "bool " << asc << oendl;
setSortOrder( col );
setAscending( asc );
updateView();
}
@@ -493,9 +493,9 @@ QWidget* TableView::createEditor(int row, int col, bool )const {
return 0l;
}
}
void TableView::setCellContentFromEditor(int row, int col ) {
- Opie::Core::owarn << "set cell content from editor" << oendl;
+ 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;
@@ -577,9 +577,9 @@ void TableView::timerEvent( QTimerEvent* ) {
void TableView::contentsMouseReleaseEvent( QMouseEvent* e) {
int row = rowAt(m_prevP.y());
int colOld = columnAt(m_prevP.x() );
int colNew = columnAt(e->x() );
- Opie::Core::owarn << "colNew: " << colNew << " colOld: " << colOld << oendl;
+ owarn << "colNew: " << colNew << " colOld: " << colOld << oendl;
if ( row == rowAt( e->y() ) && row != -1 &&
colOld != colNew ) {
TodoView::complete( sorted()[row] );
return;
diff --git a/core/pim/todo/templatedialog.cpp b/core/pim/todo/templatedialog.cpp
index 32327a6..8d72297 100644
--- a/core/pim/todo/templatedialog.cpp
+++ b/core/pim/todo/templatedialog.cpp
@@ -50,15 +50,11 @@ QListView* TemplateDialog::listView() {
QLineEdit* TemplateDialog::edit() {
return m_lne;
}
void TemplateDialog::slotAdd() {
- Opie::Core::owarn << "Not Implemented here" << oendl;
}
void TemplateDialog::slotRemove() {
- Opie::Core::owarn << "Not Implemented here" << oendl;
}
void TemplateDialog::slotEdit() {
- Opie::Core::owarn << "Not Implemented here" << oendl;
}
void TemplateDialog::slotReturn() {
- Opie::Core::owarn << "Not Implemented here" << oendl;
}
diff --git a/core/pim/todo/todoeditor.cpp b/core/pim/todo/todoeditor.cpp
index 7857d52..a1c559d 100644
--- a/core/pim/todo/todoeditor.cpp
+++ b/core/pim/todo/todoeditor.cpp
@@ -30,10 +30,8 @@ OPimTodo Editor::newTodo( int cur,
}else
m_accepted = false;
OPimTodo ev = e->todo();
- 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 7826747..c4b8fbc 100644
--- a/core/pim/todo/todomanager.cpp
+++ b/core/pim/todo/todomanager.cpp
@@ -39,18 +39,18 @@ TodoManager::TodoManager( QObject *obj )
m_db = 0l;
QTime time;
time.start();
int el = time.elapsed();
- Opie::Core::owarn << "QTimer for loading " << el/1000 << oendl;
+ 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() {
- Opie::Core::owarn << "update lists" << oendl;
+ owarn << "update lists" << oendl;
m_list = m_db->allRecords();
}
OPimTodoAccess::List TodoManager::list() const{
return m_list;
diff --git a/core/pim/todo/todotemplatemanager.cpp b/core/pim/todo/todotemplatemanager.cpp
index 0b20d5a..7690d37 100644
--- a/core/pim/todo/todotemplatemanager.cpp
+++ b/core/pim/todo/todotemplatemanager.cpp
@@ -35,9 +35,8 @@ void TemplateManager::load() {
m_templates.insert( str, ev );
}
}
void TemplateManager::save() {
- Opie::Core::owarn << "Saving!!!!" << oendl;
Config conf("todolist_templates");
OPimTodoAccessXML *res = new OPimTodoAccessXML( "template",
m_path );
@@ -49,17 +48,15 @@ void TemplateManager::save() {
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() ) );
- 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) {
- 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 03e1060..3d2c982 100644
--- a/core/pim/todo/todoview.cpp
+++ b/core/pim/todo/todoview.cpp
@@ -32,18 +32,18 @@ OPimTodoAccess::List TodoView::sorted()const{
return m_sort;
}
void TodoView::sort() {
m_sort = todoWindow()->sorted(m_asc,m_sortOrder );
- Opie::Core::owarn << "m_sort.count() = " << m_sort.count() << oendl;
+ 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 ) {
- Opie::Core::owarn << "setAscending " << b << oendl;
+ owarn << "setAscending " << b << oendl;
m_asc = b;
}
void TodoView::update(int, const SmallTodo& ) {
//m_main->slotUpate1( uid, to );