summaryrefslogtreecommitdiff
path: root/core
authoreilers <eilers>2004-10-12 09:07:04 (UTC)
committer eilers <eilers>2004-10-12 09:07:04 (UTC)
commitc6cd1497c5e08f68085c27c04277cdb5f720527f (patch) (unidiff)
tree6aeb5079e5d5046240be7eabca2e859f269ef073 /core
parentc1be01cafaa3b9f22586c73d14c5eaf0e7c6848d (diff)
downloadopie-c6cd1497c5e08f68085c27c04277cdb5f720527f.zip
opie-c6cd1497c5e08f68085c27c04277cdb5f720527f.tar.gz
opie-c6cd1497c5e08f68085c27c04277cdb5f720527f.tar.bz2
No functional changes.
Just replaced owarn to odebug where debug output was ment by the developer. These warnings confusing users if the have any problems..
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/ablabel.cpp14
-rw-r--r--core/pim/addressbook/abtable.cpp46
-rw-r--r--core/pim/addressbook/abview.cpp52
-rw-r--r--core/pim/addressbook/addressbook.cpp58
-rw-r--r--core/pim/addressbook/configdlg.cpp10
-rw-r--r--core/pim/addressbook/contacteditor.cpp58
-rw-r--r--core/pim/addressbook/picker.cpp2
7 files changed, 120 insertions, 120 deletions
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index b81a3b9..6b8e4dd 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -95,15 +95,15 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
95 if ( !m_empty ){ 95 if ( !m_empty ){
96 switch( e->key() ) { 96 switch( e->key() ) {
97 case Qt::Key_Left: 97 case Qt::Key_Left:
98 owarn << "Left.." << oendl; 98 odebug << "Left.." << oendl;
99 case Qt::Key_Right: 99 case Qt::Key_Right:
100 owarn << "Right.." << oendl; 100 odebug << "Right.." << oendl;
101 case Qt::Key_F33: 101 case Qt::Key_F33:
102 owarn << "OK.." << oendl; 102 odebug << "OK.." << oendl;
103 emit signalOkPressed(); 103 emit signalOkPressed();
104 break; 104 break;
105 case Qt::Key_Up: 105 case Qt::Key_Up:
106 owarn << "Up.." << oendl; 106 odebug << "Up.." << oendl;
107 if ( ( visibleHeight() < contentsHeight() ) && 107 if ( ( visibleHeight() < contentsHeight() ) &&
108 ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) ) 108 ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) )
109 scrollBy( 0, -(visibleHeight()-20) ); 109 scrollBy( 0, -(visibleHeight()-20) );
@@ -117,9 +117,9 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
117 117
118 break; 118 break;
119 case Qt::Key_Down: 119 case Qt::Key_Down:
120 owarn << "Down.." << oendl; 120 odebug << "Down.." << oendl;
121 // owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl; 121 // odebug << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl;
122 // owarn << "Value: " << verticalScrollBar()->value() 122 // odebug << "Value: " << verticalScrollBar()->value()
123 // << ", barMaxValue: " << verticalScrollBar()->maxValue() << oendl; 123 // << ", barMaxValue: " << verticalScrollBar()->maxValue() << oendl;
124 if ( ( visibleHeight() < contentsHeight() ) && 124 if ( ( visibleHeight() < contentsHeight() ) &&
125 ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) ) 125 ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) )
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 3fb2214..30d749c 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -121,7 +121,7 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
121 columnVisible( true ), 121 columnVisible( true ),
122 countNested( 0 ) 122 countNested( 0 )
123{ 123{
124 //owarn << "C'tor start" << oendl; 124 //odebug << "C'tor start" << oendl;
125 setSelectionMode( NoSelection ); 125 setSelectionMode( NoSelection );
126 init(); 126 init();
127 setSorting( TRUE ); 127 setSorting( TRUE );
@@ -129,7 +129,7 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
129 this, SLOT(itemClicked(int,int)) ); 129 this, SLOT(itemClicked(int,int)) );
130 130
131 // contactList.clear(); 131 // contactList.clear();
132 //owarn << "C'tor end" << oendl; 132 //odebug << "C'tor end" << oendl;
133} 133}
134 134
135AbTable::~AbTable() 135AbTable::~AbTable()
@@ -151,7 +151,7 @@ void AbTable::init()
151 151
152void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) 152void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
153{ 153{
154 owarn << "AbTable::setContacts()" << oendl; 154 odebug << "AbTable::setContacts()" << oendl;
155 155
156 clear(); 156 clear();
157 m_viewList = viewList; 157 m_viewList = viewList;
@@ -183,13 +183,13 @@ void AbTable::setOrderedList( const QValueList<int> ordered )
183 183
184bool AbTable::selectContact( int UID ) 184bool AbTable::selectContact( int UID )
185{ 185{
186 owarn << "AbTable::selectContact( " << UID << " )" << oendl; 186 odebug << "AbTable::selectContact( " << UID << " )" << oendl;
187 int rows = numRows(); 187 int rows = numRows();
188 Opie::OPimContact* foundContact = 0l; 188 Opie::OPimContact* foundContact = 0l;
189 bool found = false; 189 bool found = false;
190 190
191 setPaintingEnabled( FALSE ); 191 setPaintingEnabled( FALSE );
192 owarn << "Search start" << oendl; 192 odebug << "Search start" << oendl;
193 for ( int r = 0; r < rows; ++r ) { 193 for ( int r = 0; r < rows; ++r ) {
194 if ( m_viewList.uidAt( r ) == UID ){ 194 if ( m_viewList.uidAt( r ) == UID ){
195 ensureCellVisible( r, 0 ); 195 ensureCellVisible( r, 0 );
@@ -198,7 +198,7 @@ bool AbTable::selectContact( int UID )
198 break; 198 break;
199 } 199 }
200 } 200 }
201 owarn << "Search end" << oendl; 201 odebug << "Search end" << oendl;
202 202
203 if ( !found ){ 203 if ( !found ){
204 ensureCellVisible( 0,0 ); 204 ensureCellVisible( 0,0 );
@@ -213,7 +213,7 @@ bool AbTable::selectContact( int UID )
213#if 0 213#if 0
214void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row ) 214void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row )
215{ 215{
216 owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, " 216 odebug << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, "
217 << row << " )" << oendl; 217 << row << " )" << oendl;
218 QString strName; 218 QString strName;
219 ContactItem contactItem; 219 ContactItem contactItem;
@@ -283,7 +283,7 @@ int AbTable::currentEntry_UID()
283 283
284void AbTable::clear() 284void AbTable::clear()
285{ 285{
286 owarn << "void AbTable::clear()" << oendl; 286 odebug << "void AbTable::clear()" << oendl;
287 // contactList.clear(); 287 // contactList.clear();
288 288
289 setPaintingEnabled( FALSE ); 289 setPaintingEnabled( FALSE );
@@ -334,7 +334,7 @@ void AbTable::keyPressEvent( QKeyEvent *e )
334 if ( key >= 'A' && key <= 'Z' ) 334 if ( key >= 'A' && key <= 'Z' )
335 moveTo( key ); 335 moveTo( key );
336 336
337 // owarn << "Received key .." << oendl; 337 // odebug << "Received key .." << oendl;
338 switch( e->key() ) { 338 switch( e->key() ) {
339 case Qt::Key_Space: 339 case Qt::Key_Space:
340 case Qt::Key_Return: 340 case Qt::Key_Return:
@@ -342,11 +342,11 @@ void AbTable::keyPressEvent( QKeyEvent *e )
342 emit signalSwitch(); 342 emit signalSwitch();
343 break; 343 break;
344 // case Qt::Key_Up: 344 // case Qt::Key_Up:
345 // owarn << "a" << oendl; 345 // odebug << "a" << oendl;
346 // emit signalKeyUp(); 346 // emit signalKeyUp();
347 // break; 347 // break;
348 // case Qt::Key_Down: 348 // case Qt::Key_Down:
349 // owarn << "b" << oendl; 349 // odebug << "b" << oendl;
350 // emit signalKeyDown(); 350 // emit signalKeyDown();
351 // break; 351 // break;
352 default: 352 default:
@@ -357,7 +357,7 @@ void AbTable::keyPressEvent( QKeyEvent *e )
357 357
358void AbTable::moveTo( char c ) 358void AbTable::moveTo( char c )
359{ 359{
360 owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl; 360 odebug << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl;
361 361
362#if 0 362#if 0
363 int rows = numRows(); 363 int rows = numRows();
@@ -423,7 +423,7 @@ void AbTable::resizeRows() {
423 423
424void AbTable::realignTable() 424void AbTable::realignTable()
425{ 425{
426 //owarn << "void AbTable::realignTable()" << oendl; 426 //odebug << "void AbTable::realignTable()" << oendl;
427 427
428 setPaintingEnabled( FALSE ); 428 setPaintingEnabled( FALSE );
429 429
@@ -473,7 +473,7 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
473 473
474void AbTable::fitColumns() 474void AbTable::fitColumns()
475{ 475{
476 owarn << "void AbTable::fitColumns()" << oendl; 476 odebug << "void AbTable::fitColumns()" << oendl;
477 int contentsWidth = visibleWidth() / 2; 477 int contentsWidth = visibleWidth() / 2;
478 // Fix to better value 478 // Fix to better value
479 // contentsWidth = 130; 479 // contentsWidth = 130;
@@ -485,7 +485,7 @@ void AbTable::fitColumns()
485 columnVisible = true; 485 columnVisible = true;
486 } 486 }
487 487
488 //owarn << "Width: " << contentsWidth << oendl; 488 //odebug << "Width: " << contentsWidth << oendl;
489 489
490 setColumnWidth( 0, contentsWidth ); 490 setColumnWidth( 0, contentsWidth );
491 adjustColumn(1); 491 adjustColumn(1);
@@ -497,7 +497,7 @@ void AbTable::fitColumns()
497 497
498void AbTable::show() 498void AbTable::show()
499{ 499{
500 //owarn << "void AbTable::show()" << oendl; 500 //odebug << "void AbTable::show()" << oendl;
501 realignTable(); 501 realignTable();
502 QTable::show(); 502 QTable::show();
503} 503}
@@ -521,11 +521,11 @@ void AbTable::setChoiceNames( const QStringList& list)
521 521
522void AbTable::itemClicked(int,int col) 522void AbTable::itemClicked(int,int col)
523{ 523{
524 //owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl; 524 //odebug << "AbTable::itemClicked(int, col: " << col << ")" << oendl;
525 if ( col == 2 ) { 525 if ( col == 2 ) {
526 return; 526 return;
527 } else { 527 } else {
528 //owarn << "Emitting signalSwitch()" << oendl; 528 //odebug << "Emitting signalSwitch()" << oendl;
529 emit signalSwitch(); 529 emit signalSwitch();
530 } 530 }
531} 531}
@@ -562,7 +562,7 @@ QStringList AbTable::choiceSelection(int /*index*/) const
562 562
563void AbTable::updateVisible() 563void AbTable::updateVisible()
564{ 564{
565 //owarn << "void AbTable::updateVisible()" << oendl; 565 //odebug << "void AbTable::updateVisible()" << oendl;
566 566
567 int visible, 567 int visible,
568 totalRows, 568 totalRows,
@@ -598,7 +598,7 @@ void AbTable::updateVisible()
598 598
599void AbTable::setPaintingEnabled( bool e ) 599void AbTable::setPaintingEnabled( bool e )
600{ 600{
601 //owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: " 601 //odebug << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: "
602 // << countNested << oendl; 602 // << countNested << oendl;
603 603
604 if ( e ) { 604 if ( e ) {
@@ -615,12 +615,12 @@ void AbTable::setPaintingEnabled( bool e )
615 enablePainting = false; 615 enablePainting = false;
616 setUpdatesEnabled( false ); 616 setUpdatesEnabled( false );
617 } 617 }
618 //owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: " 618 //odebug << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: "
619 // << countNested << oendl; 619 // << countNested << oendl;
620} 620}
621 621
622void AbTable::viewportPaintEvent( QPaintEvent* e ) { 622void AbTable::viewportPaintEvent( QPaintEvent* e ) {
623 //owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> " 623 //odebug << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> "
624 // << enablePainting << oendl; 624 // << enablePainting << oendl;
625 if ( enablePainting ) 625 if ( enablePainting )
626 QTable::viewportPaintEvent( e ); 626 QTable::viewportPaintEvent( e );
@@ -631,7 +631,7 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool )
631 631
632 p->save(); 632 p->save();
633 633
634 //owarn << "Paint row: " << row << oendl; 634 //odebug << "Paint row: " << row << oendl;
635 635
636 Opie::OPimContact act_contact = m_viewList[row]; 636 Opie::OPimContact act_contact = m_viewList[row];
637 637
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 7a5b6d4..7abb45c 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -52,7 +52,7 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
52 m_abTable( 0l ), 52 m_abTable( 0l ),
53 m_orderedFields( ordered ) 53 m_orderedFields( ordered )
54{ 54{
55 owarn << "AbView::c'tor" << oendl; 55 odebug << "AbView::c'tor" << oendl;
56 // Load default database and handle syncing myself.. ! 56 // Load default database and handle syncing myself.. !
57 m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false ); 57 m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false );
58 m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available 58 m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available
@@ -100,28 +100,28 @@ AbView::~AbView()
100 100
101void AbView::setView( Views view ) 101void AbView::setView( Views view )
102{ 102{
103 owarn << "AbView::setView( Views view )" << oendl; 103 odebug << "AbView::setView( Views view )" << oendl;
104 m_curr_View = view; 104 m_curr_View = view;
105 load(); 105 load();
106} 106}
107 107
108void AbView::addEntry( const Opie::OPimContact &newContact ) 108void AbView::addEntry( const Opie::OPimContact &newContact )
109{ 109{
110 owarn << "AbView::AddContact" << oendl; 110 odebug << "AbView::AddContact" << oendl;
111 m_contactdb->add ( newContact ); 111 m_contactdb->add ( newContact );
112 load(); 112 load();
113 113
114} 114}
115void AbView::removeEntry( const int UID ) 115void AbView::removeEntry( const int UID )
116{ 116{
117 owarn << "AbView;:RemoveContact" << oendl; 117 odebug << "AbView;:RemoveContact" << oendl;
118 m_contactdb->remove( UID ); 118 m_contactdb->remove( UID );
119 load(); 119 load();
120} 120}
121 121
122void AbView::replaceEntry( const Opie::OPimContact &contact ) 122void AbView::replaceEntry( const Opie::OPimContact &contact )
123{ 123{
124 owarn << "AbView::ReplaceContact" << oendl; 124 odebug << "AbView::ReplaceContact" << oendl;
125 m_contactdb->replace( contact ); 125 m_contactdb->replace( contact );
126 load(); 126 load();
127 127
@@ -145,14 +145,14 @@ Opie::OPimContact AbView::currentEntry()
145 145
146bool AbView::save() 146bool AbView::save()
147{ 147{
148 //owarn << "AbView::Save data" << oendl; 148 //odebug << "AbView::Save data" << oendl;
149 149
150 return m_contactdb->save(); 150 return m_contactdb->save();
151} 151}
152 152
153void AbView::load() 153void AbView::load()
154{ 154{
155 owarn << "AbView::Load data" << oendl; 155 odebug << "AbView::Load data" << oendl;
156 156
157 // Letter Search is stopped at this place 157 // Letter Search is stopped at this place
158 emit signalClearLetterPicker(); 158 emit signalClearLetterPicker();
@@ -166,7 +166,7 @@ void AbView::load()
166 clearForCategory(); 166 clearForCategory();
167 } 167 }
168 168
169 owarn << "Number of contacts: " << m_list.count() << oendl; 169 odebug << "Number of contacts: " << m_list.count() << oendl;
170 170
171 updateView( true ); 171 updateView( true );
172 172
@@ -174,7 +174,7 @@ void AbView::load()
174 174
175void AbView::reload() 175void AbView::reload()
176{ 176{
177 owarn << "AbView::::reload()" << oendl; 177 odebug << "AbView::::reload()" << oendl;
178 178
179 m_contactdb->reload(); 179 m_contactdb->reload();
180 load(); 180 load();
@@ -187,7 +187,7 @@ void AbView::clear()
187 187
188void AbView::setShowByCategory( const QString& cat ) 188void AbView::setShowByCategory( const QString& cat )
189{ 189{
190 owarn << "AbView::setShowCategory( const QString& cat )" << oendl; 190 odebug << "AbView::setShowCategory( const QString& cat )" << oendl;
191 191
192 int intCat = 0; 192 int intCat = 0;
193 193
@@ -199,7 +199,7 @@ void AbView::setShowByCategory( const QString& cat )
199 199
200 // Just do anything if we really change the category 200 // Just do anything if we really change the category
201 if ( intCat != m_curr_category ){ 201 if ( intCat != m_curr_category ){
202 // owarn << "Categories: Selected " << cat << ".. Number: " 202 // odebug << "Categories: Selected " << cat << ".. Number: "
203 // << m_curr_category << oendl; 203 // << m_curr_category << oendl;
204 204
205 m_curr_category = intCat; 205 m_curr_category = intCat;
@@ -212,10 +212,10 @@ void AbView::setShowByCategory( const QString& cat )
212 212
213void AbView::setShowToView( Views view ) 213void AbView::setShowToView( Views view )
214{ 214{
215 owarn << "void AbView::setShowToView( View " << view << " )" << oendl; 215 odebug << "void AbView::setShowToView( View " << view << " )" << oendl;
216 216
217 if ( m_curr_View != view ){ 217 if ( m_curr_View != view ){
218 owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl; 218 odebug << "Change the View (Category is: " << m_curr_category << ")" << oendl;
219 m_prev_View = m_curr_View; 219 m_prev_View = m_curr_View;
220 m_curr_View = view; 220 m_curr_View = view;
221 221
@@ -226,7 +226,7 @@ void AbView::setShowToView( Views view )
226 226
227void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) 227void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
228{ 228{
229 owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl; 229 odebug << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
230 230
231 assert( mode < AbConfig::LASTELEMENT ); 231 assert( mode < AbConfig::LASTELEMENT );
232 232
@@ -279,7 +279,7 @@ QString AbView::showCategory() const
279 279
280void AbView::showPersonal( bool personal ) 280void AbView::showPersonal( bool personal )
281{ 281{
282 owarn << "void AbView::showPersonal( " << personal << " )" << oendl; 282 odebug << "void AbView::showPersonal( " << personal << " )" << oendl;
283 283
284 if ( personal ){ 284 if ( personal ){
285 285
@@ -349,7 +349,7 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
349 category = mCat.id("Contacts", cat ); 349 category = mCat.id("Contacts", cat );
350 } 350 }
351 351
352 //owarn << "Find in Category " << category << oendl; 352 //odebug << "Find in Category " << category << oendl;
353 353
354 QRegExp r( str ); 354 QRegExp r( str );
355 r.setCaseSensitive( caseSensitive ); 355 r.setCaseSensitive( caseSensitive );
@@ -358,7 +358,7 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
358 // Get all matching entries out of the database 358 // Get all matching entries out of the database
359 m_list = m_contactdb->matchRegexp( r ); 359 m_list = m_contactdb->matchRegexp( r );
360 360
361 //owarn << "Found: " << m_list.count() << oendl; 361 //odebug << "Found: " << m_list.count() << oendl;
362 if ( m_list.count() == 0 ){ 362 if ( m_list.count() == 0 ){
363 emit signalNotFound(); 363 emit signalNotFound();
364 return; 364 return;
@@ -382,16 +382,16 @@ void AbView::offSearch()
382} 382}
383 383
384void AbView::slotSwitch(){ 384void AbView::slotSwitch(){
385 //owarn << "AbView::slotSwitch()" << oendl; 385 //odebug << "AbView::slotSwitch()" << oendl;
386 386
387 m_prev_View = m_curr_View; 387 m_prev_View = m_curr_View;
388 switch ( (int) m_curr_View ){ 388 switch ( (int) m_curr_View ){
389 case TableView: 389 case TableView:
390 owarn << "Switching to CardView" << oendl; 390 odebug << "Switching to CardView" << oendl;
391 m_curr_View = CardView; 391 m_curr_View = CardView;
392 break; 392 break;
393 case CardView: 393 case CardView:
394 owarn << "Switching to TableView" << oendl; 394 odebug << "Switching to TableView" << oendl;
395 m_curr_View = TableView; 395 m_curr_View = TableView;
396 break; 396 break;
397 } 397 }
@@ -410,7 +410,7 @@ void AbView::clearForCategory()
410 if ( m_curr_category != -1 ){ 410 if ( m_curr_category != -1 ){
411 for ( it = allList.begin(); it != allList.end(); ++it ){ 411 for ( it = allList.begin(); it != allList.end(); ++it ){
412 if ( !contactCompare( *it, m_curr_category ) ){ 412 if ( !contactCompare( *it, m_curr_category ) ){
413 //owarn << "Removing " << (*it).uid() << oendl; 413 //odebug << "Removing " << (*it).uid() << oendl;
414 m_list.remove( (*it).uid() ); 414 m_list.remove( (*it).uid() );
415 } 415 }
416 } 416 }
@@ -420,14 +420,14 @@ void AbView::clearForCategory()
420 420
421bool AbView::contactCompare( const Opie::OPimContact &cnt, int category ) 421bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
422{ 422{
423 //owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, " 423 //odebug << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
424 // << category << " )" << oendl; 424 // << category << " )" << oendl;
425 425
426 bool returnMe; 426 bool returnMe;
427 QArray<int> cats; 427 QArray<int> cats;
428 cats = cnt.categories(); 428 cats = cnt.categories();
429 429
430 //owarn << "Number of categories: " << cats.count() << oendl; 430 //odebug << "Number of categories: " << cats.count() << oendl;
431 431
432 returnMe = false; 432 returnMe = false;
433 if ( cats.count() == 0 && category == 0 ) 433 if ( cats.count() == 0 && category == 0 )
@@ -436,14 +436,14 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
436 else { 436 else {
437 int i; 437 int i;
438 for ( i = 0; i < int(cats.count()); i++ ) { 438 for ( i = 0; i < int(cats.count()); i++ ) {
439 //owarn << "Comparing " << cats[i] << " with " << category << oendl; 439 //odebug << "Comparing " << cats[i] << " with " << category << oendl;
440 if ( cats[i] == category ) { 440 if ( cats[i] == category ) {
441 returnMe = true; 441 returnMe = true;
442 break; 442 break;
443 } 443 }
444 } 444 }
445 } 445 }
446 //owarn << "Return: " << returnMe << oendl; 446 //odebug << "Return: " << returnMe << oendl;
447 return returnMe; 447 return returnMe;
448} 448}
449 449
@@ -456,7 +456,7 @@ void AbView::updateListinViews()
456 456
457void AbView::updateView( bool newdata ) 457void AbView::updateView( bool newdata )
458{ 458{
459 //owarn << "AbView::updateView()" << oendl; 459 //odebug << "AbView::updateView()" << oendl;
460 460
461 if ( m_viewStack -> visibleWidget() ){ 461 if ( m_viewStack -> visibleWidget() ){
462 m_viewStack -> visibleWidget() -> clearFocus(); 462 m_viewStack -> visibleWidget() -> clearFocus();
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 35d0f41..835038a 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -267,10 +267,10 @@ void AddressbookWindow::slotConfig()
267 ConfigDlg* dlg = new ConfigDlg( this, "Config" ); 267 ConfigDlg* dlg = new ConfigDlg( this, "Config" );
268 dlg -> setConfig( m_config ); 268 dlg -> setConfig( m_config );
269 if ( QPEApplication::execDialog( dlg ) ) { 269 if ( QPEApplication::execDialog( dlg ) ) {
270 owarn << "Config Dialog accepted!" << oendl; 270 odebug << "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 owarn << "Font was changed!" << oendl; 273 odebug << "Font was changed!" << oendl;
274 m_curFontSize = m_config.fontSize(); 274 m_curFontSize = m_config.fontSize();
275 emit slotSetFont( m_curFontSize ); 275 emit slotSetFont( m_curFontSize );
276 } 276 }
@@ -283,7 +283,7 @@ void AddressbookWindow::slotConfig()
283 283
284void AddressbookWindow::slotSetFont( int size ) 284void AddressbookWindow::slotSetFont( int size )
285{ 285{
286 owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl; 286 odebug << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
287 287
288 if (size > 2 || size < 0) 288 if (size > 2 || size < 0)
289 size = 1; 289 size = 1;
@@ -325,10 +325,10 @@ void AddressbookWindow::importvCard() {
325} 325}
326void AddressbookWindow::exportvCard() 326void AddressbookWindow::exportvCard()
327{ 327{
328 owarn << "void AddressbookWindow::exportvCard()" << oendl; 328 odebug << "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 owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl; 331 odebug << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl;
332 Opie::OPimContact curCont = m_abView->currentEntry(); 332 Opie::OPimContact curCont = m_abView->currentEntry();
333 if ( !curCont.isEmpty() ){ 333 if ( !curCont.isEmpty() ){
334 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, 334 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
@@ -350,7 +350,7 @@ void AddressbookWindow::exportvCard()
350 350
351void AddressbookWindow::setDocument( const QString &filename ) 351void AddressbookWindow::setDocument( const QString &filename )
352{ 352{
353 owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl; 353 odebug << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
354 354
355 if ( filename.find(".vcf") != int(filename.length()) - 4 ){ 355 if ( filename.find(".vcf") != int(filename.length()) - 4 ){
356 356
@@ -362,10 +362,10 @@ void AddressbookWindow::setDocument( const QString &filename )
362 0, // Enter == button 0 362 0, // Enter == button 0
363 2 ) ) { // Escape == button 2 363 2 ) ) { // Escape == button 2
364 case 0: 364 case 0:
365 owarn << "YES clicked" << oendl; 365 odebug << "YES clicked" << oendl;
366 break; 366 break;
367 case 1: 367 case 1:
368 owarn << "NO clicked" << oendl; 368 odebug << "NO clicked" << oendl;
369 return; 369 return;
370 break; 370 break;
371 } 371 }
@@ -375,7 +375,7 @@ void AddressbookWindow::setDocument( const QString &filename )
375 filename ); 375 filename );
376 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); 376 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
377 Opie::OPimContactAccess::List allList = access->allRecords(); 377 Opie::OPimContactAccess::List allList = access->allRecords();
378 owarn << "Found number of contacts in File: " << allList.count() << oendl; 378 odebug << "Found number of contacts in File: " << allList.count() << oendl;
379 379
380 if ( !allList.count() ) { 380 if ( !allList.count() ) {
381 QMessageBox::information( this, "Import VCard", 381 QMessageBox::information( this, "Import VCard",
@@ -386,7 +386,7 @@ void AddressbookWindow::setDocument( const QString &filename )
386 bool doAsk = true; 386 bool doAsk = true;
387 Opie::OPimContactAccess::List::Iterator it; 387 Opie::OPimContactAccess::List::Iterator it;
388 for ( it = allList.begin(); it != allList.end(); ++it ){ 388 for ( it = allList.begin(); it != allList.end(); ++it ){
389 owarn << "Adding Contact from: " << (*it).fullName() << oendl; 389 odebug << "Adding Contact from: " << (*it).fullName() << oendl;
390 if ( doAsk ){ 390 if ( doAsk ){
391 switch( QMessageBox::information( this, tr ( "Add Contact?" ), 391 switch( QMessageBox::information( this, tr ( "Add Contact?" ),
392 tr( "Do you really want add contact for \n%1?" ) 392 tr( "Do you really want add contact for \n%1?" )
@@ -395,14 +395,14 @@ void AddressbookWindow::setDocument( const QString &filename )
395 0, // Enter == button 0 395 0, // Enter == button 0
396 2 ) ) { // Escape == button 2 396 2 ) ) { // Escape == button 2
397 case 0: 397 case 0:
398 owarn << "YES clicked" << oendl; 398 odebug << "YES clicked" << oendl;
399 m_abView->addEntry( *it ); 399 m_abView->addEntry( *it );
400 break; 400 break;
401 case 1: 401 case 1:
402 owarn << "NO clicked" << oendl; 402 odebug << "NO clicked" << oendl;
403 break; 403 break;
404 case 2: 404 case 2:
405 owarn << "YesAll clicked" << oendl; 405 odebug << "YesAll clicked" << oendl;
406 doAsk = false; 406 doAsk = false;
407 break; 407 break;
408 } 408 }
@@ -538,9 +538,9 @@ void AddressbookWindow::writeMail()
538 // Try to access the preferred. If not possible, try to 538 // Try to access the preferred. If not possible, try to
539 // switch to the other one.. 539 // switch to the other one..
540 if ( m_config.useQtMail() ){ 540 if ( m_config.useQtMail() ){
541 owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl; 541 odebug << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
542 if ( QFile::exists( basepath + "/bin/qtmail" ) ){ 542 if ( QFile::exists( basepath + "/bin/qtmail" ) ){
543 owarn << "QCop" << oendl; 543 odebug << "QCop" << oendl;
544 QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)"); 544 QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
545 e << name << email; 545 e << name << email;
546 return; 546 return;
@@ -548,9 +548,9 @@ void AddressbookWindow::writeMail()
548 m_config.setUseOpieMail( true ); 548 m_config.setUseOpieMail( true );
549 } 549 }
550 if ( m_config.useOpieMail() ){ 550 if ( m_config.useOpieMail() ){
551 owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl; 551 odebug << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
552 if ( QFile::exists( basepath + "/bin/opiemail" ) ){ 552 if ( QFile::exists( basepath + "/bin/opiemail" ) ){
553 owarn << "QCop" << oendl; 553 odebug << "QCop" << oendl;
554 QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)"); 554 QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)");
555 e << name << email; 555 e << name << email;
556 return; 556 return;
@@ -592,7 +592,7 @@ void AddressbookWindow::slotBeam()
592 beamFilename = beamfile; 592 beamFilename = beamfile;
593 } 593 }
594 594
595 owarn << "Beaming: " << beamFilename << oendl; 595 odebug << "Beaming: " << beamFilename << oendl;
596 596
597 Ir *ir = new Ir( this ); 597 Ir *ir = new Ir( this );
598 connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) ); 598 connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
@@ -639,7 +639,7 @@ static void parseName( const QString& name, QString *first, QString *middle,
639void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) 639void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
640{ 640{
641 bool needShow = FALSE; 641 bool needShow = FALSE;
642 owarn << "Receiving QCop-Call with message " << msg << oendl; 642 odebug << "Receiving QCop-Call with message " << msg << oendl;
643 643
644 644
645 if (msg == "editPersonal()") { 645 if (msg == "editPersonal()") {
@@ -682,7 +682,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
682 int uid; 682 int uid;
683 stream >> uid; 683 stream >> uid;
684 684
685 owarn << "Showing uid: " << uid << oendl; 685 odebug << "Showing uid: " << uid << oendl;
686 686
687 // Deactivate Personal View.. 687 // Deactivate Personal View..
688 if ( actionPersonal->isOn() ){ 688 if ( actionPersonal->isOn() ){
@@ -762,7 +762,7 @@ void AddressbookWindow::editPersonal()
762 // Switch to personal view if not selected 762 // Switch to personal view if not selected
763 // but take care of the menu, too 763 // but take care of the menu, too
764 if ( ! actionPersonal->isOn() ){ 764 if ( ! actionPersonal->isOn() ){
765 owarn << "*** ++++" << oendl; 765 odebug << "*** ++++" << oendl;
766 actionPersonal->setOn( true ); 766 actionPersonal->setOn( true );
767 slotPersonalView(); 767 slotPersonalView();
768 } 768 }
@@ -781,10 +781,10 @@ void AddressbookWindow::editPersonal()
781 781
782void AddressbookWindow::slotPersonalView() 782void AddressbookWindow::slotPersonalView()
783{ 783{
784 owarn << "slotPersonalView()" << oendl; 784 odebug << "slotPersonalView()" << oendl;
785 if (!actionPersonal->isOn()) { 785 if (!actionPersonal->isOn()) {
786 // we just turned it off 786 // we just turned it off
787 owarn << "slotPersonalView()-> OFF" << oendl; 787 odebug << "slotPersonalView()-> OFF" << oendl;
788 setCaption( tr("Contacts") ); 788 setCaption( tr("Contacts") );
789 actionNew->setEnabled(TRUE); 789 actionNew->setEnabled(TRUE);
790 actionTrash->setEnabled(TRUE); 790 actionTrash->setEnabled(TRUE);
@@ -797,7 +797,7 @@ void AddressbookWindow::slotPersonalView()
797 return; 797 return;
798 } 798 }
799 799
800 owarn << "slotPersonalView()-> ON" << oendl; 800 odebug << "slotPersonalView()-> ON" << oendl;
801 // XXX need to disable some QActions. 801 // XXX need to disable some QActions.
802 actionNew->setEnabled(FALSE); 802 actionNew->setEnabled(FALSE);
803 actionTrash->setEnabled(FALSE); 803 actionTrash->setEnabled(FALSE);
@@ -887,7 +887,7 @@ void AddressbookWindow::slotSave()
887 887
888void AddressbookWindow::slotNotFound() 888void AddressbookWindow::slotNotFound()
889{ 889{
890 owarn << "Got not found signal!" << oendl; 890 odebug << "Got not found signal!" << oendl;
891 QMessageBox::information( this, tr( "Not Found" ), 891 QMessageBox::information( this, tr( "Not Found" ),
892 "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" ); 892 "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" );
893 893
@@ -895,7 +895,7 @@ void AddressbookWindow::slotNotFound()
895} 895}
896void AddressbookWindow::slotWrapAround() 896void AddressbookWindow::slotWrapAround()
897{ 897{
898 owarn << "Got wrap signal!" << oendl; 898 odebug << "Got wrap signal!" << oendl;
899 // if ( doNotifyWrapAround ) 899 // if ( doNotifyWrapAround )
900 // QMessageBox::information( this, tr( "End of list" ), 900 // QMessageBox::information( this, tr( "End of list" ),
901 // tr( "End of list. Wrap around now...!" ) + "\n" ); 901 // tr( "End of list. Wrap around now...!" ) + "\n" );
@@ -904,7 +904,7 @@ void AddressbookWindow::slotWrapAround()
904 904
905void AddressbookWindow::slotSetCategory( int c ) 905void AddressbookWindow::slotSetCategory( int c )
906{ 906{
907 owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from " 907 odebug << "void AddressbookWindow::slotSetCategory( " << c << " ) from "
908 << catMenu->count() << oendl; 908 << catMenu->count() << oendl;
909 909
910 QString cat, book; 910 QString cat, book;
@@ -940,7 +940,7 @@ void AddressbookWindow::slotSetCategory( int c )
940 cat = QString::null; 940 cat = QString::null;
941 }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled 941 }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled
942 cat = "Unfiled"; 942 cat = "Unfiled";
943 owarn << "Unfiled selected!" << oendl; 943 odebug << "Unfiled selected!" << oendl;
944 }else{ 944 }else{
945 cat = m_abView->categories()[i - 4]; 945 cat = m_abView->categories()[i - 4];
946 } 946 }
@@ -963,7 +963,7 @@ void AddressbookWindow::slotSetCategory( int c )
963 963
964void AddressbookWindow::slotViewSwitched( int view ) 964void AddressbookWindow::slotViewSwitched( int view )
965{ 965{
966 owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl; 966 odebug << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
967 int menu = 0; 967 int menu = 0;
968 968
969 // Switch to selected view 969 // Switch to selected view
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index 22f7291..61e6c7e 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -43,7 +43,7 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
43 43
44void ConfigDlg::slotItemUp() 44void ConfigDlg::slotItemUp()
45{ 45{
46 owarn << "void ConfigDlg::slotItemUp()" << oendl; 46 odebug << "void ConfigDlg::slotItemUp()" << oendl;
47 47
48 int i = fieldListBox->currentItem(); 48 int i = fieldListBox->currentItem();
49 if ( i > 0 ) { 49 if ( i > 0 ) {
@@ -57,7 +57,7 @@ void ConfigDlg::slotItemUp()
57 57
58void ConfigDlg::slotItemDown() 58void ConfigDlg::slotItemDown()
59{ 59{
60 owarn << "void ConfigDlg::slotItemDown()" << oendl; 60 odebug << "void ConfigDlg::slotItemDown()" << oendl;
61 61
62 int i = fieldListBox->currentItem(); 62 int i = fieldListBox->currentItem();
63 if ( i < (int)fieldListBox->count() - 1 ) { 63 if ( i < (int)fieldListBox->count() - 1 ) {
@@ -70,19 +70,19 @@ void ConfigDlg::slotItemDown()
70 70
71void ConfigDlg::slotItemAdd() 71void ConfigDlg::slotItemAdd()
72{ 72{
73 owarn << "void ConfigDlg::slotItemAdd()" << oendl; 73 odebug << "void ConfigDlg::slotItemAdd()" << oendl;
74 74
75 int i = allFieldListBox->currentItem(); 75 int i = allFieldListBox->currentItem();
76 if ( i > 0 ) { 76 if ( i > 0 ) {
77 QString item = allFieldListBox->currentText(); 77 QString item = allFieldListBox->currentText();
78 owarn << "Adding " << item << oendl; 78 odebug << "Adding " << item << oendl;
79 fieldListBox->insertItem( item ); 79 fieldListBox->insertItem( item );
80 } 80 }
81} 81}
82 82
83void ConfigDlg::slotItemRemove() 83void ConfigDlg::slotItemRemove()
84{ 84{
85 owarn << "void ConfigDlg::slotItemRemove()" << oendl; 85 odebug << "void ConfigDlg::slotItemRemove()" << oendl;
86 86
87 int i = fieldListBox->currentItem(); 87 int i = fieldListBox->currentItem();
88 if ( i > 0 ) { 88 if ( i > 0 ) {
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 312c663..b078968 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -79,7 +79,7 @@ ContactEditor::~ContactEditor() {
79} 79}
80 80
81void ContactEditor::init() { 81void ContactEditor::init() {
82 owarn << "init() START" << oendl; 82 odebug << "init() START" << oendl;
83 83
84 uint i = 0; 84 uint i = 0;
85 85
@@ -688,7 +688,7 @@ void ContactEditor::init() {
688 688
689 setPersonalView ( m_personalView ); 689 setPersonalView ( m_personalView );
690 690
691 owarn << "init() END" << oendl; 691 odebug << "init() END" << oendl;
692} 692}
693 693
694void ContactEditor::defaultEmailChanged(int i){ 694void ContactEditor::defaultEmailChanged(int i){
@@ -739,7 +739,7 @@ void ContactEditor::populateDefaultEmailCmb(){
739// be handled by something else.. 739// be handled by something else..
740bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) { 740bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
741 QString type = slChooserNames[index]; 741 QString type = slChooserNames[index];
742 owarn << "ContactEditor::cmbChooserChange -> Type: " << type 742 odebug << "ContactEditor::cmbChooserChange -> Type: " << type
743 << ", WidgetPos: " << widgetPos << oendl; 743 << ", WidgetPos: " << widgetPos << oendl;
744 744
745 if ( !initializing ) 745 if ( !initializing )
@@ -747,7 +747,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
747 747
748 // Create and connect combobox for selecting the default email 748 // Create and connect combobox for selecting the default email
749 if ( type == "Default Email"){ 749 if ( type == "Default Email"){
750 owarn << "Choosing default-email (defaultEmailChooserPosition= " 750 odebug << "Choosing default-email (defaultEmailChooserPosition= "
751 << defaultEmailChooserPosition << ") " << oendl; 751 << defaultEmailChooserPosition << ") " << oendl;
752 752
753 // More than one default-email chooser is not allowed ! 753 // More than one default-email chooser is not allowed !
@@ -781,7 +781,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
781 781
782 } else { 782 } else {
783 // Something else was selected: Hide combo.. 783 // Something else was selected: Hide combo..
784 owarn << " Hiding default-email combo" << oendl; 784 odebug << " Hiding default-email combo" << oendl;
785 if ( defaultEmailChooserPosition == widgetPos ){ 785 if ( defaultEmailChooserPosition == widgetPos ){
786 defaultEmailChooserPosition = -1; 786 defaultEmailChooserPosition = -1;
787 } 787 }
@@ -847,7 +847,7 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
847 << " )" << oendl; 847 << " )" << oendl;
848 848
849 if ( type == "Default Email"){ 849 if ( type == "Default Email"){
850 owarn << "??? Wozu??: " << textChanged << oendl; 850 odebug << "??? Wozu??: " << textChanged << oendl;
851 defaultEmail = textChanged; 851 defaultEmail = textChanged;
852 852
853 populateDefaultEmailCmb(); 853 populateDefaultEmailCmb();
@@ -866,23 +866,23 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
866} 866}
867 867
868void ContactEditor::slotChooser1Change( const QString &textChanged ) { 868void ContactEditor::slotChooser1Change( const QString &textChanged ) {
869 owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl; 869 odebug << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
870 chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1); 870 chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
871} 871}
872 872
873void ContactEditor::slotChooser2Change( const QString &textChanged ) { 873void ContactEditor::slotChooser2Change( const QString &textChanged ) {
874 owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl; 874 odebug << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
875 chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2); 875 chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
876 876
877} 877}
878 878
879void ContactEditor::slotChooser3Change( const QString &textChanged ) { 879void ContactEditor::slotChooser3Change( const QString &textChanged ) {
880 owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl; 880 odebug << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
881 chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3); 881 chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
882} 882}
883 883
884void ContactEditor::slotChooser4Change( const QString &textChanged ) { 884void ContactEditor::slotChooser4Change( const QString &textChanged ) {
885 owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl; 885 odebug << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
886 chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4); 886 chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
887} 887}
888 888
@@ -952,7 +952,7 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) {
952 952
953 953
954void ContactEditor::slotCmbChooser1Change( int index ) { 954void ContactEditor::slotCmbChooser1Change( int index ) {
955 owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl; 955 odebug << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
956 if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){ 956 if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
957 957
958 txtChooserField1->setText( slChooserValues[index] ); 958 txtChooserField1->setText( slChooserValues[index] );
@@ -963,7 +963,7 @@ void ContactEditor::slotCmbChooser1Change( int index ) {
963} 963}
964 964
965void ContactEditor::slotCmbChooser2Change( int index ) { 965void ContactEditor::slotCmbChooser2Change( int index ) {
966 owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl; 966 odebug << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
967 967
968 if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){ 968 if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){
969 969
@@ -974,7 +974,7 @@ void ContactEditor::slotCmbChooser2Change( int index ) {
974} 974}
975 975
976void ContactEditor::slotCmbChooser3Change( int index ) { 976void ContactEditor::slotCmbChooser3Change( int index ) {
977 owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl; 977 odebug << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
978 978
979 if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){ 979 if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){
980 980
@@ -985,7 +985,7 @@ void ContactEditor::slotCmbChooser3Change( int index ) {
985} 985}
986 986
987void ContactEditor::slotCmbChooser4Change( int index ) { 987void ContactEditor::slotCmbChooser4Change( int index ) {
988 owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl; 988 odebug << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
989 989
990 if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){ 990 if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){
991 991
@@ -1030,7 +1030,7 @@ void ContactEditor::slotAddressTypeChange( int index ) {
1030 1030
1031void ContactEditor::slotFullNameChange( const QString &textChanged ) { 1031void ContactEditor::slotFullNameChange( const QString &textChanged ) {
1032 1032
1033 owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl; 1033 odebug << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
1034 1034
1035 int index = cmbFileAs->currentItem(); 1035 int index = cmbFileAs->currentItem();
1036 1036
@@ -1054,7 +1054,7 @@ void ContactEditor::slotSuffixChange( const QString& ) {
1054} 1054}
1055 1055
1056void ContactEditor::slotOrganizationChange( const QString &textChanged ){ 1056void ContactEditor::slotOrganizationChange( const QString &textChanged ){
1057 owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl; 1057 odebug << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl;
1058 // Special handling for storing Companies: 1058 // Special handling for storing Companies:
1059 // If no Fullname is given, we store the Company-Name as lastname 1059 // If no Fullname is given, we store the Company-Name as lastname
1060 // to handle it like a person.. 1060 // to handle it like a person..
@@ -1136,11 +1136,11 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1136 int commapos; 1136 int commapos;
1137 bool haveLastName = false; 1137 bool haveLastName = false;
1138 1138
1139 owarn << "Fullname: " << simplifiedName << oendl; 1139 odebug << "Fullname: " << simplifiedName << oendl;
1140 1140
1141 commapos = simplifiedName.find( ',', 0, TRUE); 1141 commapos = simplifiedName.find( ',', 0, TRUE);
1142 if ( commapos >= 0 ) { 1142 if ( commapos >= 0 ) {
1143 owarn << " Commapos: " << commapos << oendl; 1143 odebug << " Commapos: " << commapos << oendl;
1144 1144
1145 // A comma (",") separates the lastname from one or 1145 // A comma (",") separates the lastname from one or
1146 // many first names. Thus, remove the lastname from the 1146 // many first names. Thus, remove the lastname from the
@@ -1149,7 +1149,7 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1149 strLastName = simplifiedName.left( commapos ); 1149 strLastName = simplifiedName.left( commapos );
1150 simplifiedName= simplifiedName.mid( commapos + 1 ); 1150 simplifiedName= simplifiedName.mid( commapos + 1 );
1151 haveLastName = true; 1151 haveLastName = true;
1152 owarn << "Fullname without ',': " << simplifiedName << oendl; 1152 odebug << "Fullname without ',': " << simplifiedName << oendl;
1153 1153
1154 // If we have any lastname, we should now split all first names. 1154 // If we have any lastname, we should now split all first names.
1155 // The first one will be the used as first, the rest as "middle names" 1155 // The first one will be the used as first, the rest as "middle names"
@@ -1183,10 +1183,10 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1183 if ( strFirstName == strLastName ) 1183 if ( strFirstName == strLastName )
1184 strFirstName = ""; 1184 strFirstName = "";
1185 1185
1186 owarn << "strFirstName: " << strFirstName << oendl; 1186 odebug << "strFirstName: " << strFirstName << oendl;
1187 owarn << "strMiddletName: " << strMiddleName << oendl; 1187 odebug << "strMiddletName: " << strMiddleName << oendl;
1188 owarn << "strLastName: " << strLastName << oendl; 1188 odebug << "strLastName: " << strLastName << oendl;
1189 owarn << "strTitle: " << strTitle << oendl; 1189 odebug << "strTitle: " << strTitle << oendl;
1190 1190
1191 switch (type) { 1191 switch (type) {
1192 case NAME_FL: 1192 case NAME_FL:
@@ -1329,7 +1329,7 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
1329 QListIterator<QLineEdit> itLE( listValue ); 1329 QListIterator<QLineEdit> itLE( listValue );
1330 for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) { 1330 for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) {
1331 1331
1332 owarn << " Filling dynamic Field: " << (*it) << oendl; 1332 odebug << " Filling dynamic Field: " << (*it) << oendl;
1333 1333
1334 if ( *it == "Department" ) 1334 if ( *it == "Department" )
1335 (*itLE)->setText( ent.department() ); 1335 (*itLE)->setText( ent.department() );
@@ -1353,7 +1353,7 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
1353 (*itLE)->setText( ent.spouse() ); 1353 (*itLE)->setText( ent.spouse() );
1354 1354
1355 if ( *it == "Nickname" ){ 1355 if ( *it == "Nickname" ){
1356 owarn << "**** Nichname: " << ent.nickname() << oendl; 1356 odebug << "**** Nichname: " << ent.nickname() << oendl;
1357 (*itLE)->setText( ent.nickname() ); 1357 (*itLE)->setText( ent.nickname() );
1358 } 1358 }
1359 1359
@@ -1586,8 +1586,8 @@ void ContactEditor::saveEntry() {
1586 QString defaultmail; 1586 QString defaultmail;
1587 parseEmailFrom( emails.join(","), defaultmail, allemail ); 1587 parseEmailFrom( emails.join(","), defaultmail, allemail );
1588 if ( defaultEmail.isEmpty() ){ 1588 if ( defaultEmail.isEmpty() ){
1589 owarn << "Default email was not set by user!" << oendl; 1589 odebug << "Default email was not set by user!" << oendl;
1590 owarn << "Using first email in list: " << defaultmail << oendl; 1590 odebug << "Using first email in list: " << defaultmail << oendl;
1591 ent.setDefaultEmail( defaultmail ); 1591 ent.setDefaultEmail( defaultmail );
1592 } 1592 }
1593 ent.setEmails( allemail ); 1593 ent.setEmails( allemail );
@@ -1739,14 +1739,14 @@ void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
1739 1739
1740void ContactEditor::slotRemoveBirthday() 1740void ContactEditor::slotRemoveBirthday()
1741{ 1741{
1742 owarn << "void ContactEditor::slotRemoveBirthday()" << oendl; 1742 odebug << "void ContactEditor::slotRemoveBirthday()" << oendl;
1743 ent.setBirthday( QDate() ); 1743 ent.setBirthday( QDate() );
1744 updateDatePicker(); 1744 updateDatePicker();
1745} 1745}
1746 1746
1747void ContactEditor::slotRemoveAnniversary() 1747void ContactEditor::slotRemoveAnniversary()
1748{ 1748{
1749 owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl; 1749 odebug << "void ContactEditor::slotRemoveAnniversary()" << oendl;
1750 ent.setAnniversary( QDate() ); 1750 ent.setAnniversary( QDate() );
1751 updateDatePicker(); 1751 updateDatePicker();
1752} 1752}
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp
index 8a9c85b..b962896 100644
--- a/core/pim/addressbook/picker.cpp
+++ b/core/pim/addressbook/picker.cpp
@@ -239,7 +239,7 @@ void LetterPicker::clear()
239 239
240void LetterPicker::newLetter( char letter ) 240void LetterPicker::newLetter( char letter )
241{ 241{
242 owarn << "LetterClicked" << oendl; 242 odebug << "LetterClicked" << oendl;
243 emit letterClicked( letter ); 243 emit letterClicked( letter );
244 244
245} 245}