1 files changed, 30 insertions, 30 deletions

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;