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
@@ -22,3 +22,3 @@
 
-
+#include <opie2/odebug.h>
 
@@ -97,7 +97,7 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
 		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();
@@ -105,3 +105,3 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
 		case Qt::Key_Up:
-			qWarning( "UP..");
+			Opie::Core::owarn << "Up.." << oendl;
 			if ( ( visibleHeight() < contentsHeight() ) &&
@@ -119,6 +119,6 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
 		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() ) &&
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
@@ -21,3 +21,3 @@
 
-
+#include <opie2/odebug.h>
 #include <opie2/opimrecordlist.h>
@@ -123,4 +123,3 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
 {
-	//	qWarning("C'tor start");
-
+	//	Opie::Core::owarn << "C'tor start" << oendl;
 	setSelectionMode( NoSelection );
@@ -132,3 +131,3 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
 	// contactList.clear();
-	//	qWarning("C'tor end");
+	//	Opie::Core::owarn << "C'tor end" << oendl;
 }
@@ -154,3 +153,3 @@ void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
-	qWarning("AbTable::setContacts()");
+	Opie::Core::owarn << "AbTable::setContacts()" << oendl;
 
@@ -186,3 +185,3 @@ bool AbTable::selectContact( int UID )
 {
-	qWarning( "AbTable::selectContact( %d )", UID );
+	Opie::Core::owarn << "AbTable::selectContact( " << UID << " )" << oendl;
 	int rows = numRows();
@@ -192,3 +191,3 @@ bool AbTable::selectContact( int UID )
 	setPaintingEnabled( FALSE );
-	qWarning( "search start" );
+	Opie::Core::owarn << "Search start" << oendl;
 	for ( int r = 0; r < rows; ++r ) {
@@ -201,3 +200,3 @@ bool AbTable::selectContact( int UID )
 	}
-	qWarning( "search end" );
+	Opie::Core::owarn << "Search end" << oendl;
 
@@ -216,3 +215,4 @@ 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;
@@ -259,3 +259,3 @@ void AbTable::resort()
 {
-	qWarning( "void AbTable::resort() NOT POSSIBLE !!" );
+	Opie::Core::owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl;
 #if 0
@@ -285,3 +285,3 @@ void AbTable::clear()
 {
-	qWarning( "void AbTable::clear()" );
+	Opie::Core::owarn << "void AbTable::clear()" << oendl;
 	// contactList.clear();
@@ -303,3 +303,3 @@ void AbTable::refresh()
 {
-	qWarning( "void AbTable::refresh() NOT IMPLEMENTED !!" );
+	Opie::Core::owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl;
 
@@ -336,3 +336,3 @@ void AbTable::keyPressEvent( QKeyEvent *e )
 
-	//	qWarning("Received key ..");
+	//		Opie::Core::owarn << "Received key .." << oendl;
 	switch( e->key() ) {
@@ -344,3 +344,3 @@ void AbTable::keyPressEvent( QKeyEvent *e )
 // 	case Qt::Key_Up:
-// 		qWarning("a");
+// 		Opie::Core::owarn << "a" << oendl;
 // 		emit signalKeyUp();
@@ -348,3 +348,3 @@ void AbTable::keyPressEvent( QKeyEvent *e )
 // 	case Qt::Key_Down:
-// 		qWarning("b");
+// 		Opie::Core::owarn << "b" << oendl;
 // 		emit signalKeyDown();
@@ -359,3 +359,3 @@ void AbTable::moveTo( char c )
 {
-	qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" );
+	Opie::Core::owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl;
 
@@ -425,3 +425,3 @@ void AbTable::realignTable()
 {
-	//	qWarning( "void AbTable::realignTable()" );
+	//	Opie::Core::owarn << "void AbTable::realignTable()" << oendl;
 
@@ -475,3 +475,3 @@ void AbTable::fitColumns()
 {
-	qWarning( "void AbTable::fitColumns()" );
+	Opie::Core::owarn << "void AbTable::fitColumns()" << oendl;
 	int contentsWidth = visibleWidth() / 2;
@@ -487,3 +487,3 @@ void AbTable::fitColumns()
 
-	//	qWarning("Width: %d", contentsWidth);
+	//	Opie::Core::owarn << "Width: " << contentsWidth << oendl;
 
@@ -499,3 +499,3 @@ void AbTable::show()
 {
-	//	qWarning( "void AbTable::show()" );
+	//	Opie::Core::owarn << "void AbTable::show()" << oendl;
 	realignTable();
@@ -523,3 +523,3 @@ 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 ) {
@@ -527,3 +527,3 @@ void AbTable::itemClicked(int,int col)
 	} else {
-		//		qWarning ("Emitting signalSwitch()");
+		//	Opie::Core::owarn << "Emitting signalSwitch()" << oendl;
 		emit signalSwitch();
@@ -564,3 +564,3 @@ void AbTable::updateVisible()
 {
-	//	qWarning("void AbTable::updateVisible()");
+	//	Opie::Core::owarn << "void AbTable::updateVisible()" << oendl;
 
@@ -600,3 +600,4 @@ 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;
 
@@ -616,3 +617,4 @@ void AbTable::setPaintingEnabled( bool e )
 	}
-	//	qWarning("OUT void AbTable::setPaintingEnabled( %d )->Nested: %d", e, countNested );
+	//	Opie::Core::owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: "
+	//						<< countNested << oendl;
 }
@@ -620,3 +622,4 @@ void AbTable::setPaintingEnabled( bool e )
 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 )
@@ -630,3 +633,3 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
 
-    //qWarning( "Paint row: %d", row );
+	//	Opie::Core::owarn << "Paint row: " << row << oendl;
 
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
@@ -19,2 +19,3 @@
 #include <opie2/ocontactaccessbackend_vcard.h>
+#include <opie2/odebug.h>
 
@@ -53,3 +54,3 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
 {
-	qWarning("AbView::c'tor");
+	Opie::Core::owarn << "AbView::c'tor" << oendl;
 	// Load default database and handle syncing myself.. !
@@ -101,3 +102,3 @@ void AbView::setView( Views view )
 {
-	qWarning("AbView::setView( Views view )");
+	Opie::Core::owarn << "AbView::setView( Views view )" << oendl;
  	m_curr_View = view;
@@ -108,3 +109,3 @@ void AbView::addEntry( const Opie::OPimContact &newContact )
 {
-	qWarning("abview:AddContact");
+	Opie::Core::owarn << "AbView::AddContact" << oendl;
 	m_contactdb->add ( newContact );
@@ -115,3 +116,3 @@ void AbView::removeEntry( const int UID )
 {
-	qWarning("abview:RemoveContact");
+	Opie::Core::owarn << "AbView;:RemoveContact" << oendl;
 	m_contactdb->remove( UID );
@@ -122,3 +123,3 @@ void AbView::replaceEntry( const Opie::OPimContact &contact )
 {
-	qWarning("abview:ReplaceContact");
+	Opie::Core::owarn << "AbView::ReplaceContact" << oendl;
 	m_contactdb->replace( contact );
@@ -146,3 +147,3 @@ bool AbView::save()
 {
-	//	qWarning("abView:Save data");
+	//	Opie::Core::owarn << "AbView::Save data" << oendl;
 
@@ -153,3 +154,3 @@ void AbView::load()
 {
-	qWarning("abView:Load data");
+	Opie::Core::owarn << "AbView::Load data" << oendl;
 
@@ -167,3 +168,3 @@ void AbView::load()
 
-	qWarning ("Number of contacts: %d", m_list.count());
+	Opie::Core::owarn << "Number of contacts: " << m_list.count() << oendl;
 
@@ -175,3 +176,3 @@ void AbView::reload()
 {
-        qWarning( "void AbView::reload()" );
+	Opie::Core::owarn << "AbView::::reload()" << oendl;
 
@@ -188,3 +189,3 @@ void AbView::setShowByCategory( const QString& cat )
 {
-	qWarning("AbView::setShowCategory( const QString& cat )");
+	Opie::Core::owarn << "AbView::setShowCategory( const QString& cat )" << oendl;
 
@@ -200,3 +201,4 @@ void AbView::setShowByCategory( const QString& cat )
 	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;
 
@@ -212,6 +214,6 @@ 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;
@@ -226,3 +228,3 @@ 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;
 
@@ -249,4 +251,4 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 		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;
@@ -279,3 +281,3 @@ void AbView::showPersonal( bool personal )
 {
-	qWarning ("void AbView::showPersonal( %d )", personal);
+	Opie::Core::owarn << "void AbView::showPersonal( " << personal << " )" << oendl;
 
@@ -335,3 +337,3 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
 {
-	//	qWarning( "void AbView::slotDoFind" );
+	//	Opie::Core::owarn << "void AbView::slotDoFind" << oendl;
 
@@ -349,3 +351,3 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
 
-	//	qWarning ("Find in Category %d", category);
+	//	Opie::Core::owarn << "Find in Category " << category << oendl;
 
@@ -358,3 +360,3 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
 
-	//	qWarning( "found: %d", m_list.count() );
+	//	Opie::Core::owarn << "Found: " << m_list.count() << oendl;
 	if ( m_list.count() == 0 ){
@@ -382,3 +384,3 @@ void AbView::offSearch()
 void AbView::slotSwitch(){
-	//	qWarning("AbView::slotSwitch()");
+	//	Opie::Core::owarn << "AbView::slotSwitch()" << oendl;
 
@@ -387,3 +389,3 @@ void AbView::slotSwitch(){
 	case TableView:
-		qWarning("Switching to CardView");
+		Opie::Core::owarn << "Switching to CardView" << oendl;
 		m_curr_View = CardView;
@@ -391,3 +393,3 @@ void AbView::slotSwitch(){
 	case CardView:
-		qWarning("Switching to TableView");
+		Opie::Core::owarn << "Switching to TableView" << oendl;
 		m_curr_View = TableView;
@@ -410,3 +412,3 @@ void AbView::clearForCategory()
 			if ( !contactCompare( *it, m_curr_category ) ){
-				//				qWarning("Removing %d", (*it).uid());
+				//Opie::Core::owarn << "Removing " << (*it).uid() << oendl;
 				m_list.remove( (*it).uid() );
@@ -420,3 +422,4 @@ 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;
 
@@ -426,3 +429,3 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
 
-	//	qWarning ("Number of categories: %d", cats.count() );
+	//	Opie::Core::owarn << "Number of categories: " << cats.count() << oendl;
 
@@ -435,3 +438,3 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
 		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 ) {
@@ -442,3 +445,3 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
 	}
-	//	qWarning ("Return: %d", returnMe);
+	//	Opie::Core::owarn << "Return: " << returnMe << oendl;
 	return returnMe;
@@ -455,3 +458,3 @@ void  AbView::updateView( bool newdata )
 {
-	//	qWarning("AbView::updateView()");
+	//	Opie::Core::owarn << "AbView::updateView()" << oendl;
 
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
@@ -24,3 +24,3 @@
 
-
+#include <opie2/odebug.h>
 #include <opie2/ofileselector.h>
@@ -253,3 +253,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
-	//    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
+	//	Opie::Core::odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl;
 	connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
@@ -269,6 +269,6 @@ void AddressbookWindow::slotConfig()
 	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();
@@ -285,3 +285,3 @@ void AddressbookWindow::slotSetFont( int size )
 {
-	qWarning("void AddressbookWindow::slotSetFont( %d )", size);
+	Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
 
@@ -327,6 +327,6 @@ 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();
@@ -352,3 +352,3 @@ void AddressbookWindow::setDocument( const QString &filename )
 {
-	qWarning( "void AddressbookWindow::setDocument( %s )", filename.latin1() );
+	Opie::Core::owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
 
@@ -364,6 +364,6 @@ void AddressbookWindow::setDocument( const QString &filename )
 		case 0:
-			qWarning("YES clicked");
+			Opie::Core::owarn << "YES clicked" << oendl;
 			break;
 		case 1:
-			qWarning("NO clicked");
+			Opie::Core::owarn << "NO clicked" << oendl;
 			return;
@@ -377,3 +377,3 @@ void AddressbookWindow::setDocument( const QString &filename )
 	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;
 
@@ -388,3 +388,3 @@ void AddressbookWindow::setDocument( const QString &filename )
 	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 ){
@@ -397,3 +397,3 @@ void AddressbookWindow::setDocument( const QString &filename )
 			case 0:
-				qWarning("YES clicked");
+				Opie::Core::owarn << "YES clicked" << oendl;
 				m_abView->addEntry( *it );
@@ -401,6 +401,6 @@ void AddressbookWindow::setDocument( const QString &filename )
 			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;
@@ -540,5 +540,5 @@ void AddressbookWindow::writeMail()
 	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)");
@@ -550,5 +550,5 @@ void AddressbookWindow::writeMail()
 	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)");
@@ -594,3 +594,3 @@ void AddressbookWindow::slotBeam()
 
-	qWarning("Beaming: %s", beamFilename.latin1() );
+	Opie::Core::owarn << "Beaming: " << beamFilename << oendl;
 
@@ -641,3 +641,3 @@ 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;
 
@@ -657,3 +657,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 		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 );
@@ -684,3 +684,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 
-		qWarning( "Showing uid: %d" , uid );
+		Opie::Core::owarn << "Showing uid: " << uid << oendl;
 
@@ -764,3 +764,3 @@ void AddressbookWindow::editPersonal()
 	if ( ! actionPersonal->isOn() ){
-		qWarning("*** ++++");
+		Opie::Core::owarn << "*** ++++" << oendl;
 		actionPersonal->setOn( true );
@@ -783,6 +783,6 @@ 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") );
@@ -799,3 +799,3 @@ void AddressbookWindow::slotPersonalView()
 
-	qWarning("slotPersonalView()-> ON");
+	Opie::Core::owarn << "slotPersonalView()-> ON" << oendl;
 	// XXX need to disable some QActions.
@@ -889,3 +889,3 @@ void AddressbookWindow::slotNotFound()
 {
-	qWarning("Got notfound signal!");
+	Opie::Core::owarn << "Got not found signal!" << oendl;
 	QMessageBox::information( this, tr( "Not Found" ),
@@ -897,3 +897,3 @@ void AddressbookWindow::slotWrapAround()
 {
-	qWarning("Got wrap signal!");
+	Opie::Core::owarn << "Got wrap signal!" << oendl;
 // 	if ( doNotifyWrapAround )
@@ -906,3 +906,4 @@ 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;
 
@@ -941,3 +942,3 @@ void AddressbookWindow::slotSetCategory( int c )
 				cat = "Unfiled";
-				qWarning ("Unfiled selected!");
+				Opie::Core::owarn << "Unfiled selected!" << oendl;
 			}else{
@@ -964,3 +965,3 @@ void AddressbookWindow::slotViewSwitched( int view )
 {
-	qWarning( "void AddressbookWindow::slotViewSwitched( %d )", view );
+	Opie::Core::owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
 	int menu = 0;
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
@@ -2,2 +2,3 @@
 
+#include <opie2/odebug.h>
 #include <opie2/opimcontact.h>
@@ -44,3 +45,3 @@ void ConfigDlg::slotItemUp()
 {
-	qWarning( "void ConfigDlg::slotItemUp()" );
+	Opie::Core::owarn << "void ConfigDlg::slotItemUp()" << oendl;
 
@@ -58,3 +59,3 @@ void ConfigDlg::slotItemDown()
 {
-	qWarning( "void ConfigDlg::slotItemDown()" );
+	Opie::Core::owarn << "void ConfigDlg::slotItemDown()" << oendl;
 
@@ -71,3 +72,3 @@ void ConfigDlg::slotItemAdd()
 {
-	qWarning( "void ConfigDlg::slotItemAdd()" );
+	Opie::Core::owarn << "void ConfigDlg::slotItemAdd()" << oendl;
 
@@ -76,3 +77,3 @@ void ConfigDlg::slotItemAdd()
 		QString item = allFieldListBox->currentText();
-		qWarning("ADding %s", item.latin1());
+		Opie::Core::owarn << "Adding " << item << oendl;
 		fieldListBox->insertItem( item );
@@ -83,3 +84,3 @@ void ConfigDlg::slotItemRemove()
 {
-	qWarning( "void ConfigDlg::slotItemRemove()" );
+	Opie::Core::owarn << "void ConfigDlg::slotItemRemove()" << oendl;
 
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
@@ -23,2 +23,3 @@
 
+#include <opie2/odebug.h>
 #include <opie2/opimcontact.h>
@@ -79,3 +80,3 @@ ContactEditor::~ContactEditor() {
 void ContactEditor::init() {
-	qWarning("init() START");
+	Opie::Core::owarn << "init() START" << oendl;
 
@@ -688,3 +689,3 @@ void ContactEditor::init() {
 
-	qWarning("init() END");
+	Opie::Core::owarn << "init() END" << oendl;
 }
@@ -692,3 +693,3 @@ void ContactEditor::init() {
 void ContactEditor::defaultEmailChanged(int i){
-	qDebug("defaultEmailChanged");
+	Opie::Core::odebug << "defaultEmailChanged" << oendl;
 
@@ -699,3 +700,3 @@ void ContactEditor::defaultEmailChanged(int i){
 	defaultEmail = cmbDefaultEmail->text(i);
-	qDebug ("Changed to: %s", defaultEmail.latin1());
+	Opie::Core::odebug << "Changed to: " << defaultEmail << oendl;
 
@@ -718,4 +719,4 @@ void ContactEditor::populateDefaultEmailCmb(){
 	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;
 
@@ -723,3 +724,3 @@ void ContactEditor::populateDefaultEmailCmb(){
 			cmbDefaultEmail->setCurrentItem( i );
-			qDebug("set");
+			Opie::Core::odebug << "set" << oendl;
 			found = true;
@@ -739,3 +740,4 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 	QString type = slChooserNames[index];
-	qWarning("ContactEditor::cmbChooserChange -> Type: %s, WidgetPos: %d", type.latin1(), widgetPos );
+	Opie::Core::owarn << "ContactEditor::cmbChooserChange -> Type: " << type
+						<< ", WidgetPos: " << widgetPos << oendl;
 
@@ -746,3 +748,4 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
         if ( type == "Default Email"){
-		qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition);
+		Opie::Core::owarn << "Choosing default-email (defaultEmailChooserPosition= "
+							<< defaultEmailChooserPosition << ") " << oendl;
 
@@ -779,3 +782,3 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 		// Something else was selected: Hide combo..
-		qWarning(" Hiding default-email combo" );
+		Opie::Core::owarn << " Hiding default-email combo" << oendl;
 		if ( defaultEmailChooserPosition == widgetPos ){
@@ -804,3 +807,3 @@ void ContactEditor::chooserError( int index )
 {
-	qWarning("ContactEditor::chooserError( %d )", index);
+	Opie::Core::owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
 	QMessageBox::warning( this, "Chooser Error",
@@ -840,7 +843,8 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
 	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;
@@ -850,3 +854,3 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
         }else if (type == "Emails"){
-		qDebug("emails");
+		Opie::Core::odebug << "emails" << oendl;
 
@@ -863,3 +867,3 @@ 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);
@@ -868,3 +872,3 @@ void ContactEditor::slotChooser1Change( const QString &textChanged ) {
 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);
@@ -874,3 +878,3 @@ void ContactEditor::slotChooser2Change( const QString &textChanged ) {
 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);
@@ -879,3 +883,3 @@ void ContactEditor::slotChooser3Change( const QString &textChanged ) {
 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);
@@ -949,3 +953,3 @@ 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) ){
@@ -960,3 +964,3 @@ void ContactEditor::slotCmbChooser1Change( int index ) {
 void ContactEditor::slotCmbChooser2Change( int index ) {
-	qWarning("ContactEditor::slotCmbChooser2Change( %d )", index);
+	Opie::Core::owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
 
@@ -971,3 +975,3 @@ void ContactEditor::slotCmbChooser2Change( int index ) {
 void ContactEditor::slotCmbChooser3Change( int index ) {
-	qWarning("ContactEditor::slotCmbChooser3Change( %d )", index);
+	Opie::Core::owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
 
@@ -982,3 +986,3 @@ void ContactEditor::slotCmbChooser3Change( int index ) {
 void ContactEditor::slotCmbChooser4Change( int index ) {
-	qWarning("ContactEditor::slotCmbChooser4Change( %d )", index);
+	Opie::Core::owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
 
@@ -1027,3 +1031,3 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 
-	qWarning( "ContactEditor::slotFullNameChange( %s )", textChanged.latin1() );
+	Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
 
@@ -1051,3 +1055,3 @@ 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:
@@ -1133,3 +1137,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 
-	qWarning("Fullname: %s", simplifiedName.latin1());
+	Opie::Core::owarn << "Fullname: " << simplifiedName << oendl;
 
@@ -1137,3 +1141,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 	if ( commapos >= 0 ) {
-		qWarning(" Commapos: %d", commapos );
+		Opie::Core::owarn << " Commapos: " << commapos << oendl;
 
@@ -1146,3 +1150,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 		haveLastName = true;
-		qWarning("Fullname without ',': %s", simplifiedName.latin1());
+		Opie::Core::owarn << "Fullname without ',': " << simplifiedName << oendl;
 
@@ -1180,6 +1184,6 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 
-	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;
 
@@ -1266,3 +1270,3 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
 	if (defaultEmail.isEmpty()) defaultEmail = emails[0];
-	qDebug("default email=%s",defaultEmail.latin1());
+	Opie::Core::odebug << "default email=" << defaultEmail << oendl;
 
@@ -1326,3 +1330,3 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
 
-		qWarning(" Filling dynamic Field: %s", (*it).latin1() );
+		Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl;
 
@@ -1350,3 +1354,3 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
 		if ( *it == "Nickname" ){
-			qWarning("**** Nichname: %s", ent.nickname().latin1() );
+			Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl;
 			(*itLE)->setText( ent.nickname() );
@@ -1583,4 +1587,4 @@ void ContactEditor::saveEntry() {
 			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 );
@@ -1736,3 +1740,3 @@ void ContactEditor::slotRemoveBirthday()
 {
-	qWarning("void ContactEditor::slotRemoveBirthday()");
+	Opie::Core::owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
 	ent.setBirthday( QDate() );
@@ -1743,3 +1747,3 @@ void ContactEditor::slotRemoveAnniversary()
 {
-	qWarning("void ContactEditor::slotRemoveAnniversary()");
+	Opie::Core::owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
 	ent.setAnniversary( QDate() );
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
@@ -7,3 +7,3 @@ 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
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
@@ -2,2 +2,4 @@
 
+#include <opie2/odebug.h>
+
 #include <qtimer.h>
@@ -7,3 +9,3 @@ char PickerLabel::lastLetter = '\0';
 
-PickerLabel::PickerLabel( QWidget *parent, const char *name ) 
+PickerLabel::PickerLabel( QWidget *parent, const char *name )
 	: QLabel ( parent, name )
@@ -32,3 +34,3 @@ void PickerLabel::setLetters( char ch1, char ch2, char ch3 )
 
-	if (ch1 != '\0') 
+	if (ch1 != '\0')
 		letter1 = ch1;
@@ -37,3 +39,3 @@ void PickerLabel::setLetters( char ch1, char ch2, char ch3 )
 
-	if (ch2 != '\0') 
+	if (ch2 != '\0')
 		letter2 = ch2;
@@ -42,3 +44,3 @@ void PickerLabel::setLetters( char ch1, char ch2, char ch3 )
 
-	if (ch3 != '\0') 
+	if (ch3 != '\0')
 		letter3 = ch3;
@@ -63,3 +65,3 @@ void PickerLabel::clearLetter()
 	QString tmpStr;
-	
+
 	tmpStr = "<qt>";
@@ -78,8 +80,8 @@ 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 );
-} 
+}
 
@@ -91,3 +93,3 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
 		QTimer::singleShot( 0, this, SLOT(emitClearSignal()) );
-	
+
 	switch (currentLetter) {
@@ -123,3 +125,3 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
 			break;
-			
+
 		case 2:
@@ -151,3 +153,3 @@ void PickerLabel::emitClearSignal() {
 }
-	
+
 LetterPicker::LetterPicker( QWidget *parent, const char *name )
@@ -159,3 +161,3 @@ LetterPicker::LetterPicker( QWidget *parent, const char *name )
 	l->addWidget( lblABC );
-	
+
 	lblDEF = new PickerLabel( this );
@@ -239,3 +241,3 @@ void LetterPicker::newLetter( char letter )
 {
-	qWarning("LetterClicked");
+	Opie::Core::owarn << "LetterClicked" << oendl;
 	emit letterClicked( letter );