56 files changed, 439 insertions, 434 deletions

diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp
index 54d2da2..ae28313 100644
--- a/noncore/net/mail/accountitem.cpp
+++ b/noncore/net/mail/accountitem.cpp
@@ -79,5 +79,5 @@ void POP3viewItem::refresh()
 RECBODYP POP3viewItem::fetchBody( const RecMailP &mail )
 {
-    qDebug( "POP3 fetchBody" );
+    odebug << "POP3 fetchBody" << oendl; 
     return wrapper->fetchBody( mail );
 }
@@ -270,5 +270,5 @@ void NNTPviewItem::refresh()
 RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail )
 {
-    qDebug( "NNTP fetchBody" );
+    odebug << "NNTP fetchBody" << oendl; 
     return wrapper->fetchBody( mail );
 }
@@ -461,5 +461,5 @@ void IMAPviewItem::refreshFolders(bool force)
             item = new IMAPfolderItem( (*it), this , item );
             folders->remove(it);
-            qDebug("inbox found");
+            odebug << "inbox found" << oendl; 
             break;
         }
@@ -534,5 +534,5 @@ void IMAPviewItem::createNewFolder()
 void IMAPviewItem::contextMenuSelected(int id)
 {
-    qDebug("Id selected: %i",id);
+    odebug << "Id selected: " << id << "" << oendl; 
     switch (id)
     {
@@ -672,5 +672,5 @@ void IMAPfolderItem::deleteFolder()
                                      QObject::tr("Yes",contextName),
                                      QObject::tr("No",contextName),QString::null,1,1);
-    qDebug("Auswahl: %i",yesno);
+    odebug << "Auswahl: " << yesno << "" << oendl; 
     if (yesno == 0)
     {
@@ -699,5 +699,5 @@ void IMAPfolderItem::downloadMails()
 void IMAPfolderItem::contextMenuSelected(int id)
 {
-    qDebug("Selected id: %i",id);
+    odebug << "Selected id: " << id << "" << oendl; 
     AccountView * view = (AccountView*)listView();
     switch(id)
@@ -803,5 +803,5 @@ void MHviewItem::refresh(bool force)
 RECBODYP MHviewItem::fetchBody( const RecMailP &mail )
 {
-    qDebug( "MH fetchBody" );
+    odebug << "MH fetchBody" << oendl; 
     return wrapper->fetchBody( mail );
 }
@@ -933,5 +933,5 @@ void MHfolderItem::deleteFolder()
                                      QObject::tr("Yes",contextName),
                                      QObject::tr("No",contextName),QString::null,1,1);
-    qDebug("Auswahl: %i",yesno);
+    odebug << "Auswahl: " << yesno << "" << oendl; 
     if (yesno == 0)
     {
@@ -1075,5 +1075,5 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder)
                                      QObject::tr("Yes",contextName),
                                      QObject::tr("No",contextName),QString::null,1,1);
-    qDebug("Auswahl: %i",yesno);
+    odebug << "Auswahl: " << yesno << "" << oendl; 
     if (yesno == 0)
     {
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index f0a163e..0052061 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -67,5 +67,5 @@ void AccountView::populate( QList<Account> list )
         {
             IMAPaccount *imap = static_cast<IMAPaccount *>(it);
-            qDebug( "added IMAP " + imap->getAccountName() );
+            odebug << "added IMAP " + imap->getAccountName() << oendl; 
             imapAccounts.append(new IMAPviewItem( imap, this ));
         }
@@ -73,5 +73,5 @@ void AccountView::populate( QList<Account> list )
         {
             POP3account *pop3 = static_cast<POP3account *>(it);
-            qDebug( "added POP3 " + pop3->getAccountName() );
+            odebug << "added POP3 " + pop3->getAccountName() << oendl; 
             /* must not be hold 'cause it isn't required */
             (void) new POP3viewItem( pop3, this );
@@ -80,5 +80,5 @@ void AccountView::populate( QList<Account> list )
         {
             NNTPaccount *nntp = static_cast<NNTPaccount *>(it);
-            qDebug( "added NNTP " + nntp->getAccountName() );
+            odebug << "added NNTP " + nntp->getAccountName() << oendl; 
             /* must not be hold 'cause it isn't required */
             (void) new NNTPviewItem( nntp, this );
@@ -90,5 +90,5 @@ void AccountView::refresh(QListViewItem *item)
 {
 
-    qDebug("AccountView refresh...");
+    odebug << "AccountView refresh..." << oendl; 
     if ( item )
     {
@@ -163,6 +163,6 @@ void AccountView::downloadMails(const FolderP&fromFolder,AbstractMail*fromWrappe
         return;
     }
-    qDebug("Targetfolder: %s",targetFolder.latin1());
-    qDebug("Fromfolder: %s",fromFolder->getName().latin1());
+    odebug << "Targetfolder: " << targetFolder.latin1() << "" << oendl; 
+    odebug << "Fromfolder: " << fromFolder->getName().latin1() << "" << oendl; 
     fromWrapper->mvcpAllMails(fromFolder,targetFolder,targetMail,sels.moveMails());
     refreshCurrent();
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index 988a1d9..fa703c4 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -184,5 +184,5 @@ void ComposeMail::accept()
 {
     if ( checkBoxLater->isChecked() ) {
-        qDebug(  "Send later" );
+        odebug << "Send later" << oendl; 
     }
 
@@ -257,5 +257,5 @@ void ComposeMail::reject()
             txt.append( sigMultiLine->text() );
         }
-        qDebug(txt);
+        odebug << txt << oendl; 
         mail->setMessage( txt );
 
@@ -293,5 +293,5 @@ AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
 {
     attachment = att;
-    qDebug( att->getMimeType() );
+    odebug << att->getMimeType() << oendl; 
     setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ?
                   Resource::loadPixmap( "UnknownDocument-14" ) :
diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 5c4bdf7..de064ca 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -41,5 +41,5 @@ EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool
         : EditAccountsUI( parent, name, modal, flags )
 {
-    qDebug( "New Account Configuration Widget" );
+    odebug << "New Account Configuration Widget" << oendl; 
     settings = s;
 
@@ -81,5 +81,5 @@ void EditAccounts::slotFillLists()
 void EditAccounts::slotNewMail()
 {
-    qDebug( "New Mail Account" );
+    odebug << "New Mail Account" << oendl; 
     QString *selection = new QString();
     SelectMailType selType( selection, this, 0, true );
@@ -95,5 +95,5 @@ void EditAccounts::slotNewAccount( const QString &type )
     if ( type.compare( "IMAP" ) == 0 )
     {
-        qDebug( "-> config IMAP" );
+        odebug << "-> config IMAP" << oendl; 
         IMAPaccount *account = new IMAPaccount();
         IMAPconfig imap( account, this, 0, true );
@@ -111,5 +111,5 @@ void EditAccounts::slotNewAccount( const QString &type )
     else if ( type.compare( "POP3" ) == 0 )
     {
-        qDebug( "-> config POP3" );
+        odebug << "-> config POP3" << oendl; 
         POP3account *account = new POP3account();
         POP3config pop3( account, this, 0, true, WStyle_ContextHelp );
@@ -127,5 +127,5 @@ void EditAccounts::slotNewAccount( const QString &type )
     else if ( type.compare( "SMTP" ) == 0 )
     {
-        qDebug( "-> config SMTP" );
+        odebug << "-> config SMTP" << oendl; 
         SMTPaccount *account = new SMTPaccount();
         SMTPconfig smtp( account, this, 0, true, WStyle_ContextHelp );
@@ -144,5 +144,5 @@ void EditAccounts::slotNewAccount( const QString &type )
     else if ( type.compare( "NNTP" ) == 0 )
     {
-        qDebug( "-> config NNTP" );
+        odebug << "-> config NNTP" << oendl; 
         NNTPaccount *account = new NNTPaccount();
         NNTPconfig nntp( account, this, 0, true, WStyle_ContextHelp );
@@ -213,5 +213,5 @@ void EditAccounts::slotDeleteAccount( Account *account )
 void EditAccounts::slotEditMail()
 {
-    qDebug( "Edit Mail Account" );
+    odebug << "Edit Mail Account" << oendl; 
     if ( !mailList->currentItem() )
     {
@@ -242,5 +242,5 @@ void EditAccounts::slotDeleteMail()
 void EditAccounts::slotNewNews()
 {
-    qDebug( "New News Account" );
+    odebug << "New News Account" << oendl; 
     slotNewAccount( "NNTP" );
 }
@@ -248,5 +248,5 @@ void EditAccounts::slotNewNews()
 void EditAccounts::slotEditNews()
 {
-    qDebug( "Edit News Account" );
+    odebug << "Edit News Account" << oendl; 
     if ( !newsList->currentItem() )
     {
@@ -263,5 +263,5 @@ void EditAccounts::slotEditNews()
 void EditAccounts::slotDeleteNews()
 {
-    qDebug( "Delete News Account" );
+    odebug << "Delete News Account" << oendl; 
     if ( !newsList->currentItem() )
     {
@@ -579,5 +579,5 @@ void NNTPconfig::save()
 
        if ( ( (QCheckListItem*)list_it.current() )->isOn() ) {
-          qDebug(list_it.current()->text(0) );
+          odebug << list_it.current()->text(0) << oendl; 
           groupList.append(  list_it.current()->text(0) );
       }
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp
index 6bebb7b..1a26351 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.cpp
+++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp
@@ -53,5 +53,5 @@ AbstractMail* AbstractMail::getWrapper(Account*a)
 encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc)
 {
-    qDebug("Decode string start");
+    odebug << "Decode string start" << oendl; 
     char*result_text;
     size_t index = 0;
@@ -77,5 +77,5 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin
         result->setContent(result_text,target_length);
     }
-    qDebug("Decode string finished");
+    odebug << "Decode string finished" << oendl; 
     return result;
 }
@@ -92,8 +92,8 @@ QString AbstractMail::convert_String(const char*text)
 /*    int err = mailmime_encoded_phrase_parse("iso-8859-1",
         text, strlen(text),&index, "iso-8859-1",&res);*/
-    //qDebug("Input: %s",text);
+    //odebug << "Input: " << text << "" << oendl; 
     if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
 //        result = QString(res);
-//        qDebug("Res: %s, length: %i",res,strlen(res));
+//        odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; 
     }
     if (res) free(res);
diff --git a/noncore/net/mail/libmailwrapper/generatemail.cpp b/noncore/net/mail/libmailwrapper/generatemail.cpp
index cb58d82..36ec232 100644
--- a/noncore/net/mail/libmailwrapper/generatemail.cpp
+++ b/noncore/net/mail/libmailwrapper/generatemail.cpp
@@ -98,5 +98,5 @@ mailimf_address_list *Generatemail::parseAddresses(const QString&addr ) {
                 if (!s.isEmpty()) {
                     list.append(s);
-                    qDebug("Appended %s",s.latin1());
+                    odebug << "Appended " << s.latin1() << "" << oendl; 
                 }
                 // !!!! this is a MUST BE!
@@ -111,5 +111,5 @@ mailimf_address_list *Generatemail::parseAddresses(const QString&addr ) {
     if (!s.isEmpty()) {
         list.append(s);
-        qDebug("Appended %s",s.latin1());
+        odebug << "Appended " << s.latin1() << "" << oendl; 
     }
     QStringList::Iterator it;
@@ -117,8 +117,8 @@ mailimf_address_list *Generatemail::parseAddresses(const QString&addr ) {
         int err = mailimf_address_list_add_parse( addresses, (char*)(*it).latin1() );
         if ( err != MAILIMF_NO_ERROR ) {
-            qDebug( "Error parsing" );
-            qDebug( *it );
+            odebug << "Error parsing" << oendl; 
+            odebug << *it << oendl; 
         } else {
-            qDebug( "Parse success! %s",(*it).latin1());
+            odebug << "Parse success! " << (*it).latin1() << "" << oendl; 
         }
     }
@@ -176,5 +176,5 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
         }
         if (err != MAILIMF_NO_ERROR) {
-            qDebug("Error setting body with file %s",file);
+            odebug << "Error setting body with file " << file << "" << oendl; 
             mailmime_free( filePart );
             filePart = 0;
@@ -207,7 +207,7 @@ void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files
     const Attachment *it;
     unsigned int count = files.count();
-    qDebug("List contains %i values",count);
+    odebug << "List contains " << count << " values" << oendl; 
     for ( unsigned int i = 0; i < count; ++i ) {
-        qDebug( "Adding file" );
+        odebug << "Adding file" << oendl; 
         mailmime *filePart;
         int err;
@@ -216,6 +216,6 @@ void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files
         filePart = buildFilePart( it->getFileName(), it->getMimeType(),"" );
         if ( filePart == NULL ) {
-            qDebug( "addFileParts: error adding file:" );
-            qDebug( it->getFileName() );
+            odebug << "addFileParts: error adding file:" << oendl; 
+            odebug << it->getFileName() << oendl; 
             continue;
         }
@@ -223,5 +223,5 @@ void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files
         if ( err != MAILIMF_NO_ERROR ) {
             mailmime_free( filePart );
-            qDebug("error smart add");
+            odebug << "error smart add" << oendl; 
         }
     }
@@ -271,5 +271,5 @@ err_free_param:
     mailmime_parameter_free( param );
 err_free:
-    qDebug( "buildTxtPart - error" );
+    odebug << "buildTxtPart - error" << oendl; 
 
     return NULL;        // Error :(
@@ -346,5 +346,5 @@ mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Ma
             memcpy(c_reply,h.latin1(),nsize);
             clist_append(in_reply_to,c_reply);
-            qDebug("In reply to: %s",c_reply);
+            odebug << "In reply to: " << c_reply << "" << oendl; 
         }
     }
@@ -354,5 +354,5 @@ mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Ma
                                            in_reply_to, NULL, subject );
         if ( fields == NULL ) {
-            qDebug("Error creating mailimf fields");
+            odebug << "Error creating mailimf fields" << oendl; 
             res = 0;
         }
@@ -436,5 +436,5 @@ err_free_fields:
     mailimf_fields_free( fields );
 err_free:
-    qDebug( "createMimeMail: error" );
+    odebug << "createMimeMail: error" << oendl; 
 
     return NULL;            // Error :(
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
index 0c68280..fae4c99 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
@@ -136,5 +136,5 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
 {
     if (current_rec >= 10) {
-        qDebug("too deep recursion!");
+        odebug << "too deep recursion!" << oendl; 
     }
     if (!message || !mime) {
@@ -273,5 +273,5 @@ QString Genericwrapper::parseAddressList( mailimf_address_list *list )
                 break;
             default:
-                qDebug( "Generic: unkown mailimf address type" );
+                odebug << "Generic: unkown mailimf address type" << oendl; 
                 break;
         }
@@ -366,5 +366,5 @@ void Genericwrapper::cleanMimeCache()
     }
     bodyCache.clear();
-    qDebug("Genericwrapper: cache cleaned");
+    odebug << "Genericwrapper: cache cleaned" << oendl; 
 }
 
@@ -395,10 +395,10 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
     r = mailsession_get_messages_list(session,&env_list);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error message list");
+        odebug << "Error message list" << oendl; 
         return;
     }
     r = mailsession_get_envelopes_list(session, env_list);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error filling message list");
+        odebug << "Error filling message list" << oendl; 
         if (env_list) {
             mailmessage_list_free(env_list);
@@ -414,5 +414,5 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
         msg = (mailmessage*)carray_get(env_list->msg_tab, i);
         if (msg->msg_fields == NULL) {
-            //qDebug("could not fetch envelope of message %i", i);
+            //odebug << "could not fetch envelope of message " << i << "" << oendl; 
             continue;
         }
@@ -449,5 +449,5 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
         if (single_fields.fld_message_id->mid_value) {
             mail->setMsgid(QString(single_fields.fld_message_id->mid_value));
-            qDebug("Msgid == %s",mail->Msgid().latin1());
+            odebug << "Msgid == " << mail->Msgid().latin1() << "" << oendl; 
         }
 
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 657c2ba..35468fe 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -31,5 +31,5 @@ int IMAPwrapper::selectMbox(const QString&mbox)
     int err = mailimap_select( m_imap, (char*)mbox.latin1());
     if ( err != MAILIMAP_NO_ERROR ) {
-        qDebug("error selecting mailbox: %s",m_imap->imap_response);
+        odebug << "error selecting mailbox: " << m_imap->imap_response << "" << oendl; 
         m_Lastmbox = "";
         return err;
@@ -42,5 +42,5 @@ void IMAPwrapper::imap_progress( size_t current, size_t maximum )
 {
     qApp->processEvents();
-    qDebug( "IMAP: %i of %i", current, maximum );
+    odebug << "IMAP: " << current << " of " << maximum << "" << oendl; 
 }
 
@@ -54,5 +54,5 @@ bool IMAPwrapper::start_tls(bool force_tls)
     if (err != MAILIMAP_NO_ERROR) {
         Global::statusMessage("error getting capabilities!");
-        qDebug("error getting capabilities!");
+        odebug << "error getting capabilities!" << oendl; 
         return false;
     }
@@ -75,5 +75,5 @@ bool IMAPwrapper::start_tls(bool force_tls)
         if (err != MAILIMAP_NO_ERROR && force_tls) {
             Global::statusMessage(tr("Server has no TLS support!"));
-            qDebug("Server has no TLS support!");
+            odebug << "Server has no TLS support!" << oendl; 
             try_tls = false;
         } else {
@@ -126,5 +126,5 @@ void IMAPwrapper::login()
       } else {
         // cancel
-        qDebug( "IMAP: Login canceled" );
+        odebug << "IMAP: Login canceled" << oendl; 
         return;
       }
@@ -149,5 +149,5 @@ void IMAPwrapper::login()
 
     if ( ssl ) {
-        qDebug(  "using ssl" );
+        odebug << "using ssl" << oendl; 
         err = mailimap_ssl_connect( m_imap, (char*)server, port );
     } else {
@@ -177,5 +177,5 @@ void IMAPwrapper::login()
     if (force_tls && !try_tls) {
         Global::statusMessage(tr("Server has no TLS support!"));
-        qDebug("Server has no TLS support!");
+        odebug << "Server has no TLS support!" << oendl; 
         ok = false;
     }
@@ -318,5 +318,5 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
         }
     } else {
-        qDebug("error fetching folders: %s",m_imap->imap_response);
+        odebug << "error fetching folders: " << m_imap->imap_response << "" << oendl; 
     }
     mailimap_list_result_free( result );
@@ -328,5 +328,5 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
     path = account->getPrefix().latin1();
     if (!path) path = "";
-    qDebug(path);
+    odebug << path << oendl; 
     err = mailimap_list( m_imap, (char*)path, (char*)mask, &result );
     if ( err == MAILIMAP_NO_ERROR ) {
@@ -355,5 +355,5 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
         }
     } else {
-        qDebug("error fetching folders %s",m_imap->imap_response);
+        odebug << "error fetching folders " << m_imap->imap_response << "" << oendl; 
     }
     if (result) mailimap_list_result_free( result );
@@ -467,6 +467,6 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
             mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date;
             QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec));
-            qDebug("%i %i %i - %i %i %i",d->dt_year,d->dt_month,d->dt_day,d->dt_hour,d->dt_min,d->dt_sec);
-            qDebug(da.toString());
+            odebug << "" << d->dt_year << " " << d->dt_month << " " << d->dt_day << " - " << d->dt_hour << " " << d->dt_min << " " << d->dt_sec << "" << oendl; 
+            odebug << da.toString() << oendl; 
 #endif
         } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) {
@@ -525,5 +525,5 @@ RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail)
         traverseBody(mail,body_desc,body,0,path);
     } else {
-        qDebug("error fetching body: %s",m_imap->imap_response);
+        odebug << "error fetching body: " << m_imap->imap_response << "" << oendl; 
     }
     if (result) mailimap_fetch_list_free(result);
@@ -637,5 +637,5 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int
         }
     } else {
-        qDebug("error fetching text: %s",m_imap->imap_response);
+        odebug << "error fetching text: " << m_imap->imap_response << "" << oendl; 
     }
     if (result) mailimap_fetch_list_free(result);
@@ -664,5 +664,5 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
             id+=QString("%1").arg(countlist[j]);
         }
-        qDebug("ID = %s",id.latin1());
+        odebug << "ID = " << id.latin1() << "" << oendl; 
         currentPart->setIdentifier(id);
         fillSinglePart(currentPart,part1);
@@ -705,5 +705,5 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
                     id+=QString("%1").arg(countlist[j]);
                 }
-                qDebug("ID(mpart) = %s",id.latin1());
+                odebug << "ID(mpart) = " << id.latin1() << "" << oendl; 
             }
             traverseBody(mail,current_body,target_body,current_recursion+1,countlist,ccount);
@@ -749,5 +749,5 @@ void IMAPwrapper::fillSingleTextPart(RecPartP&target_part,mailimap_body_type_tex
     QString sub;
     sub = which->bd_media_text;
-    qDebug("Type= text/%s",which->bd_media_text);
+    odebug << "Type= text/" << which->bd_media_text << "" << oendl; 
     target_part->setSubtype(sub.lower());
     target_part->setLines(which->bd_lines);
@@ -761,5 +761,5 @@ void IMAPwrapper::fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg*
     }
     target_part->setSubtype("rfc822");
-    qDebug("Message part");
+    odebug << "Message part" << oendl; 
     /* we set this type to text/plain */
     target_part->setLines(which->bd_lines);
@@ -820,5 +820,5 @@ void IMAPwrapper::fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_ba
         sub = "";
     }
-    qDebug("Type = %s/%s",type.latin1(),sub.latin1());
+    odebug << "Type = " << type.latin1() << "/" << sub.latin1() << "" << oendl; 
     target_part->setType(type.lower());
     target_part->setSubtype(sub.lower());
@@ -896,14 +896,14 @@ void IMAPwrapper::deleteMail(const RecMailP&mail)
 
     if (err != MAILIMAP_NO_ERROR) {
-        qDebug("error deleting mail: %s",m_imap->imap_response);
+        odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; 
         return;
     }
-    qDebug("deleting mail: %s",m_imap->imap_response);
+    odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; 
     /* should we realy do that at this moment? */
     err = mailimap_expunge(m_imap);
     if (err != MAILIMAP_NO_ERROR) {
-        qDebug("error deleting mail: %s",m_imap->imap_response);
+        odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; 
     }
-    qDebug("Delete successfull %s",m_imap->imap_response);
+    odebug << "Delete successfull " << m_imap->imap_response << "" << oendl; 
 }
 
@@ -931,5 +931,5 @@ void IMAPwrapper::answeredMail(const RecMailP&mail)
 
     if (err != MAILIMAP_NO_ERROR) {
-        qDebug("error marking mail: %s",m_imap->imap_response);
+        odebug << "error marking mail: " << m_imap->imap_response << "" << oendl; 
         return;
     }
@@ -999,5 +999,5 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder)
         return 0;
     }
-    qDebug("deleting mail: %s",m_imap->imap_response);
+    odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; 
     /* should we realy do that at this moment? */
     err = mailimap_expunge(m_imap);
@@ -1006,5 +1006,5 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder)
         return 0;
     }
-    qDebug("Delete successfull %s",m_imap->imap_response);
+    odebug << "Delete successfull " << m_imap->imap_response << "" << oendl; 
     return 1;
 }
@@ -1031,5 +1031,5 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons
         }
     }
-    qDebug("Creating %s",pre.latin1());
+    odebug << "Creating " << pre.latin1() << "" << oendl; 
     int res = mailimap_create(m_imap,pre.latin1());
     if (res != MAILIMAP_NO_ERROR) {
@@ -1090,5 +1090,5 @@ void IMAPwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
         }
     } else {
-        qDebug("Error retrieving status");
+        odebug << "Error retrieving status" << oendl; 
     }
     if (status) mailimap_mailbox_data_status_free(status);
@@ -1114,5 +1114,5 @@ MAILLIB::ATYPE IMAPwrapper::getType()const
 const QString&IMAPwrapper::getName()const
 {
-    qDebug("Get name: %s",account->getAccountName().latin1());
+    odebug << "Get name: " << account->getAccountName().latin1() << "" << oendl; 
     return account->getAccountName();
 }
@@ -1130,5 +1130,5 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
     if (targetWrapper != this) {
         AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit);
-        qDebug("Using generic");
+        odebug << "Using generic" << oendl; 
         return;
     }
@@ -1149,5 +1149,5 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
         QString error_msg = tr("error copy mails: %1").arg(m_imap->imap_response);
         Global::statusMessage(error_msg);
-        qDebug(error_msg);
+        odebug << error_msg << oendl; 
         return;
     }
@@ -1160,5 +1160,5 @@ void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstra
 {
     if (targetWrapper != this) {
-        qDebug("Using generic");
+        odebug << "Using generic" << oendl; 
         AbstractMail::mvcpMail(mail,targetFolder,targetWrapper,moveit);
         return;
@@ -1179,5 +1179,5 @@ void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstra
         QString error_msg = tr("error copy mail: %1").arg(m_imap->imap_response);
         Global::statusMessage(error_msg);
-        qDebug(error_msg);
+        odebug << error_msg << oendl; 
         return;
     }
diff --git a/noncore/net/mail/libmailwrapper/logindialog.cpp b/noncore/net/mail/libmailwrapper/logindialog.cpp
index 01d177e..c9ae190 100644
--- a/noncore/net/mail/libmailwrapper/logindialog.cpp
+++ b/noncore/net/mail/libmailwrapper/logindialog.cpp
@@ -25,5 +25,5 @@ void LoginDialog::accept()
     _pass = passLine->text();
 
-    qDebug("User im accept: |%s|",_user.latin1());
+    odebug << "User im accept: |" << _user.latin1() << "|" << oendl; 
     QDialog::accept();
 }
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp
index 90b8865..6d44db4 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.cpp
+++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp
@@ -14,5 +14,5 @@ RecMail::RecMail(const RecMail&old)
     init();
     copy_old(old);
-    qDebug("Copy constructor RecMail");
+    odebug << "Copy constructor RecMail" << oendl; 
 }
 
@@ -132,5 +132,5 @@ RecPart::RecPart(const RecPart&old)
     m_Parameters = old.m_Parameters;
     m_poslist = old.m_poslist;
-    qDebug("RecPart copy constructor");
+    odebug << "RecPart copy constructor" << oendl; 
 }
 
@@ -256,5 +256,5 @@ RecBody::RecBody(const RecBody&old)
     m_PartsList = old.m_PartsList;
     m_description = old.m_description;
-    qDebug("Recbody copy constructor");
+    odebug << "Recbody copy constructor" << oendl; 
 }
 
@@ -321,5 +321,5 @@ encodedString::encodedString(const encodedString&old)
     init();
     copy_old(old);
-    qDebug("encodedeString: copy constructor!");
+    odebug << "encodedeString: copy constructor!" << oendl; 
 }
 
@@ -328,5 +328,5 @@ encodedString& encodedString::operator=(const encodedString&old)
     init();
     copy_old(old);
-    qDebug("encodedString: assign operator!");
+    odebug << "encodedString: assign operator!" << oendl; 
     return *this;
 }
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
index eddc0b9..2b0d112 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
@@ -52,5 +52,5 @@ IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no
   nameDisplay = IMAPFolder::decodeFolderName( name );
   /*
-  qDebug( "folder " + name + " - displayed as " + nameDisplay );
+  odebug << "folder " + name + " - displayed as " + nameDisplay << oendl; 
   */
     prefix = aprefix;
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
index e3c75f3..df2112f 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
@@ -32,5 +32,5 @@ void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &ta
     r = mailfolder_connect(folder);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error initializing mbox");
+        odebug << "Error initializing mbox" << oendl; 
         mailfolder_free(folder);
         mailstorage_free(storage);
@@ -71,5 +71,5 @@ void MBOXwrapper::deleteMail(const RecMailP & mail)
     r = mailfolder_connect(folder);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error initializing mbox");
+        odebug << "Error initializing mbox" << oendl; 
         mailfolder_free(folder);
         mailstorage_free(storage);
@@ -78,5 +78,5 @@ void MBOXwrapper::deleteMail(const RecMailP & mail)
     r = mailsession_remove_message(folder->fld_session,mail->getNumber());
     if (r != MAIL_NO_ERROR) {
-        qDebug("error deleting mail");
+        odebug << "error deleting mail" << oendl; 
     }
     mailfolder_free(folder);
@@ -103,5 +103,5 @@ RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail )
     r = mailfolder_connect(folder);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error initializing mbox");
+        odebug << "Error initializing mbox" << oendl; 
         mailfolder_free(folder);
         mailstorage_free(storage);
@@ -110,5 +110,5 @@ RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail )
     r = mailsession_get_message(folder->fld_session, mail->getNumber(), &msg);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error fetching mail %i",mail->getNumber());
+        odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; 
         mailfolder_free(folder);
         mailstorage_free(storage);
@@ -117,5 +117,5 @@ RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail )
     r = mailmessage_fetch(msg,&data,&size);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error fetching mail %i",mail->getNumber());
+        odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; 
         mailfolder_free(folder);
         mailstorage_free(storage);
@@ -133,5 +133,5 @@ RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail )
 void MBOXwrapper::mbox_progress( size_t current, size_t maximum )
 {
-    qDebug("MBOX %i von %i",current,maximum);
+    odebug << "MBOX " << current << " von " << maximum << "" << oendl; 
 }
 
@@ -221,5 +221,5 @@ void MBOXwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP>
     int r = mailmbox_init(p.latin1(),0,1,0,&f);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error init folder");
+        odebug << "Error init folder" << oendl; 
         return;
     }
@@ -236,10 +236,10 @@ void MBOXwrapper::deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &targ
         r = mailmbox_delete_msg(f,(*it)->getNumber());
         if (r!=MAILMBOX_NO_ERROR) {
-            qDebug("error delete mail");
+            odebug << "error delete mail" << oendl; 
         }
     }
     r = mailmbox_expunge(f);
     if (r != MAILMBOX_NO_ERROR) {
-        qDebug("error expunge mailbox");
+        odebug << "error expunge mailbox" << oendl; 
     }
 }
@@ -270,5 +270,5 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder)
         r = mailsession_get_messages_list(folder->fld_session,&l);
         if (r != MAIL_NO_ERROR) {
-            qDebug("Error message list");
+            odebug << "Error message list" << oendl; 
             res=0;
         }
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
index 12472e9..cd7cecb 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
@@ -17,5 +17,5 @@ MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name)
             MHPath=MHPath.left(MHPath.length()-1);
         }
-        qDebug(MHPath);
+        odebug << MHPath << oendl; 
         QDir dir(MHPath);
         if (!dir.exists()) {
@@ -34,5 +34,5 @@ void MHwrapper::init_storage()
         r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0);
         if (r != MAIL_NO_ERROR) {
-            qDebug("error initializing storage");
+            odebug << "error initializing storage" << oendl; 
             mailstorage_free(m_storage);
             m_storage = 0;
@@ -42,5 +42,5 @@ void MHwrapper::init_storage()
     r = mailstorage_connect(m_storage);
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error connecting storage");
+        odebug << "error connecting storage" << oendl; 
         mailstorage_free(m_storage);
         m_storage = 0;
@@ -71,5 +71,5 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSm
     int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1());
     if (r!=MAIL_NO_ERROR) {
-        qDebug("listMessages: error selecting folder!");
+        odebug << "listMessages: error selecting folder!" << oendl; 
         return;
     }
@@ -91,5 +91,5 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders()
     int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist);
     if (r != MAIL_NO_ERROR || !flist) {
-        qDebug("error getting folder list");
+        odebug << "error getting folder list" << oendl; 
         return folders;
     }
@@ -111,10 +111,10 @@ void MHwrapper::deleteMail(const RecMailP&mail)
     int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1());
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error selecting folder!");
+        odebug << "error selecting folder!" << oendl; 
         return;
     }
     r = mailsession_remove_message(m_storage->sto_session,mail->getNumber());
     if (r != MAIL_NO_ERROR) {
-        qDebug("error deleting mail");
+        odebug << "error deleting mail" << oendl; 
     }
 }
@@ -141,5 +141,5 @@ RecBodyP MHwrapper::fetchBody( const RecMailP &mail )
     r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error fetching mail %i",mail->getNumber());
+        odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; 
         return body;
     }
@@ -151,5 +151,5 @@ RecBodyP MHwrapper::fetchBody( const RecMailP &mail )
 void MHwrapper::mbox_progress( size_t current, size_t maximum )
 {
-    qDebug("MH %i von %i",current,maximum);
+    odebug << "MH " << current << " von " << maximum << "" << oendl; 
 }
 
@@ -184,11 +184,11 @@ int MHwrapper::createMbox(const QString&folder,const FolderP&pfolder,const QStri
         f+=folder;
     }
-    qDebug(f);
+    odebug << f << oendl; 
     int r = mailsession_create_folder(m_storage->sto_session,(char*)f.latin1());
     if (r != MAIL_NO_ERROR) {
-        qDebug("error creating folder %i",r);
+        odebug << "error creating folder " << r << "" << oendl; 
         return 0;
     }
-    qDebug("Folder created");
+    odebug << "Folder created" << oendl; 
     return 1;
 }
@@ -203,10 +203,10 @@ void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder)
     int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1());
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error selecting folder!");
+        odebug << "error selecting folder!" << oendl; 
         return;
     }
     r = mailsession_append_message(m_storage->sto_session,(char*)msg,length);
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error storing mail");
+        odebug << "error storing mail" << oendl; 
     }
     return;
@@ -225,5 +225,5 @@ encodedString* MHwrapper::fetchRawBody(const RecMailP&mail)
     int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1());
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error selecting folder!");
+        odebug << "error selecting folder!" << oendl; 
         return result;
     }
@@ -249,5 +249,5 @@ void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &
     int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1());
     if (r!=MAIL_NO_ERROR) {
-        qDebug("deleteMails: error selecting folder!");
+        odebug << "deleteMails: error selecting folder!" << oendl; 
         return;
     }
@@ -256,5 +256,5 @@ void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &
         r = mailsession_remove_message(m_storage->sto_session,(*it)->getNumber());
         if (r != MAIL_NO_ERROR) {
-            qDebug("error deleting mail");
+            odebug << "error deleting mail" << oendl; 
             break;
         }
@@ -272,5 +272,5 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder)
     int r = mailsession_select_folder(m_storage->sto_session,(char*)tfolder->getName().latin1());
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error selecting folder!");
+        odebug << "error selecting folder!" << oendl; 
         return 0;
     }
@@ -278,5 +278,5 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder)
     r = mailsession_get_messages_list(m_storage->sto_session,&l);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error message list");
+        odebug << "Error message list" << oendl; 
         res = 0;
     }
@@ -309,5 +309,5 @@ int MHwrapper::deleteMbox(const FolderP&tfolder)
 
     if (r != MAIL_NO_ERROR) {
-        qDebug("error deleting mail box");
+        odebug << "error deleting mail box" << oendl; 
         return 0;
     }
@@ -327,8 +327,8 @@ int MHwrapper::deleteMbox(const FolderP&tfolder)
     removeMboxfailed = false;
     if(!process->start(OProcess::Block, OProcess::All) ) {
-        qDebug("could not start process");
+        odebug << "could not start process" << oendl; 
         return 0;
     }
-    qDebug("mail box deleted");
+    odebug << "mail box deleted" << oendl; 
     return 1;
 }
@@ -379,13 +379,13 @@ void MHwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstract
     }
     if (targetWrapper != this) {
-        qDebug("Using generic");
+        odebug << "Using generic" << oendl; 
         Genericwrapper::mvcpMail(mail,targetFolder,targetWrapper,moveit);
         return;
     }
-    qDebug("Using internal routines for move/copy");
+    odebug << "Using internal routines for move/copy" << oendl; 
     QString tf = buildPath(targetFolder);
     int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1());
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error selecting source mailbox");
+        odebug << "Error selecting source mailbox" << oendl; 
         return;
     }
@@ -396,5 +396,5 @@ void MHwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstract
     }
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error copy/moving mail internal (%i)",r);
+        odebug << "Error copy/moving mail internal (" << r << ")" << oendl; 
     }
 }
@@ -408,5 +408,5 @@ void MHwrapper::mvcpAllMails(const FolderP&fromFolder,
     }
     if (targetWrapper != this) {
-        qDebug("Using generic");
+        odebug << "Using generic" << oendl; 
         Genericwrapper::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit);
         return;
@@ -415,5 +415,5 @@ void MHwrapper::mvcpAllMails(const FolderP&fromFolder,
     int r = mailsession_select_folder(m_storage->sto_session,(char*)fromFolder->getName().latin1());
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error selecting source folder!");
+        odebug << "error selecting source folder!" << oendl; 
         return;
     }
@@ -422,5 +422,5 @@ void MHwrapper::mvcpAllMails(const FolderP&fromFolder,
     r = mailsession_get_messages_list(m_storage->sto_session,&l);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error message list");
+        odebug << "Error message list" << oendl; 
     }
     unsigned j = 0;
@@ -435,5 +435,5 @@ void MHwrapper::mvcpAllMails(const FolderP&fromFolder,
         }
         if (r != MAIL_NO_ERROR) {
-            qDebug("Error copy/moving mail internal (%i)",r);
+            odebug << "Error copy/moving mail internal (" << r << ")" << oendl; 
             break;
         }
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
index cfded43..5d5011a 100644
--- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
@@ -30,5 +30,5 @@ NNTPwrapper::~NNTPwrapper() {
 
 void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) {
-    qDebug( "NNTP: %i of %i", current, maximum );
+    odebug << "NNTP: " << current << " of " << maximum << "" << oendl; 
 }
 
@@ -47,5 +47,5 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
     mailmessage * mailmsg;
     if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) {
-        qDebug("Message to large: %i",mail->Msgsize());
+        odebug << "Message to large: " << mail->Msgsize() << "" << oendl; 
         return body;
     }
@@ -135,5 +135,5 @@ void NNTPwrapper::login()
         } else {
             // cancel
-            qDebug( "NNTP: Login canceled" );
+            odebug << "NNTP: Login canceled" << oendl; 
             return;
         }
@@ -172,5 +172,5 @@ void NNTPwrapper::login()
 
    if (err != NEWSNNTP_NO_ERROR) {
-        qDebug( QString( "FEHLERNUMMER %1" ).arg(  err ) );
+        odebug << QString( "FEHLERNUMMER %1" ).arg(  err ) << oendl; 
      //   Global::statusMessage(tr("Error initializing folder"));
         mailstorage_free(m_nntp);
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 5467547..c586c29 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -29,5 +29,5 @@ POP3wrapper::~POP3wrapper() {
 
 void POP3wrapper::pop3_progress( size_t current, size_t maximum ) {
-    qDebug( "POP3: %i of %i", current, maximum );
+    odebug << "POP3: " << current << " of " << maximum << "" << oendl; 
 }
 
@@ -46,5 +46,5 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
     mailmessage * mailmsg;
     if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) {
-        qDebug("Message to large: %i",mail->Msgsize());
+        odebug << "Message to large: " << mail->Msgsize() << "" << oendl; 
         return body;
     }
@@ -131,5 +131,5 @@ void POP3wrapper::login()
         } else {
             // cancel
-            qDebug( "POP3: Login canceled" );
+            odebug << "POP3: Login canceled" << oendl; 
             return;
         }
@@ -163,5 +163,5 @@ void POP3wrapper::login()
     err = mailstorage_connect(m_pop3);
     if (err != MAIL_NO_ERROR) {
-        qDebug( QString( "FEHLERNUMMER %1" ).arg(  err ) );
+        odebug << QString( "FEHLERNUMMER %1" ).arg(  err ) << oendl; 
         Global::statusMessage(tr("Error initializing folder"));
         mailstorage_free(m_pop3);
@@ -237,5 +237,5 @@ void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) {
                                       &target_stat.message_recent,&target_stat.message_unseen);
     if (r != MAIL_NO_ERROR) {
-        qDebug("error getting folter status.");
+        odebug << "error getting folter status." << oendl; 
     }
 }
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp
index 2c81963..de36eeb 100644
--- a/noncore/net/mail/libmailwrapper/settings.cpp
+++ b/noncore/net/mail/libmailwrapper/settings.cpp
@@ -27,5 +27,5 @@ void Settings::checkDirectory()
     if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) {
         system( "mkdir -p $HOME/Applications/opiemail" );
-        qDebug( "$HOME/Applications/opiemail created" );
+        odebug << "$HOME/Applications/opiemail created" << oendl; 
     }
 }
@@ -55,5 +55,5 @@ void Settings::updateAccounts()
     QStringList imap = dir.entryList( "imap-*" );
     for ( it = imap.begin(); it != imap.end(); it++ ) {
-        qDebug( "Added IMAP account" );
+        odebug << "Added IMAP account" << oendl; 
         IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") );
         accounts.append( account );
@@ -62,5 +62,5 @@ void Settings::updateAccounts()
     QStringList pop3 = dir.entryList( "pop3-*" );
     for ( it = pop3.begin(); it != pop3.end(); it++ ) {
-        qDebug( "Added POP account" );
+        odebug << "Added POP account" << oendl; 
         POP3account *account = new POP3account( (*it).replace(0, 5, "") );
         accounts.append( account );
@@ -69,5 +69,5 @@ void Settings::updateAccounts()
     QStringList smtp = dir.entryList( "smtp-*" );
     for ( it = smtp.begin(); it != smtp.end(); it++ ) {
-        qDebug( "Added SMTP account" );
+        odebug << "Added SMTP account" << oendl; 
         SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") );
         accounts.append( account );
@@ -76,5 +76,5 @@ void Settings::updateAccounts()
     QStringList nntp = dir.entryList( "nntp-*" );
     for ( it = nntp.begin(); it != nntp.end(); it++ ) {
-        qDebug( "Added NNTP account" );
+        odebug << "Added NNTP account" << oendl; 
         NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") );
         accounts.append( account );
@@ -180,5 +180,5 @@ void IMAPaccount::read()
 void IMAPaccount::save()
 {
-    qDebug( "saving " + getFileName() );
+    odebug << "saving " + getFileName() << oendl; 
     Settings::checkDirectory();
 
@@ -258,5 +258,5 @@ void POP3account::read()
 void POP3account::save()
 {
-    qDebug( "saving " + getFileName() );
+    odebug << "saving " + getFileName() << oendl; 
     Settings::checkDirectory();
 
@@ -340,5 +340,5 @@ void SMTPaccount::read()
 void SMTPaccount::save()
 {
-    qDebug( "saving " + getFileName() );
+    odebug << "saving " + getFileName() << oendl; 
     Settings::checkDirectory();
 
@@ -417,5 +417,5 @@ void NNTPaccount::read()
 void NNTPaccount::save()
 {
-    qDebug( "saving " + getFileName() );
+    odebug << "saving " + getFileName() << oendl; 
     Settings::checkDirectory();
 
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index e2cea7a..ba78c3b 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -116,5 +116,5 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later) {
         if (data)
             free(data);
-        qDebug("Error fetching mime...");
+        odebug << "Error fetching mime..." << oendl; 
         return;
     }
@@ -209,14 +209,14 @@ void SMTPwrapper::connect_server()
 
     int err = MAILSMTP_NO_ERROR;
-    qDebug( "Servername %s at port %i", server, port );
+    odebug << "Servername " << server << " at port " << port << "" << oendl; 
     if ( ssl ) {
-        qDebug( "SSL session" );
+        odebug << "SSL session" << oendl; 
         err = mailsmtp_ssl_connect( m_smtp, server, port );
     } else {
-        qDebug( "No SSL session" );
+        odebug << "No SSL session" << oendl; 
         err = mailsmtp_socket_connect( m_smtp, server, port );
     }
     if ( err != MAILSMTP_NO_ERROR ) {
-        qDebug("Error init connection");
+        odebug << "Error init connection" << oendl; 
         failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err));
         result = 0;
@@ -247,5 +247,5 @@ void SMTPwrapper::connect_server()
 
     if (result==1 && m_SmtpAccount->getLogin() ) {
-        qDebug("smtp with auth");
+        odebug << "smtp with auth" << oendl; 
         if ( m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty() ) {
             // get'em
@@ -265,9 +265,9 @@ void SMTPwrapper::connect_server()
             pass = m_SmtpAccount->getPassword().latin1();
         }
-        qDebug( "session->auth: %i", m_smtp->auth);
+        odebug << "session->auth: " << m_smtp->auth << "" << oendl; 
         if (result) {
             err = mailsmtp_auth( m_smtp, (char*)user, (char*)pass );
             if ( err == MAILSMTP_NO_ERROR ) {
-                qDebug("auth ok");
+                odebug << "auth ok" << oendl; 
             } else {
                 failuretext = tr("Authentification failed");
@@ -308,5 +308,5 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size )
         storeFailedMail(data,size,failuretext);
     } else {
-        qDebug( "Mail sent." );
+        odebug << "Mail sent." << oendl; 
         storeMail(data,size,"Sent");
     }
@@ -320,5 +320,5 @@ void SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later
     mimeMail = createMimeMail(mail );
     if ( mimeMail == NULL ) {
-        qDebug( "sendMail: error creating mime mail" );
+        odebug << "sendMail: error creating mime mail" << oendl; 
     } else {
         sendProgress = new progressMailSend();
@@ -326,5 +326,5 @@ void SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later
         sendProgress->setMaxMails(1);
         smtpSend( mimeMail,later);
-        qDebug("Clean up done");
+        odebug << "Clean up done" << oendl; 
         sendProgress->hide();
         delete sendProgress;
@@ -379,7 +379,7 @@ bool SMTPwrapper::flushOutbox() {
     bool returnValue = true;
 
-    qDebug("Sending the queue");
+    odebug << "Sending the queue" << oendl; 
     if (!m_SmtpAccount) {
-        qDebug("No smtp account given");
+        odebug << "No smtp account given" << oendl; 
         return false;
     }
@@ -389,5 +389,5 @@ bool SMTPwrapper::flushOutbox() {
     AbstractMail*wrap = AbstractMail::getWrapper(localfolders);
     if (!wrap) {
-        qDebug("memory error");
+        odebug << "memory error" << oendl; 
         return false;
     }
@@ -399,5 +399,5 @@ bool SMTPwrapper::flushOutbox() {
     if (mailsToSend.count()==0) {
         delete wrap;
-        qDebug("No mails to send");
+        odebug << "No mails to send" << oendl; 
         return false;
     }
diff --git a/noncore/net/mail/libmailwrapper/statusmail.cpp b/noncore/net/mail/libmailwrapper/statusmail.cpp
index b78244d..51383f6 100644
--- a/noncore/net/mail/libmailwrapper/statusmail.cpp
+++ b/noncore/net/mail/libmailwrapper/statusmail.cpp
@@ -44,5 +44,5 @@ void StatusMail::initAccounts(QList<Account>&accounts)
         current->logout();
     }
-    qDebug("Pop3 init count: %i",currentPop3Stat.message_count);
+    odebug << "Pop3 init count: " << currentPop3Stat.message_count << "" << oendl; 
     currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0;
     lastPop3Stat.message_unseen = currentPop3Stat.message_unseen;
@@ -73,8 +73,8 @@ void StatusMail::check_current_stat(folderStat&targetStat)
         } else if (it->getType() == MAILLIB::A_POP3) {
             currentPop3Stat.message_count+=currentStat.message_count;
-            qDebug("Pop3 count: %i",currentPop3Stat.message_count);
+            odebug << "Pop3 count: " << currentPop3Stat.message_count << "" << oendl; 
         }
     }
-    qDebug("Pop3 last: %i",lastPop3Stat.message_count);
+    odebug << "Pop3 last: " << lastPop3Stat.message_count << "" << oendl; 
     if (currentPop3Stat.message_count > lastPop3Stat.message_count) {
         currentPop3Stat.message_recent = currentPop3Stat.message_count - lastPop3Stat.message_count;
diff --git a/noncore/net/mail/libmailwrapper/storemail.cpp b/noncore/net/mail/libmailwrapper/storemail.cpp
index 914a11d..546d756 100644
--- a/noncore/net/mail/libmailwrapper/storemail.cpp
+++ b/noncore/net/mail/libmailwrapper/storemail.cpp
@@ -59,5 +59,5 @@ int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail)
     mimeMail = createMimeMail(mail );
     if ( mimeMail == NULL ) {
-        qDebug( "storeMail: error creating mime mail" );
+        odebug << "storeMail: error creating mime mail" << oendl; 
         return 0;
     }
@@ -74,5 +74,5 @@ int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail)
     msg = 0;
     if (r != MAIL_NO_ERROR || !data) {
-        qDebug("Error fetching mime...");
+        odebug << "Error fetching mime..." << oendl; 
         ret = 0;
     }
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index c23ad3f..4c87d64 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -142,5 +142,5 @@ MainWindow::~MainWindow()
 void MainWindow::appMessage(const QCString &, const QByteArray &)
 {
-    qDebug("appMessage not reached");
+    odebug << "appMessage not reached" << oendl; 
 }
 
@@ -176,30 +176,30 @@ void MainWindow::slotEditSettings()
 void MainWindow::slotShowFolders( bool )
 {
-   qDebug( "slotShowFolders not reached" );
+   odebug << "slotShowFolders not reached" << oendl; 
 }
 
 void MainWindow::refreshMailView(const QValueList<RecMailP>&)
 {
-   qDebug( "refreshMailView not reached" );
+   odebug << "refreshMailView not reached" << oendl; 
 }
 
 void MainWindow::mailLeftClicked(int, QListViewItem *,const QPoint&,int )
 {
-    qDebug( "mailLeftClicked not reached" );
+    odebug << "mailLeftClicked not reached" << oendl; 
 }
 
 void MainWindow::displayMail()
 {
-    qDebug("displayMail not reached");
+    odebug << "displayMail not reached" << oendl; 
 }
 
 void MainWindow::slotDeleteMail()
 {
-    qDebug("deleteMail not reached");
+    odebug << "deleteMail not reached" << oendl; 
 }
 
 void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int  )
 {
-    qDebug("mailHold not reached");
+    odebug << "mailHold not reached" << oendl; 
 }
 
diff --git a/noncore/net/mail/nntpgroups.cpp b/noncore/net/mail/nntpgroups.cpp
index 8741c4b..3243ee3 100644
--- a/noncore/net/mail/nntpgroups.cpp
+++ b/noncore/net/mail/nntpgroups.cpp
@@ -54,5 +54,5 @@ void NNTPGroups::storeValues()
     for ( ; list_it.current(); ++list_it ) {
         if ( ( (QCheckListItem*)list_it.current() )->isOn() ) {
-            qDebug(list_it.current()->text(0) );
+            odebug << list_it.current()->text(0) << oendl; 
             subscribedGroups.append(  list_it.current()->text(0) );
         }
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 5da2161..0669b5a 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -68,5 +68,5 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email)
 void OpieMail::slotComposeMail()
 {
-    qDebug( "Compose Mail" );
+    odebug << "Compose Mail" << oendl; 
     slotwriteMail(0l,0l);
 }
@@ -74,5 +74,5 @@ void OpieMail::slotComposeMail()
 void OpieMail::slotSendQueued()
 {
-    qDebug( "Send Queued" );
+    odebug << "Send Queued" << oendl; 
     SMTPaccount *smtp = 0;
 
@@ -121,5 +121,5 @@ void OpieMail::slotSendQueued()
 void OpieMail::slotSearchMails()
 {
-    qDebug( "Search Mails" );
+    odebug << "Search Mails" << oendl; 
 }
 
@@ -132,5 +132,5 @@ void OpieMail::slotEditSettings()
 void OpieMail::slotEditAccounts()
 {
-    qDebug( "Edit Accounts" );
+    odebug << "Edit Accounts" << oendl; 
     EditAccounts eaDialog( settings, this, 0, true,  WStyle_ContextHelp );
     eaDialog.slotAdjustColumns();
@@ -181,5 +181,5 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
     /* just the RIGHT button - or hold on pda */
     if (button!=2) {return;}
-    qDebug("Event right/hold");
+    odebug << "Event right/hold" << oendl; 
     if (!item) return;
     QPopupMenu *m = new QPopupMenu(0);
@@ -205,13 +205,13 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
 void OpieMail::slotShowFolders( bool show )
 {
-    qDebug( "Show Folders" );
+    odebug << "Show Folders" << oendl; 
     if ( show && folderView->isHidden() )
     {
-        qDebug( "-> showing" );
+        odebug << "-> showing" << oendl; 
         folderView->show();
     }
     else if ( !show && !folderView->isHidden() )
     {
-        qDebug( "-> hiding" );
+        odebug << "-> hiding" << oendl; 
         folderView->hide();
     }
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp
index f672a36..cac9048 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.cpp
+++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp
@@ -105,5 +105,5 @@ void MailApplet::slotCheck() {
     int newMailsOld = m_newMails;
     m_newMails = stat.message_unseen;
-    qDebug( QString( "test %1" ).arg( m_newMails ) );
+    odebug << QString( "test %1" ).arg( m_newMails ) << oendl; 
     if ( m_newMails > 0 &&  newMailsOld != m_newMails  ) {
         ODevice *device = ODevice::inst();
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 156e11d..a574ea1 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -140,5 +140,5 @@ void ViewMail::setBody(const RecBodyP&body )
         for (;it!=body->Parts()[i]->Parameters().end();++it)
         {
-            qDebug(it.key());
+            odebug << it.key() << oendl; 
             if (it.key().lower()=="name")
             {
diff --git a/noncore/net/opieftp/config.in b/noncore/net/opieftp/config.in
index 96e8b27..95cf73c 100644
--- a/noncore/net/opieftp/config.in
+++ b/noncore/net/opieftp/config.in
@@ -2,3 +2,3 @@
     boolean "opie-ftp (ftp client for Opie)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && FTPLIB
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && FTPLIB
diff --git a/noncore/net/opieftp/filePermissions.cpp b/noncore/net/opieftp/filePermissions.cpp
index f545c1f..991fcd5 100644
--- a/noncore/net/opieftp/filePermissions.cpp
+++ b/noncore/net/opieftp/filePermissions.cpp
@@ -33,5 +33,5 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     if ( !name )
   setName( tr("filePermissions") );
-//    qDebug("FilePermissions "+fileName);
+//    odebug << "FilePermissions "+fileName << oendl; 
     resize( 236, 210 );
      isRemote=useRemote;
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 4c39569..fe96103 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -20,9 +20,11 @@ extern "C" {
 #include "inputDialog.h"
 
-#include <qmenubar.h>
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
+using namespace Opie::Core;
 
 #include <qtextstream.h>
@@ -37,12 +39,13 @@ extern "C" {
 #include <qlayout.h>
 #include <qmessagebox.h>
+#include <qmenubar.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qvbox.h>
 
+/* STD */
 #include <unistd.h>
 #include <stdlib.h>
 
-
 QProgressBar *ProgressBar;
 static netbuf *conn=NULL;
@@ -62,5 +65,5 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
         : QMainWindow( parent,  name, fl )
 {
-    qDebug("OpieFtp constructor");
+    odebug << "OpieFtp constructor" << oendl; 
     setCaption( tr( "OpieFtp" ) );
     fuckeduphack=FALSE;
@@ -335,5 +338,5 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
 
     TabWidget->setCurrentPage(2);
-        qDebug("Constructor done");
+        odebug << "Constructor done" << oendl; 
 }
 
@@ -406,5 +409,5 @@ void OpieFtp::serverComboEdited(const QString & )
 {
 //   if(  ServerComboBox->text(currentServerConfig) != edit /*edit.isEmpty() */) {
-//       qDebug("ServerComboEdited");
+//       odebug << "ServerComboEdited" << oendl; 
 //  //        currentServerConfig = -1;
 //      }
@@ -531,5 +534,5 @@ void OpieFtp::localUpload()
                 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
                 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
-                qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1());
+                odebug << "Put: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
 
                 if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
@@ -592,5 +595,5 @@ void OpieFtp::remoteDownload()
             FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
             FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
-            qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1());
+            odebug << "Get: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
 
             if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
@@ -621,5 +624,5 @@ bool OpieFtp::remoteDirList(const QString &dir)
     else
         tmp+="._temp";
-//    qDebug("Listing remote dir "+tmp);
+//    odebug << "Listing remote dir "+tmp << oendl; 
 //    QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) {
@@ -643,5 +646,5 @@ bool OpieFtp::remoteChDir(const QString &dir)
         msg.replace(QRegExp(":"),"\n");
         QMessageBox::message(tr("Note"),msg);
-//        qDebug(msg);
+//        odebug << msg << oendl; 
 //        QCopEnvelope ( "QPE/System", "notBusy()" );
         return FALSE;
@@ -665,5 +668,5 @@ void OpieFtp::populateLocalView()
         if (fi->isSymLink() ){
             QString symLink=fi->readLink();
-         qDebug("Symlink detected "+symLink);
+         odebug << "Symlink detected "+symLink << oendl; 
             QFileInfo sym( symLink);
             fileS.sprintf( "%10i", sym.size() );
@@ -671,5 +674,5 @@ void OpieFtp::populateLocalView()
             fileDate = sym.lastModified().toString();
         } else {
-        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
+        odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl; 
             fileS.sprintf( "%10i", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
@@ -678,5 +681,5 @@ void OpieFtp::populateLocalView()
                 fileL+="/";
                 isDir=TRUE;
-     qDebug( fileL);
+     odebug << fileL << oendl; 
             }
         }
@@ -721,5 +724,5 @@ void OpieFtp::populateLocalView()
 bool OpieFtp::populateRemoteView( )
 {
-//    qDebug("populate remoteview");
+//    odebug << "populate remoteview" << oendl; 
     QString sfile=QDir::homeDirPath();
     if(sfile.right(1) != "/")
@@ -770,5 +773,5 @@ bool OpieFtp::populateRemoteView( )
             file. remove();
     } else
-        qDebug("temp file not opened successfully "+sfile);
+        odebug << "temp file not opened successfully "+sfile << oendl; 
     Remote_View->setSorting( 4,TRUE);
     return true;
@@ -789,5 +792,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
                 msg.replace(QRegExp(":"),"\n");
                 QMessageBox::message(tr("Note"),msg);
-//                qDebug(msg);
+//                odebug << msg << oendl; 
             }
             char path[256];
@@ -797,5 +800,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
                 msg.replace(QRegExp(":"),"\n");
                 QMessageBox::message(tr("Note"),msg);
-//                qDebug(msg);
+//                odebug << msg << oendl; 
             }
             currentRemoteDir=path;
@@ -808,5 +811,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
                     currentRemoteDir = oldRemoteCurrentDir;
                     strItem="";
-//                     qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
+//                     odebug << "RemoteCurrentDir1 "+oldRemoteCurrentDir << oendl; 
                 }
             } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory
@@ -814,5 +817,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
                     currentRemoteDir = oldRemoteCurrentDir;
                     strItem="";
-//                     qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
+//                     odebug << "RemoteCurrentDir1 "+oldRemoteCurrentDir << oendl; 
 
                 } else {
@@ -867,5 +870,5 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem)
                 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                 if( QFile::exists(strItem ) ) {
-                      //  qDebug("upload "+strItem);
+                      //  odebug << "upload "+strItem << oendl; 
                     return;
                 }
@@ -1171,5 +1174,5 @@ void OpieFtp::currentPathComboChanged()
 {
     QString  oldRemoteCurrentDir =  currentRemoteDir;
-//    qDebug("oldRemoteCurrentDir "+oldRemoteCurrentDir);
+//    odebug << "oldRemoteCurrentDir "+oldRemoteCurrentDir << oendl; 
     if (TabWidget->currentPageIndex() == 0) {
         if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
@@ -1217,5 +1220,5 @@ void OpieFtp::readConfig()
     currentServerConfig = cfg.readNumEntry("currentServer", -1);
 
-//    qDebug("Reading %d", currentServerConfig);
+//    odebug << "Reading " << currentServerConfig << "" << oendl; 
     serverComboSelected( currentServerConfig-1);
 
@@ -1224,5 +1227,5 @@ void OpieFtp::readConfig()
 void OpieFtp::writeConfig()
 {
-    qDebug("write config");
+    odebug << "write config" << oendl; 
     Config cfg("opieftp");
     cfg.setGroup("Server");
@@ -1255,5 +1258,5 @@ void OpieFtp::writeConfig()
 
         currentServerConfig = numberOfEntries+1;
-        qDebug("setting currentserverconfig to %d",        currentServerConfig);
+        odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl; 
 
         cfg.setGroup(temp);
@@ -1274,5 +1277,5 @@ void OpieFtp::writeConfig()
 
 void OpieFtp::clearCombos() {
-    qDebug("clearing");
+    odebug << "clearing" << oendl; 
     ServerComboBox->clear();
     UsernameComboBox->clear();
@@ -1293,8 +1296,8 @@ void OpieFtp::fillCombos()
     for (int i = 1; i <= numberOfEntries; i++) {
         temp.setNum(i);
-        qDebug(temp);
+        odebug << temp << oendl; 
         cfg.setGroup("Server");
         remoteServerStr = cfg.readEntry( temp,"");
-        qDebug( remoteServerStr);
+        odebug << remoteServerStr << oendl; 
 
         int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
@@ -1304,5 +1307,5 @@ void OpieFtp::fillCombos()
 
         remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider);
-        qDebug( "remote server string "+remoteServerStr);
+        odebug << "remote server string "+remoteServerStr << oendl; 
         ServerComboBox->insertItem( remoteServerStr );
 
@@ -1322,5 +1325,5 @@ void OpieFtp::serverComboSelected(int index)
 {
     currentServerConfig = index+1;
-    qDebug("server combo selected %d", index+1);
+    odebug << "server combo selected " << index+1 << "" << oendl; 
     QString username, remoteServerStr, remotePathStr, password, port, temp;
 //    remoteServerStr = ServerComboBox->text(index);
@@ -1333,7 +1336,7 @@ void OpieFtp::serverComboSelected(int index)
     remoteServerStr = cfg.readEntry( temp,"");
 
-    qDebug("Group" +temp);
+    odebug << "Group" +temp << oendl; 
     cfg.setGroup(temp);
-//    qDebug(temp);
+//    odebug << temp << oendl; 
     int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
     port = remoteServerStr.right( divider - 1);
@@ -1350,6 +1353,6 @@ void OpieFtp::serverComboSelected(int index)
     username =  cfg.readEntry("Username", "anonymous");
     UsernameComboBox->lineEdit()->setText(username);
-    qDebug(username);
-//    qDebug("Password is "+cfg.readEntryCrypt(username, "me@opieftp.org"));
+    odebug << username << oendl; 
+//    odebug << "Password is "+cfg.readEntryCrypt(username << oendl; 
     PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org"));
 //   UsernameComboBox
@@ -1363,5 +1366,5 @@ void OpieFtp::serverComboSelected(int index)
    serverListView->setCurrentItem( index);
    fuckeduphack=FALSE;
-   qDebug("server list set selected %d",index);
+   odebug << "server list set selected " << index << "" << oendl; 
     update();
 }
@@ -1392,5 +1395,5 @@ void OpieFtp::deleteServer()
             serverListView->removeItem(i);
 
-            qDebug("OK DELETE "+tempname);
+            odebug << "OK DELETE "+tempname << oendl; 
             cfg.removeEntry(QString::number(i));
             for ( ; i <= numberOfEntries; i++) {
@@ -1447,5 +1450,5 @@ void OpieFtp::upDir()
             msg.replace(QRegExp(":"),"\n");
             QMessageBox::message(tr("Note"),msg);
-//                qDebug(msg);
+//                odebug << msg << oendl; 
         }
         char path[256];
@@ -1455,5 +1458,5 @@ void OpieFtp::upDir()
             msg.replace(QRegExp(":"),"\n");
             QMessageBox::message(tr("Note"),msg);
-//                qDebug(msg);
+//                odebug << msg << oendl; 
         }
         currentRemoteDir=path;
@@ -1516,5 +1519,5 @@ void OpieFtp::serverListClicked( const QString &item) {
     if(item.isEmpty()) return;
     Config cfg("opieftp");
-    qDebug("highltined "+item);
+    odebug << "highltined "+item << oendl; 
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
         for (int i = 1; i <= numberOfEntries; i++) {
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro
index 2f97dc2..003b166 100644
--- a/noncore/net/opieftp/opieftp.pro
+++ b/noncore/net/opieftp/opieftp.pro
@@ -1,10 +1,9 @@
-#CONFIG    += qt warn_on  quick-app
-CONFIG    += qt warn_on  
-HEADERS   = opieftp.h inputDialog.h
-SOURCES   = opieftp.cpp inputDialog.cpp main.cpp
-TARGET    = opieftp
+CONFIG      += qt warn_on  
+HEADERS     = opieftp.h inputDialog.h
+SOURCES     = opieftp.cpp inputDialog.cpp main.cpp
+TARGET      = opieftp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe -lftplib 
+LIBS        += -lqpe -lopiecore2 -lftplib
 DESTDIR = $(OPIEDIR)/bin
 
diff --git a/noncore/net/opieirc/config.in b/noncore/net/opieirc/config.in
index a61cf70..2c56523 100644
--- a/noncore/net/opieirc/config.in
+++ b/noncore/net/opieirc/config.in
@@ -2,3 +2,3 @@
     boolean "opie-irc (chat via your favorite IRC server)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBQTAUX
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX
diff --git a/noncore/net/opieirc/ircmisc.cpp b/noncore/net/opieirc/ircmisc.cpp
index 22387b3..6d93a34 100644
--- a/noncore/net/opieirc/ircmisc.cpp
+++ b/noncore/net/opieirc/ircmisc.cpp
@@ -1,5 +1,8 @@
-#include <stdio.h>
 #include "ircmisc.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 IRCTabBar::IRCTabBar(QWidget *parent, const char *name) : QTabBar(parent, name) {
 }
@@ -65,5 +68,5 @@ void IRCHistoryLineEdit::keyPressEvent(QKeyEvent *event) {
         m_index = -1;
     } else if (key == Key_Tab) {
-        printf("got tab\n");
+        odebug << "got tab" << oendl;
         return;
     }
@@ -76,5 +79,5 @@ bool IRCHistoryLineEdit::eventFilter(QObject *object, QEvent *event) {
         /* Catch tab characters */
         if (k->key() == Key_Tab) {
-            qDebug("tab!");
+            odebug << "tab!" << oendl; 
             return TRUE;
         }
diff --git a/noncore/net/opieirc/opieirc.pro b/noncore/net/opieirc/opieirc.pro
index 4f9092f..2455ec4 100644
--- a/noncore/net/opieirc/opieirc.pro
+++ b/noncore/net/opieirc/opieirc.pro
@@ -1,4 +1,4 @@
-        CONFIG  = qt warn_on  quick-app
-        HEADERS         = ircchannel.h ircconnection.h \
+        CONFIG    = qt warn_on quick-app
+HEADERS     = ircchannel.h ircconnection.h \
               ircmessage.h \
               ircmessageparser.h ircoutput.h \
@@ -8,5 +8,5 @@ HEADERS		= ircchannel.h ircconnection.h \
               ircserverlist.h ircservereditor.h \
               ircquerytab.h ircsettings.h ircmisc.h
-        SOURCES         = ircchannel.cpp ircconnection.cpp \
+        SOURCES    = ircchannel.cpp ircconnection.cpp \
               ircmessage.cpp \
               ircmessageparser.cpp ircoutput.cpp \
@@ -18,8 +18,7 @@ SOURCES		= ircchannel.cpp ircconnection.cpp \
               ircquerytab.cpp ircsettings.cpp ircmisc.cpp
 INCLUDEPATH += $(OPIEDIR)/include
-        DEPENDPATH+= $(OPIEDIR)/include
-LIBS        += -lqpe -lopieui2 -lqtaux2
-
-        TARGET= opieirc
+DEPENDPATH  += $(OPIEDIR)/include
+LIBS        += -lqpe -lopiecore2 -lopieui2 -lqtaux2
+TARGET      = opieirc
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 8a7f0bc..1d93f5c 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -207,5 +207,5 @@ namespace OpieTooth {
     void BluezApplet::paintEvent( QPaintEvent* ) {
         QPainter p(this);
-        qDebug("paint bluetooth pixmap");
+        odebug << "paint bluetooth pixmap" << oendl; 
 
         if (bluezactive > 0) {
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp
index 09b19d2..37f2ae7 100644
--- a/noncore/net/opietooth/lib/startdunconnection.cpp
+++ b/noncore/net/opietooth/lib/startdunconnection.cpp
@@ -46,5 +46,5 @@ void StartDunConnection::start()  {
              this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) );
     if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
-        qWarning( "could not start" );
+        owarn << "could not start" << oendl; 
         delete m_dunConnect;
     }
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp
index 24ac530..50afc9f 100644
--- a/noncore/net/opietooth/lib/startpanconnection.cpp
+++ b/noncore/net/opietooth/lib/startpanconnection.cpp
@@ -40,5 +40,5 @@ StartConnection::ConnectionType StartPanConnection::type() {
 void StartPanConnection::start()  {
     m_panConnect = new OProcess();
-    qDebug( "IM START " + m_mac );
+    odebug << "IM START " + m_mac << oendl; 
     *m_panConnect << "pand" << "--connect" << m_mac;
 
@@ -48,5 +48,5 @@ void StartPanConnection::start()  {
              this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) );
     if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
-        qWarning( "could not start" );
+        owarn << "could not start" << oendl; 
         delete m_panConnect;
     }
@@ -69,5 +69,5 @@ void StartPanConnection::stop()  {
     }
     m_panConnect = new OProcess();
-    qDebug("IM STOP " + m_mac);
+    odebug << "IM STOP " + m_mac << oendl; 
 
     *m_panConnect << "pand" << "--kill" << m_mac;
@@ -78,5 +78,5 @@ void StartPanConnection::stop()  {
              this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) );
     if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
-        qWarning( "could not stop" );
+        owarn << "could not stop" << oendl; 
         delete m_panConnect;
     }
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 29030ab..b1cddd2 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -156,5 +156,5 @@ void BlueBase::writeConfig()
 void BlueBase::writeToHciConfig()
 {
-    qWarning("writeToHciConfig");
+    owarn << "writeToHciConfig" << oendl; 
     HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" );
     hciconf.load();
@@ -368,5 +368,5 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         if ( it != list.end() )
         {
-            qWarning("Searching id %d %s", it.key(), it.data().latin1() );
+            owarn << "Searching id " << it.key() << " " << it.data().latin1() << "" << oendl; 
             popup = m_popHelper.find( it.key(),
                                       service->services(),
@@ -375,10 +375,10 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         else
         {
-            qWarning("Empty");
+            owarn << "Empty" << oendl; 
         }
 
         if ( popup == 0l )
         {
-            qWarning("factory returned 0l");
+            owarn << "factory returned 0l" << oendl; 
             popup = new QPopupMenu();
         }
@@ -386,5 +386,5 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
 
         ret = popup->exec( point );
-        qWarning("returned from exec() ");
+        owarn << "returned from exec() " << oendl; 
         if ( ret == -1 )
         {
@@ -407,5 +407,5 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
 void BlueBase::addServicesToDevice( BTDeviceItem * item )
 {
-    qDebug("addServicesToDevice");
+    odebug << "addServicesToDevice" << oendl; 
     // row of mac adress text(3)
     RemoteDevice device = item->remoteDevice();
@@ -424,5 +424,5 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item )
 void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList )
 {
-    qDebug("fill services list");
+    odebug << "fill services list" << oendl; 
 
     QMap<QString,BTDeviceItem*>::Iterator it;
@@ -608,5 +608,5 @@ void BlueBase::deviceActive( const RemoteDevice &device )
 void BlueBase::deviceActive( const QString& device, bool connected  )
 {
-    qDebug("deviceActive slot");
+    odebug << "deviceActive slot" << oendl; 
 
     QMap<QString,BTDeviceItem*>::Iterator it;
diff --git a/noncore/net/opietooth/manager/devicehandler.cpp b/noncore/net/opietooth/manager/devicehandler.cpp
index 9c5b817..bd34351 100644
--- a/noncore/net/opietooth/manager/devicehandler.cpp
+++ b/noncore/net/opietooth/manager/devicehandler.cpp
@@ -34,11 +34,11 @@ QString path = QDir::homeDirPath() + "/Settings/bluetooth";
                 continue;
 
-            qDebug((*it).latin1() );
+            odebug << (*it).latin1() << oendl; 
             Config conf(path + "/"+(*it),  Config::File);
             conf.setGroup("Info");
             name = conf.readEntry("name", "Error");
             mac = conf.readEntry("mac", QString::null);
-            qDebug("MAC: " + mac);
-            qDebug("NAME: " + name);
+            odebug << "MAC: " + mac << oendl; 
+            odebug << "NAME: " + name << oendl; 
             if (mac.isEmpty() )
                 continue;
@@ -67,5 +67,5 @@ void DeviceHandler::save( const RemoteDevice::ValueList& list) {
     rm = "mkdir ";
     rm += QDir::homeDirPath() + "/Settings/bluetooth";
-    qWarning("out %s",  rm.data() );
+    owarn << "out " << rm.data() << "" << oendl; 
     system( rm.data() );
 
@@ -74,5 +74,5 @@ void DeviceHandler::save( const RemoteDevice::ValueList& list) {
 
     for ( it = list.begin(); it != list.end(); ++it ) {
-        qDebug( "/Settings/bluetooth/" + (*it).mac() + ".conf");
+        odebug << "/Settings/bluetooth/" + (*it).mac() + ".conf" << oendl; 
 
         Config conf( QDir::homeDirPath() +
diff --git a/noncore/net/opietooth/manager/dunpopup.cpp b/noncore/net/opietooth/manager/dunpopup.cpp
index 3043f71..5b01d2f 100644
--- a/noncore/net/opietooth/manager/dunpopup.cpp
+++ b/noncore/net/opietooth/manager/dunpopup.cpp
@@ -12,5 +12,5 @@ using namespace OpieTooth;
 DunPopup::DunPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu()  {
 
-    qWarning("DunPopup c'tor");
+    owarn << "DunPopup c'tor" << oendl; 
 
     m_item = item;
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp
index 35e9cd9..71c935c 100644
--- a/noncore/net/opietooth/manager/hciconfwrapper.cpp
+++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp
@@ -75,8 +75,8 @@ namespace OpieTooth {
             str = (*it);
             if( (str.contains(key)) > 0 ) {
-                qDebug("Found");
+                odebug << "Found" << oendl; 
                 // still need to look if its commented out!!!
                 str.simplifyWhiteSpace();
-                qDebug( key );
+                odebug << key << oendl; 
                 if (str.startsWith("#")) {
                     str = (key + " " + value + ";");
@@ -84,5 +84,5 @@ namespace OpieTooth {
                     str = str.replace( QRegExp( "\\s*"+key+"\\s+[^\\s][^;]*;" ),  key + " " + value + ";");
                 }
-                qDebug( str );
+                odebug << str << oendl; 
                 it = m_file.remove( it );
                 it = m_file.insert( it,  str );
@@ -99,9 +99,9 @@ namespace OpieTooth {
      */
     void HciConfWrapper::load() {
-        qWarning("loaded");
+        owarn << "loaded" << oendl; 
         m_file.clear();
         QFile file( m_fileName );
         if (!file.open( IO_ReadOnly ) ) {
-            qDebug("Could not open");
+            odebug << "Could not open" << oendl; 
             return;
         }
@@ -120,5 +120,5 @@ namespace OpieTooth {
     }
     void HciConfWrapper::save() {
-        qWarning("save");
+        owarn << "save" << oendl; 
         if (m_file.isEmpty() ) // load first
             return;
@@ -126,5 +126,5 @@ namespace OpieTooth {
         QFile file( m_fileName );
         if ( !file.open(IO_WriteOnly ) ) {
-            qWarning("could not open %s",  m_fileName.latin1() );
+            owarn << "could not open " << m_fileName.latin1() << "" << oendl; 
             return;
         }
@@ -135,5 +135,5 @@ namespace OpieTooth {
             stream << (*it) << endl;
         }
-        qWarning("saved");
+        owarn << "saved" << oendl; 
     };
 }
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp
index 1ef862a..3a3dbb0 100644
--- a/noncore/net/opietooth/manager/obexdialog.cpp
+++ b/noncore/net/opietooth/manager/obexdialog.cpp
@@ -81,5 +81,5 @@ void ObexDialog::sendData() {
     }
     if (!obexSend->start(OProcess::DontCare, OProcess::AllOutput) ) {
-        qWarning("could not start");
+        owarn << "could not start" << oendl; 
         delete obexSend;
     }
diff --git a/noncore/net/opietooth/manager/obexpopup.cpp b/noncore/net/opietooth/manager/obexpopup.cpp
index d147d52..9a50199 100644
--- a/noncore/net/opietooth/manager/obexpopup.cpp
+++ b/noncore/net/opietooth/manager/obexpopup.cpp
@@ -17,5 +17,5 @@ ObexPopup::ObexPopup()
         : QPopupMenu()
 {
-    qWarning("RfcCommPopup c'tor");
+    owarn << "RfcCommPopup c'tor" << oendl; 
 
     QAction* a;
@@ -37,5 +37,5 @@ void ObexPopup::slotPush()
 {
 
-    qWarning("push something");
+    owarn << "push something" << oendl; 
 
     ObexDialog obexDialog;
diff --git a/noncore/net/opietooth/manager/panpopup.cpp b/noncore/net/opietooth/manager/panpopup.cpp
index 8b05964..43c2777 100644
--- a/noncore/net/opietooth/manager/panpopup.cpp
+++ b/noncore/net/opietooth/manager/panpopup.cpp
@@ -12,5 +12,5 @@ using namespace OpieTooth;
 PanPopup::PanPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu()  {
 
-    qWarning("PanPopup c'tor");
+    owarn << "PanPopup c'tor" << oendl; 
 
     m_item = item;
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp
index ab22fea..19deb19 100644
--- a/noncore/net/opietooth/manager/popuphelper.cpp
+++ b/noncore/net/opietooth/manager/popuphelper.cpp
@@ -17,8 +17,8 @@ void PopupHelper::insert( int id, popupFactory fact ) {
 
 QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) {
-    //qWarning("find");
+    //owarn << "find" << oendl; 
     FactoryMap::Iterator it = m_map.find(id );
     if ( it != m_map.end() ) {
-        //qWarning("found");
+        //owarn << "found" << oendl; 
         popupFactory fact = it.data();
         return (*fact)(ser, item);
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp
index 78c1501..989bf45 100644
--- a/noncore/net/opietooth/manager/pppdialog.cpp
+++ b/noncore/net/opietooth/manager/pppdialog.cpp
@@ -57,5 +57,5 @@ void PPPDialog::connectToDevice() {
              this, SLOT(fillOutPut(Opie::Core::OProcess*,char*,int) ) );
      if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) {
-        qWarning("could not start");
+        owarn << "could not start" << oendl; 
         delete pppDial;
     }
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
index fc76301..4469129 100644
--- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
+++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
@@ -72,5 +72,5 @@ void RfcommAssignDialog::newDevice( const QString & mac )
                 rfcomm->setChannel( newDev->channel() );
                 rfcomm->setComment( newDev->comment() );
-                qDebug( "New device set up" );
+                odebug << "New device set up" << oendl; 
             }
         }
@@ -93,5 +93,5 @@ void RfcommAssignDialog::loadConfig()
         if ( it != confHandler->foundEntries().end() )
         {
-            qDebug( "Found key in foundEntries() " );
+            odebug << "Found key in foundEntries() " << oendl; 
             rfcomm->setMac( it.data()->mac() );
             rfcomm->setChannel( it.data()->channel() );
diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.cpp b/noncore/net/opietooth/manager/rfcommconfhandler.cpp
index 20453e8..2ef95ff 100644
--- a/noncore/net/opietooth/manager/rfcommconfhandler.cpp
+++ b/noncore/net/opietooth/manager/rfcommconfhandler.cpp
@@ -93,11 +93,11 @@ void RfCommConfHandler::load()  {
             if ( tmpLine.startsWith("rfcomm") )  {
                 QString number = tmpLine.mid( 6,1 );
-                qDebug( tmpLine );
-                qDebug( "TEST " + number );
+                odebug << tmpLine << oendl; 
+                odebug << "TEST " + number << oendl; 
             } else if ( tmpLine.startsWith( "}" ) ) {
                 m_foundEntries.insert( number, new RfCommConfObject( number.toInt(), mac, channel.toInt(),  comment ) );
             } else if ( tmpLine.startsWith( "device" ) )  {
                 mac = tmpLine.mid( 7, 17 );
-                qDebug( "mac" + mac );
+                odebug << "mac" + mac << oendl; 
             } else if ( tmpLine.startsWith( "channel" ) ) {
                 channel = tmpLine.mid( 8, 1 );
@@ -105,5 +105,5 @@ void RfCommConfHandler::load()  {
             } else if ( tmpLine.startsWith( "comment" ) ) {
                 comment = tmpLine.mid( 9, tmpLine.find( ';' ) - 9 - 1 );
-                qDebug( "Comment: " + comment );
+                odebug << "Comment: " + comment << oendl; 
             }
         }
@@ -111,4 +111,4 @@ void RfCommConfHandler::load()  {
     }
     save( m_foundEntries );
-    qDebug( QString( "ENTries: %1").arg( m_foundEntries.count() ) );
+    odebug << QString( "ENTries: %1").arg( m_foundEntries.count() ) << oendl; 
 }
diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp
index 04bfe48..01ad616 100644
--- a/noncore/net/opietooth/manager/rfcpopup.cpp
+++ b/noncore/net/opietooth/manager/rfcpopup.cpp
@@ -18,5 +18,5 @@ RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item  )
         : QPopupMenu()
 {
-    qWarning("RfcCommPopup c'tor");
+    owarn << "RfcCommPopup c'tor" << oendl; 
 
     QAction* a;
@@ -71,5 +71,5 @@ void RfcCommPopup::slotConnect()
 {
 
-    qWarning("connect");
+    owarn << "connect" << oendl; 
 
     PPPDialog pppDialog;
@@ -80,5 +80,5 @@ void RfcCommPopup::slotConnect()
 void RfcCommPopup::slotDisconnect()
 {
-    qWarning("slot disconnected");
+    owarn << "slot disconnected" << oendl; 
 }
 
@@ -99,5 +99,5 @@ void RfcCommPopup::slotBind()
 void RfcCommPopup::slotBar()
 {
-    qWarning("slotBar");
+    owarn << "slotBar" << oendl; 
 };
 
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index c8ea3e3..3b005c4 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -156,5 +156,5 @@ namespace OpieTooth {
  */
     ScanDialog::~ScanDialog() {
-        qWarning("delete scan dialog");
+        owarn << "delete scan dialog" << oendl; 
         delete localDevice;
     }
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index da39113..bfdb20a 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -24,5 +24,7 @@
 #include <opie2/oconfig.h>
 #include <opie2/odevice.h>
-using namespace Opie;
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+using namespace Opie::Net;
 #endif
 
@@ -41,13 +43,7 @@ using namespace Opie;
 #include <qtextstream.h>
 
-/* POSIX */
+/* STD */
 #include <assert.h>
 
-using namespace Opie::Core;
-using namespace Opie::Net;
-using namespace Opie::Core;
-using namespace Opie::Net;
-using namespace Opie::Core;
-using namespace Opie::Net;
 WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
 
@@ -117,5 +113,5 @@ void WellenreiterConfigWindow::performAutodetection()
     //      like we're actually doing something fancy... ;-)
 
-    qDebug( "WellenreiterConfigWindow::performAutodetection()" );
+    odebug << "WellenreiterConfigWindow::performAutodetection()" << oendl; 
 
     // try to guess device type
@@ -138,5 +134,5 @@ void WellenreiterConfigWindow::performAutodetection()
             deviceType->setCurrentItem( devicetype );
             _guess = devicetype;
-            qDebug( "Wellenreiter: guessed device type to be #%d", devicetype );
+            odebug << "Wellenreiter: guessed device type to be #" << devicetype << "" << oendl; 
         }
     }
@@ -242,5 +238,5 @@ void WellenreiterConfigWindow::getCaptureFileNameClicked()
 {
     QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(true);
-    qDebug( "name = %s", (const char*) name );
+    odebug << "name = " << (const char*) name << "" << oendl; 
     if ( !name.isEmpty() )
     {
@@ -317,9 +313,9 @@ void WellenreiterConfigWindow::performAction( const QString& type,
     else
     {
-        qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) type );
+        owarn << "WellenreiterConfigWindow::performAction(): unknown type '" << (const char*) type << "'" << oendl; 
         return;
     }
 
-    qDebug( "for event '%s' I'm going to perform action %d (script='%s')", (const char*) type, action, (const char*) script );
+    odebug << "for event '" << (const char*) type << "' I'm going to perform action " << action << " (script='" << (const char*) script << "')" << oendl; 
 
     switch( action )
@@ -346,7 +342,7 @@ void WellenreiterConfigWindow::performAction( const QString& type,
             script = script.replace( QRegExp( "$CHAN" ), QString::number( channel ) );
 
-            qDebug( "going to call script '%s'", (const char*) script );
+            odebug << "going to call script '" << (const char*) script << "'" << oendl; 
             ::system( script );
-            qDebug( "script returned." );
+            odebug << "script returned." << oendl; 
             return;
         }
@@ -362,5 +358,5 @@ void WellenreiterConfigWindow::load()
     performAutodetection();
 #else
-    qDebug( "loading configuration settings..." );
+    odebug << "loading configuration settings..." << oendl; 
 
     /* This is dumb monkey typing stuff... We _need_ to do this automatically! */
@@ -440,5 +436,5 @@ void WellenreiterConfigWindow::save()
     #warning Persistent Configuration not yet implemented for standalone X11 build
 #else
-    qDebug( "saving configuration settings..." );
+    odebug << "saving configuration settings..." << oendl; 
 
     /* This is dumb monkey typing stuff... We _need_ to do this automatically! */
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp
index a47b4ec..bd91e35 100644
--- a/noncore/net/wellenreiter/gui/gps.cpp
+++ b/noncore/net/wellenreiter/gui/gps.cpp
@@ -16,4 +16,8 @@
 #include "gps.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 /* QT */
 #include <qtextstream.h>
@@ -26,5 +30,5 @@ GPS::GPS( QObject* parent, const char * name )
     :QObject( parent, name )
 {
-    qDebug( "GPS::GPS()" );
+    odebug << "GPS::GPS()" << oendl; 
     _socket = new QSocket( this, "gpsd commsock" );
 }
@@ -33,5 +37,5 @@ GPS::GPS( QObject* parent, const char * name )
 GPS::~GPS()
 {
-    qDebug( "GPS::~GPS()" );
+    odebug << "GPS::~GPS()" << oendl; 
 }
 
@@ -54,5 +58,5 @@ GpsLocation GPS::position() const
     {
         int numAvail = _socket->bytesAvailable();
-        qDebug( "GPS write succeeded, %d bytes available for reading...", numAvail );
+        odebug << "GPS write succeeded, " << numAvail << " bytes available for reading..." << oendl; 
         if ( numAvail )
         {                     
@@ -62,5 +66,5 @@ GpsLocation GPS::position() const
             if ( numRead < 7 || numScan != 2 )
             {
-                qDebug( "GPS read %d bytes succeeded, invalid response: '%s'", numRead, &buf[0] );
+                odebug << "GPS read " << numRead << " bytes succeeded, invalid response: '" << &buf[0] << "'" << oendl; 
                 return GpsLocation( -111, -111 );
             }
diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp
index 1c72cf4..714a9a9 100644
--- a/noncore/net/wellenreiter/gui/logwindow.cpp
+++ b/noncore/net/wellenreiter/gui/logwindow.cpp
@@ -15,4 +15,10 @@
 
 #include "logwindow.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qmultilineedit.h>
 #include <qdatetime.h>
@@ -39,5 +45,5 @@ void MLogWindow::log( QString text )
     ledit->getCursorPosition( &col, &row );
     ledit->insertAt( line, col, row );
-    qDebug( line );
+    odebug << line << oendl; 
 }
 
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp
index 6bbc39b..62db967 100644
--- a/noncore/net/wellenreiter/gui/main.cpp
+++ b/noncore/net/wellenreiter/gui/main.cpp
@@ -15,5 +15,7 @@
 
 #include "mainwindow.h"
+
 #ifdef QWS
+#include <opie2/odebug.h>
 #include <opie2/oapplication.h>
 #include <opie2/oprocess.h>
@@ -22,7 +24,9 @@
 #endif
 
+/* QT */
 #include <qmessagebox.h>
 #include <qstringlist.h>
 
+/* STD */
 #include <errno.h>
 #include <signal.h>
@@ -31,6 +35,5 @@
 
 using namespace Opie::Core;
-using namespace Opie::Core;
-using namespace Opie::Core;
+
 int main( int argc, char **argv )
 {
@@ -56,8 +59,8 @@ int main( int argc, char **argv )
     for ( int i = 1; i < argc; ++i )
     {
-        qDebug( "Wellenreiter::main() parsing argument %d = '%s'", i, argv[i] );
+        odebug << "Wellenreiter::main() parsing argument " << i << " = '" << argv[i] << "'" << oendl; 
         if ( !strcmp( "-nocheck", argv[i] ) )
         {
-            qDebug( "-nocheck found" );
+            odebug << "-nocheck found" << oendl; 
             check = false;
             break;
@@ -70,5 +73,5 @@ int main( int argc, char **argv )
         if ( getuid() )
         {
-            qWarning( QObject::tr( "Wellenreiter: trying to run as non-root!" ) );
+            owarn << QObject::tr( "Wellenreiter: trying to run as non-root!" ) << oendl; 
             result = QMessageBox::warning( w, " - Wellenreiter II -  (non-root)", QObject::tr( "You have started Wellenreiter II\n"
             "as non-root. You will have\nonly limited functionality.\nProceed anyway?" ),
@@ -87,5 +90,5 @@ int main( int argc, char **argv )
             {
                 if ( -1 == ::kill( dhcpid, SIGTERM ) )
-                    qWarning( "Wellenreiter: can't kill process #%d (%s)", result, strerror( errno ) );
+                    owarn << "Wellenreiter: can't kill process #" << result << " (" << strerror( errno ) << ")" << oendl; 
                 else
                     killed = true;
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 7add6cd..a4b8839 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -22,4 +22,19 @@
 #include "scanlist.h"
 
+/* OPIE */
+#ifdef QWS
+#include <qpe/resource.h>
+#include <opie2/odebug.h>
+#include <opie2/ofiledialog.h>
+#else
+#include "resource.h"
+#include <qapplication.h>
+#include <qfiledialog.h> 
+#endif
+using namespace Opie::Core;
+using namespace Opie::Net;
+using namespace Opie::Ui;
+
+/* QT */
 #include <qcombobox.h>
 #include <qdatastream.h>
@@ -40,21 +55,7 @@
 #include <qwhatsthis.h>
 
-#ifdef QWS
-#include <qpe/resource.h>
-#include <opie2/ofiledialog.h>
-using namespace Opie;
-#else
-#include "resource.h"
-#include <qapplication.h>
-#include <qfiledialog.h>
-#endif
-
+/* STD */
 #include <unistd.h>
 
-using namespace Opie::Ui;
-using namespace Opie::Net;
-using namespace Opie::Ui;
-using namespace Opie::Net;
-using namespace Opie::Net;
 WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f )
@@ -189,5 +190,5 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 void WellenreiterMainWindow::showConfigure()
 {
-    qDebug( "show configure..." );
+    odebug << "show configure..." << oendl; 
     cw->setCaption( tr( "Configure" ) );
     int result = QPEApplication::execDialog( cw );
@@ -232,5 +233,5 @@ void WellenreiterMainWindow::changedSniffingState()
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
-    qDebug( "Wellenreiter: bye." );
+    odebug << "Wellenreiter: bye." << oendl; 
 };
 
@@ -252,5 +253,5 @@ void WellenreiterMainWindow::demoReadFromGps()
     WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance();
     GPS* gps = new GPS( this );
-    qDebug( "Wellenreiter::demoReadFromGps(): url=gps://%s:%d/", (const char*) configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
+    odebug << "Wellenreiter::demoReadFromGps(): url=gps://" << (const char*) configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "/" << oendl; 
     gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
     GpsLocation loc = gps->position();
@@ -306,9 +307,9 @@ void WellenreiterMainWindow::fileSaveLog()
             t << mw->logWindow()->getLog();
             f.close();
-            qDebug( "Saved log to file '%s'", (const char*) fname );
+            odebug << "Saved log to file '" << (const char*) fname << "'" << oendl; 
         }
         else
         {
-            qDebug( "Problem saving log to file '%s'", (const char*) fname );
+            odebug << "Problem saving log to file '" << (const char*) fname << "'" << oendl; 
         }
     }
@@ -327,9 +328,9 @@ void WellenreiterMainWindow::fileSaveSession()
             t << *mw->netView();
             f.close();
-            qDebug( "Saved session to file '%s'", (const char*) fname );
+            odebug << "Saved session to file '" << (const char*) fname << "'" << oendl; 
         }
         else
         {
-            qDebug( "Problem saving session to file '%s'", (const char*) fname );
+            odebug << "Problem saving session to file '" << (const char*) fname << "'" << oendl; 
         }
     }
@@ -349,9 +350,9 @@ void WellenreiterMainWindow::fileSaveHex()
             t << mw->hexWindow()->getLog();
             f.close();
-            qDebug( "Saved hex log to file '%s'", (const char*) fname );
+            odebug << "Saved hex log to file '" << (const char*) fname << "'" << oendl; 
         }
         else
         {
-            qDebug( "Problem saving hex log to file '%s'", (const char*) fname );
+            odebug << "Problem saving hex log to file '" << (const char*) fname << "'" << oendl; 
         }
     }
@@ -370,9 +371,9 @@ void WellenreiterMainWindow::fileLoadSession()
             t >> *mw->netView();
             f.close();
-            qDebug( "Loaded session from file '%s'", (const char*) fname );
+            odebug << "Loaded session from file '" << (const char*) fname << "'" << oendl; 
         }
         else
         {
-            qDebug( "Problem loading session from file '%s'", (const char*) fname );
+            odebug << "Problem loading session from file '" << (const char*) fname << "'" << oendl; 
         }
     }
@@ -439,9 +440,9 @@ void WellenreiterMainWindow::uploadSession()
     if ( !result )
     {
-        qDebug( "Session upload cancelled :(" );
+        odebug << "Session upload cancelled :(" << oendl; 
         return;
     }
 
-    qDebug( "Starting upload..." );
+    odebug << "Starting upload..." << oendl; 
 
     struct sockaddr_in raddr;
diff --git a/noncore/net/wellenreiter/gui/packetview.cpp b/noncore/net/wellenreiter/gui/packetview.cpp
index 3d3aa18..4df01da 100644
--- a/noncore/net/wellenreiter/gui/packetview.cpp
+++ b/noncore/net/wellenreiter/gui/packetview.cpp
@@ -85,5 +85,5 @@ void PacketView::showPacket( int number )
     else
     {
-        qDebug( "D'oh! No packet!" );
+        odebug << "D'oh! No packet!" << oendl; 
     }
 }
diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp
index d98ef0b..cb17f51 100644
--- a/noncore/net/wellenreiter/gui/resource.cpp
+++ b/noncore/net/wellenreiter/gui/resource.cpp
@@ -30,5 +30,5 @@ QPixmap loadPixmap( const QString& pix )
     if ( pixmap.isNull() )
     {
-        qDebug( "Wellenreiter::Resource: can't find pixmap " + filename );
+        odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; 
     }
     return pixmap;
@@ -42,5 +42,5 @@ QIconSet loadIconSet( const QString& pix )
     if ( pixmap.isNull() )
     {
-        qDebug( "Wellenreiter::Resource: can't find pixmap " + filename );
+        odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; 
     }
     return QIconSet( pixmap );
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 3b7120a..a2be782 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -18,19 +18,24 @@
 #include "logwindow.h"
 
-#include <assert.h>
-#include <qcursor.h>
-#include <qdatetime.h>
-#include <qpopupmenu.h>
-#include <qcheckbox.h>
-
+/* OPIE */
 #ifdef QWS
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
-#endif
-
-#ifdef QWS
 #include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
+using namespace Opie::Core;
+using namespace Opie::Ui;
+using namespace Opie::Net;
+
+/* QT */
+#include <qcursor.h>
+#include <qdatetime.h>
+#include <qpopupmenu.h>
+#include <qcheckbox.h>
+
+/* STD */
+#include <assert.h>
 
 const int col_type = 0;
@@ -47,10 +52,4 @@ const int col_lastseen = 9;
 const int col_location = 10;
 
-using namespace Opie::Net;
-using namespace Opie::Ui;
-using namespace Opie::Net;
-using namespace Opie::Ui;
-using namespace Opie::Ui;
-using namespace Opie::Net;
 MScanListView::MScanListView( QWidget* parent, const char* name )
               :OListView( parent, name )
@@ -107,5 +106,5 @@ OListViewItem* MScanListView::childFactory()
 void MScanListView::serializeTo( QDataStream& s) const
 {
-    qDebug( "serializing MScanListView" );
+    odebug << "serializing MScanListView" << oendl; 
     OListView::serializeTo( s );
 }
@@ -114,5 +113,5 @@ void MScanListView::serializeTo( QDataStream& s) const
 void MScanListView::serializeFrom( QDataStream& s)
 {
-    qDebug( "serializing MScanListView" );
+    odebug << "serializing MScanListView" << oendl; 
     OListView::serializeFrom( s );
 }
@@ -144,5 +143,5 @@ void MScanListView::addNewItem( const QString& type,
     {
         #ifdef DEBUG
-        qDebug( "itemtext: %s", (const char*) item->text( col_essid ) );
+        odebug << "itemtext: " << (const char*) item->text( col_essid ) << "" << oendl; 
         #endif
         item = static_cast<MScanListItem*> ( item->nextSibling() );
@@ -160,5 +159,5 @@ void MScanListView::addNewItem( const QString& type,
         {
             #ifdef DEBUG
-            qDebug( "subitemtext: %s", (const char*) item->text( col_ap ) );
+            odebug << "subitemtext: " << (const char*) item->text( col_ap ) << "" << oendl; 
             #endif
             item = static_cast<MScanListItem*> ( item->nextSibling() );
@@ -169,5 +168,5 @@ void MScanListView::addNewItem( const QString& type,
             // we have already seen this item, it's a dupe
             #ifdef DEBUG
-            qDebug( "%s is a dupe - ignoring...", (const char*) macaddr );
+            odebug << "" << (const char*) macaddr << " is a dupe - ignoring..." << oendl; 
             #endif
             item->receivedBeacon();
@@ -187,5 +186,5 @@ void MScanListView::addNewItem( const QString& type,
 
     #ifdef DEBUG
-    qDebug( "inserting new station %s", (const char*) macaddr );
+    odebug << "inserting new station " << (const char*) macaddr << "" << oendl; 
     #endif
 
@@ -213,5 +212,5 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
     {
         #ifdef DEBUG
-        qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) );
+        odebug << "subitemtext: " << (const char*) subitem->text( col_ap ) << "" << oendl; 
         #endif
         subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
@@ -222,5 +221,5 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
         // we have already seen this item, it's a dupe
         #ifdef DEBUG
-        qDebug( "%s is a dupe - ignoring...", (const char*) addr.toString(true) );
+        odebug << "" << (const char*) addr.toString(true) << " is a dupe - ignoring..." << oendl; 
         #endif
         subitem->receivedBeacon(); //FIXME: sent data bit
@@ -247,5 +246,5 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
 void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo )
 {
-    qDebug( "WDSTraffic: %s and %s seem to form a WDS", (const char*) viaFrom.toString(), (const char*) viaTo.toString() );
+    odebug << "WDSTraffic: " << (const char*) viaFrom.toString() << " and " << (const char*) viaTo.toString() << " seem to form a WDS" << oendl; 
     QString s;
     MScanListItem* network;
@@ -265,5 +264,5 @@ void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to,
     else
     {
-        qDebug( "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" );
+        odebug << "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" << oendl; 
         MLogWindow::logwindow()->log( "WARNING: Unhandled WSD traffic!" );
     }
@@ -287,5 +286,5 @@ void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to,
     else
     {
-        qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" );
+        odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; 
         MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" );
 
@@ -310,5 +309,5 @@ void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& t
     else
     {
-        qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" );
+        odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; 
         MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" );
     }
@@ -318,5 +317,5 @@ void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& t
 void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
 {
-    qWarning( "D'oh! Not yet implemented..." );
+    owarn << "D'oh! Not yet implemented..." << oendl; 
     MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" );
 }
@@ -325,5 +324,5 @@ void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to,
 void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
 {
-    qDebug( "identify %s = %s", (const char*) macaddr.toString(), (const char*) ip );
+    odebug << "identify " << (const char*) macaddr.toString() << " = " << (const char*) ip << "" << oendl; 
 
     QListViewItemIterator it( this );
@@ -336,5 +335,5 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
         }
     }
-    qDebug( "D'oh! Received identification, but item not yet in list... ==> Handle this!" );
+    odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; 
     MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!",
                                                      (const char*) macaddr.toString(), (const char*) ip ) );
@@ -344,5 +343,5 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
 void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip )
 {
-    qDebug( "addService '%s', Server = %s = %s", (const char*) name, (const char*) macaddr.toString(), (const char*) ip );
+    odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << (const char*) ip << "" << oendl; 
 
     //TODO: Refactor that out, we need it all over the place.
@@ -361,5 +360,5 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
             {
                 #ifdef DEBUG
-                qDebug( "subitemtext: %s", (const char*) subitem->text( col_essid ) );
+                odebug << "subitemtext: " << (const char*) subitem->text( col_essid ) << "" << oendl; 
                 #endif
                 subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
@@ -370,5 +369,5 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
                 // we have already seen this item, it's a dupe
                 #ifdef DEBUG
-                qDebug( "%s is a dupe - ignoring...", (const char*) name );
+                odebug << "" << (const char*) name << " is a dupe - ignoring..." << oendl; 
                 #endif
                 subitem->receivedBeacon(); //FIXME: sent data bit
@@ -384,5 +383,5 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
         }
     }
-    qDebug( "D'oh! Received identification, but item not yet in list... ==> Handle this!" );
+    odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; 
     MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled service addition %s = %s!",
                                                      (const char*) macaddr.toString(), (const char*) ip ) );
@@ -422,5 +421,5 @@ MScanListItem::MScanListItem( QListView* parent, const QString& type, const QStr
 {
     #ifdef DEBUG
-    qDebug( "creating scanlist item" );
+    odebug << "creating scanlist item" << oendl; 
     #endif
 
@@ -436,5 +435,5 @@ MScanListItem::MScanListItem( QListViewItem* parent, const QString& type, const
 {
     #ifdef DEBUG
-    qDebug( "creating scanlist item" );
+    odebug << "creating scanlist item" << oendl; 
     #endif
     if ( WellenreiterConfigWindow::instance() )
@@ -460,5 +459,5 @@ void MScanListItem::serializeTo( QDataStream& s ) const
 {
     #ifdef DEBUG
-    qDebug( "serializing MScanListItem" );
+    odebug << "serializing MScanListItem" << oendl; 
     #endif
     OListViewItem::serializeTo( s );
@@ -471,5 +470,5 @@ void MScanListItem::serializeFrom( QDataStream& s )
 {
     #ifdef DEBUG
-    qDebug( "serializing MScanListItem" );
+    odebug << "serializing MScanListItem" << oendl; 
     #endif
     OListViewItem::serializeFrom( s );
@@ -557,5 +556,5 @@ void MScanListItem::receivedBeacon()
     _beacons++;
     #ifdef DEBUG
-    qDebug( "MScanListItem %s: received beacon #%d", (const char*) _macaddr, _beacons );
+    odebug << "MScanListItem " << (const char*) _macaddr << ": received beacon #" << _beacons << "" << oendl; 
     #endif
     setText( col_sig, QString::number( _beacons ) );
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index fff7c35..fad6efd 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -12,6 +12,4 @@
 ***********************************************************************/
 
-// Local
-
 #include "gps.h"
 #include "wellenreiter.h"
@@ -24,8 +22,8 @@
 #include "protolistview.h"
 
-// Opie
-
+/* OPIE */
 #ifdef QWS
 #include <opie2/oapplication.h>
+#include <opie2/odebug.h>
 #include <opie2/odevice.h>
 #else
@@ -36,8 +34,9 @@
 #include <opie2/opcap.h>
 #include <qpe/qcopenvelope_qws.h>
-using namespace Opie;
-
-// Qt
+using namespace Opie::Core;
+using namespace Opie::Net;
+using namespace Opie::Ui;
 
+/* QT */
 #include <qcheckbox.h>
 #include <qcombobox.h>
@@ -53,6 +52,5 @@ using namespace Opie;
 #include <qmainwindow.h>
 
-// Standard
-
+/* STD */
 #include <assert.h>
 #include <errno.h>
@@ -62,10 +60,4 @@ using namespace Opie;
 #include <stdlib.h>
 
-using namespace Opie::Core;
-using namespace Opie::Net;
-using namespace Opie::Net;
-using namespace Opie::Core;
-using namespace Opie::Net;
-using namespace Opie::Core;
 Wellenreiter::Wellenreiter( QWidget* parent )
     : WellenreiterBase( parent, 0, 0 ),
@@ -107,5 +99,5 @@ Wellenreiter::~Wellenreiter()
 void Wellenreiter::initialTimer()
 {
-    qDebug( "Wellenreiter::preloading manufacturer database..." );
+    odebug << "Wellenreiter::preloading manufacturer database..." << oendl; 
     OManufacturerDB::instance();
 }
@@ -150,10 +142,10 @@ void Wellenreiter::handleNotification( OPacket* p )
         {
             QString action = configwindow->parsePackets->protocolAction( name );
-            qDebug( "parsePacket-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
+            odebug << "parsePacket-action for '" << (const char*) name << "' seems to be '" << (const char*) action << "'" << oendl; 
             doAction( action, name, p );
         }
         else
         {
-            qDebug( "protocol '%s' not checked in parsePackets.", (const char*) name );
+            odebug << "protocol '" << (const char*) name << "' not checked in parsePackets." << oendl; 
         }
     ++it;
@@ -167,5 +159,5 @@ void Wellenreiter::handleManagementFrame( OPacket* p, OWaveLanManagementPacket*
     else if ( manage->managementType() == "ProbeRequest" ) handleManagementFrameProbeRequest( p, manage );
     else if ( manage->managementType() == "ProbeResponse" ) handleManagementFrameProbeResponse( p, manage );
-    else qWarning( "Wellenreiter::handleManagementFrame(): '%s' - please handle me!", (const char*) manage->managementType() );
+    else owarn << "Wellenreiter::handleManagementFrame(): '" << (const char*) manage->managementType() << "' - please handle me!" << oendl; 
 }
 
@@ -183,12 +175,12 @@ void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManage
     {
         // TODO: add check if GPS is working!?
-        qDebug( "Wellenreiter::gathering GPS data..." );
+        odebug << "Wellenreiter::gathering GPS data..." << oendl; 
         loc = gps->position();
-        qDebug( "Wellenreiter::GPS data received is ( %f , %f ) - dms string = '%s'", loc.latitude(), loc.longitude(), loc.dmsPosition().latin1() );
+        odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl; 
     }
 
     if ( essid.length() )
         netView()->addNewItem( "adhoc", essid, header->macAddress2(), false /* should check FrameControl field */, -1, 0, loc, true /* only probed */ );
-    qDebug( "Wellenreiter::invalid frame [possibly noise] detected!" );
+    odebug << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl; 
 }
 
@@ -212,5 +204,5 @@ void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPa
     else
     {
-        qWarning( "Wellenreiter::invalid frame [possibly noise] detected!" );
+        owarn << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl; 
         return;
     }
@@ -227,7 +219,7 @@ void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPa
     {
         // TODO: add check if GPS is working!?
-        qDebug( "Wellenreiter::gathering GPS data..." );
+        odebug << "Wellenreiter::gathering GPS data..." << oendl; 
         loc = gps->position();
-        qDebug( "Wellenreiter::GPS data received is ( %f , %f ) - dms string = '%s'", loc.latitude(), loc.longitude(), loc.dmsPosition().latin1() );
+        odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl; 
     }
 
@@ -256,5 +248,5 @@ void Wellenreiter::handleControlFrame( OPacket* p, OWaveLanControlPacket* contro
     else
     {
-        qDebug( "Wellenreiter::handleControlFrame - please handle %s in a future version! :D", (const char*) control->controlType()  );
+        odebug << "Wellenreiter::handleControlFrame - please handle " << (const char*) control->controlType() << " in a future version! :D" << oendl; 
     }
 }
@@ -305,5 +297,5 @@ void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& source,
     if ( arp )
     {
-        qDebug( "Received ARP traffic (type '%s'): ", (const char*) arp->type() );
+        odebug << "Received ARP traffic (type '" << (const char*) arp->type() << "'): " << oendl; 
         if ( arp->type() == "REQUEST" )
         {
@@ -326,8 +318,8 @@ void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source,
     if ( dhcp )
     {
-        qDebug( "Received DHCP '%s' packet", (const char*) dhcp->type() );
+        odebug << "Received DHCP '" << (const char*) dhcp->type() << "' packet" << oendl; 
         if ( dhcp->type() == "OFFER" )
         {
-            qDebug( "DHCP: '%s' ('%s') seems to be a DHCP server.", (const char*) source.toString(), (const char*) dhcp->serverAddress().toString() );
+            odebug << "DHCP: '" << (const char*) source.toString() << "' ('" << (const char*) dhcp->serverAddress().toString() << "') seems to be a DHCP server." << oendl; 
             netView()->identify( source, dhcp->serverAddress().toString() );
             netView()->addService( "DHCP", source, dhcp->serverAddress().toString() );
@@ -335,5 +327,5 @@ void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source,
         else if ( dhcp->type() == "ACK" )
         {
-            qDebug( "DHCP: '%s' ('%s') accepted the offered DHCP address.", (const char*) dhcp->clientMacAddress().toString(), (const char*) dhcp->yourAddress().toString() );
+            odebug << "DHCP: '" << (const char*) dhcp->clientMacAddress().toString() << "' ('" << (const char*) dhcp->yourAddress().toString() << "') accepted the offered DHCP address." << oendl; 
             netView()->identify( dhcp->clientMacAddress(), dhcp->yourAddress().toString() );
         }
@@ -369,5 +361,5 @@ bool Wellenreiter::checkDumpPacket( OPacket* p )
         {
             QString action = configwindow->capturePackets->protocolAction( name );
-            qDebug( "capturePackets-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
+            odebug << "capturePackets-action for '" << (const char*) name << "' seems to be '" << (const char*) action << "'" << oendl; 
             if ( action == "Discard" )
             {
@@ -378,5 +370,5 @@ bool Wellenreiter::checkDumpPacket( OPacket* p )
         else
         {
-            qDebug( "protocol '%s' not checked in capturePackets.", (const char*) name );
+            odebug << "protocol '" << (const char*) name << "' not checked in capturePackets." << oendl; 
         }
     ++it;
@@ -552,5 +544,5 @@ void Wellenreiter::startClicked()
         case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break;
-        case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break;
+        case DEVTYPE_FILE: odebug << "Wellenreiter: Capturing from file '" << (const char*) interface << "'" << oendl;  break;
         default: assert( 0 ); // shouldn't reach this
     }
@@ -573,5 +565,5 @@ void Wellenreiter::startClicked()
     if ( configwindow->enableGPS->isChecked() )
     {
-        qDebug( "Wellenreiter:GPS enabled @ %s:%d", (const char*) configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
+        odebug << "Wellenreiter:GPS enabled @ " << (const char*) configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "" << oendl; 
         gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
     }
@@ -597,5 +589,5 @@ void Wellenreiter::startClicked()
         pcap->open( QFile( interface ) );
 
-    qDebug( "Wellenreiter:: dumping to %s", (const char*) dumpname );
+    odebug << "Wellenreiter:: dumping to " << (const char*) dumpname << "" << oendl; 
     pcap->openDumpFile( dumpname );
 
@@ -653,5 +645,5 @@ void Wellenreiter::startClicked()
 void Wellenreiter::timerEvent( QTimerEvent* )
 {
-    qDebug( "Wellenreiter::timerEvent()" );
+    odebug << "Wellenreiter::timerEvent()" << oendl; 
     OPacket* p = pcap->next();
     if ( !p ) // no more packets available
@@ -716,13 +708,13 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch
     QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" );
     int count = 3;
-    qDebug("sending %d messages",count);
+    odebug << "sending " << count << " messages" << oendl; 
     msg << QString("count") << QString::number(count);
-    qDebug("msg >%s< Mode >%s<", iface->name(),type.latin1() );
+    odebug << "msg >" << iface->name() << "< Mode >" << type.latin1() << "<" << oendl; 
     msg << QString(iface->name()) << QString("Mode") << type;
-    qDebug("msg >%s< essid >%s<", iface->name(),essid.latin1());
+    odebug << "msg >" << iface->name() << "< essid >" << essid.latin1() << "<" << oendl; 
     msg << QString(iface->name()) << QString("ESSID") << essid;
-    qDebug("msg >%s< channel >%d<", iface->name(),channel);
+    odebug << "msg >" << iface->name() << "< channel >" << channel << "<" << oendl; 
     msg << QString(iface->name()) << QString("Channel") << channel;
-//    qDebug("msg >%s< mac >%s<", iface->name(),macaddr);
+//    odebug << "msg >" << iface->name() << "< mac >" << macaddr << "<" << oendl; 
 //    msg << QString(iface->name()) << QString("MacAddr") << macaddr;
     #else