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
@@ -94,17 +94,17 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
94 // Commonly handled keys 94 // Commonly handled keys
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 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();
104 break; 104 break;
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() ) &&
108 ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) ) 108 ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) )
109 scrollBy( 0, -(visibleHeight()-20) ); 109 scrollBy( 0, -(visibleHeight()-20) );
110 else { 110 else {
@@ -116,11 +116,11 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
116 } 116 }
117 117
118 break; 118 break;
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;
124 if ( ( visibleHeight() < contentsHeight() ) && 124 if ( ( visibleHeight() < contentsHeight() ) &&
125 ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) ) 125 ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) )
126 scrollBy( 0, visibleHeight()-20 ); 126 scrollBy( 0, visibleHeight()-20 );
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
@@ -120,17 +120,17 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
120 enablePainting( true ), 120 enablePainting( true ),
121 columnVisible( true ), 121 columnVisible( true ),
122 countNested( 0 ) 122 countNested( 0 )
123{ 123{
124 //Opie::Core::owarn << "C'tor start" << oendl; 124 //owarn << "C'tor start" << oendl;
125 setSelectionMode( NoSelection ); 125 setSelectionMode( NoSelection );
126 init(); 126 init();
127 setSorting( TRUE ); 127 setSorting( TRUE );
128 connect( this, SIGNAL(clicked(int,int,int,const QPoint&)), 128 connect( this, SIGNAL(clicked(int,int,int,const QPoint&)),
129 this, SLOT(itemClicked(int,int)) ); 129 this, SLOT(itemClicked(int,int)) );
130 130
131 // contactList.clear(); 131 // contactList.clear();
132 //Opie::Core::owarn << "C'tor end" << oendl; 132 //owarn << "C'tor end" << oendl;
133} 133}
134 134
135AbTable::~AbTable() 135AbTable::~AbTable()
136{ 136{
@@ -150,9 +150,9 @@ void AbTable::init()
150} 150}
151 151
152void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) 152void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
153{ 153{
154 Opie::Core::owarn << "AbTable::setContacts()" << oendl; 154 owarn << "AbTable::setContacts()" << oendl;
155 155
156 clear(); 156 clear();
157 m_viewList = viewList; 157 m_viewList = viewList;
158 158
@@ -182,24 +182,24 @@ void AbTable::setOrderedList( const QValueList<int> ordered )
182 182
183 183
184bool AbTable::selectContact( int UID ) 184bool 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();
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 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 ) {
194 if ( m_viewList.uidAt( r ) == UID ){ 194 if ( m_viewList.uidAt( r ) == UID ){
195 ensureCellVisible( r, 0 ); 195 ensureCellVisible( r, 0 );
196 setCurrentCell( r, 0 ); 196 setCurrentCell( r, 0 );
197 found = true; 197 found = true;
198 break; 198 break;
199 } 199 }
200 } 200 }
201 Opie::Core::owarn << "Search end" << oendl; 201 owarn << "Search end" << oendl;
202 202
203 if ( !found ){ 203 if ( !found ){
204 ensureCellVisible( 0,0 ); 204 ensureCellVisible( 0,0 );
205 setCurrentCell( 0, 0 ); 205 setCurrentCell( 0, 0 );
@@ -212,9 +212,9 @@ bool AbTable::selectContact( int UID )
212 212
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 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;
218 QString strName; 218 QString strName;
219 ContactItem contactItem; 219 ContactItem contactItem;
220 220
@@ -256,9 +256,9 @@ void AbTable::columnClicked( int col )
256} 256}
257 257
258void AbTable::resort() 258void 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
262 setPaintingEnabled( FALSE ); 262 setPaintingEnabled( FALSE );
263 if ( sorting() ) { 263 if ( sorting() ) {
264 if ( lastSortCol == -1 ) 264 if ( lastSortCol == -1 )
@@ -282,9 +282,9 @@ int AbTable::currentEntry_UID()
282} 282}
283 283
284void AbTable::clear() 284void AbTable::clear()
285{ 285{
286 Opie::Core::owarn << "void AbTable::clear()" << oendl; 286 owarn << "void AbTable::clear()" << oendl;
287 // contactList.clear(); 287 // contactList.clear();
288 288
289 setPaintingEnabled( FALSE ); 289 setPaintingEnabled( FALSE );
290 for ( int r = 0; r < numRows(); ++r ) { 290 for ( int r = 0; r < numRows(); ++r ) {
@@ -300,9 +300,9 @@ void AbTable::clear()
300 300
301// Refresh updates column 2 if the contactsettings changed 301// Refresh updates column 2 if the contactsettings changed
302void AbTable::refresh() 302void AbTable::refresh()
303{ 303{
304 Opie::Core::owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl; 304 owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl;
305 305
306#if 0 306#if 0
307 int rows = numRows(); 307 int rows = numRows();
308 AbTableItem *abi; 308 AbTableItem *abi;
@@ -333,21 +333,21 @@ void AbTable::keyPressEvent( QKeyEvent *e )
333 333
334 if ( key >= 'A' && key <= 'Z' ) 334 if ( key >= 'A' && key <= 'Z' )
335 moveTo( key ); 335 moveTo( key );
336 336
337 // Opie::Core::owarn << "Received key .." << oendl; 337 // owarn << "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:
341 case Qt::Key_Enter: 341 case Qt::Key_Enter:
342 emit signalSwitch(); 342 emit signalSwitch();
343 break; 343 break;
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();
347 // break; 347 // break;
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();
351 // break; 351 // break;
352 default: 352 default:
353 QTable::keyPressEvent( e ); 353 QTable::keyPressEvent( e );
@@ -356,9 +356,9 @@ void AbTable::keyPressEvent( QKeyEvent *e )
356} 356}
357 357
358void AbTable::moveTo( char c ) 358void 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
362#if 0 362#if 0
363 int rows = numRows(); 363 int rows = numRows();
364 QString value; 364 QString value;
@@ -422,9 +422,9 @@ void AbTable::resizeRows() {
422 422
423 423
424void AbTable::realignTable() 424void AbTable::realignTable()
425{ 425{
426 //Opie::Core::owarn << "void AbTable::realignTable()" << oendl; 426 //owarn << "void AbTable::realignTable()" << oendl;
427 427
428 setPaintingEnabled( FALSE ); 428 setPaintingEnabled( FALSE );
429 429
430 resizeRows(); 430 resizeRows();
@@ -472,9 +472,9 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
472 472
473 473
474void AbTable::fitColumns() 474void 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;
478 // Fix to better value 478 // Fix to better value
479 // contentsWidth = 130; 479 // contentsWidth = 130;
480 480
@@ -484,9 +484,9 @@ void AbTable::fitColumns()
484 showColumn(0); 484 showColumn(0);
485 columnVisible = true; 485 columnVisible = true;
486 } 486 }
487 487
488 //Opie::Core::owarn << "Width: " << contentsWidth << oendl; 488 //owarn << "Width: " << contentsWidth << oendl;
489 489
490 setColumnWidth( 0, contentsWidth ); 490 setColumnWidth( 0, contentsWidth );
491 adjustColumn(1); 491 adjustColumn(1);
492 if ( columnWidth(1) < contentsWidth ) 492 if ( columnWidth(1) < contentsWidth )
@@ -496,9 +496,9 @@ void AbTable::fitColumns()
496} 496}
497 497
498void AbTable::show() 498void AbTable::show()
499{ 499{
500 //Opie::Core::owarn << "void AbTable::show()" << oendl; 500 //owarn << "void AbTable::show()" << oendl;
501 realignTable(); 501 realignTable();
502 QTable::show(); 502 QTable::show();
503} 503}
504 504
@@ -520,13 +520,13 @@ void AbTable::setChoiceNames( const QStringList& list)
520#endif 520#endif
521 521
522void AbTable::itemClicked(int,int col) 522void 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 ) {
526 return; 526 return;
527 } else { 527 } else {
528 //Opie::Core::owarn << "Emitting signalSwitch()" << oendl; 528 //owarn << "Emitting signalSwitch()" << oendl;
529 emit signalSwitch(); 529 emit signalSwitch();
530 } 530 }
531} 531}
532 532
@@ -561,9 +561,9 @@ QStringList AbTable::choiceSelection(int /*index*/) const
561 561
562 562
563void AbTable::updateVisible() 563void AbTable::updateVisible()
564{ 564{
565 //Opie::Core::owarn << "void AbTable::updateVisible()" << oendl; 565 //owarn << "void AbTable::updateVisible()" << oendl;
566 566
567 int visible, 567 int visible,
568 totalRows, 568 totalRows,
569 row, 569 row,
@@ -597,9 +597,9 @@ void AbTable::updateVisible()
597 597
598 598
599void AbTable::setPaintingEnabled( bool e ) 599void 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;
603 603
604 if ( e ) { 604 if ( e ) {
605 if ( countNested > 0 ) 605 if ( countNested > 0 )
@@ -614,14 +614,14 @@ void AbTable::setPaintingEnabled( bool e )
614 ++countNested; 614 ++countNested;
615 enablePainting = false; 615 enablePainting = false;
616 setUpdatesEnabled( false ); 616 setUpdatesEnabled( false );
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;
620} 620}
621 621
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;
625 if ( enablePainting ) 625 if ( enablePainting )
626 QTable::viewportPaintEvent( e ); 626 QTable::viewportPaintEvent( e );
627} 627}
@@ -630,9 +630,9 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool )
630 const QColorGroup &cg = colorGroup(); 630 const QColorGroup &cg = colorGroup();
631 631
632 p->save(); 632 p->save();
633 633
634 //Opie::Core::owarn << "Paint row: " << row << oendl; 634 //owarn << "Paint row: " << row << oendl;
635 635
636 Opie::OPimContact act_contact = m_viewList[row]; 636 Opie::OPimContact act_contact = m_viewList[row];
637 637
638 // Paint alternating background bars 638 // Paint alternating background bars
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
@@ -51,9 +51,9 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
51 m_viewStack( 0l ), 51 m_viewStack( 0l ),
52 m_abTable( 0l ), 52 m_abTable( 0l ),
53 m_orderedFields( ordered ) 53 m_orderedFields( 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.. !
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
59 mCat.load( categoryFileName() ); 59 mCat.load( categoryFileName() );
@@ -99,30 +99,30 @@ AbView::~AbView()
99 99
100 100
101void AbView::setView( Views view ) 101void 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;
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 Opie::Core::owarn << "AbView::AddContact" << oendl; 110 owarn << "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 Opie::Core::owarn << "AbView;:RemoveContact" << oendl; 117 owarn << "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 Opie::Core::owarn << "AbView::ReplaceContact" << oendl; 124 owarn << "AbView::ReplaceContact" << oendl;
125 m_contactdb->replace( contact ); 125 m_contactdb->replace( contact );
126 load(); 126 load();
127 127
128} 128}
@@ -144,16 +144,16 @@ Opie::OPimContact AbView::currentEntry()
144} 144}
145 145
146bool AbView::save() 146bool AbView::save()
147{ 147{
148 //Opie::Core::owarn << "AbView::Save data" << oendl; 148 //owarn << "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 Opie::Core::owarn << "AbView::Load data" << oendl; 155 owarn << "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();
159 159
@@ -165,17 +165,17 @@ void AbView::load()
165 if ( m_curr_category != -1 ) 165 if ( m_curr_category != -1 )
166 clearForCategory(); 166 clearForCategory();
167 } 167 }
168 168
169 Opie::Core::owarn << "Number of contacts: " << m_list.count() << oendl; 169 owarn << "Number of contacts: " << m_list.count() << oendl;
170 170
171 updateView( true ); 171 updateView( true );
172 172
173} 173}
174 174
175void AbView::reload() 175void AbView::reload()
176{ 176{
177 Opie::Core::owarn << "AbView::::reload()" << oendl; 177 owarn << "AbView::::reload()" << oendl;
178 178
179 m_contactdb->reload(); 179 m_contactdb->reload();
180 load(); 180 load();
181} 181}
@@ -186,9 +186,9 @@ void AbView::clear()
186} 186}
187 187
188void AbView::setShowByCategory( const QString& cat ) 188void 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
192 int intCat = 0; 192 int intCat = 0;
193 193
194 // All (cat == NULL) will be stored as -1 194 // All (cat == NULL) will be stored as -1
@@ -198,9 +198,9 @@ void AbView::setShowByCategory( const QString& cat )
198 intCat = mCat.id("Contacts", cat ); 198 intCat = mCat.id("Contacts", 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 // Opie::Core::owarn << "Categories: Selected " << cat << ".. Number: " 202 // owarn << "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;
206 emit signalClearLetterPicker(); 206 emit signalClearLetterPicker();
@@ -211,12 +211,12 @@ void AbView::setShowByCategory( const QString& cat )
211} 211}
212 212
213void AbView::setShowToView( Views view ) 213void 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;
220 m_curr_View = view; 220 m_curr_View = view;
221 221
222 updateView(); 222 updateView();
@@ -225,9 +225,9 @@ void AbView::setShowToView( Views view )
225} 225}
226 226
227void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) 227void 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
231 assert( mode < AbConfig::LASTELEMENT ); 231 assert( mode < AbConfig::LASTELEMENT );
232 232
233 Opie::OPimContact query; 233 Opie::OPimContact query;
@@ -248,9 +248,9 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
248 case AbConfig::FileAs: 248 case AbConfig::FileAs:
249 query.setFileAs( QString("%1*").arg(c) ); 249 query.setFileAs( QString("%1*").arg(c) );
250 break; 250 break;
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;
254 return; 254 return;
255 } 255 }
256 m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ); 256 m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase );
@@ -278,9 +278,9 @@ QString AbView::showCategory() const
278} 278}
279 279
280void AbView::showPersonal( bool personal ) 280void AbView::showPersonal( bool personal )
281{ 281{
282 Opie::Core::owarn << "void AbView::showPersonal( " << personal << " )" << oendl; 282 owarn << "void AbView::showPersonal( " << personal << " )" << oendl;
283 283
284 if ( personal ){ 284 if ( personal ){
285 285
286 if ( m_inPersonal ) 286 if ( m_inPersonal )
@@ -334,9 +334,9 @@ QStringList AbView::categories()
334// BEGIN: Slots 334// BEGIN: Slots
335void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, 335void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
336 bool , QString cat ) 336 bool , QString cat )
337{ 337{
338 //Opie::Core::owarn << "void AbView::slotDoFind" << oendl; 338 //owarn << "void AbView::slotDoFind" << oendl;
339 339
340 // We reloading the data: Deselect Letterpicker 340 // We reloading the data: Deselect Letterpicker
341 emit signalClearLetterPicker(); 341 emit signalClearLetterPicker();
342 342
@@ -348,18 +348,18 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
348 else{ 348 else{
349 category = mCat.id("Contacts", cat ); 349 category = mCat.id("Contacts", cat );
350 } 350 }
351 351
352 //Opie::Core::owarn << "Find in Category " << category << oendl; 352 //owarn << "Find in Category " << category << oendl;
353 353
354 QRegExp r( str ); 354 QRegExp r( str );
355 r.setCaseSensitive( caseSensitive ); 355 r.setCaseSensitive( caseSensitive );
356 r.setWildcard( !useRegExp ); 356 r.setWildcard( !useRegExp );
357 357
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 //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 ){
363 emit signalNotFound(); 363 emit signalNotFound();
364 return; 364 return;
365 } 365 }
@@ -381,18 +381,18 @@ void AbView::offSearch()
381 load(); 381 load();
382} 382}
383 383
384void AbView::slotSwitch(){ 384void AbView::slotSwitch(){
385 //Opie::Core::owarn << "AbView::slotSwitch()" << oendl; 385 //owarn << "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 Opie::Core::owarn << "Switching to CardView" << oendl; 390 owarn << "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 Opie::Core::owarn << "Switching to TableView" << oendl; 394 owarn << "Switching to TableView" << oendl;
395 m_curr_View = TableView; 395 m_curr_View = TableView;
396 break; 396 break;
397 } 397 }
398 updateView(); 398 updateView();
@@ -409,9 +409,9 @@ void AbView::clearForCategory()
409 Opie::OPimContactAccess::List allList = m_list; 409 Opie::OPimContactAccess::List allList = m_list;
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 //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() );
415 } 415 }
416 } 416 }
417 } 417 }
@@ -419,32 +419,32 @@ void AbView::clearForCategory()
419} 419}
420 420
421bool AbView::contactCompare( const Opie::OPimContact &cnt, int category ) 421bool 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;
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 //Opie::Core::owarn << "Number of categories: " << cats.count() << oendl; 430 //owarn << "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 )
434 // Contacts with no category will just shown on "All" and "Unfiled" 434 // Contacts with no category will just shown on "All" and "Unfiled"
435 returnMe = true; 435 returnMe = true;
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 //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 ) {
441 returnMe = true; 441 returnMe = true;
442 break; 442 break;
443 } 443 }
444 } 444 }
445 } 445 }
446 //Opie::Core::owarn << "Return: " << returnMe << oendl; 446 //owarn << "Return: " << returnMe << oendl;
447 return returnMe; 447 return returnMe;
448} 448}
449 449
450// In Some rare cases we have to update all lists.. 450// In Some rare cases we have to update all lists..
@@ -455,9 +455,9 @@ void AbView::updateListinViews()
455} 455}
456 456
457void AbView::updateView( bool newdata ) 457void AbView::updateView( bool newdata )
458{ 458{
459 //Opie::Core::owarn << "AbView::updateView()" << oendl; 459 //owarn << "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();
463 } 463 }
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
@@ -250,9 +250,9 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
250 m_curFontSize = m_config.fontSize(); 250 m_curFontSize = m_config.fontSize();
251 251
252 setCentralWidget(listContainer); 252 setCentralWidget(listContainer);
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() ) );
256 connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) ); 256 connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) );
257 connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ), 257 connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
258 this, SLOT( appMessage(const QCString&,const QByteArray&) ) ); 258 this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
@@ -266,12 +266,12 @@ void AddressbookWindow::slotConfig()
266{ 266{
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 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();
275 emit slotSetFont( m_curFontSize ); 275 emit slotSetFont( m_curFontSize );
276 } 276 }
277 m_abView -> setListOrder( m_config.orderList() ); 277 m_abView -> setListOrder( m_config.orderList() );
@@ -282,9 +282,9 @@ void AddressbookWindow::slotConfig()
282 282
283 283
284void AddressbookWindow::slotSetFont( int size ) 284void AddressbookWindow::slotSetFont( int size )
285{ 285{
286 Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl; 286 owarn << "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;
290 290
@@ -324,12 +324,12 @@ void AddressbookWindow::importvCard() {
324 324
325} 325}
326void AddressbookWindow::exportvCard() 326void 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();
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,
335 filename ); 335 filename );
@@ -349,9 +349,9 @@ void AddressbookWindow::exportvCard()
349} 349}
350 350
351void AddressbookWindow::setDocument( const QString &filename ) 351void 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
355 if ( filename.find(".vcf") != int(filename.length()) - 4 ){ 355 if ( filename.find(".vcf") != int(filename.length()) - 4 ){
356 356
357 357
@@ -361,12 +361,12 @@ void AddressbookWindow::setDocument( const QString &filename )
361 tr( "&Yes" ), tr( "&No" ), QString::null, 361 tr( "&Yes" ), tr( "&No" ), QString::null,
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 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;
370 break; 370 break;
371 } 371 }
372 } 372 }
@@ -374,9 +374,9 @@ void AddressbookWindow::setDocument( const QString &filename )
374 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, 374 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
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 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
380 if ( !allList.count() ) { 380 if ( !allList.count() ) {
381 QMessageBox::information( this, "Import VCard", 381 QMessageBox::information( this, "Import VCard",
382 "It was impossible to import\nthe VCard.\n" 382 "It was impossible to import\nthe VCard.\n"
@@ -385,25 +385,25 @@ void AddressbookWindow::setDocument( const QString &filename )
385 385
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 Opie::Core::owarn << "Adding Contact from: " << (*it).fullName() << oendl; 389 owarn << "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?" )
393 .arg( (*it).fullName().latin1() ), 393 .arg( (*it).fullName().latin1() ),
394 tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"), 394 tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"),
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 Opie::Core::owarn << "YES clicked" << oendl; 398 owarn << "YES clicked" << oendl;
399 m_abView->addEntry( *it ); 399 m_abView->addEntry( *it );
400 break; 400 break;
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;
407 break; 407 break;
408 } 408 }
409 }else 409 }else
@@ -537,21 +537,21 @@ void AddressbookWindow::writeMail()
537 537
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 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)");
545 e << name << email; 545 e << name << email;
546 return; 546 return;
547 } else 547 } else
548 m_config.setUseOpieMail( true ); 548 m_config.setUseOpieMail( true );
549 } 549 }
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)");
555 e << name << email; 555 e << name << email;
556 return; 556 return;
557 } else 557 } else
@@ -591,9 +591,9 @@ void AddressbookWindow::slotBeam()
591 591
592 beamFilename = beamfile; 592 beamFilename = beamfile;
593 } 593 }
594 594
595 Opie::Core::owarn << "Beaming: " << beamFilename << oendl; 595 owarn << "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*) ) );
599 QString description = c.fullName(); 599 QString description = c.fullName();
@@ -638,9 +638,9 @@ static void parseName( const QString& name, QString *first, QString *middle,
638 638
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 Opie::Core::owarn << "Receiving QCop-Call with message " << msg << oendl; 642 owarn << "Receiving QCop-Call with message " << msg << oendl;
643 643
644 644
645 if (msg == "editPersonal()") { 645 if (msg == "editPersonal()") {
646 editPersonal(); 646 editPersonal();
@@ -654,9 +654,9 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
654 654
655 Opie::OPimContact cnt; 655 Opie::OPimContact cnt;
656 QString fn, mn, ln; 656 QString fn, mn, ln;
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 );
660 cnt.setMiddleName( mn ); 660 cnt.setMiddleName( mn );
661 cnt.setLastName( ln ); 661 cnt.setLastName( ln );
662 cnt.insertEmails( email ); 662 cnt.insertEmails( email );
@@ -681,9 +681,9 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
681 QDataStream stream(data,IO_ReadOnly); 681 QDataStream stream(data,IO_ReadOnly);
682 int uid; 682 int uid;
683 stream >> uid; 683 stream >> uid;
684 684
685 Opie::Core::owarn << "Showing uid: " << uid << oendl; 685 owarn << "Showing uid: " << uid << oendl;
686 686
687 // Deactivate Personal View.. 687 // Deactivate Personal View..
688 if ( actionPersonal->isOn() ){ 688 if ( actionPersonal->isOn() ){
689 actionPersonal->setOn( false ); 689 actionPersonal->setOn( false );
@@ -761,9 +761,9 @@ void AddressbookWindow::editPersonal()
761 761
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 Opie::Core::owarn << "*** ++++" << oendl; 765 owarn << "*** ++++" << oendl;
766 actionPersonal->setOn( true ); 766 actionPersonal->setOn( true );
767 slotPersonalView(); 767 slotPersonalView();
768 } 768 }
769 769
@@ -780,12 +780,12 @@ void AddressbookWindow::editPersonal()
780 780
781 781
782void AddressbookWindow::slotPersonalView() 782void 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") );
789 actionNew->setEnabled(TRUE); 789 actionNew->setEnabled(TRUE);
790 actionTrash->setEnabled(TRUE); 790 actionTrash->setEnabled(TRUE);
791 actionFind->setEnabled(TRUE); 791 actionFind->setEnabled(TRUE);
@@ -796,9 +796,9 @@ void AddressbookWindow::slotPersonalView()
796 796
797 return; 797 return;
798 } 798 }
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.
802 actionNew->setEnabled(FALSE); 802 actionNew->setEnabled(FALSE);
803 actionTrash->setEnabled(FALSE); 803 actionTrash->setEnabled(FALSE);
804 actionFind->setEnabled(FALSE); 804 actionFind->setEnabled(FALSE);
@@ -886,26 +886,26 @@ void AddressbookWindow::slotSave()
886 886
887 887
888void AddressbookWindow::slotNotFound() 888void 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" ),
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
894 894
895} 895}
896void AddressbookWindow::slotWrapAround() 896void AddressbookWindow::slotWrapAround()
897{ 897{
898 Opie::Core::owarn << "Got wrap signal!" << oendl; 898 owarn << "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" );
902 902
903} 903}
904 904
905void AddressbookWindow::slotSetCategory( int c ) 905void 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;
909 909
910 QString cat, book; 910 QString cat, book;
911 AbView::Views view = AbView::TableView; 911 AbView::Views view = AbView::TableView;
@@ -939,9 +939,9 @@ void AddressbookWindow::slotSetCategory( int c )
939 }else if ( i == 3 ){ // default All Categories 939 }else if ( i == 3 ){ // default All Categories
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 Opie::Core::owarn << "Unfiled selected!" << oendl; 943 owarn << "Unfiled selected!" << oendl;
944 }else{ 944 }else{
945 cat = m_abView->categories()[i - 4]; 945 cat = m_abView->categories()[i - 4];
946 } 946 }
947 } 947 }
@@ -962,9 +962,9 @@ void AddressbookWindow::slotSetCategory( int c )
962} 962}
963 963
964void AddressbookWindow::slotViewSwitched( int view ) 964void 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;
968 968
969 // Switch to selected view 969 // Switch to selected view
970 switch ( view ){ 970 switch ( view ){
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
@@ -42,9 +42,9 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
42} 42}
43 43
44void ConfigDlg::slotItemUp() 44void ConfigDlg::slotItemUp()
45{ 45{
46 Opie::Core::owarn << "void ConfigDlg::slotItemUp()" << oendl; 46 owarn << "void ConfigDlg::slotItemUp()" << oendl;
47 47
48 int i = fieldListBox->currentItem(); 48 int i = fieldListBox->currentItem();
49 if ( i > 0 ) { 49 if ( i > 0 ) {
50 QString item = fieldListBox->currentText(); 50 QString item = fieldListBox->currentText();
@@ -56,9 +56,9 @@ void ConfigDlg::slotItemUp()
56} 56}
57 57
58void ConfigDlg::slotItemDown() 58void ConfigDlg::slotItemDown()
59{ 59{
60 Opie::Core::owarn << "void ConfigDlg::slotItemDown()" << oendl; 60 owarn << "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 ) {
64 QString item = fieldListBox->currentText(); 64 QString item = fieldListBox->currentText();
@@ -69,21 +69,21 @@ void ConfigDlg::slotItemDown()
69} 69}
70 70
71void ConfigDlg::slotItemAdd() 71void ConfigDlg::slotItemAdd()
72{ 72{
73 Opie::Core::owarn << "void ConfigDlg::slotItemAdd()" << oendl; 73 owarn << "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 Opie::Core::owarn << "Adding " << item << oendl; 78 owarn << "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 Opie::Core::owarn << "void ConfigDlg::slotItemRemove()" << oendl; 85 owarn << "void ConfigDlg::slotItemRemove()" << oendl;
86 86
87 int i = fieldListBox->currentItem(); 87 int i = fieldListBox->currentItem();
88 if ( i > 0 ) { 88 if ( i > 0 ) {
89 fieldListBox->removeItem( i ); 89 fieldListBox->removeItem( i );
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
@@ -77,9 +77,9 @@ ContactEditor::ContactEditor( const Opie::OPimContact &entry,
77ContactEditor::~ContactEditor() { 77ContactEditor::~ContactEditor() {
78} 78}
79 79
80void ContactEditor::init() { 80void ContactEditor::init() {
81 Opie::Core::owarn << "init() START" << oendl; 81 owarn << "init() START" << oendl;
82 82
83 uint i = 0; 83 uint i = 0;
84 84
85 QStringList trlChooserNames; 85 QStringList trlChooserNames;
@@ -686,20 +686,20 @@ void ContactEditor::init() {
686 new QPEDialogListener(this); 686 new QPEDialogListener(this);
687 687
688 setPersonalView ( m_personalView ); 688 setPersonalView ( m_personalView );
689 689
690 Opie::Core::owarn << "init() END" << oendl; 690 owarn << "init() END" << oendl;
691} 691}
692 692
693void ContactEditor::defaultEmailChanged(int i){ 693void ContactEditor::defaultEmailChanged(int i){
694 Opie::Core::odebug << "defaultEmailChanged" << oendl; 694 odebug << "defaultEmailChanged" << oendl;
695 695
696 // was sollte das ? (se) 696 // was sollte das ? (se)
697 // int index = cmbChooserField1->currentItem(); 697 // int index = cmbChooserField1->currentItem();
698 // slChooserValues[index] = cmbDefaultEmail->text(i); 698 // slChooserValues[index] = cmbDefaultEmail->text(i);
699 699
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
703} 703}
704 704
705void ContactEditor::populateDefaultEmailCmb(){ 705void ContactEditor::populateDefaultEmailCmb(){
@@ -716,14 +716,14 @@ void ContactEditor::populateDefaultEmailCmb(){
716 716
717 // Select default email in combo.. 717 // Select default email in combo..
718 bool found = false; 718 bool found = false;
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;
722 722
723 if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){ 723 if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
724 cmbDefaultEmail->setCurrentItem( i ); 724 cmbDefaultEmail->setCurrentItem( i );
725 Opie::Core::odebug << "set" << oendl; 725 odebug << "set" << oendl;
726 found = true; 726 found = true;
727 } 727 }
728 } 728 }
729 729
@@ -737,17 +737,17 @@ void ContactEditor::populateDefaultEmailCmb(){
737// "true" returned if the change was chandled by this function, else it should 737// "true" returned if the change was chandled by this function, else it should
738// be handled by something else.. 738// be handled by something else..
739bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) { 739bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
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;
743 743
744 if ( !initializing ) 744 if ( !initializing )
745 contactfields.setFieldOrder( widgetPos-1, index ); 745 contactfields.setFieldOrder( widgetPos-1, index );
746 746
747 // Create and connect combobox for selecting the default email 747 // Create and connect combobox for selecting the default email
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;
751 751
752 // More than one default-email chooser is not allowed ! 752 // More than one default-email chooser is not allowed !
753 if ( ( defaultEmailChooserPosition != -1 ) && 753 if ( ( defaultEmailChooserPosition != -1 ) &&
@@ -779,9 +779,9 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
779 779
780 780
781 } else { 781 } else {
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 ){
785 defaultEmailChooserPosition = -1; 785 defaultEmailChooserPosition = -1;
786 } 786 }
787 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); 787 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
@@ -804,9 +804,9 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
804 804
805// Currently accessed when we select default-email more than once ! 805// Currently accessed when we select default-email more than once !
806void ContactEditor::chooserError( int index ) 806void 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",
810 "Multiple selection of this\n" 810 "Multiple selection of this\n"
811 "Item is not allowed !\n\n" 811 "Item is not allowed !\n\n"
812 "First deselect the previous one !", 812 "First deselect the previous one !",
@@ -840,20 +840,20 @@ void ContactEditor::chooserError( int index )
840void ContactEditor::chooserChange( const QString &textChanged, int index, 840void ContactEditor::chooserChange( const QString &textChanged, int index,
841 QLineEdit* , int widgetPos ) { 841 QLineEdit* , int widgetPos ) {
842 842
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
846 << " )" << oendl; 846 << " )" << oendl;
847 847
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;
851 851
852 populateDefaultEmailCmb(); 852 populateDefaultEmailCmb();
853 853
854 }else if (type == "Emails"){ 854 }else if (type == "Emails"){
855 Opie::Core::odebug << "emails" << oendl; 855 odebug << "emails" << oendl;
856 856
857 QString de; 857 QString de;
858 emails = QStringList::split (",", textChanged ); 858 emails = QStringList::split (",", textChanged );
859 859
@@ -864,25 +864,25 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
864 864
865} 865}
866 866
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);
870} 870}
871 871
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);
875 875
876} 876}
877 877
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);
881} 881}
882 882
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);
886} 886}
887 887
888void ContactEditor::slotAddressChange( const QString &textChanged ) { 888void ContactEditor::slotAddressChange( const QString &textChanged ) {
@@ -950,9 +950,9 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) {
950} 950}
951 951
952 952
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) ){
956 956
957 txtChooserField1->setText( slChooserValues[index] ); 957 txtChooserField1->setText( slChooserValues[index] );
958 txtChooserField1->setFocus(); 958 txtChooserField1->setFocus();
@@ -961,9 +961,9 @@ void ContactEditor::slotCmbChooser1Change( int index ) {
961 961
962} 962}
963 963
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
967 if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){ 967 if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){
968 968
969 txtChooserField2->setText( slChooserValues[index] ); 969 txtChooserField2->setText( slChooserValues[index] );
@@ -972,9 +972,9 @@ void ContactEditor::slotCmbChooser2Change( int index ) {
972 } 972 }
973} 973}
974 974
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
978 if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){ 978 if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){
979 979
980 txtChooserField3->setText( slChooserValues[index] ); 980 txtChooserField3->setText( slChooserValues[index] );
@@ -983,9 +983,9 @@ void ContactEditor::slotCmbChooser3Change( int index ) {
983 } 983 }
984} 984}
985 985
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
989 if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){ 989 if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){
990 990
991 txtChooserField4->setText( slChooserValues[index] ); 991 txtChooserField4->setText( slChooserValues[index] );
@@ -1028,9 +1028,9 @@ void ContactEditor::slotAddressTypeChange( int index ) {
1028} 1028}
1029 1029
1030void ContactEditor::slotFullNameChange( const QString &textChanged ) { 1030void ContactEditor::slotFullNameChange( const QString &textChanged ) {
1031 1031
1032 Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl; 1032 owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
1033 1033
1034 int index = cmbFileAs->currentItem(); 1034 int index = cmbFileAs->currentItem();
1035 1035
1036 cmbFileAs->clear(); 1036 cmbFileAs->clear();
@@ -1052,9 +1052,9 @@ void ContactEditor::slotSuffixChange( const QString& ) {
1052 slotFullNameChange( txtFullName->text() ); 1052 slotFullNameChange( txtFullName->text() );
1053} 1053}
1054 1054
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:
1058 // If no Fullname is given, we store the Company-Name as lastname 1058 // If no Fullname is given, we store the Company-Name as lastname
1059 // to handle it like a person.. 1059 // to handle it like a person..
1060 if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) ) 1060 if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) )
@@ -1134,22 +1134,22 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1134 QString strTitle; 1134 QString strTitle;
1135 int commapos; 1135 int commapos;
1136 bool haveLastName = false; 1136 bool haveLastName = false;
1137 1137
1138 Opie::Core::owarn << "Fullname: " << simplifiedName << oendl; 1138 owarn << "Fullname: " << simplifiedName << oendl;
1139 1139
1140 commapos = simplifiedName.find( ',', 0, TRUE); 1140 commapos = simplifiedName.find( ',', 0, TRUE);
1141 if ( commapos >= 0 ) { 1141 if ( commapos >= 0 ) {
1142 Opie::Core::owarn << " Commapos: " << commapos << oendl; 1142 owarn << " Commapos: " << commapos << oendl;
1143 1143
1144 // A comma (",") separates the lastname from one or 1144 // A comma (",") separates the lastname from one or
1145 // many first names. Thus, remove the lastname from the 1145 // many first names. Thus, remove the lastname from the
1146 // String and parse the firstnames. 1146 // String and parse the firstnames.
1147 1147
1148 strLastName = simplifiedName.left( commapos ); 1148 strLastName = simplifiedName.left( commapos );
1149 simplifiedName= simplifiedName.mid( commapos + 1 ); 1149 simplifiedName= simplifiedName.mid( commapos + 1 );
1150 haveLastName = true; 1150 haveLastName = true;
1151 Opie::Core::owarn << "Fullname without ',': " << simplifiedName << oendl; 1151 owarn << "Fullname without ',': " << simplifiedName << oendl;
1152 1152
1153 // If we have any lastname, we should now split all first names. 1153 // If we have any lastname, we should now split all first names.
1154 // The first one will be the used as first, the rest as "middle names" 1154 // The first one will be the used as first, the rest as "middle names"
1155 1155
@@ -1181,12 +1181,12 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1181 1181
1182 if ( strFirstName == strLastName ) 1182 if ( strFirstName == strLastName )
1183 strFirstName = ""; 1183 strFirstName = "";
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
1190 switch (type) { 1190 switch (type) {
1191 case NAME_FL: 1191 case NAME_FL:
1192 return strFirstName + " " + strLastName; 1192 return strFirstName + " " + strLastName;
@@ -1267,9 +1267,9 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
1267 1267
1268 emails = QStringList(ent.emailList()); 1268 emails = QStringList(ent.emailList());
1269 defaultEmail = ent.defaultEmail(); 1269 defaultEmail = ent.defaultEmail();
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
1273 txtFirstName->setText( ent.firstName() ); 1273 txtFirstName->setText( ent.firstName() );
1274 txtMiddleName->setText( ent.middleName() ); 1274 txtMiddleName->setText( ent.middleName() );
1275 txtLastName->setText( ent.lastName() ); 1275 txtLastName->setText( ent.lastName() );
@@ -1327,9 +1327,9 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
1327 QStringList::ConstIterator it; 1327 QStringList::ConstIterator it;
1328 QListIterator<QLineEdit> itLE( listValue ); 1328 QListIterator<QLineEdit> itLE( listValue );
1329 for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) { 1329 for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) {
1330 1330
1331 Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl; 1331 owarn << " Filling dynamic Field: " << (*it) << oendl;
1332 1332
1333 if ( *it == "Department" ) 1333 if ( *it == "Department" )
1334 (*itLE)->setText( ent.department() ); 1334 (*itLE)->setText( ent.department() );
1335 1335
@@ -1351,9 +1351,9 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
1351 if ( *it == "Spouse" ) 1351 if ( *it == "Spouse" )
1352 (*itLE)->setText( ent.spouse() ); 1352 (*itLE)->setText( ent.spouse() );
1353 1353
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() );
1357 } 1357 }
1358 1358
1359 if ( *it == "Children" ) 1359 if ( *it == "Children" )
@@ -1584,10 +1584,10 @@ void ContactEditor::saveEntry() {
1584 QString allemail; 1584 QString allemail;
1585 QString defaultmail; 1585 QString defaultmail;
1586 parseEmailFrom( emails.join(","), defaultmail, allemail ); 1586 parseEmailFrom( emails.join(","), defaultmail, allemail );
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 );
1591 } 1591 }
1592 ent.setEmails( allemail ); 1592 ent.setEmails( allemail );
1593 } 1593 }
@@ -1737,15 +1737,15 @@ void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
1737} 1737}
1738 1738
1739void ContactEditor::slotRemoveBirthday() 1739void 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() );
1743 updateDatePicker(); 1743 updateDatePicker();
1744} 1744}
1745 1745
1746void ContactEditor::slotRemoveAnniversary() 1746void 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() );
1750 updateDatePicker(); 1750 updateDatePicker();
1751} 1751}
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
@@ -238,8 +238,8 @@ void LetterPicker::clear()
238} 238}
239 239
240void LetterPicker::newLetter( char letter ) 240void LetterPicker::newLetter( char letter )
241{ 241{
242 Opie::Core::owarn << "LetterClicked" << oendl; 242 owarn << "LetterClicked" << oendl;
243 emit letterClicked( letter ); 243 emit letterClicked( letter );
244 244
245} 245}