s/Opie::Core::odebug/odebug/ (same with oerr,owarn,ofatal)

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
@@ -92,21 +92,21 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
 {
 
         // Commonly handled keys
         if ( !m_empty ){
                 switch( e->key() ) {
                 case Qt::Key_Left:
-                        Opie::Core::owarn << "Left.." << oendl;
+                        owarn << "Left.." << oendl;
                 case Qt::Key_Right:
-                        Opie::Core::owarn << "Right.." << oendl;
+                        owarn << "Right.." << oendl;
                 case Qt::Key_F33:
-                        Opie::Core::owarn << "OK.." << oendl;
+                        owarn << "OK.." << oendl;
                         emit signalOkPressed();
                         break;
                 case Qt::Key_Up:
-                        Opie::Core::owarn << "Up.." << oendl;
+                        owarn << "Up.." << oendl;
                         if ( ( visibleHeight() < contentsHeight() ) &&
                              ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) )
                                 scrollBy( 0, -(visibleHeight()-20) );
                         else {
                                 --m_itCurContact;
                                 if ( *m_itCurContact != Opie::OPimContact() )
@@ -114,15 +114,15 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
                                 else
                                         m_itCurContact = m_viewList.end();
                         }
 
                         break;
                 case Qt::Key_Down:
-                        Opie::Core::owarn << "Down.." << oendl;
-        //              Opie::Core::owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl;
-        //              Opie::Core::owarn << "Value: " << verticalScrollBar()->value()
+                        owarn << "Down.." << oendl;
+        //              owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl;
+        //              owarn << "Value: " << verticalScrollBar()->value()
         //                              << ", barMaxValue: " << verticalScrollBar()->maxValue() << oendl;
                         if ( ( visibleHeight() < contentsHeight() ) &&
                              ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) )
                                 scrollBy( 0, visibleHeight()-20 );
                         else {
                                 ++m_itCurContact;
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
@@ -118,21 +118,21 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
           asc( TRUE ),
           intFields( order ),
           enablePainting( true ),
           columnVisible( true ),
           countNested( 0 )
 {
-                //Opie::Core::owarn << "C'tor start" << oendl;
+                //owarn << "C'tor start" << oendl;
         setSelectionMode( NoSelection );
         init();
         setSorting( TRUE );
         connect( this, SIGNAL(clicked(int,int,int,const QPoint&)),
                  this, SLOT(itemClicked(int,int)) );
 
         // contactList.clear();
-                //Opie::Core::owarn << "C'tor end" << oendl;
+                //owarn << "C'tor end" << oendl;
 }
 
 AbTable::~AbTable()
 {
 }
 
@@ -148,13 +148,13 @@ void AbTable::init()
         verticalHeader()->hide();
         columnVisible = true;
 }
 
 void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
-        Opie::Core::owarn << "AbTable::setContacts()" << oendl;
+        owarn << "AbTable::setContacts()" << oendl;
 
         clear();
         m_viewList = viewList;
 
         setSorting( false );
         setPaintingEnabled( FALSE );
@@ -180,28 +180,28 @@ void AbTable::setOrderedList( const QValueList<int> ordered )
         intFields = ordered;
 }
 
 
 bool AbTable::selectContact( int UID )
 {
-        Opie::Core::owarn << "AbTable::selectContact( " << UID << " )" << oendl;
+        owarn << "AbTable::selectContact( " << UID << " )" << oendl;
         int rows = numRows();
         Opie::OPimContact* foundContact = 0l;
         bool found = false;
 
         setPaintingEnabled( FALSE );
-        Opie::Core::owarn << "Search start" << oendl;
+        owarn << "Search start" << oendl;
         for ( int r = 0; r < rows; ++r ) {
                 if ( m_viewList.uidAt( r ) == UID ){
                         ensureCellVisible( r, 0 );
                         setCurrentCell( r, 0 );
                         found = true;
                         break;
                 }
         }
-        Opie::Core::owarn << "Search end" << oendl;
+        owarn << "Search end" << oendl;
 
         if ( !found ){
                 ensureCellVisible( 0,0 );
                 setCurrentCell( 0, 0 );
         }
 
@@ -210,13 +210,13 @@ bool AbTable::selectContact( int UID )
         return true;
 }
 
 #if 0
 void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row )
 {
-        Opie::Core::owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, "
+        owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, "
                                         << row << " )" << oendl;
         QString strName;
         ContactItem contactItem;
 
         strName = findContactName( cnt );
         contactItem = findContactContact( cnt, row );
@@ -254,13 +254,13 @@ void AbTable::columnClicked( int col )
         //QMessageBox::information( this, "resort", "columnClicked" );
         resort();
 }
 
 void AbTable::resort()
 {
-        Opie::Core::owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl;
+        owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl;
 #if 0
         setPaintingEnabled( FALSE );
         if ( sorting() ) {
                 if ( lastSortCol == -1 )
                         lastSortCol = 0;
                 sortColumn( lastSortCol, asc, TRUE );
@@ -280,13 +280,13 @@ int AbTable::currentEntry_UID()
 {
         return ( currentEntry().uid() );
 }
 
 void AbTable::clear()
 {
-        Opie::Core::owarn << "void AbTable::clear()" << oendl;
+        owarn << "void AbTable::clear()" << oendl;
         // contactList.clear();
 
         setPaintingEnabled( FALSE );
         for ( int r = 0; r < numRows(); ++r ) {
                 for ( int c = 0; c < numCols(); ++c ) {
                         if ( cellWidget( r, c ) )
@@ -298,13 +298,13 @@ void AbTable::clear()
         setPaintingEnabled( TRUE );
 }
 
 // Refresh updates column 2 if the contactsettings changed
 void AbTable::refresh()
 {
-        Opie::Core::owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl;
+        owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl;
 
 #if 0
         int rows = numRows();
         AbTableItem *abi;
         ContactItem contactItem;
 
@@ -331,36 +331,36 @@ void AbTable::keyPressEvent( QKeyEvent *e )
 {
         char key = toupper( e->ascii() );
 
         if ( key >= 'A' && key <= 'Z' )
                 moveTo( key );
 
-                //      Opie::Core::owarn << "Received key .." << oendl;
+                //      owarn << "Received key .." << oendl;
         switch( e->key() ) {
         case Qt::Key_Space:
         case Qt::Key_Return:
         case Qt::Key_Enter:
                 emit signalSwitch();
                 break;
         // case Qt::Key_Up:
-        //      Opie::Core::owarn << "a" << oendl;
+        //      owarn << "a" << oendl;
         //      emit signalKeyUp();
         //      break;
         // case Qt::Key_Down:
-        //      Opie::Core::owarn << "b" << oendl;
+        //      owarn << "b" << oendl;
         //      emit signalKeyDown();
         //      break;
         default:
                 QTable::keyPressEvent( e );
         }
 
 }
 
 void AbTable::moveTo( char c )
 {
-        Opie::Core::owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl;
+        owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl;
 
 #if 0
         int rows = numRows();
         QString value;
         AbTableItem *abi;
         int r;
@@ -420,13 +420,13 @@ void AbTable::resizeRows() {
         */
 }
 
 
 void AbTable::realignTable()
 {
-                //Opie::Core::owarn << "void AbTable::realignTable()" << oendl;
+                //owarn << "void AbTable::realignTable()" << oendl;
 
         setPaintingEnabled( FALSE );
 
         resizeRows();
         fitColumns();
 
@@ -470,37 +470,37 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
 // }
 
 
 
 void AbTable::fitColumns()
 {
-        Opie::Core::owarn << "void AbTable::fitColumns()" << oendl;
+        owarn << "void AbTable::fitColumns()" << oendl;
         int contentsWidth = visibleWidth() / 2;
         // Fix to better value
         // contentsWidth = 130;
 
         setPaintingEnabled( FALSE );
 
         if ( columnVisible == false ){
                 showColumn(0);
                 columnVisible = true;
         }
 
-                //Opie::Core::owarn << "Width: " << contentsWidth << oendl;
+                //owarn << "Width: " << contentsWidth << oendl;
 
         setColumnWidth( 0, contentsWidth );
         adjustColumn(1);
         if ( columnWidth(1) < contentsWidth )
                 setColumnWidth( 1, contentsWidth );
 
         setPaintingEnabled( TRUE );
 }
 
 void AbTable::show()
 {
-                //Opie::Core::owarn << "void AbTable::show()" << oendl;
+                //owarn << "void AbTable::show()" << oendl;
         realignTable();
         QTable::show();
 }
 
 #if 0
 void AbTable::setChoiceNames( const QStringList& list)
@@ -518,17 +518,17 @@ void AbTable::setChoiceNames( const QStringList& list)
         fitColumns();
 }
 #endif
 
 void AbTable::itemClicked(int,int col)
 {
-                //Opie::Core::owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl;
+                //owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl;
         if ( col == 2 ) {
                 return;
         } else {
-                        //Opie::Core::owarn << "Emitting signalSwitch()" << oendl;
+                        //owarn << "Emitting signalSwitch()" << oendl;
                 emit signalSwitch();
         }
 }
 
 #if 0
 QStringList AbTable::choiceNames() const
@@ -559,13 +559,13 @@ QStringList AbTable::choiceSelection(int /*index*/) const
         return r;
 }
 
 
 void AbTable::updateVisible()
 {
-                //Opie::Core::owarn << "void AbTable::updateVisible()" << oendl;
+                //owarn << "void AbTable::updateVisible()" << oendl;
 
         int visible,
                 totalRows,
                 row,
                 selectedRow = 0;
 
@@ -595,13 +595,13 @@ void AbTable::updateVisible()
         setPaintingEnabled( TRUE );
 }
 
 
 void AbTable::setPaintingEnabled( bool e )
 {
-                //Opie::Core::owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: "
+                //owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: "
                 //                                      << countNested << oendl;
 
         if ( e ) {
                 if ( countNested > 0 )
                         --countNested;
                 if ( ! countNested ){
@@ -612,29 +612,29 @@ void AbTable::setPaintingEnabled( bool e )
                 }
         } else {
                 ++countNested;
                 enablePainting = false;
                 setUpdatesEnabled( false );
         }
-                //Opie::Core::owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: "
+                //owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: "
                 //                                      << countNested << oendl;
 }
 
 void AbTable::viewportPaintEvent( QPaintEvent* e ) {
-                //Opie::Core::owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> "
+                //owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> "
                 //                                      << enablePainting << oendl;
         if ( enablePainting )
                 QTable::viewportPaintEvent( e );
 }
 
 void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool ) {
     const QColorGroup &cg = colorGroup();
 
     p->save();
 
-                //Opie::Core::owarn << "Paint row: " << row << oendl;
+                //owarn << "Paint row: " << row << oendl;
 
     Opie::OPimContact act_contact = m_viewList[row];
 
     // Paint alternating background bars
     if (  (row % 2 ) == 0 ) {
         p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
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
@@ -49,13 +49,13 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
         m_contactdb ( 0l ),
         m_storedDB ( 0l ),
         m_viewStack( 0l ),
         m_abTable( 0l ),
         m_orderedFields( ordered )
 {
-        Opie::Core::owarn << "AbView::c'tor" << oendl;
+        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
         mCat.load( categoryFileName() );
 
         // Create Layout and put WidgetStack into it.
@@ -97,34 +97,34 @@ AbView::~AbView()
         }
 }
 
 
 void AbView::setView( Views view )
 {
-        Opie::Core::owarn << "AbView::setView( Views view )" << oendl;
+        owarn << "AbView::setView( Views view )" << oendl;
          m_curr_View = view;
          load();
 }
 
 void AbView::addEntry( const Opie::OPimContact &newContact )
 {
-        Opie::Core::owarn << "AbView::AddContact" << oendl;
+        owarn << "AbView::AddContact" << oendl;
         m_contactdb->add ( newContact );
         load();
 
 }
 void AbView::removeEntry( const int UID )
 {
-        Opie::Core::owarn << "AbView;:RemoveContact" << oendl;
+        owarn << "AbView;:RemoveContact" << oendl;
         m_contactdb->remove( UID );
         load();
 }
 
 void AbView::replaceEntry( const Opie::OPimContact &contact )
 {
-        Opie::Core::owarn << "AbView::ReplaceContact" << oendl;
+        owarn << "AbView::ReplaceContact" << oendl;
         m_contactdb->replace( contact );
         load();
 
 }
 
 Opie::OPimContact AbView::currentEntry()
@@ -142,20 +142,20 @@ Opie::OPimContact AbView::currentEntry()
         m_curr_Contact = currentContact.uid();
         return currentContact;
 }
 
 bool AbView::save()
 {
-                //Opie::Core::owarn << "AbView::Save data" << oendl;
+                //owarn << "AbView::Save data" << oendl;
 
         return m_contactdb->save();
 }
 
 void AbView::load()
 {
-        Opie::Core::owarn << "AbView::Load data" << oendl;
+        owarn << "AbView::Load data" << oendl;
 
         // Letter Search is stopped at this place
         emit signalClearLetterPicker();
 
         if ( m_inPersonal )
                 // VCard Backend does not sort..
@@ -163,73 +163,73 @@ void AbView::load()
         else{
                 m_list = m_contactdb->sorted( true, 0, 0, 0 );
                 if ( m_curr_category != -1 )
                         clearForCategory();
         }
 
-        Opie::Core::owarn << "Number of contacts: " << m_list.count() << oendl;
+        owarn << "Number of contacts: " << m_list.count() << oendl;
 
         updateView( true );
 
 }
 
 void AbView::reload()
 {
-        Opie::Core::owarn << "AbView::::reload()" << oendl;
+        owarn << "AbView::::reload()" << oendl;
 
         m_contactdb->reload();
         load();
 }
 
 void AbView::clear()
 {
         // :SX
 }
 
 void AbView::setShowByCategory( const QString& cat )
 {
-        Opie::Core::owarn << "AbView::setShowCategory( const QString& cat )" << oendl;
+        owarn << "AbView::setShowCategory( const QString& cat )" << oendl;
 
         int intCat = 0;
 
         // All (cat == NULL) will be stored as -1
         if ( cat.isNull() )
                 intCat = -1;
         else
                 intCat = mCat.id("Contacts", cat );
 
         // Just do anything if we really change the category
         if ( intCat != m_curr_category ){
-                        //      Opie::Core::owarn << "Categories: Selected " << cat << ".. Number: "
+                        //      owarn << "Categories: Selected " << cat << ".. Number: "
                         //                                      << m_curr_category << oendl;
 
                 m_curr_category = intCat;
                 emit signalClearLetterPicker();
 
                 load();
         }
 
 }
 
 void AbView::setShowToView( Views view )
 {
-        Opie::Core::owarn << "void AbView::setShowToView( View " << view << " )" << oendl;
+        owarn << "void AbView::setShowToView( View " << view << " )" << oendl;
 
         if ( m_curr_View != view ){
-                Opie::Core::owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl;
+                owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl;
                 m_prev_View = m_curr_View;
                 m_curr_View = view;
 
                 updateView();
         }
 
 }
 
 void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 {
-        Opie::Core::owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
+        owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
 
         assert( mode < AbConfig::LASTELEMENT );
 
         Opie::OPimContact query;
         if ( c == 0 ){
                 load();
@@ -246,13 +246,13 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
                         query.setLastName( QString("%1*").arg(c) );
                         break;
                 case AbConfig::FileAs:
                         query.setFileAs( QString("%1*").arg(c) );
                         break;
                 default:
-                        Opie::Core::owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl
+                        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 );
                 if ( m_curr_category != -1 )
                         clearForCategory();
@@ -276,13 +276,13 @@ QString AbView::showCategory() const
 {
         return mCat.label( "Contacts", m_curr_category );
 }
 
 void AbView::showPersonal( bool personal )
 {
-        Opie::Core::owarn << "void AbView::showPersonal( " << personal << " )" << oendl;
+        owarn << "void AbView::showPersonal( " << personal << " )" << oendl;
 
         if ( personal ){
 
                 if ( m_inPersonal )
                         return;
 
@@ -332,13 +332,13 @@ QStringList AbView::categories()
 }
 
 // BEGIN: Slots
 void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
                          bool , QString cat )
 {
-                //Opie::Core::owarn << "void AbView::slotDoFind" << oendl;
+                //owarn << "void AbView::slotDoFind" << oendl;
 
         // We reloading the data: Deselect Letterpicker
         emit signalClearLetterPicker();
 
         // Use the current Category if nothing else selected
         int category = 0;
@@ -346,22 +346,22 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
         if ( cat.isEmpty() )
                 category = m_curr_category;
         else{
                 category = mCat.id("Contacts", cat );
         }
 
-                //Opie::Core::owarn << "Find in Category " << category << oendl;
+                //owarn << "Find in Category " << category << oendl;
 
         QRegExp r( str );
         r.setCaseSensitive( caseSensitive );
         r.setWildcard( !useRegExp );
 
         // Get all matching entries out of the database
         m_list = m_contactdb->matchRegexp( r );
 
-                //Opie::Core::owarn << "Found: " << m_list.count() << oendl;
+                //owarn << "Found: " << m_list.count() << oendl;
         if ( m_list.count() == 0 ){
                 emit signalNotFound();
                 return;
         }
 
         // Now remove all contacts with wrong category (if any selected)
@@ -379,22 +379,22 @@ void AbView::offSearch()
         m_inSearch = false;
 
         load();
 }
 
 void AbView::slotSwitch(){
-                //Opie::Core::owarn << "AbView::slotSwitch()" << oendl;
+                //owarn << "AbView::slotSwitch()" << oendl;
 
         m_prev_View = m_curr_View;
         switch ( (int) m_curr_View ){
         case TableView:
-                Opie::Core::owarn << "Switching to CardView" << oendl;
+                owarn << "Switching to CardView" << oendl;
                 m_curr_View = CardView;
                 break;
         case CardView:
-                Opie::Core::owarn << "Switching to TableView" << oendl;
+                owarn << "Switching to TableView" << oendl;
                 m_curr_View = TableView;
                 break;
         }
         updateView();
 
 }
@@ -407,59 +407,59 @@ void AbView::clearForCategory()
         // Now remove all contacts with wrong category if any category selected
 
         Opie::OPimContactAccess::List allList = m_list;
         if ( m_curr_category != -1 ){
                 for ( it = allList.begin(); it != allList.end(); ++it ){
                         if ( !contactCompare( *it, m_curr_category ) ){
-                                //Opie::Core::owarn << "Removing " << (*it).uid() << oendl;
+                                //owarn << "Removing " << (*it).uid() << oendl;
                                 m_list.remove( (*it).uid() );
                         }
                 }
         }
 
 }
 
 bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
 {
-                //Opie::Core::owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
+                //owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
                 //                              << category << " )" << oendl;
 
         bool returnMe;
         QArray<int> cats;
         cats = cnt.categories();
 
-                //Opie::Core::owarn << "Number of categories: " << cats.count() << oendl;
+                //owarn << "Number of categories: " << cats.count() << oendl;
 
         returnMe = false;
         if ( cats.count() == 0 && category == 0 )
                 // Contacts with no category will just shown on "All" and "Unfiled"
                 returnMe = true;
         else {
                 int i;
                 for ( i = 0; i < int(cats.count()); i++ ) {
-                        //Opie::Core::owarn << "Comparing " << cats[i] << " with " << category << oendl;
+                        //owarn << "Comparing " << cats[i] << " with " << category << oendl;
                         if ( cats[i] == category ) {
                                 returnMe = true;
                                 break;
                         }
                 }
         }
-                //Opie::Core::owarn << "Return: " << returnMe << oendl;
+                //owarn << "Return: " << returnMe << oendl;
         return returnMe;
 }
 
 // In Some rare cases we have to update all lists..
 void AbView::updateListinViews()
 {
                 m_abTable -> setContacts( m_list );
                 m_ablabel -> setContacts( m_list );
 }
 
 void  AbView::updateView( bool newdata )
 {
-                //Opie::Core::owarn << "AbView::updateView()" << oendl;
+                //owarn << "AbView::updateView()" << oendl;
 
         if ( m_viewStack -> visibleWidget() ){
                 m_viewStack -> visibleWidget() -> clearFocus();
         }
 
         // If we switching the view, we have to store some information
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
@@ -248,13 +248,13 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         defaultFont = new QFont( m_abView->font() );
          slotSetFont(m_config.fontSize());
         m_curFontSize = m_config.fontSize();
 
         setCentralWidget(listContainer);
 
-                //Opie::Core::odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl;
+                //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&) ),
         this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
 
 
@@ -264,29 +264,29 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
 void AddressbookWindow::slotConfig()
 {
         ConfigDlg* dlg = new ConfigDlg( this, "Config" );
         dlg -> setConfig( m_config );
         if ( QPEApplication::execDialog( dlg ) ) {
-                Opie::Core::owarn << "Config Dialog accepted!" << oendl;
+                owarn << "Config Dialog accepted!" << oendl;
                 m_config = dlg -> getConfig();
                 if ( m_curFontSize != m_config.fontSize() ){
-                        Opie::Core::owarn << "Font was changed!" << oendl;
+                        owarn << "Font was changed!" << oendl;
                         m_curFontSize = m_config.fontSize();
                         emit slotSetFont( m_curFontSize );
                 }
                 m_abView -> setListOrder( m_config.orderList() );
         }
 
         delete dlg;
 }
 
 
 void AddressbookWindow::slotSetFont( int size )
 {
-        Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
+        owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
 
         if (size > 2 || size < 0)
                 size = 1;
 
         m_config.setFontSize( size );
 
@@ -322,16 +322,16 @@ void AddressbookWindow::importvCard() {
                 setDocument((const QString&) str );
         }
 
 }
 void AddressbookWindow::exportvCard()
 {
-        Opie::Core::owarn << "void AddressbookWindow::exportvCard()" << oendl;
+        owarn << "void AddressbookWindow::exportvCard()" << oendl;
         QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
         if( !filename.isEmpty() &&  ( filename[filename.length()-1] != '/' ) ){
-                Opie::Core::owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl;
+                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,
                                                                                                 filename );
                         Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook_exp", QString::null , vcard_backend, true );
                         if ( access ){
@@ -347,65 +347,65 @@ void AddressbookWindow::exportvCard()
                 QMessageBox::critical( 0, "Export VCard",
                                        QString( tr( "You have to set a filename !") ) );
 }
 
 void AddressbookWindow::setDocument( const QString &filename )
 {
-        Opie::Core::owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
+        owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
 
         if ( filename.find(".vcf") != int(filename.length()) - 4 ){
 
 
 
                 switch( QMessageBox::information( this, tr ( "Right file type ?" ),
                                                   tr( "The selected file \n does not end with \".vcf\".\n Do you really want to open it?" ),
                                                   tr( "&Yes" ), tr( "&No" ), QString::null,
                                                   0,      // Enter == button 0
                                                   2 ) ) { // Escape == button 2
                 case 0:
-                        Opie::Core::owarn << "YES clicked" << oendl;
+                        owarn << "YES clicked" << oendl;
                         break;
                 case 1:
-                        Opie::Core::owarn << "NO clicked" << oendl;
+                        owarn << "NO clicked" << oendl;
                         return;
                         break;
                 }
         }
 
         Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                          filename );
         Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
         Opie::OPimContactAccess::List allList = access->allRecords();
-        Opie::Core::owarn << "Found number of contacts in File: " << allList.count() << oendl;
+        owarn << "Found number of contacts in File: " << allList.count() << oendl;
 
         if ( !allList.count() ) {
                 QMessageBox::information( this, "Import VCard",
                                           "It was impossible to import\nthe VCard.\n"
                                           "The VCard may be corrupted!" );
         }
 
         bool doAsk = true;
         Opie::OPimContactAccess::List::Iterator it;
         for ( it = allList.begin(); it != allList.end(); ++it ){
-                Opie::Core::owarn << "Adding Contact from: " << (*it).fullName() << oendl;
+                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?" )
                                                           .arg( (*it).fullName().latin1() ),
                                                           tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"),
                                                           0,      // Enter == button 0
                                                           2 ) ) { // Escape == button 2
                         case 0:
-                                Opie::Core::owarn << "YES clicked" << oendl;
+                                owarn << "YES clicked" << oendl;
                                 m_abView->addEntry( *it );
                                 break;
                         case 1:
-                                Opie::Core::owarn << "NO clicked" << oendl;
+                                owarn << "NO clicked" << oendl;
                                 break;
                         case 2:
-                                Opie::Core::owarn << "YesAll clicked" << oendl;
+                                owarn << "YesAll clicked" << oendl;
                                 doAsk = false;
                                 break;
                         }
                 }else
                         m_abView->addEntry( *it );
 
@@ -535,25 +535,25 @@ void AddressbookWindow::writeMail()
         if ( basepath.isEmpty() )
                 basepath = QString::fromLatin1( getenv("QPEDIR") );
 
         // Try to access the preferred. If not possible, try to
         // switch to the other one..
         if ( m_config.useQtMail() ){
-                Opie::Core::owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
+                owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
                 if ( QFile::exists( basepath + "/bin/qtmail" ) ){
-                        Opie::Core::owarn << "QCop" << oendl;
+                        owarn << "QCop" << oendl;
                         QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
                         e << name << email;
                         return;
                 } else
                         m_config.setUseOpieMail( true );
         }
         if ( m_config.useOpieMail() ){
-                Opie::Core::owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
+                owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
                 if ( QFile::exists( basepath + "/bin/opiemail" ) ){
-                        Opie::Core::owarn << "QCop" << oendl;
+                        owarn << "QCop" << oendl;
                         QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)");
                         e << name << email;
                         return;
                 } else
                         m_config.setUseQtMail( true );
         }
@@ -589,13 +589,13 @@ void AddressbookWindow::slotBeam()
                 access->save();
                 delete access;
 
                 beamFilename = beamfile;
         }
 
-        Opie::Core::owarn << "Beaming: " << beamFilename << oendl;
+        owarn << "Beaming: " << beamFilename << oendl;
 
         Ir *ir = new Ir( this );
         connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
         QString description = c.fullName();
         ir->send( beamFilename, description, "text/x-vCard" );
 }
@@ -636,13 +636,13 @@ static void parseName( const QString& name, QString *first, QString *middle,
 }
 
 
 void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
         bool needShow = FALSE;
-                Opie::Core::owarn << "Receiving QCop-Call with message " << msg << oendl;
+                owarn << "Receiving QCop-Call with message " << msg << oendl;
 
 
         if (msg == "editPersonal()") {
                 editPersonal();
         } else if (msg == "editPersonalAndClose()") {
                 editPersonal();
@@ -652,13 +652,13 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                 QString name, email;
                 stream >> name >> email;
 
                 Opie::OPimContact cnt;
                 QString fn, mn, ln;
                 parseName( name, &fn, &mn, &ln );
-                        //Opie::Core::odebug << " " << fn << " - " << mn " - " << ln << oendl;
+                        //odebug << " " << fn << " - " << mn " - " << ln << oendl;
                 cnt.setFirstName( fn );
                 cnt.setMiddleName( mn );
                 cnt.setLastName( ln );
                 cnt.insertEmails( email );
                 cnt.setDefaultEmail( email );
                 cnt.setFileAs();
@@ -679,13 +679,13 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
         } else if ( msg == "show(int)" ) {
                 raise();
                 QDataStream stream(data,IO_ReadOnly);
                 int uid;
                 stream >> uid;
 
-                Opie::Core::owarn << "Showing uid: " << uid << oendl;
+                owarn << "Showing uid: " << uid << oendl;
 
                 // Deactivate Personal View..
                 if ( actionPersonal->isOn() ){
                         actionPersonal->setOn( false );
                         slotPersonalView();
                 }
@@ -759,13 +759,13 @@ void AddressbookWindow::editPersonal()
 {
         Opie::OPimContact entry;
 
         // Switch to personal view if not selected
         // but take care of the menu, too
         if ( ! actionPersonal->isOn() ){
-                Opie::Core::owarn << "*** ++++" << oendl;
+                owarn << "*** ++++" << oendl;
                 actionPersonal->setOn( true );
                 slotPersonalView();
         }
 
         if ( !abEditor ) {
                 abEditor = new ContactEditor( entry, this, "editor" );
@@ -778,29 +778,29 @@ void AddressbookWindow::editPersonal()
 
 }
 
 
 void AddressbookWindow::slotPersonalView()
 {
-        Opie::Core::owarn << "slotPersonalView()" << oendl;
+        owarn << "slotPersonalView()" << oendl;
         if (!actionPersonal->isOn()) {
                 // we just turned it off
-                Opie::Core::owarn << "slotPersonalView()-> OFF" << oendl;
+                owarn << "slotPersonalView()-> OFF" << oendl;
                 setCaption( tr("Contacts") );
                 actionNew->setEnabled(TRUE);
                 actionTrash->setEnabled(TRUE);
                 actionFind->setEnabled(TRUE);
                 actionMail->setEnabled(TRUE);
                 // slotUpdateToolbar();
 
                 m_abView->showPersonal( false );
 
                 return;
         }
 
-        Opie::Core::owarn << "slotPersonalView()-> ON" << oendl;
+        owarn << "slotPersonalView()-> ON" << oendl;
         // XXX need to disable some QActions.
         actionNew->setEnabled(FALSE);
         actionTrash->setEnabled(FALSE);
         actionFind->setEnabled(FALSE);
         actionMail->setEnabled(FALSE);
 
@@ -884,30 +884,30 @@ void AddressbookWindow::slotSave()
 }
 #endif
 
 
 void AddressbookWindow::slotNotFound()
 {
-        Opie::Core::owarn << "Got not found signal!" << oendl;
+        owarn << "Got not found signal!" << oendl;
         QMessageBox::information( this, tr( "Not Found" ),
                                  "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" );
 
 
 }
 void AddressbookWindow::slotWrapAround()
 {
-        Opie::Core::owarn << "Got wrap signal!" << oendl;
+        owarn << "Got wrap signal!" << oendl;
         // if ( doNotifyWrapAround )
         //      QMessageBox::information( this, tr( "End of list" ),
         //                                tr( "End of list. Wrap around now...!" ) + "\n" );
 
 }
 
 void AddressbookWindow::slotSetCategory( int c )
 {
-        Opie::Core::owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from "
+        owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from "
                                         << catMenu->count() << oendl;
 
         QString cat, book;
         AbView::Views  view = AbView::TableView;
 
         if ( c <= 0 )
@@ -937,13 +937,13 @@ void AddressbookWindow::slotSetCategory( int c )
         //                      book = tr( "Personal" );
         //                      view = AbView:: PersonalView;
                         }else if ( i == 3 ){ // default All Categories
                                 cat = QString::null;
                         }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled
                                 cat = "Unfiled";
-                                Opie::Core::owarn << "Unfiled selected!" << oendl;
+                                owarn << "Unfiled selected!" << oendl;
                         }else{
                                 cat = m_abView->categories()[i - 4];
                         }
                 }
         }
 
@@ -960,13 +960,13 @@ void AddressbookWindow::slotSetCategory( int c )
 
         setCaption( tr( "Contacts" ) + " - " + book + " - " + tr( cat ) );
 }
 
 void AddressbookWindow::slotViewSwitched( int view )
 {
-        Opie::Core::owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
+        owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
         int menu = 0;
 
         // Switch to selected view
         switch ( view ){
         case AbView::TableView:
                 menu = 1;
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
@@ -40,13 +40,13 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
         connect ( m_upButton, SIGNAL( clicked() ), this, SLOT( slotItemUp() ) );
         connect ( m_downButton, SIGNAL( clicked() ), this, SLOT( slotItemDown() ) );
 }
 
 void ConfigDlg::slotItemUp()
 {
-        Opie::Core::owarn << "void ConfigDlg::slotItemUp()" << oendl;
+        owarn << "void ConfigDlg::slotItemUp()" << oendl;
 
         int i = fieldListBox->currentItem();
         if ( i > 0 ) {
                 QString item = fieldListBox->currentText();
                 fieldListBox->removeItem( i );
                 fieldListBox->insertItem( item, i-1 );
@@ -54,38 +54,38 @@ void ConfigDlg::slotItemUp()
         }
 
 }
 
 void ConfigDlg::slotItemDown()
 {
-        Opie::Core::owarn << "void ConfigDlg::slotItemDown()" << oendl;
+        owarn << "void ConfigDlg::slotItemDown()" << oendl;
 
         int i = fieldListBox->currentItem();
         if ( i < (int)fieldListBox->count() - 1 ) {
                 QString item = fieldListBox->currentText();
                 fieldListBox->removeItem( i );
                 fieldListBox->insertItem( item, i+1 );
                 fieldListBox->setCurrentItem( i+1 );
         }
 }
 
 void ConfigDlg::slotItemAdd()
 {
-        Opie::Core::owarn << "void ConfigDlg::slotItemAdd()" << oendl;
+        owarn << "void ConfigDlg::slotItemAdd()" << oendl;
 
         int i = allFieldListBox->currentItem();
         if ( i > 0 ) {
                 QString item = allFieldListBox->currentText();
-                Opie::Core::owarn << "Adding " << item << oendl;
+                owarn << "Adding " << item << oendl;
                 fieldListBox->insertItem( item );
         }
 }
 
 void ConfigDlg::slotItemRemove()
 {
-        Opie::Core::owarn << "void ConfigDlg::slotItemRemove()" << oendl;
+        owarn << "void ConfigDlg::slotItemRemove()" << oendl;
 
         int i = fieldListBox->currentItem();
         if ( i > 0 ) {
                 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
@@ -75,13 +75,13 @@ ContactEditor::ContactEditor(	const Opie::OPimContact &entry,
 }
 
 ContactEditor::~ContactEditor() {
 }
 
 void ContactEditor::init() {
-        Opie::Core::owarn << "init() START" << oendl;
+        owarn << "init() START" << oendl;
 
         uint i = 0;
 
         QStringList trlChooserNames;
 
         for (i = 0; i <= 6; i++) {
@@ -684,24 +684,24 @@ void ContactEditor::init() {
                  this, SLOT(slotAddressTypeChange(int)) );
 
         new QPEDialogListener(this);
 
         setPersonalView ( m_personalView );
 
-        Opie::Core::owarn << "init() END" << oendl;
+        owarn << "init() END" << oendl;
 }
 
 void ContactEditor::defaultEmailChanged(int i){
-        Opie::Core::odebug << "defaultEmailChanged" << oendl;
+        odebug << "defaultEmailChanged" << oendl;
 
         // was sollte das ? (se)
         // int index = cmbChooserField1->currentItem();
         // slChooserValues[index] = cmbDefaultEmail->text(i);
 
         defaultEmail = cmbDefaultEmail->text(i);
-        Opie::Core::odebug << "Changed to: " << defaultEmail << oendl;
+        odebug << "Changed to: " << defaultEmail << oendl;
 
 }
 
 void ContactEditor::populateDefaultEmailCmb(){
 
         // if the default-email combo was not selected and therfore not created
@@ -714,18 +714,18 @@ void ContactEditor::populateDefaultEmailCmb(){
         cmbDefaultEmail->insertStringList( emails );
         // cmbDefaultEmail->show();
 
         // Select default email in combo..
         bool found = false;
         for ( int i = 0; i < cmbDefaultEmail->count(); i++){
-                Opie::Core::odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
+                odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
                                                         << "< defaultEmail >" << defaultEmail << "<" << oendl;
 
                 if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
                         cmbDefaultEmail->setCurrentItem( i );
-                        Opie::Core::odebug << "set" << oendl;
+                        odebug << "set" << oendl;
                         found = true;
                 }
         }
 
         // If the current default email is not found in the list, we choose the
         // first one..
@@ -735,21 +735,21 @@ void ContactEditor::populateDefaultEmailCmb(){
 
 // Called when any combobox was changed.
 // "true" returned if the change was chandled by this function, else it should
 // be handled by something else..
 bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
         QString type = slChooserNames[index];
-        Opie::Core::owarn << "ContactEditor::cmbChooserChange -> Type: " << type
+        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"){
-                Opie::Core::owarn << "Choosing default-email (defaultEmailChooserPosition= "
+                owarn << "Choosing default-email (defaultEmailChooserPosition= "
                                                         << defaultEmailChooserPosition << ") " << oendl;
 
                 // More than one default-email chooser is not allowed !
                 if ( ( defaultEmailChooserPosition != -1 ) &&
                      defaultEmailChooserPosition != widgetPos && !initializing){
                         chooserError( widgetPos );
@@ -777,13 +777,13 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
                 // Set current default email
                 populateDefaultEmailCmb();
 
 
         } else {
                 // Something else was selected: Hide combo..
-                Opie::Core::owarn << " Hiding default-email combo" << oendl;
+                owarn << " Hiding default-email combo" << oendl;
                 if ( defaultEmailChooserPosition == widgetPos ){
                         defaultEmailChooserPosition = -1;
                 }
                 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
                 if ( cmbo ){
                         inputStack->raiseWidget( TextField );
@@ -802,13 +802,13 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 
 }
 
 // Currently accessed when we select default-email more than once !
 void ContactEditor::chooserError( int index )
 {
-        Opie::Core::owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
+        owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
         QMessageBox::warning( this, "Chooser Error",
                               "Multiple selection of this\n"
                               "Item is not allowed !\n\n"
                               "First deselect the previous one !",
                               "&OK", 0, 0,
                               0, 0 );
@@ -838,53 +838,53 @@ void ContactEditor::chooserError( int index )
 
 // Called when something was changed in a textfield (shouldn't it called textchanged? (se))
 void ContactEditor::chooserChange( const QString &textChanged, int index,
                                    QLineEdit* , int widgetPos ) {
 
         QString type = slChooserNames[index]; // :SX
-        Opie::Core::odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
+        odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
                                                 << textChanged << "< index=" << index << ", widgetPos=" << widgetPos
                                                 << " )" << oendl;
 
         if ( type == "Default Email"){
-                Opie::Core::owarn << "??? Wozu??: " << textChanged << oendl;
+                owarn << "??? Wozu??: " << textChanged << oendl;
                 defaultEmail = textChanged;
 
                 populateDefaultEmailCmb();
 
         }else if (type == "Emails"){
-                Opie::Core::odebug << "emails" << oendl;
+                odebug << "emails" << oendl;
 
                 QString de;
                 emails = QStringList::split (",", textChanged );
 
                 populateDefaultEmailCmb();
         }
 
         slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
-        Opie::Core::owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
+        owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
 }
 
 void ContactEditor::slotChooser2Change( const QString &textChanged ) {
-        Opie::Core::owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
+        owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
 
 }
 
 void ContactEditor::slotChooser3Change( const QString &textChanged ) {
-        Opie::Core::owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
+        owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
 }
 
 void ContactEditor::slotChooser4Change( const QString &textChanged ) {
-        Opie::Core::owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
+        owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
 }
 
 void ContactEditor::slotAddressChange( const QString &textChanged ) {
 
         if ( cmbAddress->currentItem() == 0 ) {
@@ -948,46 +948,46 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) {
                 slHomeAddress[6] = textChanged;
         }
 }
 
 
 void ContactEditor::slotCmbChooser1Change( int index ) {
-        Opie::Core::owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
+        owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
         if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
 
                 txtChooserField1->setText( slChooserValues[index] );
                 txtChooserField1->setFocus();
 
         }
 
 }
 
 void ContactEditor::slotCmbChooser2Change( int index ) {
-        Opie::Core::owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
+        owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
 
         if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){
 
                 txtChooserField2->setText( slChooserValues[index] );
                 txtChooserField2->setFocus();
 
         }
 }
 
 void ContactEditor::slotCmbChooser3Change( int index ) {
-        Opie::Core::owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
+        owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
 
         if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){
 
                 txtChooserField3->setText( slChooserValues[index] );
                 txtChooserField3->setFocus();
 
         }
 }
 
 void ContactEditor::slotCmbChooser4Change( int index ) {
-        Opie::Core::owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
+        owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
 
         if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){
 
                 txtChooserField4->setText( slChooserValues[index] );
                 txtChooserField4->setFocus();
 
@@ -1026,13 +1026,13 @@ void ContactEditor::slotAddressTypeChange( int index ) {
         }
 
 }
 
 void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 
-        Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
+        owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
 
         int index = cmbFileAs->currentItem();
 
         cmbFileAs->clear();
 
         cmbFileAs->insertItem( parseName( textChanged, NAME_LF ) );
@@ -1050,13 +1050,13 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 void ContactEditor::slotSuffixChange( const QString& ) {
         // Just want to update the FileAs combo if the suffix was changed..
         slotFullNameChange( txtFullName->text() );
 }
 
 void ContactEditor::slotOrganizationChange( const QString &textChanged ){
-        Opie::Core::owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl;
+        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..
         if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) )
                 txtFullName->setText( textChanged );
 
@@ -1132,26 +1132,26 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
         QString strMiddleName;
         QString strLastName;
         QString strTitle;
         int commapos;
         bool haveLastName = false;
 
-        Opie::Core::owarn << "Fullname: " << simplifiedName << oendl;
+        owarn << "Fullname: " << simplifiedName << oendl;
 
         commapos = simplifiedName.find( ',', 0, TRUE);
         if ( commapos >= 0 ) {
-                Opie::Core::owarn << " Commapos: " << commapos << oendl;
+                owarn << " Commapos: " << commapos << oendl;
 
                 // A comma (",") separates the lastname from one or
                 // many first names. Thus, remove the lastname from the
                 // String and parse the firstnames.
 
                 strLastName = simplifiedName.left( commapos );
                 simplifiedName= simplifiedName.mid( commapos + 1 );
                 haveLastName = true;
-                Opie::Core::owarn << "Fullname without ',': " << simplifiedName << oendl;
+                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"
 
                 QStringList allFirstNames = QStringList::split(" ", simplifiedName);
                 QStringList::Iterator it = allFirstNames.begin();
@@ -1179,16 +1179,16 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 
         }
 
         if ( strFirstName == strLastName )
                 strFirstName = "";
 
-        Opie::Core::owarn << "strFirstName: " << strFirstName << oendl;
-        Opie::Core::owarn << "strMiddletName: " << strMiddleName << oendl;
-        Opie::Core::owarn << "strLastName: " << strLastName << oendl;
-        Opie::Core::owarn << "strTitle: " << strTitle << oendl;
+        owarn << "strFirstName: " << strFirstName << oendl;
+        owarn << "strMiddletName: " << strMiddleName << oendl;
+        owarn << "strLastName: " << strLastName << oendl;
+        owarn << "strTitle: " << strTitle << oendl;
 
         switch (type) {
         case NAME_FL:
                 return strFirstName + " " + strLastName;
 
         case NAME_LF:
@@ -1265,13 +1265,13 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
 
         ent = entry;
 
         emails = QStringList(ent.emailList());
         defaultEmail = ent.defaultEmail();
         if (defaultEmail.isEmpty()) defaultEmail = emails[0];
-        Opie::Core::odebug << "default email=" << defaultEmail << oendl;
+        odebug << "default email=" << defaultEmail << oendl;
 
         txtFirstName->setText( ent.firstName() );
         txtMiddleName->setText( ent.middleName() );
         txtLastName->setText( ent.lastName() );
         txtSuffix->setText( ent.suffix() );
 
@@ -1325,13 +1325,13 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
         //}
 
         QStringList::ConstIterator it;
         QListIterator<QLineEdit> itLE( listValue );
         for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) {
 
-                Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl;
+                owarn << " Filling dynamic Field: " << (*it) << oendl;
 
                 if ( *it ==  "Department"  )
                         (*itLE)->setText( ent.department() );
 
                 if ( *it == "Company" )
                         (*itLE)->setText( ent.company() );
@@ -1349,13 +1349,13 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
                         (*itLE)->setText( ent.manager() );
 
                 if ( *it == "Spouse" )
                         (*itLE)->setText( ent.spouse() );
 
                 if ( *it == "Nickname" ){
-                        Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl;
+                        owarn << "**** Nichname: " << ent.nickname() << oendl;
                         (*itLE)->setText( ent.nickname() );
                 }
 
                 if ( *it == "Children" )
                         (*itLE)->setText( ent.children() );
 
@@ -1582,14 +1582,14 @@ void ContactEditor::saveEntry() {
 
                 if ( *it == "Emails" ){
                         QString allemail;
                         QString defaultmail;
                         parseEmailFrom( emails.join(","), defaultmail, allemail );
                         if ( defaultEmail.isEmpty() ){
-                                Opie::Core::owarn << "Default email was not set by user!" << oendl;
-                                Opie::Core::owarn << "Using first email in list: " << defaultmail << oendl;
+                                owarn << "Default email was not set by user!" << oendl;
+                                owarn << "Using first email in list: " << defaultmail << oendl;
                                 ent.setDefaultEmail( defaultmail );
                         }
                         ent.setEmails( allemail );
                 }
 
                 if ( *it == "Default Email")
@@ -1735,17 +1735,17 @@ void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
         birthdayButton->setText( dateString );
         ent.setBirthday ( date );
 }
 
 void ContactEditor::slotRemoveBirthday()
 {
-        Opie::Core::owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
+        owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
         ent.setBirthday( QDate() );
         updateDatePicker();
 }
 
 void ContactEditor::slotRemoveAnniversary()
 {
-        Opie::Core::owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
+        owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
         ent.setAnniversary( QDate() );
         updateDatePicker();
 }
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
@@ -236,10 +236,10 @@ void LetterPicker::clear()
         lblVWX->clearLetter();
         lblYZ->clearLetter();
 }
 
 void LetterPicker::newLetter( char letter )
 {
-        Opie::Core::owarn << "LetterClicked" << oendl;
+        owarn << "LetterClicked" << oendl;
         emit letterClicked( letter );
 
 }