summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -59,10 +59,10 @@
#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,
@@ -296,7 +296,7 @@ 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() {
@@ -315,7 +315,7 @@ OPimTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
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;
@@ -374,7 +374,7 @@ void MainWindow::closeEvent( QCloseEvent* e ) {
}
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"),
@@ -537,7 +537,7 @@ 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 );
@@ -600,17 +600,17 @@ void MainWindow::receiveFile( const QString& filename ) {
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();
+ }
}
}
@@ -681,7 +681,9 @@ void MainWindow::slotShowDue(bool ov) {
}
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() );
}
@@ -740,7 +742,7 @@ void MainWindow::setReadAhead( uint count ) {
m_todoMgr.todoDB()->setReadAhead( count );
}
void MainWindow::slotQuickEntered() {
- Opie::Core::owarn << "entered" << oendl;
+ owarn << "entered" << oendl;
OPimTodo todo = quickEditor()->todo();
if (todo.isEmpty() )
return;
@@ -787,7 +789,7 @@ 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 );
@@ -950,7 +952,7 @@ 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 );
}
@@ -958,7 +960,7 @@ namespace {
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
@@ -35,7 +35,6 @@ 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 );
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
@@ -195,7 +195,7 @@ void TableView::showOverDue( bool ) {
}
void TableView::updateView( ) {
- Opie::Core::owarn << "update view" << oendl;
+ owarn << "update view" << oendl;
m_row = false;
static int id;
id = startTimer(4000 );
@@ -209,7 +209,7 @@ void TableView::updateView( ) {
it = sorted().begin();
end = sorted().end();
- Opie::Core::owarn << "setTodos" << oendl;
+ owarn << "setTodos" << oendl;
QTime time;
time.start();
m_enablePaint = false;
@@ -255,11 +255,11 @@ 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
@@ -282,7 +282,7 @@ 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();
@@ -347,7 +347,7 @@ 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 */
@@ -355,7 +355,7 @@ void TableView::slotPressed(int row, int col, int,
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();
@@ -371,7 +371,7 @@ QWidget* TableView::widget() {
* 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();
@@ -494,7 +494,7 @@ QWidget* TableView::createEditor(int row, int col, bool )const {
}
}
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") ) {
@@ -578,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() );
- 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] );
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
@@ -51,14 +51,10 @@ 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
@@ -31,8 +31,6 @@ OPimTodo Editor::newTodo( int cur,
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
@@ -40,7 +40,7 @@ TodoManager::TodoManager( QObject *obj )
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;
@@ -49,7 +49,7 @@ 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{
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
@@ -36,7 +36,6 @@ void TemplateManager::load() {
}
}
void TemplateManager::save() {
- Opie::Core::owarn << "Saving!!!!" << oendl;
Config conf("todolist_templates");
OPimTodoAccessXML *res = new OPimTodoAccessXML( "template",
@@ -50,7 +49,6 @@ void TemplateManager::save() {
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 );
}
@@ -58,7 +56,6 @@ void TemplateManager::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
@@ -33,7 +33,7 @@ OPimTodoAccess::List TodoView::sorted()const{
}
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 );
@@ -42,7 +42,7 @@ 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& ) {