15 files changed, 145 insertions, 145 deletions

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
@@ -54,3 +54,3 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin
 {
-    qDebug("Decode string start");
+    odebug << "Decode string start" << oendl; 
     char*result_text;
@@ -78,3 +78,3 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin
     }
-    qDebug("Decode string finished");
+    odebug << "Decode string finished" << oendl; 
     return result;
@@ -93,6 +93,6 @@ QString AbstractMail::convert_String(const char*text)
         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; 
     }
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
@@ -99,3 +99,3 @@ mailimf_address_list *Generatemail::parseAddresses(const QString&addr ) {
                     list.append(s);
-                    qDebug("Appended %s",s.latin1());
+                    odebug << "Appended " << s.latin1() << "" << oendl; 
                 }
@@ -112,3 +112,3 @@ mailimf_address_list *Generatemail::parseAddresses(const QString&addr ) {
         list.append(s);
-        qDebug("Appended %s",s.latin1());
+        odebug << "Appended " << s.latin1() << "" << oendl; 
     }
@@ -118,6 +118,6 @@ mailimf_address_list *Generatemail::parseAddresses(const QString&addr ) {
         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; 
         }
@@ -177,3 +177,3 @@ 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 );
@@ -208,5 +208,5 @@ void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files
     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;
@@ -217,4 +217,4 @@ void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files
         if ( filePart == NULL ) {
-            qDebug( "addFileParts: error adding file:" );
-            qDebug( it->getFileName() );
+            odebug << "addFileParts: error adding file:" << oendl; 
+            odebug << it->getFileName() << oendl; 
             continue;
@@ -224,3 +224,3 @@ void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files
             mailmime_free( filePart );
-            qDebug("error smart add");
+            odebug << "error smart add" << oendl; 
         }
@@ -272,3 +272,3 @@ err_free_param:
 err_free:
-    qDebug( "buildTxtPart - error" );
+    odebug << "buildTxtPart - error" << oendl; 
 
@@ -347,3 +347,3 @@ mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Ma
             clist_append(in_reply_to,c_reply);
-            qDebug("In reply to: %s",c_reply);
+            odebug << "In reply to: " << c_reply << "" << oendl; 
         }
@@ -355,3 +355,3 @@ mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Ma
         if ( fields == NULL ) {
-            qDebug("Error creating mailimf fields");
+            odebug << "Error creating mailimf fields" << oendl; 
             res = 0;
@@ -437,3 +437,3 @@ err_free_fields:
 err_free:
-    qDebug( "createMimeMail: error" );
+    odebug << "createMimeMail: error" << oendl; 
 
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
@@ -137,3 +137,3 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
     if (current_rec >= 10) {
-        qDebug("too deep recursion!");
+        odebug << "too deep recursion!" << oendl; 
     }
@@ -274,3 +274,3 @@ QString Genericwrapper::parseAddressList( mailimf_address_list *list )
             default:
-                qDebug( "Generic: unkown mailimf address type" );
+                odebug << "Generic: unkown mailimf address type" << oendl; 
                 break;
@@ -367,3 +367,3 @@ void Genericwrapper::cleanMimeCache()
     bodyCache.clear();
-    qDebug("Genericwrapper: cache cleaned");
+    odebug << "Genericwrapper: cache cleaned" << oendl; 
 }
@@ -396,3 +396,3 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error message list");
+        odebug << "Error message list" << oendl; 
         return;
@@ -401,3 +401,3 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error filling message list");
+        odebug << "Error filling message list" << oendl; 
         if (env_list) {
@@ -415,3 +415,3 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
         if (msg->msg_fields == NULL) {
-            //qDebug("could not fetch envelope of message %i", i);
+            //odebug << "could not fetch envelope of message " << i << "" << oendl; 
             continue;
@@ -450,3 +450,3 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
             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
@@ -32,3 +32,3 @@ int IMAPwrapper::selectMbox(const QString&mbox)
     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 = "";
@@ -43,3 +43,3 @@ 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; 
 }
@@ -55,3 +55,3 @@ bool IMAPwrapper::start_tls(bool force_tls)
         Global::statusMessage("error getting capabilities!");
-        qDebug("error getting capabilities!");
+        odebug << "error getting capabilities!" << oendl; 
         return false;
@@ -76,3 +76,3 @@ bool IMAPwrapper::start_tls(bool 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;
@@ -127,3 +127,3 @@ void IMAPwrapper::login()
         // cancel
-        qDebug( "IMAP: Login canceled" );
+        odebug << "IMAP: Login canceled" << oendl; 
         return;
@@ -150,3 +150,3 @@ void IMAPwrapper::login()
     if ( ssl ) {
-        qDebug(  "using ssl" );
+        odebug << "using ssl" << oendl; 
         err = mailimap_ssl_connect( m_imap, (char*)server, port );
@@ -178,3 +178,3 @@ void IMAPwrapper::login()
         Global::statusMessage(tr("Server has no TLS support!"));
-        qDebug("Server has no TLS support!");
+        odebug << "Server has no TLS support!" << oendl; 
         ok = false;
@@ -319,3 +319,3 @@ 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; 
     }
@@ -329,3 +329,3 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
     if (!path) path = "";
-    qDebug(path);
+    odebug << path << oendl; 
     err = mailimap_list( m_imap, (char*)path, (char*)mask, &result );
@@ -356,3 +356,3 @@ 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; 
     }
@@ -468,4 +468,4 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
             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
@@ -526,3 +526,3 @@ RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail)
     } else {
-        qDebug("error fetching body: %s",m_imap->imap_response);
+        odebug << "error fetching body: " << m_imap->imap_response << "" << oendl; 
     }
@@ -638,3 +638,3 @@ 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; 
     }
@@ -665,3 +665,3 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
         }
-        qDebug("ID = %s",id.latin1());
+        odebug << "ID = " << id.latin1() << "" << oendl; 
         currentPart->setIdentifier(id);
@@ -706,3 +706,3 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
                 }
-                qDebug("ID(mpart) = %s",id.latin1());
+                odebug << "ID(mpart) = " << id.latin1() << "" << oendl; 
             }
@@ -750,3 +750,3 @@ void IMAPwrapper::fillSingleTextPart(RecPartP&target_part,mailimap_body_type_tex
     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());
@@ -762,3 +762,3 @@ 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 */
@@ -821,3 +821,3 @@ void IMAPwrapper::fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_ba
     }
-    qDebug("Type = %s/%s",type.latin1(),sub.latin1());
+    odebug << "Type = " << type.latin1() << "/" << sub.latin1() << "" << oendl; 
     target_part->setType(type.lower());
@@ -897,6 +897,6 @@ 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? */
@@ -904,5 +904,5 @@ 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; 
     }
-    qDebug("Delete successfull %s",m_imap->imap_response);
+    odebug << "Delete successfull " << m_imap->imap_response << "" << oendl; 
 }
@@ -932,3 +932,3 @@ 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;
@@ -1000,3 +1000,3 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder)
     }
-    qDebug("deleting mail: %s",m_imap->imap_response);
+    odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; 
     /* should we realy do that at this moment? */
@@ -1007,3 +1007,3 @@ int IMAPwrapper::deleteAllMail(const FolderP&folder)
     }
-    qDebug("Delete successfull %s",m_imap->imap_response);
+    odebug << "Delete successfull " << m_imap->imap_response << "" << oendl; 
     return 1;
@@ -1032,3 +1032,3 @@ 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());
@@ -1091,3 +1091,3 @@ void IMAPwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
     } else {
-        qDebug("Error retrieving status");
+        odebug << "Error retrieving status" << oendl; 
     }
@@ -1115,3 +1115,3 @@ const QString&IMAPwrapper::getName()const
 {
-    qDebug("Get name: %s",account->getAccountName().latin1());
+    odebug << "Get name: " << account->getAccountName().latin1() << "" << oendl; 
     return account->getAccountName();
@@ -1131,3 +1131,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
         AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit);
-        qDebug("Using generic");
+        odebug << "Using generic" << oendl; 
         return;
@@ -1150,3 +1150,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
         Global::statusMessage(error_msg);
-        qDebug(error_msg);
+        odebug << error_msg << oendl; 
         return;
@@ -1161,3 +1161,3 @@ 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);
@@ -1180,3 +1180,3 @@ void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstra
         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
@@ -26,3 +26,3 @@ void LoginDialog::accept()
 
-    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
@@ -15,3 +15,3 @@ RecMail::RecMail(const RecMail&old)
     copy_old(old);
-    qDebug("Copy constructor RecMail");
+    odebug << "Copy constructor RecMail" << oendl; 
 }
@@ -133,3 +133,3 @@ RecPart::RecPart(const RecPart&old)
     m_poslist = old.m_poslist;
-    qDebug("RecPart copy constructor");
+    odebug << "RecPart copy constructor" << oendl; 
 }
@@ -257,3 +257,3 @@ RecBody::RecBody(const RecBody&old)
     m_description = old.m_description;
-    qDebug("Recbody copy constructor");
+    odebug << "Recbody copy constructor" << oendl; 
 }
@@ -322,3 +322,3 @@ encodedString::encodedString(const encodedString&old)
     copy_old(old);
-    qDebug("encodedeString: copy constructor!");
+    odebug << "encodedeString: copy constructor!" << oendl; 
 }
@@ -329,3 +329,3 @@ encodedString& encodedString::operator=(const encodedString&old)
     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
@@ -53,3 +53,3 @@ IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no
   /*
-  qDebug( "folder " + name + " - displayed as " + nameDisplay );
+  odebug << "folder " + name + " - displayed as " + nameDisplay << oendl; 
   */
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
@@ -33,3 +33,3 @@ void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &ta
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error initializing mbox");
+        odebug << "Error initializing mbox" << oendl; 
         mailfolder_free(folder);
@@ -72,3 +72,3 @@ void MBOXwrapper::deleteMail(const RecMailP & mail)
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error initializing mbox");
+        odebug << "Error initializing mbox" << oendl; 
         mailfolder_free(folder);
@@ -79,3 +79,3 @@ void MBOXwrapper::deleteMail(const RecMailP & mail)
     if (r != MAIL_NO_ERROR) {
-        qDebug("error deleting mail");
+        odebug << "error deleting mail" << oendl; 
     }
@@ -104,3 +104,3 @@ RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail )
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error initializing mbox");
+        odebug << "Error initializing mbox" << oendl; 
         mailfolder_free(folder);
@@ -111,3 +111,3 @@ RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail )
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error fetching mail %i",mail->getNumber());
+        odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; 
         mailfolder_free(folder);
@@ -118,3 +118,3 @@ RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail )
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error fetching mail %i",mail->getNumber());
+        odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; 
         mailfolder_free(folder);
@@ -134,3 +134,3 @@ void MBOXwrapper::mbox_progress( size_t current, size_t maximum )
 {
-    qDebug("MBOX %i von %i",current,maximum);
+    odebug << "MBOX " << current << " von " << maximum << "" << oendl; 
 }
@@ -222,3 +222,3 @@ void MBOXwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP>
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error init folder");
+        odebug << "Error init folder" << oendl; 
         return;
@@ -237,3 +237,3 @@ void MBOXwrapper::deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &targ
         if (r!=MAILMBOX_NO_ERROR) {
-            qDebug("error delete mail");
+            odebug << "error delete mail" << oendl; 
         }
@@ -242,3 +242,3 @@ void MBOXwrapper::deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &targ
     if (r != MAILMBOX_NO_ERROR) {
-        qDebug("error expunge mailbox");
+        odebug << "error expunge mailbox" << oendl; 
     }
@@ -271,3 +271,3 @@ int MBOXwrapper::deleteAllMail(const FolderP&tfolder)
         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
@@ -18,3 +18,3 @@ MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name)
         }
-        qDebug(MHPath);
+        odebug << MHPath << oendl; 
         QDir dir(MHPath);
@@ -35,3 +35,3 @@ void MHwrapper::init_storage()
         if (r != MAIL_NO_ERROR) {
-            qDebug("error initializing storage");
+            odebug << "error initializing storage" << oendl; 
             mailstorage_free(m_storage);
@@ -43,3 +43,3 @@ void MHwrapper::init_storage()
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error connecting storage");
+        odebug << "error connecting storage" << oendl; 
         mailstorage_free(m_storage);
@@ -72,3 +72,3 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSm
     if (r!=MAIL_NO_ERROR) {
-        qDebug("listMessages: error selecting folder!");
+        odebug << "listMessages: error selecting folder!" << oendl; 
         return;
@@ -92,3 +92,3 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders()
     if (r != MAIL_NO_ERROR || !flist) {
-        qDebug("error getting folder list");
+        odebug << "error getting folder list" << oendl; 
         return folders;
@@ -112,3 +112,3 @@ void MHwrapper::deleteMail(const RecMailP&mail)
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error selecting folder!");
+        odebug << "error selecting folder!" << oendl; 
         return;
@@ -117,3 +117,3 @@ void MHwrapper::deleteMail(const RecMailP&mail)
     if (r != MAIL_NO_ERROR) {
-        qDebug("error deleting mail");
+        odebug << "error deleting mail" << oendl; 
     }
@@ -142,3 +142,3 @@ RecBodyP MHwrapper::fetchBody( const RecMailP &mail )
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error fetching mail %i",mail->getNumber());
+        odebug << "Error fetching mail " << mail->getNumber() << "" << oendl; 
         return body;
@@ -152,3 +152,3 @@ void MHwrapper::mbox_progress( size_t current, size_t maximum )
 {
-    qDebug("MH %i von %i",current,maximum);
+    odebug << "MH " << current << " von " << maximum << "" << oendl; 
 }
@@ -185,9 +185,9 @@ int MHwrapper::createMbox(const QString&folder,const FolderP&pfolder,const QStri
     }
-    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;
@@ -204,3 +204,3 @@ void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder)
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error selecting folder!");
+        odebug << "error selecting folder!" << oendl; 
         return;
@@ -209,3 +209,3 @@ void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder)
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error storing mail");
+        odebug << "error storing mail" << oendl; 
     }
@@ -226,3 +226,3 @@ encodedString* MHwrapper::fetchRawBody(const RecMailP&mail)
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error selecting folder!");
+        odebug << "error selecting folder!" << oendl; 
         return result;
@@ -250,3 +250,3 @@ void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &
     if (r!=MAIL_NO_ERROR) {
-        qDebug("deleteMails: error selecting folder!");
+        odebug << "deleteMails: error selecting folder!" << oendl; 
         return;
@@ -257,3 +257,3 @@ void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &
         if (r != MAIL_NO_ERROR) {
-            qDebug("error deleting mail");
+            odebug << "error deleting mail" << oendl; 
             break;
@@ -273,3 +273,3 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder)
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error selecting folder!");
+        odebug << "error selecting folder!" << oendl; 
         return 0;
@@ -279,3 +279,3 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder)
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error message list");
+        odebug << "Error message list" << oendl; 
         res = 0;
@@ -310,3 +310,3 @@ int MHwrapper::deleteMbox(const FolderP&tfolder)
     if (r != MAIL_NO_ERROR) {
-        qDebug("error deleting mail box");
+        odebug << "error deleting mail box" << oendl; 
         return 0;
@@ -328,6 +328,6 @@ int MHwrapper::deleteMbox(const FolderP&tfolder)
     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;
@@ -380,3 +380,3 @@ 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);
@@ -384,3 +384,3 @@ void MHwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstract
     }
-    qDebug("Using internal routines for move/copy");
+    odebug << "Using internal routines for move/copy" << oendl; 
     QString tf = buildPath(targetFolder);
@@ -388,3 +388,3 @@ void MHwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,Abstract
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error selecting source mailbox");
+        odebug << "Error selecting source mailbox" << oendl; 
         return;
@@ -397,3 +397,3 @@ 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; 
     }
@@ -409,3 +409,3 @@ void MHwrapper::mvcpAllMails(const FolderP&fromFolder,
     if (targetWrapper != this) {
-        qDebug("Using generic");
+        odebug << "Using generic" << oendl; 
         Genericwrapper::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit);
@@ -416,3 +416,3 @@ void MHwrapper::mvcpAllMails(const FolderP&fromFolder,
     if (r!=MAIL_NO_ERROR) {
-        qDebug("error selecting source folder!");
+        odebug << "error selecting source folder!" << oendl; 
         return;
@@ -423,3 +423,3 @@ void MHwrapper::mvcpAllMails(const FolderP&fromFolder,
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error message list");
+        odebug << "Error message list" << oendl; 
     }
@@ -436,3 +436,3 @@ 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
@@ -31,3 +31,3 @@ 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; 
 }
@@ -48,3 +48,3 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
     if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) {
-        qDebug("Message to large: %i",mail->Msgsize());
+        odebug << "Message to large: " << mail->Msgsize() << "" << oendl; 
         return body;
@@ -136,3 +136,3 @@ void NNTPwrapper::login()
             // cancel
-            qDebug( "NNTP: Login canceled" );
+            odebug << "NNTP: Login canceled" << oendl; 
             return;
@@ -173,3 +173,3 @@ 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"));
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
@@ -30,3 +30,3 @@ 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; 
 }
@@ -47,3 +47,3 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
     if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) {
-        qDebug("Message to large: %i",mail->Msgsize());
+        odebug << "Message to large: " << mail->Msgsize() << "" << oendl; 
         return body;
@@ -132,3 +132,3 @@ void POP3wrapper::login()
             // cancel
-            qDebug( "POP3: Login canceled" );
+            odebug << "POP3: Login canceled" << oendl; 
             return;
@@ -164,3 +164,3 @@ void POP3wrapper::login()
     if (err != MAIL_NO_ERROR) {
-        qDebug( QString( "FEHLERNUMMER %1" ).arg(  err ) );
+        odebug << QString( "FEHLERNUMMER %1" ).arg(  err ) << oendl; 
         Global::statusMessage(tr("Error initializing folder"));
@@ -238,3 +238,3 @@ void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) {
     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
@@ -28,3 +28,3 @@ void Settings::checkDirectory()
         system( "mkdir -p $HOME/Applications/opiemail" );
-        qDebug( "$HOME/Applications/opiemail created" );
+        odebug << "$HOME/Applications/opiemail created" << oendl; 
     }
@@ -56,3 +56,3 @@ void Settings::updateAccounts()
     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, "") );
@@ -63,3 +63,3 @@ void Settings::updateAccounts()
     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, "") );
@@ -70,3 +70,3 @@ void Settings::updateAccounts()
     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, "") );
@@ -77,3 +77,3 @@ void Settings::updateAccounts()
     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, "") );
@@ -181,3 +181,3 @@ void IMAPaccount::save()
 {
-    qDebug( "saving " + getFileName() );
+    odebug << "saving " + getFileName() << oendl; 
     Settings::checkDirectory();
@@ -259,3 +259,3 @@ void POP3account::save()
 {
-    qDebug( "saving " + getFileName() );
+    odebug << "saving " + getFileName() << oendl; 
     Settings::checkDirectory();
@@ -341,3 +341,3 @@ void SMTPaccount::save()
 {
-    qDebug( "saving " + getFileName() );
+    odebug << "saving " + getFileName() << oendl; 
     Settings::checkDirectory();
@@ -418,3 +418,3 @@ 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
@@ -117,3 +117,3 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later) {
             free(data);
-        qDebug("Error fetching mime...");
+        odebug << "Error fetching mime..." << oendl; 
         return;
@@ -210,8 +210,8 @@ 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 );
@@ -219,3 +219,3 @@ void SMTPwrapper::connect_server()
     if ( err != MAILSMTP_NO_ERROR ) {
-        qDebug("Error init connection");
+        odebug << "Error init connection" << oendl; 
         failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err));
@@ -248,3 +248,3 @@ 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() ) {
@@ -266,3 +266,3 @@ void SMTPwrapper::connect_server()
         }
-        qDebug( "session->auth: %i", m_smtp->auth);
+        odebug << "session->auth: " << m_smtp->auth << "" << oendl; 
         if (result) {
@@ -270,3 +270,3 @@ void SMTPwrapper::connect_server()
             if ( err == MAILSMTP_NO_ERROR ) {
-                qDebug("auth ok");
+                odebug << "auth ok" << oendl; 
             } else {
@@ -309,3 +309,3 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size )
     } else {
-        qDebug( "Mail sent." );
+        odebug << "Mail sent." << oendl; 
         storeMail(data,size,"Sent");
@@ -321,3 +321,3 @@ void SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later
     if ( mimeMail == NULL ) {
-        qDebug( "sendMail: error creating mime mail" );
+        odebug << "sendMail: error creating mime mail" << oendl; 
     } else {
@@ -327,3 +327,3 @@ void SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later
         smtpSend( mimeMail,later);
-        qDebug("Clean up done");
+        odebug << "Clean up done" << oendl; 
         sendProgress->hide();
@@ -380,5 +380,5 @@ bool SMTPwrapper::flushOutbox() {
 
-    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;
@@ -390,3 +390,3 @@ bool SMTPwrapper::flushOutbox() {
     if (!wrap) {
-        qDebug("memory error");
+        odebug << "memory error" << oendl; 
         return false;
@@ -400,3 +400,3 @@ bool SMTPwrapper::flushOutbox() {
         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
@@ -45,3 +45,3 @@ void StatusMail::initAccounts(QList<Account>&accounts)
     }
-    qDebug("Pop3 init count: %i",currentPop3Stat.message_count);
+    odebug << "Pop3 init count: " << currentPop3Stat.message_count << "" << oendl; 
     currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0;
@@ -74,6 +74,6 @@ void StatusMail::check_current_stat(folderStat&targetStat)
             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) {
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
@@ -60,3 +60,3 @@ int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail)
     if ( mimeMail == NULL ) {
-        qDebug( "storeMail: error creating mime mail" );
+        odebug << "storeMail: error creating mime mail" << oendl; 
         return 0;
@@ -75,3 +75,3 @@ int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail)
     if (r != MAIL_NO_ERROR || !data) {
-        qDebug("Error fetching mime...");
+        odebug << "Error fetching mime..." << oendl; 
         ret = 0;