summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/ablabel.cpp14
-rw-r--r--core/pim/addressbook/abtable.cpp50
-rw-r--r--core/pim/addressbook/abview.cpp56
-rw-r--r--core/pim/addressbook/addressbook.cpp62
-rw-r--r--core/pim/addressbook/configdlg.cpp10
-rw-r--r--core/pim/addressbook/contacteditor.cpp74
-rw-r--r--core/pim/addressbook/picker.cpp2
7 files changed, 134 insertions, 134 deletions
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 8216d6f..b81a3b9 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -97,7 +97,7 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
97 case Qt::Key_Left: 97 case Qt::Key_Left:
98 Opie::Core::owarn << "Left.." << oendl; 98 owarn << "Left.." << oendl;
99 case Qt::Key_Right: 99 case Qt::Key_Right:
100 Opie::Core::owarn << "Right.." << oendl; 100 owarn << "Right.." << oendl;
101 case Qt::Key_F33: 101 case Qt::Key_F33:
102 Opie::Core::owarn << "OK.." << oendl; 102 owarn << "OK.." << oendl;
103 emit signalOkPressed(); 103 emit signalOkPressed();
@@ -105,3 +105,3 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
105 case Qt::Key_Up: 105 case Qt::Key_Up:
106 Opie::Core::owarn << "Up.." << oendl; 106 owarn << "Up.." << oendl;
107 if ( ( visibleHeight() < contentsHeight() ) && 107 if ( ( visibleHeight() < contentsHeight() ) &&
@@ -119,5 +119,5 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
119 case Qt::Key_Down: 119 case Qt::Key_Down:
120 Opie::Core::owarn << "Down.." << oendl; 120 owarn << "Down.." << oendl;
121 // Opie::Core::owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl; 121 // owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl;
122 // Opie::Core::owarn << "Value: " << verticalScrollBar()->value() 122 // owarn << "Value: " << verticalScrollBar()->value()
123 // << ", barMaxValue: " << verticalScrollBar()->maxValue() << oendl; 123 // << ", barMaxValue: " << verticalScrollBar()->maxValue() << oendl;
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index cb57342..3fb2214 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -123,3 +123,3 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
123{ 123{
124 //Opie::Core::owarn << "C'tor start" << oendl; 124 //owarn << "C'tor start" << oendl;
125 setSelectionMode( NoSelection ); 125 setSelectionMode( NoSelection );
@@ -131,3 +131,3 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
131 // contactList.clear(); 131 // contactList.clear();
132 //Opie::Core::owarn << "C'tor end" << oendl; 132 //owarn << "C'tor end" << oendl;
133} 133}
@@ -153,3 +153,3 @@ void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
153{ 153{
154 Opie::Core::owarn << "AbTable::setContacts()" << oendl; 154 owarn << "AbTable::setContacts()" << oendl;
155 155
@@ -185,3 +185,3 @@ bool AbTable::selectContact( int UID )
185{ 185{
186 Opie::Core::owarn << "AbTable::selectContact( " << UID << " )" << oendl; 186 owarn << "AbTable::selectContact( " << UID << " )" << oendl;
187 int rows = numRows(); 187 int rows = numRows();
@@ -191,3 +191,3 @@ bool AbTable::selectContact( int UID )
191 setPaintingEnabled( FALSE ); 191 setPaintingEnabled( FALSE );
192 Opie::Core::owarn << "Search start" << oendl; 192 owarn << "Search start" << oendl;
193 for ( int r = 0; r < rows; ++r ) { 193 for ( int r = 0; r < rows; ++r ) {
@@ -200,3 +200,3 @@ bool AbTable::selectContact( int UID )
200 } 200 }
201 Opie::Core::owarn << "Search end" << oendl; 201 owarn << "Search end" << oendl;
202 202
@@ -215,3 +215,3 @@ void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row )
215{ 215{
216 Opie::Core::owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, " 216 owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, "
217 << row << " )" << oendl; 217 << row << " )" << oendl;
@@ -259,3 +259,3 @@ void AbTable::resort()
259{ 259{
260 Opie::Core::owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl; 260 owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl;
261#if 0 261#if 0
@@ -285,3 +285,3 @@ void AbTable::clear()
285{ 285{
286 Opie::Core::owarn << "void AbTable::clear()" << oendl; 286 owarn << "void AbTable::clear()" << oendl;
287 // contactList.clear(); 287 // contactList.clear();
@@ -303,3 +303,3 @@ void AbTable::refresh()
303{ 303{
304 Opie::Core::owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl; 304 owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl;
305 305
@@ -336,3 +336,3 @@ void AbTable::keyPressEvent( QKeyEvent *e )
336 336
337 // Opie::Core::owarn << "Received key .." << oendl; 337 // owarn << "Received key .." << oendl;
338 switch( e->key() ) { 338 switch( e->key() ) {
@@ -344,3 +344,3 @@ void AbTable::keyPressEvent( QKeyEvent *e )
344 // case Qt::Key_Up: 344 // case Qt::Key_Up:
345 // Opie::Core::owarn << "a" << oendl; 345 // owarn << "a" << oendl;
346 // emit signalKeyUp(); 346 // emit signalKeyUp();
@@ -348,3 +348,3 @@ void AbTable::keyPressEvent( QKeyEvent *e )
348 // case Qt::Key_Down: 348 // case Qt::Key_Down:
349 // Opie::Core::owarn << "b" << oendl; 349 // owarn << "b" << oendl;
350 // emit signalKeyDown(); 350 // emit signalKeyDown();
@@ -359,3 +359,3 @@ void AbTable::moveTo( char c )
359{ 359{
360 Opie::Core::owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl; 360 owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl;
361 361
@@ -425,3 +425,3 @@ void AbTable::realignTable()
425{ 425{
426 //Opie::Core::owarn << "void AbTable::realignTable()" << oendl; 426 //owarn << "void AbTable::realignTable()" << oendl;
427 427
@@ -475,3 +475,3 @@ void AbTable::fitColumns()
475{ 475{
476 Opie::Core::owarn << "void AbTable::fitColumns()" << oendl; 476 owarn << "void AbTable::fitColumns()" << oendl;
477 int contentsWidth = visibleWidth() / 2; 477 int contentsWidth = visibleWidth() / 2;
@@ -487,3 +487,3 @@ void AbTable::fitColumns()
487 487
488 //Opie::Core::owarn << "Width: " << contentsWidth << oendl; 488 //owarn << "Width: " << contentsWidth << oendl;
489 489
@@ -499,3 +499,3 @@ void AbTable::show()
499{ 499{
500 //Opie::Core::owarn << "void AbTable::show()" << oendl; 500 //owarn << "void AbTable::show()" << oendl;
501 realignTable(); 501 realignTable();
@@ -523,3 +523,3 @@ void AbTable::itemClicked(int,int col)
523{ 523{
524 //Opie::Core::owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl; 524 //owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl;
525 if ( col == 2 ) { 525 if ( col == 2 ) {
@@ -527,3 +527,3 @@ void AbTable::itemClicked(int,int col)
527 } else { 527 } else {
528 //Opie::Core::owarn << "Emitting signalSwitch()" << oendl; 528 //owarn << "Emitting signalSwitch()" << oendl;
529 emit signalSwitch(); 529 emit signalSwitch();
@@ -564,3 +564,3 @@ void AbTable::updateVisible()
564{ 564{
565 //Opie::Core::owarn << "void AbTable::updateVisible()" << oendl; 565 //owarn << "void AbTable::updateVisible()" << oendl;
566 566
@@ -600,3 +600,3 @@ void AbTable::setPaintingEnabled( bool e )
600{ 600{
601 //Opie::Core::owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: " 601 //owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: "
602 // << countNested << oendl; 602 // << countNested << oendl;
@@ -617,3 +617,3 @@ void AbTable::setPaintingEnabled( bool e )
617 } 617 }
618 //Opie::Core::owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: " 618 //owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: "
619 // << countNested << oendl; 619 // << countNested << oendl;
@@ -622,3 +622,3 @@ void AbTable::setPaintingEnabled( bool e )
622void AbTable::viewportPaintEvent( QPaintEvent* e ) { 622void AbTable::viewportPaintEvent( QPaintEvent* e ) {
623 //Opie::Core::owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> " 623 //owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> "
624 // << enablePainting << oendl; 624 // << enablePainting << oendl;
@@ -633,3 +633,3 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool )
633 633
634 //Opie::Core::owarn << "Paint row: " << row << oendl; 634 //owarn << "Paint row: " << row << oendl;
635 635
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 52e5f59..7a5b6d4 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -54,3 +54,3 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
54{ 54{
55 Opie::Core::owarn << "AbView::c'tor" << oendl; 55 owarn << "AbView::c'tor" << oendl;
56 // Load default database and handle syncing myself.. ! 56 // Load default database and handle syncing myself.. !
@@ -102,3 +102,3 @@ void AbView::setView( Views view )
102{ 102{
103 Opie::Core::owarn << "AbView::setView( Views view )" << oendl; 103 owarn << "AbView::setView( Views view )" << oendl;
104 m_curr_View = view; 104 m_curr_View = view;
@@ -109,3 +109,3 @@ void AbView::addEntry( const Opie::OPimContact &newContact )
109{ 109{
110 Opie::Core::owarn << "AbView::AddContact" << oendl; 110 owarn << "AbView::AddContact" << oendl;
111 m_contactdb->add ( newContact ); 111 m_contactdb->add ( newContact );
@@ -116,3 +116,3 @@ void AbView::removeEntry( const int UID )
116{ 116{
117 Opie::Core::owarn << "AbView;:RemoveContact" << oendl; 117 owarn << "AbView;:RemoveContact" << oendl;
118 m_contactdb->remove( UID ); 118 m_contactdb->remove( UID );
@@ -123,3 +123,3 @@ void AbView::replaceEntry( const Opie::OPimContact &contact )
123{ 123{
124 Opie::Core::owarn << "AbView::ReplaceContact" << oendl; 124 owarn << "AbView::ReplaceContact" << oendl;
125 m_contactdb->replace( contact ); 125 m_contactdb->replace( contact );
@@ -147,3 +147,3 @@ bool AbView::save()
147{ 147{
148 //Opie::Core::owarn << "AbView::Save data" << oendl; 148 //owarn << "AbView::Save data" << oendl;
149 149
@@ -154,3 +154,3 @@ void AbView::load()
154{ 154{
155 Opie::Core::owarn << "AbView::Load data" << oendl; 155 owarn << "AbView::Load data" << oendl;
156 156
@@ -168,3 +168,3 @@ void AbView::load()
168 168
169 Opie::Core::owarn << "Number of contacts: " << m_list.count() << oendl; 169 owarn << "Number of contacts: " << m_list.count() << oendl;
170 170
@@ -176,3 +176,3 @@ void AbView::reload()
176{ 176{
177 Opie::Core::owarn << "AbView::::reload()" << oendl; 177 owarn << "AbView::::reload()" << oendl;
178 178
@@ -189,3 +189,3 @@ void AbView::setShowByCategory( const QString& cat )
189{ 189{
190 Opie::Core::owarn << "AbView::setShowCategory( const QString& cat )" << oendl; 190 owarn << "AbView::setShowCategory( const QString& cat )" << oendl;
191 191
@@ -201,3 +201,3 @@ void AbView::setShowByCategory( const QString& cat )
201 if ( intCat != m_curr_category ){ 201 if ( intCat != m_curr_category ){
202 // Opie::Core::owarn << "Categories: Selected " << cat << ".. Number: " 202 // owarn << "Categories: Selected " << cat << ".. Number: "
203 // << m_curr_category << oendl; 203 // << m_curr_category << oendl;
@@ -214,6 +214,6 @@ void AbView::setShowToView( Views view )
214{ 214{
215 Opie::Core::owarn << "void AbView::setShowToView( View " << view << " )" << oendl; 215 owarn << "void AbView::setShowToView( View " << view << " )" << oendl;
216 216
217 if ( m_curr_View != view ){ 217 if ( m_curr_View != view ){
218 Opie::Core::owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl; 218 owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl;
219 m_prev_View = m_curr_View; 219 m_prev_View = m_curr_View;
@@ -228,3 +228,3 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
228{ 228{
229 Opie::Core::owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl; 229 owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
230 230
@@ -251,3 +251,3 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
251 default: 251 default:
252 Opie::Core::owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl 252 owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl
253 << "I will ignore it.." << oendl; 253 << "I will ignore it.." << oendl;
@@ -281,3 +281,3 @@ void AbView::showPersonal( bool personal )
281{ 281{
282 Opie::Core::owarn << "void AbView::showPersonal( " << personal << " )" << oendl; 282 owarn << "void AbView::showPersonal( " << personal << " )" << oendl;
283 283
@@ -337,3 +337,3 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
337{ 337{
338 //Opie::Core::owarn << "void AbView::slotDoFind" << oendl; 338 //owarn << "void AbView::slotDoFind" << oendl;
339 339
@@ -351,3 +351,3 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
351 351
352 //Opie::Core::owarn << "Find in Category " << category << oendl; 352 //owarn << "Find in Category " << category << oendl;
353 353
@@ -360,3 +360,3 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
360 360
361 //Opie::Core::owarn << "Found: " << m_list.count() << oendl; 361 //owarn << "Found: " << m_list.count() << oendl;
362 if ( m_list.count() == 0 ){ 362 if ( m_list.count() == 0 ){
@@ -384,3 +384,3 @@ void AbView::offSearch()
384void AbView::slotSwitch(){ 384void AbView::slotSwitch(){
385 //Opie::Core::owarn << "AbView::slotSwitch()" << oendl; 385 //owarn << "AbView::slotSwitch()" << oendl;
386 386
@@ -389,3 +389,3 @@ void AbView::slotSwitch(){
389 case TableView: 389 case TableView:
390 Opie::Core::owarn << "Switching to CardView" << oendl; 390 owarn << "Switching to CardView" << oendl;
391 m_curr_View = CardView; 391 m_curr_View = CardView;
@@ -393,3 +393,3 @@ void AbView::slotSwitch(){
393 case CardView: 393 case CardView:
394 Opie::Core::owarn << "Switching to TableView" << oendl; 394 owarn << "Switching to TableView" << oendl;
395 m_curr_View = TableView; 395 m_curr_View = TableView;
@@ -412,3 +412,3 @@ void AbView::clearForCategory()
412 if ( !contactCompare( *it, m_curr_category ) ){ 412 if ( !contactCompare( *it, m_curr_category ) ){
413 //Opie::Core::owarn << "Removing " << (*it).uid() << oendl; 413 //owarn << "Removing " << (*it).uid() << oendl;
414 m_list.remove( (*it).uid() ); 414 m_list.remove( (*it).uid() );
@@ -422,3 +422,3 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
422{ 422{
423 //Opie::Core::owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, " 423 //owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
424 // << category << " )" << oendl; 424 // << category << " )" << oendl;
@@ -429,3 +429,3 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
429 429
430 //Opie::Core::owarn << "Number of categories: " << cats.count() << oendl; 430 //owarn << "Number of categories: " << cats.count() << oendl;
431 431
@@ -438,3 +438,3 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
438 for ( i = 0; i < int(cats.count()); i++ ) { 438 for ( i = 0; i < int(cats.count()); i++ ) {
439 //Opie::Core::owarn << "Comparing " << cats[i] << " with " << category << oendl; 439 //owarn << "Comparing " << cats[i] << " with " << category << oendl;
440 if ( cats[i] == category ) { 440 if ( cats[i] == category ) {
@@ -445,3 +445,3 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
445 } 445 }
446 //Opie::Core::owarn << "Return: " << returnMe << oendl; 446 //owarn << "Return: " << returnMe << oendl;
447 return returnMe; 447 return returnMe;
@@ -458,3 +458,3 @@ void AbView::updateView( bool newdata )
458{ 458{
459 //Opie::Core::owarn << "AbView::updateView()" << oendl; 459 //owarn << "AbView::updateView()" << oendl;
460 460
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 94c0a13..35d0f41 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -253,3 +253,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
253 253
254 //Opie::Core::odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl; 254 //odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl;
255 connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); 255 connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
@@ -269,6 +269,6 @@ void AddressbookWindow::slotConfig()
269 if ( QPEApplication::execDialog( dlg ) ) { 269 if ( QPEApplication::execDialog( dlg ) ) {
270 Opie::Core::owarn << "Config Dialog accepted!" << oendl; 270 owarn << "Config Dialog accepted!" << oendl;
271 m_config = dlg -> getConfig(); 271 m_config = dlg -> getConfig();
272 if ( m_curFontSize != m_config.fontSize() ){ 272 if ( m_curFontSize != m_config.fontSize() ){
273 Opie::Core::owarn << "Font was changed!" << oendl; 273 owarn << "Font was changed!" << oendl;
274 m_curFontSize = m_config.fontSize(); 274 m_curFontSize = m_config.fontSize();
@@ -285,3 +285,3 @@ void AddressbookWindow::slotSetFont( int size )
285{ 285{
286 Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl; 286 owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
287 287
@@ -327,6 +327,6 @@ void AddressbookWindow::exportvCard()
327{ 327{
328 Opie::Core::owarn << "void AddressbookWindow::exportvCard()" << oendl; 328 owarn << "void AddressbookWindow::exportvCard()" << oendl;
329 QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this ); 329 QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
330 if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){ 330 if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){
331 Opie::Core::owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl; 331 owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl;
332 Opie::OPimContact curCont = m_abView->currentEntry(); 332 Opie::OPimContact curCont = m_abView->currentEntry();
@@ -352,3 +352,3 @@ void AddressbookWindow::setDocument( const QString &filename )
352{ 352{
353 Opie::Core::owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl; 353 owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
354 354
@@ -364,6 +364,6 @@ void AddressbookWindow::setDocument( const QString &filename )
364 case 0: 364 case 0:
365 Opie::Core::owarn << "YES clicked" << oendl; 365 owarn << "YES clicked" << oendl;
366 break; 366 break;
367 case 1: 367 case 1:
368 Opie::Core::owarn << "NO clicked" << oendl; 368 owarn << "NO clicked" << oendl;
369 return; 369 return;
@@ -377,3 +377,3 @@ void AddressbookWindow::setDocument( const QString &filename )
377 Opie::OPimContactAccess::List allList = access->allRecords(); 377 Opie::OPimContactAccess::List allList = access->allRecords();
378 Opie::Core::owarn << "Found number of contacts in File: " << allList.count() << oendl; 378 owarn << "Found number of contacts in File: " << allList.count() << oendl;
379 379
@@ -388,3 +388,3 @@ void AddressbookWindow::setDocument( const QString &filename )
388 for ( it = allList.begin(); it != allList.end(); ++it ){ 388 for ( it = allList.begin(); it != allList.end(); ++it ){
389 Opie::Core::owarn << "Adding Contact from: " << (*it).fullName() << oendl; 389 owarn << "Adding Contact from: " << (*it).fullName() << oendl;
390 if ( doAsk ){ 390 if ( doAsk ){
@@ -397,3 +397,3 @@ void AddressbookWindow::setDocument( const QString &filename )
397 case 0: 397 case 0:
398 Opie::Core::owarn << "YES clicked" << oendl; 398 owarn << "YES clicked" << oendl;
399 m_abView->addEntry( *it ); 399 m_abView->addEntry( *it );
@@ -401,6 +401,6 @@ void AddressbookWindow::setDocument( const QString &filename )
401 case 1: 401 case 1:
402 Opie::Core::owarn << "NO clicked" << oendl; 402 owarn << "NO clicked" << oendl;
403 break; 403 break;
404 case 2: 404 case 2:
405 Opie::Core::owarn << "YesAll clicked" << oendl; 405 owarn << "YesAll clicked" << oendl;
406 doAsk = false; 406 doAsk = false;
@@ -540,5 +540,5 @@ void AddressbookWindow::writeMail()
540 if ( m_config.useQtMail() ){ 540 if ( m_config.useQtMail() ){
541 Opie::Core::owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl; 541 owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
542 if ( QFile::exists( basepath + "/bin/qtmail" ) ){ 542 if ( QFile::exists( basepath + "/bin/qtmail" ) ){
543 Opie::Core::owarn << "QCop" << oendl; 543 owarn << "QCop" << oendl;
544 QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)"); 544 QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
@@ -550,5 +550,5 @@ void AddressbookWindow::writeMail()
550 if ( m_config.useOpieMail() ){ 550 if ( m_config.useOpieMail() ){
551 Opie::Core::owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl; 551 owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
552 if ( QFile::exists( basepath + "/bin/opiemail" ) ){ 552 if ( QFile::exists( basepath + "/bin/opiemail" ) ){
553 Opie::Core::owarn << "QCop" << oendl; 553 owarn << "QCop" << oendl;
554 QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)"); 554 QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)");
@@ -594,3 +594,3 @@ void AddressbookWindow::slotBeam()
594 594
595 Opie::Core::owarn << "Beaming: " << beamFilename << oendl; 595 owarn << "Beaming: " << beamFilename << oendl;
596 596
@@ -641,3 +641,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
641 bool needShow = FALSE; 641 bool needShow = FALSE;
642 Opie::Core::owarn << "Receiving QCop-Call with message " << msg << oendl; 642 owarn << "Receiving QCop-Call with message " << msg << oendl;
643 643
@@ -657,3 +657,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
657 parseName( name, &fn, &mn, &ln ); 657 parseName( name, &fn, &mn, &ln );
658 //Opie::Core::odebug << " " << fn << " - " << mn " - " << ln << oendl; 658 //odebug << " " << fn << " - " << mn " - " << ln << oendl;
659 cnt.setFirstName( fn ); 659 cnt.setFirstName( fn );
@@ -684,3 +684,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
684 684
685 Opie::Core::owarn << "Showing uid: " << uid << oendl; 685 owarn << "Showing uid: " << uid << oendl;
686 686
@@ -764,3 +764,3 @@ void AddressbookWindow::editPersonal()
764 if ( ! actionPersonal->isOn() ){ 764 if ( ! actionPersonal->isOn() ){
765 Opie::Core::owarn << "*** ++++" << oendl; 765 owarn << "*** ++++" << oendl;
766 actionPersonal->setOn( true ); 766 actionPersonal->setOn( true );
@@ -783,6 +783,6 @@ void AddressbookWindow::slotPersonalView()
783{ 783{
784 Opie::Core::owarn << "slotPersonalView()" << oendl; 784 owarn << "slotPersonalView()" << oendl;
785 if (!actionPersonal->isOn()) { 785 if (!actionPersonal->isOn()) {
786 // we just turned it off 786 // we just turned it off
787 Opie::Core::owarn << "slotPersonalView()-> OFF" << oendl; 787 owarn << "slotPersonalView()-> OFF" << oendl;
788 setCaption( tr("Contacts") ); 788 setCaption( tr("Contacts") );
@@ -799,3 +799,3 @@ void AddressbookWindow::slotPersonalView()
799 799
800 Opie::Core::owarn << "slotPersonalView()-> ON" << oendl; 800 owarn << "slotPersonalView()-> ON" << oendl;
801 // XXX need to disable some QActions. 801 // XXX need to disable some QActions.
@@ -889,3 +889,3 @@ void AddressbookWindow::slotNotFound()
889{ 889{
890 Opie::Core::owarn << "Got not found signal!" << oendl; 890 owarn << "Got not found signal!" << oendl;
891 QMessageBox::information( this, tr( "Not Found" ), 891 QMessageBox::information( this, tr( "Not Found" ),
@@ -897,3 +897,3 @@ void AddressbookWindow::slotWrapAround()
897{ 897{
898 Opie::Core::owarn << "Got wrap signal!" << oendl; 898 owarn << "Got wrap signal!" << oendl;
899 // if ( doNotifyWrapAround ) 899 // if ( doNotifyWrapAround )
@@ -906,3 +906,3 @@ void AddressbookWindow::slotSetCategory( int c )
906{ 906{
907 Opie::Core::owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from " 907 owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from "
908 << catMenu->count() << oendl; 908 << catMenu->count() << oendl;
@@ -942,3 +942,3 @@ void AddressbookWindow::slotSetCategory( int c )
942 cat = "Unfiled"; 942 cat = "Unfiled";
943 Opie::Core::owarn << "Unfiled selected!" << oendl; 943 owarn << "Unfiled selected!" << oendl;
944 }else{ 944 }else{
@@ -965,3 +965,3 @@ void AddressbookWindow::slotViewSwitched( int view )
965{ 965{
966 Opie::Core::owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl; 966 owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
967 int menu = 0; 967 int menu = 0;
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index 094dbda..22f7291 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -45,3 +45,3 @@ void ConfigDlg::slotItemUp()
45{ 45{
46 Opie::Core::owarn << "void ConfigDlg::slotItemUp()" << oendl; 46 owarn << "void ConfigDlg::slotItemUp()" << oendl;
47 47
@@ -59,3 +59,3 @@ void ConfigDlg::slotItemDown()
59{ 59{
60 Opie::Core::owarn << "void ConfigDlg::slotItemDown()" << oendl; 60 owarn << "void ConfigDlg::slotItemDown()" << oendl;
61 61
@@ -72,3 +72,3 @@ void ConfigDlg::slotItemAdd()
72{ 72{
73 Opie::Core::owarn << "void ConfigDlg::slotItemAdd()" << oendl; 73 owarn << "void ConfigDlg::slotItemAdd()" << oendl;
74 74
@@ -77,3 +77,3 @@ void ConfigDlg::slotItemAdd()
77 QString item = allFieldListBox->currentText(); 77 QString item = allFieldListBox->currentText();
78 Opie::Core::owarn << "Adding " << item << oendl; 78 owarn << "Adding " << item << oendl;
79 fieldListBox->insertItem( item ); 79 fieldListBox->insertItem( item );
@@ -84,3 +84,3 @@ void ConfigDlg::slotItemRemove()
84{ 84{
85 Opie::Core::owarn << "void ConfigDlg::slotItemRemove()" << oendl; 85 owarn << "void ConfigDlg::slotItemRemove()" << oendl;
86 86
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index e496387..72c8bd3 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -80,3 +80,3 @@ ContactEditor::~ContactEditor() {
80void ContactEditor::init() { 80void ContactEditor::init() {
81 Opie::Core::owarn << "init() START" << oendl; 81 owarn << "init() START" << oendl;
82 82
@@ -689,3 +689,3 @@ void ContactEditor::init() {
689 689
690 Opie::Core::owarn << "init() END" << oendl; 690 owarn << "init() END" << oendl;
691} 691}
@@ -693,3 +693,3 @@ void ContactEditor::init() {
693void ContactEditor::defaultEmailChanged(int i){ 693void ContactEditor::defaultEmailChanged(int i){
694 Opie::Core::odebug << "defaultEmailChanged" << oendl; 694 odebug << "defaultEmailChanged" << oendl;
695 695
@@ -700,3 +700,3 @@ void ContactEditor::defaultEmailChanged(int i){
700 defaultEmail = cmbDefaultEmail->text(i); 700 defaultEmail = cmbDefaultEmail->text(i);
701 Opie::Core::odebug << "Changed to: " << defaultEmail << oendl; 701 odebug << "Changed to: " << defaultEmail << oendl;
702 702
@@ -719,3 +719,3 @@ void ContactEditor::populateDefaultEmailCmb(){
719 for ( int i = 0; i < cmbDefaultEmail->count(); i++){ 719 for ( int i = 0; i < cmbDefaultEmail->count(); i++){
720 Opie::Core::odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i ) 720 odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
721 << "< defaultEmail >" << defaultEmail << "<" << oendl; 721 << "< defaultEmail >" << defaultEmail << "<" << oendl;
@@ -724,3 +724,3 @@ void ContactEditor::populateDefaultEmailCmb(){
724 cmbDefaultEmail->setCurrentItem( i ); 724 cmbDefaultEmail->setCurrentItem( i );
725 Opie::Core::odebug << "set" << oendl; 725 odebug << "set" << oendl;
726 found = true; 726 found = true;
@@ -740,3 +740,3 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
740 QString type = slChooserNames[index]; 740 QString type = slChooserNames[index];
741 Opie::Core::owarn << "ContactEditor::cmbChooserChange -> Type: " << type 741 owarn << "ContactEditor::cmbChooserChange -> Type: " << type
742 << ", WidgetPos: " << widgetPos << oendl; 742 << ", WidgetPos: " << widgetPos << oendl;
@@ -748,3 +748,3 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
748 if ( type == "Default Email"){ 748 if ( type == "Default Email"){
749 Opie::Core::owarn << "Choosing default-email (defaultEmailChooserPosition= " 749 owarn << "Choosing default-email (defaultEmailChooserPosition= "
750 << defaultEmailChooserPosition << ") " << oendl; 750 << defaultEmailChooserPosition << ") " << oendl;
@@ -782,3 +782,3 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
782 // Something else was selected: Hide combo.. 782 // Something else was selected: Hide combo..
783 Opie::Core::owarn << " Hiding default-email combo" << oendl; 783 owarn << " Hiding default-email combo" << oendl;
784 if ( defaultEmailChooserPosition == widgetPos ){ 784 if ( defaultEmailChooserPosition == widgetPos ){
@@ -807,3 +807,3 @@ void ContactEditor::chooserError( int index )
807{ 807{
808 Opie::Core::owarn << "ContactEditor::chooserError( " << index << " )" << oendl; 808 owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
809 QMessageBox::warning( this, "Chooser Error", 809 QMessageBox::warning( this, "Chooser Error",
@@ -843,3 +843,3 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
843 QString type = slChooserNames[index]; // :SX 843 QString type = slChooserNames[index]; // :SX
844 Opie::Core::odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>" 844 odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
845 << textChanged << "< index=" << index << ", widgetPos=" << widgetPos 845 << textChanged << "< index=" << index << ", widgetPos=" << widgetPos
@@ -848,3 +848,3 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
848 if ( type == "Default Email"){ 848 if ( type == "Default Email"){
849 Opie::Core::owarn << "??? Wozu??: " << textChanged << oendl; 849 owarn << "??? Wozu??: " << textChanged << oendl;
850 defaultEmail = textChanged; 850 defaultEmail = textChanged;
@@ -854,3 +854,3 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
854 }else if (type == "Emails"){ 854 }else if (type == "Emails"){
855 Opie::Core::odebug << "emails" << oendl; 855 odebug << "emails" << oendl;
856 856
@@ -867,3 +867,3 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
867void ContactEditor::slotChooser1Change( const QString &textChanged ) { 867void ContactEditor::slotChooser1Change( const QString &textChanged ) {
868 Opie::Core::owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl; 868 owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
869 chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1); 869 chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
@@ -872,3 +872,3 @@ void ContactEditor::slotChooser1Change( const QString &textChanged ) {
872void ContactEditor::slotChooser2Change( const QString &textChanged ) { 872void ContactEditor::slotChooser2Change( const QString &textChanged ) {
873 Opie::Core::owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl; 873 owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
874 chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2); 874 chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
@@ -878,3 +878,3 @@ void ContactEditor::slotChooser2Change( const QString &textChanged ) {
878void ContactEditor::slotChooser3Change( const QString &textChanged ) { 878void ContactEditor::slotChooser3Change( const QString &textChanged ) {
879 Opie::Core::owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl; 879 owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
880 chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3); 880 chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
@@ -883,3 +883,3 @@ void ContactEditor::slotChooser3Change( const QString &textChanged ) {
883void ContactEditor::slotChooser4Change( const QString &textChanged ) { 883void ContactEditor::slotChooser4Change( const QString &textChanged ) {
884 Opie::Core::owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl; 884 owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
885 chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4); 885 chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
@@ -953,3 +953,3 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) {
953void ContactEditor::slotCmbChooser1Change( int index ) { 953void ContactEditor::slotCmbChooser1Change( int index ) {
954 Opie::Core::owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl; 954 owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
955 if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){ 955 if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
@@ -964,3 +964,3 @@ void ContactEditor::slotCmbChooser1Change( int index ) {
964void ContactEditor::slotCmbChooser2Change( int index ) { 964void ContactEditor::slotCmbChooser2Change( int index ) {
965 Opie::Core::owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl; 965 owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
966 966
@@ -975,3 +975,3 @@ void ContactEditor::slotCmbChooser2Change( int index ) {
975void ContactEditor::slotCmbChooser3Change( int index ) { 975void ContactEditor::slotCmbChooser3Change( int index ) {
976 Opie::Core::owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl; 976 owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
977 977
@@ -986,3 +986,3 @@ void ContactEditor::slotCmbChooser3Change( int index ) {
986void ContactEditor::slotCmbChooser4Change( int index ) { 986void ContactEditor::slotCmbChooser4Change( int index ) {
987 Opie::Core::owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl; 987 owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
988 988
@@ -1031,3 +1031,3 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
1031 1031
1032 Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl; 1032 owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
1033 1033
@@ -1055,3 +1055,3 @@ void ContactEditor::slotSuffixChange( const QString& ) {
1055void ContactEditor::slotOrganizationChange( const QString &textChanged ){ 1055void ContactEditor::slotOrganizationChange( const QString &textChanged ){
1056 Opie::Core::owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl; 1056 owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl;
1057 // Special handling for storing Companies: 1057 // Special handling for storing Companies:
@@ -1137,3 +1137,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1137 1137
1138 Opie::Core::owarn << "Fullname: " << simplifiedName << oendl; 1138 owarn << "Fullname: " << simplifiedName << oendl;
1139 1139
@@ -1141,3 +1141,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1141 if ( commapos >= 0 ) { 1141 if ( commapos >= 0 ) {
1142 Opie::Core::owarn << " Commapos: " << commapos << oendl; 1142 owarn << " Commapos: " << commapos << oendl;
1143 1143
@@ -1150,3 +1150,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1150 haveLastName = true; 1150 haveLastName = true;
1151 Opie::Core::owarn << "Fullname without ',': " << simplifiedName << oendl; 1151 owarn << "Fullname without ',': " << simplifiedName << oendl;
1152 1152
@@ -1184,6 +1184,6 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1184 1184
1185 Opie::Core::owarn << "strFirstName: " << strFirstName << oendl; 1185 owarn << "strFirstName: " << strFirstName << oendl;
1186 Opie::Core::owarn << "strMiddletName: " << strMiddleName << oendl; 1186 owarn << "strMiddletName: " << strMiddleName << oendl;
1187 Opie::Core::owarn << "strLastName: " << strLastName << oendl; 1187 owarn << "strLastName: " << strLastName << oendl;
1188 Opie::Core::owarn << "strTitle: " << strTitle << oendl; 1188 owarn << "strTitle: " << strTitle << oendl;
1189 1189
@@ -1270,3 +1270,3 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
1270 if (defaultEmail.isEmpty()) defaultEmail = emails[0]; 1270 if (defaultEmail.isEmpty()) defaultEmail = emails[0];
1271 Opie::Core::odebug << "default email=" << defaultEmail << oendl; 1271 odebug << "default email=" << defaultEmail << oendl;
1272 1272
@@ -1330,3 +1330,3 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
1330 1330
1331 Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl; 1331 owarn << " Filling dynamic Field: " << (*it) << oendl;
1332 1332
@@ -1354,3 +1354,3 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
1354 if ( *it == "Nickname" ){ 1354 if ( *it == "Nickname" ){
1355 Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl; 1355 owarn << "**** Nichname: " << ent.nickname() << oendl;
1356 (*itLE)->setText( ent.nickname() ); 1356 (*itLE)->setText( ent.nickname() );
@@ -1587,4 +1587,4 @@ void ContactEditor::saveEntry() {
1587 if ( defaultEmail.isEmpty() ){ 1587 if ( defaultEmail.isEmpty() ){
1588 Opie::Core::owarn << "Default email was not set by user!" << oendl; 1588 owarn << "Default email was not set by user!" << oendl;
1589 Opie::Core::owarn << "Using first email in list: " << defaultmail << oendl; 1589 owarn << "Using first email in list: " << defaultmail << oendl;
1590 ent.setDefaultEmail( defaultmail ); 1590 ent.setDefaultEmail( defaultmail );
@@ -1740,3 +1740,3 @@ void ContactEditor::slotRemoveBirthday()
1740{ 1740{
1741 Opie::Core::owarn << "void ContactEditor::slotRemoveBirthday()" << oendl; 1741 owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
1742 ent.setBirthday( QDate() ); 1742 ent.setBirthday( QDate() );
@@ -1747,3 +1747,3 @@ void ContactEditor::slotRemoveAnniversary()
1747{ 1747{
1748 Opie::Core::owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl; 1748 owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
1749 ent.setAnniversary( QDate() ); 1749 ent.setAnniversary( QDate() );
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp
index df3d6ac..8a9c85b 100644
--- a/core/pim/addressbook/picker.cpp
+++ b/core/pim/addressbook/picker.cpp
@@ -241,3 +241,3 @@ void LetterPicker::newLetter( char letter )
241{ 241{
242 Opie::Core::owarn << "LetterClicked" << oendl; 242 owarn << "LetterClicked" << oendl;
243 emit letterClicked( letter ); 243 emit letterClicked( letter );