Use ODebug (135 down...), and remove libopiedb2 from dependencies

8 files changed, 170 insertions, 156 deletions

diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 70a66a0..8216d6f 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -20,7 +20,7 @@
 
 #include "ablabel.h"
 
-
+#include <opie2/odebug.h>
 
 AbLabel::AbLabel( QWidget *parent, const char *name ):
 	QTextView( parent, name ),
@@ -95,15 +95,15 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
 	if ( !m_empty ){
 		switch( e->key() ) {
 		case Qt::Key_Left:
-			qWarning( "Left..");
+			Opie::Core::owarn << "Left.." << oendl;
 		case Qt::Key_Right:
-			qWarning( "Right..");
+			Opie::Core::owarn << "Right.." << oendl;
 		case Qt::Key_F33:
-			qWarning( "OK..");
+			Opie::Core::owarn << "OK.." << oendl;
 			emit signalOkPressed();
 			break;
 		case Qt::Key_Up:
-			qWarning( "UP..");
+			Opie::Core::owarn << "Up.." << oendl;
 			if ( ( visibleHeight() < contentsHeight() ) &&
 			     ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) )
 				scrollBy( 0, -(visibleHeight()-20) );
@@ -117,10 +117,10 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
 
 			break;
 		case Qt::Key_Down:
-			qWarning( "DOWN..");
-// 			qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight());
-// 			qWarning( "value: %d; barMaxValue: %d", verticalScrollBar()->value()
-// 				  , verticalScrollBar()->maxValue() );
+			Opie::Core::owarn << "Down.." << oendl;
+//			Opie::Core::owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl;
+//			Opie::Core::owarn << "Value: " << verticalScrollBar()->value()
+//					<< ", barMaxValue: " << verticalScrollBar()->maxValue() << oendl;
 			if ( ( visibleHeight() < contentsHeight() ) &&
 			     ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) )
 				scrollBy( 0, visibleHeight()-20 );
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index cd77b13..cb57342 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -19,7 +19,7 @@
 **
 **********************************************************************/
 
-
+#include <opie2/odebug.h>
 #include <opie2/opimrecordlist.h>
 
 #include <qpe/timestring.h>
@@ -121,8 +121,7 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
 	  columnVisible( true ),
 	  countNested( 0 )
 {
-	//	qWarning("C'tor start");
-
+	//	Opie::Core::owarn << "C'tor start" << oendl;
 	setSelectionMode( NoSelection );
 	init();
 	setSorting( TRUE );
@@ -130,7 +129,7 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
 		 this, SLOT(itemClicked(int,int)) );
 
 	// contactList.clear();
-	//	qWarning("C'tor end");
+	//	Opie::Core::owarn << "C'tor end" << oendl;
 }
 
 AbTable::~AbTable()
@@ -152,7 +151,7 @@ void AbTable::init()
 
 void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
-	qWarning("AbTable::setContacts()");
+	Opie::Core::owarn << "AbTable::setContacts()" << oendl;
 
 	clear();
 	m_viewList = viewList;
@@ -184,13 +183,13 @@ void AbTable::setOrderedList( const QValueList<int> ordered )
 
 bool AbTable::selectContact( int UID )
 {
-	qWarning( "AbTable::selectContact( %d )", UID );
+	Opie::Core::owarn << "AbTable::selectContact( " << UID << " )" << oendl;
 	int rows = numRows();
 	Opie::OPimContact* foundContact = 0l;
 	bool found = false;
 
 	setPaintingEnabled( FALSE );
-	qWarning( "search start" );
+	Opie::Core::owarn << "Search start" << oendl;
 	for ( int r = 0; r < rows; ++r ) {
 		if ( m_viewList.uidAt( r ) == UID ){
 			ensureCellVisible( r, 0 );
@@ -199,7 +198,7 @@ bool AbTable::selectContact( int UID )
 			break;
 		}
 	}
-	qWarning( "search end" );
+	Opie::Core::owarn << "Search end" << oendl;
 
 	if ( !found ){
 		ensureCellVisible( 0,0 );
@@ -214,7 +213,8 @@ bool AbTable::selectContact( int UID )
 #if 0
 void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row )
 {
-	qWarning( "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, %d )", row );
+	Opie::Core::owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, "
+					<< row << " )" << oendl;
 	QString strName;
 	ContactItem contactItem;
 
@@ -257,7 +257,7 @@ void AbTable::columnClicked( int col )
 
 void AbTable::resort()
 {
-	qWarning( "void AbTable::resort() NOT POSSIBLE !!" );
+	Opie::Core::owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl;
 #if 0
 	setPaintingEnabled( FALSE );
 	if ( sorting() ) {
@@ -283,7 +283,7 @@ int AbTable::currentEntry_UID()
 
 void AbTable::clear()
 {
-	qWarning( "void AbTable::clear()" );
+	Opie::Core::owarn << "void AbTable::clear()" << oendl;
 	// contactList.clear();
 
 	setPaintingEnabled( FALSE );
@@ -301,7 +301,7 @@ void AbTable::clear()
 // Refresh updates column 2 if the contactsettings changed
 void AbTable::refresh()
 {
-	qWarning( "void AbTable::refresh() NOT IMPLEMENTED !!" );
+	Opie::Core::owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl;
 
 #if 0
 	int rows = numRows();
@@ -334,7 +334,7 @@ void AbTable::keyPressEvent( QKeyEvent *e )
 	if ( key >= 'A' && key <= 'Z' )
 		moveTo( key );
 
-	//	qWarning("Received key ..");
+	//		Opie::Core::owarn << "Received key .." << oendl;
 	switch( e->key() ) {
 	case Qt::Key_Space:
 	case Qt::Key_Return:
@@ -342,11 +342,11 @@ void AbTable::keyPressEvent( QKeyEvent *e )
 		emit signalSwitch();
 		break;
 // 	case Qt::Key_Up:
-// 		qWarning("a");
+// 		Opie::Core::owarn << "a" << oendl;
 // 		emit signalKeyUp();
 // 		break;
 // 	case Qt::Key_Down:
-// 		qWarning("b");
+// 		Opie::Core::owarn << "b" << oendl;
 // 		emit signalKeyDown();
 // 		break;
 	default:
@@ -357,7 +357,7 @@ void AbTable::keyPressEvent( QKeyEvent *e )
 
 void AbTable::moveTo( char c )
 {
-	qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" );
+	Opie::Core::owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl;
 
 #if 0
 	int rows = numRows();
@@ -423,7 +423,7 @@ void AbTable::resizeRows() {
 
 void AbTable::realignTable()
 {
-	//	qWarning( "void AbTable::realignTable()" );
+	//	Opie::Core::owarn << "void AbTable::realignTable()" << oendl;
 
 	setPaintingEnabled( FALSE );
 
@@ -473,7 +473,7 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
 
 void AbTable::fitColumns()
 {
-	qWarning( "void AbTable::fitColumns()" );
+	Opie::Core::owarn << "void AbTable::fitColumns()" << oendl;
 	int contentsWidth = visibleWidth() / 2;
 	// Fix to better value
 	// contentsWidth = 130;
@@ -485,7 +485,7 @@ void AbTable::fitColumns()
 		columnVisible = true;
 	}
 
-	//	qWarning("Width: %d", contentsWidth);
+	//	Opie::Core::owarn << "Width: " << contentsWidth << oendl;
 
 	setColumnWidth( 0, contentsWidth );
 	adjustColumn(1);
@@ -497,7 +497,7 @@ void AbTable::fitColumns()
 
 void AbTable::show()
 {
-	//	qWarning( "void AbTable::show()" );
+	//	Opie::Core::owarn << "void AbTable::show()" << oendl;
 	realignTable();
 	QTable::show();
 }
@@ -521,11 +521,11 @@ void AbTable::setChoiceNames( const QStringList& list)
 
 void AbTable::itemClicked(int,int col)
 {
-	//	qWarning( "AbTable::itemClicked(int, col:%d)", col);
+	//	Opie::Core::owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl;
 	if ( col == 2 ) {
 		return;
 	} else {
-		//		qWarning ("Emitting signalSwitch()");
+		//	Opie::Core::owarn << "Emitting signalSwitch()" << oendl;
 		emit signalSwitch();
 	}
 }
@@ -562,7 +562,7 @@ QStringList AbTable::choiceSelection(int /*index*/) const
 
 void AbTable::updateVisible()
 {
-	//	qWarning("void AbTable::updateVisible()");
+	//	Opie::Core::owarn << "void AbTable::updateVisible()" << oendl;
 
 	int visible,
 		totalRows,
@@ -598,7 +598,8 @@ void AbTable::updateVisible()
 
 void AbTable::setPaintingEnabled( bool e )
 {
-	//	qWarning("IN void AbTable::setPaintingEnabled( %d )->Nested: %d", e, countNested );
+	//	Opie::Core::owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: "
+	//						<< countNested << oendl;
 
 	if ( e ) {
 		if ( countNested > 0 )
@@ -614,11 +615,13 @@ void AbTable::setPaintingEnabled( bool e )
 		enablePainting = false;
 		setUpdatesEnabled( false );
 	}
-	//	qWarning("OUT void AbTable::setPaintingEnabled( %d )->Nested: %d", e, countNested );
+	//	Opie::Core::owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: "
+	//						<< countNested << oendl;
 }
 
 void AbTable::viewportPaintEvent( QPaintEvent* e ) {
-	//	qWarning(" void AbTable::viewportPaintEvent( QPaintEvent* e ) -> %d", enablePainting);
+	//	Opie::Core::owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> "
+	//						<< enablePainting << oendl;
 	if ( enablePainting )
 		QTable::viewportPaintEvent( e );
 }
@@ -628,7 +631,7 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
 
     p->save();
 
-    //qWarning( "Paint row: %d", row );
+	//	Opie::Core::owarn << "Paint row: " << row << oendl;
 
     Opie::OPimContact act_contact = m_viewList[row];
 
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index aa242b7..52e5f59 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -17,6 +17,7 @@
 #include "abview.h"
 
 #include <opie2/ocontactaccessbackend_vcard.h>
+#include <opie2/odebug.h>
 
 #include <qpe/global.h>
 
@@ -51,7 +52,7 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
 	m_abTable( 0l ),
 	m_orderedFields( ordered )
 {
-	qWarning("AbView::c'tor");
+	Opie::Core::owarn << "AbView::c'tor" << oendl;
 	// Load default database and handle syncing myself.. !
 	m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false );
 	m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available
@@ -99,28 +100,28 @@ AbView::~AbView()
 
 void AbView::setView( Views view )
 {
-	qWarning("AbView::setView( Views view )");
+	Opie::Core::owarn << "AbView::setView( Views view )" << oendl;
  	m_curr_View = view;
  	load();
 }
 
 void AbView::addEntry( const Opie::OPimContact &newContact )
 {
-	qWarning("abview:AddContact");
+	Opie::Core::owarn << "AbView::AddContact" << oendl;
 	m_contactdb->add ( newContact );
 	load();
 
 }
 void AbView::removeEntry( const int UID )
 {
-	qWarning("abview:RemoveContact");
+	Opie::Core::owarn << "AbView;:RemoveContact" << oendl;
 	m_contactdb->remove( UID );
 	load();
 }
 
 void AbView::replaceEntry( const Opie::OPimContact &contact )
 {
-	qWarning("abview:ReplaceContact");
+	Opie::Core::owarn << "AbView::ReplaceContact" << oendl;
 	m_contactdb->replace( contact );
 	load();
 
@@ -144,14 +145,14 @@ Opie::OPimContact AbView::currentEntry()
 
 bool AbView::save()
 {
-	//	qWarning("abView:Save data");
+	//	Opie::Core::owarn << "AbView::Save data" << oendl;
 
 	return m_contactdb->save();
 }
 
 void AbView::load()
 {
-	qWarning("abView:Load data");
+	Opie::Core::owarn << "AbView::Load data" << oendl;
 
 	// Letter Search is stopped at this place
 	emit signalClearLetterPicker();
@@ -165,7 +166,7 @@ void AbView::load()
 			clearForCategory();
 	}
 
-	qWarning ("Number of contacts: %d", m_list.count());
+	Opie::Core::owarn << "Number of contacts: " << m_list.count() << oendl;
 
 	updateView( true );
 
@@ -173,7 +174,7 @@ void AbView::load()
 
 void AbView::reload()
 {
-        qWarning( "void AbView::reload()" );
+	Opie::Core::owarn << "AbView::::reload()" << oendl;
 
 	m_contactdb->reload();
 	load();
@@ -186,7 +187,7 @@ void AbView::clear()
 
 void AbView::setShowByCategory( const QString& cat )
 {
-	qWarning("AbView::setShowCategory( const QString& cat )");
+	Opie::Core::owarn << "AbView::setShowCategory( const QString& cat )" << oendl;
 
 	int intCat = 0;
 
@@ -198,7 +199,8 @@ void AbView::setShowByCategory( const QString& cat )
 
 	// Just do anything if we really change the category
 	if ( intCat != m_curr_category ){
-		//		qWarning ("Categories: Selected %s.. Number: %d", cat.latin1(), m_curr_category);
+		//		Opie::Core::owarn << "Categories: Selected " << cat << ".. Number: "
+		//						<< m_curr_category << oendl;
 
 		m_curr_category = intCat;
 		emit signalClearLetterPicker();
@@ -210,10 +212,10 @@ void AbView::setShowByCategory( const QString& cat )
 
 void AbView::setShowToView( Views view )
 {
-       	qWarning("void AbView::setShowToView( View %d )", view);
+	Opie::Core::owarn << "void AbView::setShowToView( View " << view << " )" << oendl;
 
 	if ( m_curr_View != view ){
-		qWarning ("Change the View (Category is: %d)", m_curr_category);
+		Opie::Core::owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl;
 		m_prev_View = m_curr_View;
 		m_curr_View = view;
 
@@ -224,7 +226,7 @@ void AbView::setShowToView( Views view )
 
 void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 {
-	qWarning("void AbView::setShowByLetter( %c, %d )", c, mode );
+	Opie::Core::owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
 
 	assert( mode < AbConfig::LASTELEMENT );
 
@@ -247,8 +249,8 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 			query.setFileAs( QString("%1*").arg(c) );
 			break;
 		default:
-			qWarning( "Unknown Searchmode for AbView::setShowByLetter ! -> %d", mode );
-			qWarning( "I will ignore it.." );
+			Opie::Core::owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl
+							<< "I will ignore it.." << oendl;
 			return;
 		}
 		m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase );
@@ -277,7 +279,7 @@ QString AbView::showCategory() const
 
 void AbView::showPersonal( bool personal )
 {
-	qWarning ("void AbView::showPersonal( %d )", personal);
+	Opie::Core::owarn << "void AbView::showPersonal( " << personal << " )" << oendl;
 
 	if ( personal ){
 
@@ -333,7 +335,7 @@ QStringList AbView::categories()
 void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
 			 bool , QString cat )
 {
-	//	qWarning( "void AbView::slotDoFind" );
+	//	Opie::Core::owarn << "void AbView::slotDoFind" << oendl;
 
 	// We reloading the data: Deselect Letterpicker
 	emit signalClearLetterPicker();
@@ -347,7 +349,7 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
 		category = mCat.id("Contacts", cat );
 	}
 
-	//	qWarning ("Find in Category %d", category);
+	//	Opie::Core::owarn << "Find in Category " << category << oendl;
 
 	QRegExp r( str );
 	r.setCaseSensitive( caseSensitive );
@@ -356,7 +358,7 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
 	// Get all matching entries out of the database
 	m_list = m_contactdb->matchRegexp( r );
 
-	//	qWarning( "found: %d", m_list.count() );
+	//	Opie::Core::owarn << "Found: " << m_list.count() << oendl;
 	if ( m_list.count() == 0 ){
 		emit signalNotFound();
 		return;
@@ -380,16 +382,16 @@ void AbView::offSearch()
 }
 
 void AbView::slotSwitch(){
-	//	qWarning("AbView::slotSwitch()");
+	//	Opie::Core::owarn << "AbView::slotSwitch()" << oendl;
 
 	m_prev_View = m_curr_View;
 	switch ( (int) m_curr_View ){
 	case TableView:
-		qWarning("Switching to CardView");
+		Opie::Core::owarn << "Switching to CardView" << oendl;
 		m_curr_View = CardView;
 		break;
 	case CardView:
-		qWarning("Switching to TableView");
+		Opie::Core::owarn << "Switching to TableView" << oendl;
 		m_curr_View = TableView;
 		break;
 	}
@@ -408,7 +410,7 @@ void AbView::clearForCategory()
 	if ( m_curr_category != -1 ){
 		for ( it = allList.begin(); it != allList.end(); ++it ){
 			if ( !contactCompare( *it, m_curr_category ) ){
-				//				qWarning("Removing %d", (*it).uid());
+				//Opie::Core::owarn << "Removing " << (*it).uid() << oendl;
 				m_list.remove( (*it).uid() );
 			}
 		}
@@ -418,13 +420,14 @@ void AbView::clearForCategory()
 
 bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
 {
-	//	qWarning ("bool AbView::contactCompare( const Opie::OPimContact &cnt, %d )", category);
+	//	Opie::Core::owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
+	//					<< category << " )" << oendl;
 
 	bool returnMe;
 	QArray<int> cats;
 	cats = cnt.categories();
 
-	//	qWarning ("Number of categories: %d", cats.count() );
+	//	Opie::Core::owarn << "Number of categories: " << cats.count() << oendl;
 
 	returnMe = false;
 	if ( cats.count() == 0 && category == 0 )
@@ -433,14 +436,14 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
 	else {
 		int i;
 		for ( i = 0; i < int(cats.count()); i++ ) {
-			//			qWarning("Comparing %d with %d",cats[i],category );
+			//Opie::Core::owarn << "Comparing " << cats[i] << " with " << category << oendl;
 			if ( cats[i] == category ) {
 				returnMe = true;
 				break;
 			}
 		}
 	}
-	//	qWarning ("Return: %d", returnMe);
+	//	Opie::Core::owarn << "Return: " << returnMe << oendl;
 	return returnMe;
 }
 
@@ -453,7 +456,7 @@ void AbView::updateListinViews()
 
 void  AbView::updateView( bool newdata )
 {
-	//	qWarning("AbView::updateView()");
+	//	Opie::Core::owarn << "AbView::updateView()" << oendl;
 
 	if ( m_viewStack -> visibleWidget() ){
 		m_viewStack -> visibleWidget() -> clearFocus();
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 9ae66d1..94c0a13 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -22,7 +22,7 @@
 // #include "addresssettings.h"
 #include "addressbook.h"
 
-
+#include <opie2/odebug.h>
 #include <opie2/ofileselector.h>
 #include <opie2/ofiledialog.h>
 #include <opie2/opimcontact.h>
@@ -251,7 +251,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
 	setCentralWidget(listContainer);
 
-	//    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
+	//	Opie::Core::odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl;
 	connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
 	connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) );
 	connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
@@ -267,10 +267,10 @@ void AddressbookWindow::slotConfig()
 	ConfigDlg* dlg = new ConfigDlg( this, "Config" );
 	dlg -> setConfig( m_config );
 	if ( QPEApplication::execDialog( dlg ) ) {
-		qWarning ("Config Dialog accepted!");
+		Opie::Core::owarn << "Config Dialog accepted!" << oendl;
 		m_config = dlg -> getConfig();
 		if ( m_curFontSize != m_config.fontSize() ){
-			qWarning("Font was changed!");
+			Opie::Core::owarn << "Font was changed!" << oendl;
 			m_curFontSize = m_config.fontSize();
 			emit slotSetFont( m_curFontSize );
 		}
@@ -283,7 +283,7 @@ void AddressbookWindow::slotConfig()
 
 void AddressbookWindow::slotSetFont( int size )
 {
-	qWarning("void AddressbookWindow::slotSetFont( %d )", size);
+	Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
 
 	if (size > 2 || size < 0)
 		size = 1;
@@ -325,10 +325,10 @@ void AddressbookWindow::importvCard() {
 }
 void AddressbookWindow::exportvCard()
 {
-	qWarning(" void AddressbookWindow::exportvCard()");
+	Opie::Core::owarn << "void AddressbookWindow::exportvCard()" << oendl;
         QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
         if( !filename.isEmpty() &&  ( filename[filename.length()-1] != '/' ) ){
-		qWarning(" Save to file %s, (%d)", filename.latin1(), filename.length()-1 );
+		Opie::Core::owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl;
 		Opie::OPimContact curCont = m_abView->currentEntry();
 		if ( !curCont.isEmpty() ){
 			Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
@@ -350,7 +350,7 @@ void AddressbookWindow::exportvCard()
 
 void AddressbookWindow::setDocument( const QString &filename )
 {
-	qWarning( "void AddressbookWindow::setDocument( %s )", filename.latin1() );
+	Opie::Core::owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
 
 	if ( filename.find(".vcf") != int(filename.length()) - 4 ){
 
@@ -362,10 +362,10 @@ void AddressbookWindow::setDocument( const QString &filename )
 						  0,      // Enter == button 0
 						  2 ) ) { // Escape == button 2
 		case 0:
-			qWarning("YES clicked");
+			Opie::Core::owarn << "YES clicked" << oendl;
 			break;
 		case 1:
-			qWarning("NO clicked");
+			Opie::Core::owarn << "NO clicked" << oendl;
 			return;
 			break;
 		}
@@ -375,7 +375,7 @@ void AddressbookWindow::setDocument( const QString &filename )
 									 filename );
 	Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
 	Opie::OPimContactAccess::List allList = access->allRecords();
-	qWarning( "Found number of contacts in File: %d", allList.count() );
+	Opie::Core::owarn << "Found number of contacts in File: " << allList.count() << oendl;
 
 	if ( !allList.count() ) {
 		QMessageBox::information( this, "Import VCard",
@@ -386,7 +386,7 @@ void AddressbookWindow::setDocument( const QString &filename )
 	bool doAsk = true;
 	Opie::OPimContactAccess::List::Iterator it;
 	for ( it = allList.begin(); it != allList.end(); ++it ){
-		qWarning("Adding Contact from: %s", (*it).fullName().latin1() );
+		Opie::Core::owarn << "Adding Contact from: " << (*it).fullName() << oendl;
 		if ( doAsk ){
 			switch( QMessageBox::information( this, tr ( "Add Contact?" ),
 							  tr( "Do you really want add contact for \n%1?" )
@@ -395,14 +395,14 @@ void AddressbookWindow::setDocument( const QString &filename )
 							  0,      // Enter == button 0
 							  2 ) ) { // Escape == button 2
 			case 0:
-				qWarning("YES clicked");
+				Opie::Core::owarn << "YES clicked" << oendl;
 				m_abView->addEntry( *it );
 				break;
 			case 1:
-				qWarning("NO clicked");
+				Opie::Core::owarn << "NO clicked" << oendl;
 				break;
 			case 2:
-				qWarning("YesAll clicked");
+				Opie::Core::owarn << "YesAll clicked" << oendl;
 				doAsk = false;
 				break;
 			}
@@ -538,9 +538,9 @@ void AddressbookWindow::writeMail()
 	// Try to access the preferred. If not possible, try to
 	// switch to the other one..
 	if ( m_config.useQtMail() ){
-		qWarning ("Accessing: %s", (basepath + "/bin/qtmail").latin1());
-	        if ( QFile::exists( basepath + "/bin/qtmail" ) ){
-			qWarning ("QCop");
+		Opie::Core::owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
+		if ( QFile::exists( basepath + "/bin/qtmail" ) ){
+			Opie::Core::owarn << "QCop" << oendl;
 			QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
 			e << name << email;
 			return;
@@ -548,9 +548,9 @@ void AddressbookWindow::writeMail()
 			m_config.setUseOpieMail( true );
 	}
 	if ( m_config.useOpieMail() ){
-		qWarning ("Accessing: %s", (basepath + "/bin/opiemail").latin1());
+		Opie::Core::owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
 		if ( QFile::exists( basepath + "/bin/opiemail" ) ){
-			qWarning ("QCop");
+			Opie::Core::owarn << "QCop" << oendl;
 			QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)");
 			e << name << email;
 			return;
@@ -592,7 +592,7 @@ void AddressbookWindow::slotBeam()
 		beamFilename = beamfile;
 	}
 
-	qWarning("Beaming: %s", beamFilename.latin1() );
+	Opie::Core::owarn << "Beaming: " << beamFilename << oendl;
 
 	Ir *ir = new Ir( this );
 	connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
@@ -639,7 +639,7 @@ static void parseName( const QString& name, QString *first, QString *middle,
 void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
         bool needShow = FALSE;
-        qWarning("Receiving QCop-Call with message %s", QString( msg ).latin1() );
+		Opie::Core::owarn << "Receiving QCop-Call with message " << msg << oendl;
 
 
 	if (msg == "editPersonal()") {
@@ -655,7 +655,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 		Opie::OPimContact cnt;
 		QString fn, mn, ln;
 		parseName( name, &fn, &mn, &ln );
-		//  qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
+		//	Opie::Core::odebug << " " << fn << " - " << mn " - " << ln << oendl;
 		cnt.setFirstName( fn );
 		cnt.setMiddleName( mn );
 		cnt.setLastName( ln );
@@ -682,7 +682,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 		int uid;
 		stream >> uid;
 
-		qWarning( "Showing uid: %d" , uid );
+		Opie::Core::owarn << "Showing uid: " << uid << oendl;
 
 		// Deactivate Personal View..
 		if ( actionPersonal->isOn() ){
@@ -762,7 +762,7 @@ void AddressbookWindow::editPersonal()
 	// Switch to personal view if not selected
 	// but take care of the menu, too
 	if ( ! actionPersonal->isOn() ){
-		qWarning("*** ++++");
+		Opie::Core::owarn << "*** ++++" << oendl;
 		actionPersonal->setOn( true );
 		slotPersonalView();
 	}
@@ -781,10 +781,10 @@ void AddressbookWindow::editPersonal()
 
 void AddressbookWindow::slotPersonalView()
 {
-	qWarning("slotPersonalView()");
+	Opie::Core::owarn << "slotPersonalView()" << oendl;
 	if (!actionPersonal->isOn()) {
 		// we just turned it off
-		qWarning("slotPersonalView()-> OFF");
+		Opie::Core::owarn << "slotPersonalView()-> OFF" << oendl;
 		setCaption( tr("Contacts") );
 		actionNew->setEnabled(TRUE);
 		actionTrash->setEnabled(TRUE);
@@ -797,7 +797,7 @@ void AddressbookWindow::slotPersonalView()
 		return;
 	}
 
-	qWarning("slotPersonalView()-> ON");
+	Opie::Core::owarn << "slotPersonalView()-> ON" << oendl;
 	// XXX need to disable some QActions.
 	actionNew->setEnabled(FALSE);
 	actionTrash->setEnabled(FALSE);
@@ -887,7 +887,7 @@ void AddressbookWindow::slotSave()
 
 void AddressbookWindow::slotNotFound()
 {
-	qWarning("Got notfound signal!");
+	Opie::Core::owarn << "Got not found signal!" << oendl;
 	QMessageBox::information( this, tr( "Not Found" ),
 				 "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" );
 
@@ -895,7 +895,7 @@ void AddressbookWindow::slotNotFound()
 }
 void AddressbookWindow::slotWrapAround()
 {
-	qWarning("Got wrap signal!");
+	Opie::Core::owarn << "Got wrap signal!" << oendl;
 // 	if ( doNotifyWrapAround )
 // 		QMessageBox::information( this, tr( "End of list" ),
 // 					  tr( "End of list. Wrap around now...!" ) + "\n" );
@@ -904,7 +904,8 @@ void AddressbookWindow::slotWrapAround()
 
 void AddressbookWindow::slotSetCategory( int c )
 {
-	qWarning( "void AddressbookWindow::slotSetCategory( %d ) from %d", c, catMenu->count() );
+	Opie::Core::owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from "
+					<< catMenu->count() << oendl;
 
 	QString cat, book;
 	AbView::Views  view = AbView::TableView;
@@ -939,7 +940,7 @@ void AddressbookWindow::slotSetCategory( int c )
 				cat = QString::null;
 			}else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled
 				cat = "Unfiled";
-				qWarning ("Unfiled selected!");
+				Opie::Core::owarn << "Unfiled selected!" << oendl;
 			}else{
 				cat = m_abView->categories()[i - 4];
 			}
@@ -962,7 +963,7 @@ void AddressbookWindow::slotSetCategory( int c )
 
 void AddressbookWindow::slotViewSwitched( int view )
 {
-	qWarning( "void AddressbookWindow::slotViewSwitched( %d )", view );
+	Opie::Core::owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
 	int menu = 0;
 
 	// Switch to selected view
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index 6c98b5d..094dbda 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -1,5 +1,6 @@
 #include "configdlg.h"
 
+#include <opie2/odebug.h>
 #include <opie2/opimcontact.h>
 #include "opie2/opimcontactfields.h"
 
@@ -42,7 +43,7 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
 
 void ConfigDlg::slotItemUp()
 {
-	qWarning( "void ConfigDlg::slotItemUp()" );
+	Opie::Core::owarn << "void ConfigDlg::slotItemUp()" << oendl;
 
 	int i = fieldListBox->currentItem();
 	if ( i > 0 ) {
@@ -56,7 +57,7 @@ void ConfigDlg::slotItemUp()
 
 void ConfigDlg::slotItemDown()
 {
-	qWarning( "void ConfigDlg::slotItemDown()" );
+	Opie::Core::owarn << "void ConfigDlg::slotItemDown()" << oendl;
 
 	int i = fieldListBox->currentItem();
 	if ( i < (int)fieldListBox->count() - 1 ) {
@@ -69,19 +70,19 @@ void ConfigDlg::slotItemDown()
 
 void ConfigDlg::slotItemAdd()
 {
-	qWarning( "void ConfigDlg::slotItemAdd()" );
+	Opie::Core::owarn << "void ConfigDlg::slotItemAdd()" << oendl;
 
 	int i = allFieldListBox->currentItem();
 	if ( i > 0 ) {
 		QString item = allFieldListBox->currentText();
-		qWarning("ADding %s", item.latin1());
+		Opie::Core::owarn << "Adding " << item << oendl;
 		fieldListBox->insertItem( item );
 	}
 }
 
 void ConfigDlg::slotItemRemove()
 {
-	qWarning( "void ConfigDlg::slotItemRemove()" );
+	Opie::Core::owarn << "void ConfigDlg::slotItemRemove()" << oendl;
 
 	int i = fieldListBox->currentItem();
 	if ( i > 0 ) {
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 534666d..e496387 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -21,6 +21,7 @@
 
 #include "contacteditor.h"
 
+#include <opie2/odebug.h>
 #include <opie2/opimcontact.h>
 
 #include <qpe/categoryselect.h>
@@ -77,7 +78,7 @@ ContactEditor::~ContactEditor() {
 }
 
 void ContactEditor::init() {
-	qWarning("init() START");
+	Opie::Core::owarn << "init() START" << oendl;
 
 	uint i = 0;
 
@@ -686,18 +687,18 @@ void ContactEditor::init() {
 
 	setPersonalView ( m_personalView );
 
-	qWarning("init() END");
+	Opie::Core::owarn << "init() END" << oendl;
 }
 
 void ContactEditor::defaultEmailChanged(int i){
-	qDebug("defaultEmailChanged");
+	Opie::Core::odebug << "defaultEmailChanged" << oendl;
 
 	// was sollte das ? (se)
 // 	int index = cmbChooserField1->currentItem();
 // 	slChooserValues[index] = cmbDefaultEmail->text(i);
 
 	defaultEmail = cmbDefaultEmail->text(i);
-	qDebug ("Changed to: %s", defaultEmail.latin1());
+	Opie::Core::odebug << "Changed to: " << defaultEmail << oendl;
 
 }
 
@@ -716,12 +717,12 @@ void ContactEditor::populateDefaultEmailCmb(){
 	// Select default email in combo..
 	bool found = false;
 	for ( int i = 0; i < cmbDefaultEmail->count(); i++){
-		qDebug(" populateDefaultEmailCmb text >%s< defaultEmail >%s<",
-		       cmbDefaultEmail->text( i ).latin1(), defaultEmail.latin1());
+		Opie::Core::odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
+							<< "< defaultEmail >" << defaultEmail << "<" << oendl;
 
 		if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
 			cmbDefaultEmail->setCurrentItem( i );
-			qDebug("set");
+			Opie::Core::odebug << "set" << oendl;
 			found = true;
 		}
 	}
@@ -737,14 +738,16 @@ void ContactEditor::populateDefaultEmailCmb(){
 // be handled by something else..
 bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
 	QString type = slChooserNames[index];
-	qWarning("ContactEditor::cmbChooserChange -> Type: %s, WidgetPos: %d", type.latin1(), widgetPos );
+	Opie::Core::owarn << "ContactEditor::cmbChooserChange -> Type: " << type
+						<< ", WidgetPos: " << widgetPos << oendl;
 
 	if ( !initializing )
 		contactfields.setFieldOrder( widgetPos-1, index );
 
 	// Create and connect combobox for selecting the default email
         if ( type == "Default Email"){
-		qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition);
+		Opie::Core::owarn << "Choosing default-email (defaultEmailChooserPosition= "
+							<< defaultEmailChooserPosition << ") " << oendl;
 
 		// More than one default-email chooser is not allowed !
 		if ( ( defaultEmailChooserPosition != -1 ) &&
@@ -777,7 +780,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 
 	} else {
 		// Something else was selected: Hide combo..
-		qWarning(" Hiding default-email combo" );
+		Opie::Core::owarn << " Hiding default-email combo" << oendl;
 		if ( defaultEmailChooserPosition == widgetPos ){
 			defaultEmailChooserPosition = -1;
 		}
@@ -802,7 +805,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 // Currently accessed when we select default-email more than once !
 void ContactEditor::chooserError( int index )
 {
-	qWarning("ContactEditor::chooserError( %d )", index);
+	Opie::Core::owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
 	QMessageBox::warning( this, "Chooser Error",
 			      "Multiple selection of this\n"
 			      "Item is not allowed !\n\n"
@@ -838,17 +841,18 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
 				   QLineEdit* , int widgetPos ) {
 
 	QString type = slChooserNames[index]; // :SX
-	qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i",
-	       type.latin1(),textChanged.latin1(), index,  widgetPos );
+	Opie::Core::odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
+						<< textChanged << "< index=" << index << ", widgetPos=" << widgetPos
+						<< " )" << oendl;
 
         if ( type == "Default Email"){
-		qWarning ("??? Wozu??: %s", textChanged.latin1());
+		Opie::Core::owarn << "??? Wozu??: " << textChanged << oendl;
 		defaultEmail = textChanged;
 
 		populateDefaultEmailCmb();
 
         }else if (type == "Emails"){
-		qDebug("emails");
+		Opie::Core::odebug << "emails" << oendl;
 
 		QString de;
 		emails = QStringList::split (",", textChanged );
@@ -861,23 +865,23 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
 }
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
-	qWarning("ContactEditor::slotChooser1Change( %s )", textChanged.latin1());
+	Opie::Core::owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
 	chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
 }
 
 void ContactEditor::slotChooser2Change( const QString &textChanged ) {
-	qWarning("ContactEditor::slotChooser2Change( %s )", textChanged.latin1());
+	Opie::Core::owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
 	chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
 
 }
 
 void ContactEditor::slotChooser3Change( const QString &textChanged ) {
-	qWarning("ContactEditor::slotChooser3Change( %s )", textChanged.latin1());
+	Opie::Core::owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
 	chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
 }
 
 void ContactEditor::slotChooser4Change( const QString &textChanged ) {
-	qWarning("ContactEditor::slotChooser4Change( %s )", textChanged.latin1());
+	Opie::Core::owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
 	chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
 }
 
@@ -947,7 +951,7 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) {
 
 
 void ContactEditor::slotCmbChooser1Change( int index ) {
-	qWarning("ContactEditor::slotCmbChooser1Change( %d )", index);
+	Opie::Core::owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
 	if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
 
 		txtChooserField1->setText( slChooserValues[index] );
@@ -958,7 +962,7 @@ void ContactEditor::slotCmbChooser1Change( int index ) {
 }
 
 void ContactEditor::slotCmbChooser2Change( int index ) {
-	qWarning("ContactEditor::slotCmbChooser2Change( %d )", index);
+	Opie::Core::owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
 
 	if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){
 
@@ -969,7 +973,7 @@ void ContactEditor::slotCmbChooser2Change( int index ) {
 }
 
 void ContactEditor::slotCmbChooser3Change( int index ) {
-	qWarning("ContactEditor::slotCmbChooser3Change( %d )", index);
+	Opie::Core::owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
 
 	if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){
 
@@ -980,7 +984,7 @@ void ContactEditor::slotCmbChooser3Change( int index ) {
 }
 
 void ContactEditor::slotCmbChooser4Change( int index ) {
-	qWarning("ContactEditor::slotCmbChooser4Change( %d )", index);
+	Opie::Core::owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
 
 	if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){
 
@@ -1025,7 +1029,7 @@ void ContactEditor::slotAddressTypeChange( int index ) {
 
 void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 
-	qWarning( "ContactEditor::slotFullNameChange( %s )", textChanged.latin1() );
+	Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
 
 	int index = cmbFileAs->currentItem();
 
@@ -1049,7 +1053,7 @@ void ContactEditor::slotSuffixChange( const QString& ) {
 }
 
 void ContactEditor::slotOrganizationChange( const QString &textChanged ){
-	qWarning( "ContactEditor::slotOrganizationChange( %s )", textChanged.latin1() );
+	Opie::Core::owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl;
 	// Special handling for storing Companies:
 	// If no Fullname is given, we store the Company-Name as lastname
 	// to handle it like a person..
@@ -1131,11 +1135,11 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 	int commapos;
 	bool haveLastName = false;
 
-	qWarning("Fullname: %s", simplifiedName.latin1());
+	Opie::Core::owarn << "Fullname: " << simplifiedName << oendl;
 
 	commapos = simplifiedName.find( ',', 0, TRUE);
 	if ( commapos >= 0 ) {
-		qWarning(" Commapos: %d", commapos );
+		Opie::Core::owarn << " Commapos: " << commapos << oendl;
 
 		// A comma (",") separates the lastname from one or
 		// many first names. Thus, remove the lastname from the
@@ -1144,7 +1148,7 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 		strLastName = simplifiedName.left( commapos );
 		simplifiedName= simplifiedName.mid( commapos + 1 );
 		haveLastName = true;
-		qWarning("Fullname without ',': %s", simplifiedName.latin1());
+		Opie::Core::owarn << "Fullname without ',': " << simplifiedName << oendl;
 
 		// If we have any lastname, we should now split all first names.
 		// The first one will be the used as first, the rest as "middle names"
@@ -1178,10 +1182,10 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 	if ( strFirstName == strLastName )
 		strFirstName = "";
 
-	qWarning(" strFirstName: %s",  strFirstName.latin1());
-	qWarning(" strMiddleName: %s",  strMiddleName.latin1());
-	qWarning(" strLastName: %s",  strLastName.latin1());
-	qWarning(" strTitle: %s",  strTitle.latin1());
+	Opie::Core::owarn << "strFirstName: " << strFirstName << oendl;
+	Opie::Core::owarn << "strMiddletName: " << strMiddleName << oendl;
+	Opie::Core::owarn << "strLastName: " << strLastName << oendl;
+	Opie::Core::owarn << "strTitle: " << strTitle << oendl;
 
 	switch (type) {
 	case NAME_FL:
@@ -1264,7 +1268,7 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
 	emails = QStringList(ent.emailList());
 	defaultEmail = ent.defaultEmail();
 	if (defaultEmail.isEmpty()) defaultEmail = emails[0];
-	qDebug("default email=%s",defaultEmail.latin1());
+	Opie::Core::odebug << "default email=" << defaultEmail << oendl;
 
 	txtFirstName->setText( ent.firstName() );
 	txtMiddleName->setText( ent.middleName() );
@@ -1324,7 +1328,7 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
 	QListIterator<QLineEdit> itLE( listValue );
 	for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) {
 
-		qWarning(" Filling dynamic Field: %s", (*it).latin1() );
+		Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl;
 
 		if ( *it ==  "Department"  )
 			(*itLE)->setText( ent.department() );
@@ -1348,7 +1352,7 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
 			(*itLE)->setText( ent.spouse() );
 
 		if ( *it == "Nickname" ){
-			qWarning("**** Nichname: %s", ent.nickname().latin1() );
+			Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl;
 			(*itLE)->setText( ent.nickname() );
 		}
 
@@ -1581,8 +1585,8 @@ void ContactEditor::saveEntry() {
  			QString defaultmail;
 			parseEmailFrom( emails.join(","), defaultmail, allemail );
 			if ( defaultEmail.isEmpty() ){
-				qWarning("Default email was not set by user!");
-				qWarning("Using first email in list: %s", defaultmail.latin1());
+				Opie::Core::owarn << "Default email was not set by user!" << oendl;
+				Opie::Core::owarn << "Using first email in list: " << defaultmail << oendl;
 				ent.setDefaultEmail( defaultmail );
 			}
  			ent.setEmails( allemail );
@@ -1734,14 +1738,14 @@ void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
 
 void ContactEditor::slotRemoveBirthday()
 {
-	qWarning("void ContactEditor::slotRemoveBirthday()");
+	Opie::Core::owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
 	ent.setBirthday( QDate() );
 	updateDatePicker();
 }
 
 void ContactEditor::slotRemoveAnniversary()
 {
-	qWarning("void ContactEditor::slotRemoveAnniversary()");
+	Opie::Core::owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
 	ent.setAnniversary( QDate() );
 	updateDatePicker();
 }
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index 18a3791..882bdf3 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -5,7 +5,7 @@ Section: opie/pim
 Conflicts: qpe-tkcaddressbook
 Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 Architecture: arm
-Depends: task-opie-minimal, opie-pics, libopiecore2, libopieui2, libopiepim2, libopiedb2
+Depends: task-opie-minimal, opie-pics, libopiecore2, libopieui2, libopiepim2
 Description: Contacts
  A simple addressbook for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp
index 7a20591..df3d6ac 100644
--- a/core/pim/addressbook/picker.cpp
+++ b/core/pim/addressbook/picker.cpp
@@ -1,11 +1,13 @@
 #include "picker.h"
 
+#include <opie2/odebug.h>
+
 #include <qtimer.h>
 #include <qlayout.h>
 
 char PickerLabel::lastLetter = '\0';
 
-PickerLabel::PickerLabel( QWidget *parent, const char *name ) 
+PickerLabel::PickerLabel( QWidget *parent, const char *name )
 	: QLabel ( parent, name )
 {
 	currentLetter = 0;
@@ -30,17 +32,17 @@ void PickerLabel::setLetters( char ch1, char ch2, char ch3 )
 {
 	QString tmpStr;
 
-	if (ch1 != '\0') 
+	if (ch1 != '\0')
 		letter1 = ch1;
 	else
 		letter1 = ' ';
 
-	if (ch2 != '\0') 
+	if (ch2 != '\0')
 		letter2 = ch2;
 	else
 		letter2 = ' ';
 
-	if (ch3 != '\0') 
+	if (ch3 != '\0')
 		letter3 = ch3;
 	else
 		letter3 = ' ';
@@ -61,7 +63,7 @@ void PickerLabel::clearLetter()
 {
 
 	QString tmpStr;
-	
+
 	tmpStr = "<qt>";
 	tmpStr += letter1;
 	tmpStr += letter2;
@@ -76,12 +78,12 @@ void PickerLabel::clearLetter()
 
 void PickerLabel::mousePressEvent( QMouseEvent* e )
 {
-	// If one pickerlabel is was, and an other is now selected, we 
+	// If one pickerlabel is was, and an other is now selected, we
 	// have to simulate the releaseevent.. Otherwise the new label
-	// will not get a highlighted  letter.. 
+	// will not get a highlighted  letter..
 	// Maybe there is a more intelligent solution, but this works and I am tired.. (se)
 	if ( ( currentLetter == 0 ) && ( lastLetter != '\0' ) ) mouseReleaseEvent( e );
-} 
+}
 
 void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
 {
@@ -89,7 +91,7 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
 
 	if (lastLetter != letter1 && lastLetter != letter2 && lastLetter != letter3 && lastLetter != '\0')
 		QTimer::singleShot( 0, this, SLOT(emitClearSignal()) );
-	
+
 	switch (currentLetter) {
 		case 0:
 			tmpStr = "<qt><u><b><font color=\"#FF00FF\">";
@@ -121,7 +123,7 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
 			lastLetter = letter2;
 			emit selectedLetter( letter2 );
 			break;
-			
+
 		case 2:
 			tmpStr = "<qt>";
 			tmpStr += letter1;
@@ -149,7 +151,7 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
 void PickerLabel::emitClearSignal() {
 	emit clearAll();
 }
-	
+
 LetterPicker::LetterPicker( QWidget *parent, const char *name )
 	: QFrame( parent, name )
 {
@@ -157,7 +159,7 @@ LetterPicker::LetterPicker( QWidget *parent, const char *name )
 
 	lblABC = new PickerLabel( this );
 	l->addWidget( lblABC );
-	
+
 	lblDEF = new PickerLabel( this );
 	l->addWidget( lblDEF );
 
@@ -237,7 +239,7 @@ void LetterPicker::clear()
 
 void LetterPicker::newLetter( char letter )
 {
-	qWarning("LetterClicked");
+	Opie::Core::owarn << "LetterClicked" << oendl;
 	emit letterClicked( letter );
 
 }