- convert qDebug to odebug

5 files changed, 41 insertions, 41 deletions

diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index b15e692..449fdf1 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -1,19 +1,23 @@
-#include <qt.h>
 
+#include "composemail.h"
+
+#include <libmailwrapper/smtpwrapper.h>
+#include <libmailwrapper/storemail.h>
+#include <libmailwrapper/abstractmail.h>
+#include <libmailwrapper/mailtypes.h>
+
+/* OPIE */
 #include <opie2/ofiledialog.h>
 #include <opie2/odebug.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/contact.h>
 
-#include "composemail.h"
+/* QT */
+#include <qt.h>
 
-#include <libmailwrapper/smtpwrapper.h>
-#include <libmailwrapper/storemail.h>
-#include <libmailwrapper/abstractmail.h>
-#include <libmailwrapper/mailtypes.h>
 
 using namespace Opie::Core;
 using namespace Opie::Ui;
 ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
@@ -183,14 +187,14 @@ void ComposeMail::removeAttachment()
 
 void ComposeMail::accept()
 {
     if ( checkBoxLater->isChecked() ) {
-        odebug << "Send later" << oendl; 
+        odebug << "Send later" << oendl;
     }
 
 #if 0
-    qDebug( "Sending Mail with " +
-            smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() );
+    odebug << "Sending Mail with "
+           << smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() << oendl;
 #endif
     Opie::Core::OSmartPointer<Mail> mail=new Mail;
 
     SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() );
@@ -256,9 +260,9 @@ void ComposeMail::reject()
         if ( !sigMultiLine->text().isEmpty() ) {
             txt.append( "\n--\n" );
             txt.append( sigMultiLine->text() );
         }
-        odebug << txt << oendl; 
+        odebug << txt << oendl;
         mail->setMessage( txt );
 
         /* only use the default drafts folder name! */
         Storemail wrapper(AbstractMail::draftFolder());
@@ -292,9 +296,9 @@ void ComposeMail::reEditMail(const RecMailP&current)
 AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
     : QListViewItem( parent )
 {
     attachment = att;
-    odebug << att->getMimeType() << oendl; 
+    odebug << att->getMimeType() << oendl;
     setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ?
                   Resource::loadPixmap( "UnknownDocument-14" ) :
                   attachment->getDocLnk().pixmap() );
     setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() );
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp
index ca2e7bd..47e170e 100644
--- a/noncore/net/opietooth/manager/hciconfwrapper.cpp
+++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp
@@ -22,9 +22,9 @@ namespace OpieTooth {
         setValue( "pin_helper"  , app  );
     }
 
     void HciConfWrapper::setName( const QString &name ) {
-        qDebug ("NAME : " + name);
+        odebug << "NAME : " << name << oendl;
         setValue( "name" , "\"" +  name + "\"" );
     }
 
     void HciConfWrapper::setIscan( bool enable) {
@@ -76,18 +76,18 @@ namespace OpieTooth {
         QString str;
         for (it = m_file.begin(); it != m_file.end(); ++it ) {
             str = (*it);
             if( (str.contains(key)) > 0 ) {
-                odebug << "Found" << oendl; 
+                odebug << "Found" << oendl;
                 // still need to look if its commented out!!!
                 str.simplifyWhiteSpace();
-                odebug << key << oendl; 
+                odebug << key << oendl;
                 if (str.startsWith("#")) {
                     str = (key + " " + value + ";");
                 } else {
                     str = str.replace( QRegExp( "\\s*"+key+"\\s+[^\\s][^;]*;" ),  key + " " + value + ";");
                 }
-                odebug << str << oendl; 
+                odebug << str << oendl;
                 it = m_file.remove( it );
                 it = m_file.insert( it,  str );
                 //return; the regexp is too wide  -zecke // all set
             }
@@ -100,13 +100,13 @@ namespace OpieTooth {
      * This loads the config file and stores it inside
      * the m_file
      */
     void HciConfWrapper::load() {
-        owarn << "loaded" << oendl; 
+        owarn << "loaded" << oendl;
         m_file.clear();
         QFile file( m_fileName );
         if (!file.open( IO_ReadOnly ) ) {
-            odebug << "Could not open" << oendl; 
+            odebug << "Could not open" << oendl;
             return;
         }
 
             /**
@@ -121,22 +121,22 @@ namespace OpieTooth {
                 m_file.append( tmp );
             }
     }
     void HciConfWrapper::save() {
-        owarn << "save" << oendl; 
+        owarn << "save" << oendl;
         if (m_file.isEmpty() ) // load first
             return;
 
         QFile file( m_fileName );
         if ( !file.open(IO_WriteOnly ) ) {
-            owarn << "could not open " << m_fileName.latin1() << "" << oendl; 
+            owarn << "could not open " << m_fileName.latin1() << "" << oendl;
             return;
         }
 
         QTextStream stream(&file );
         QStringList::Iterator it;
         for ( it = m_file.begin(); it != m_file.end(); ++it ) {
             stream << (*it) << endl;
         }
-        owarn << "saved" << oendl; 
+        owarn << "saved" << oendl;
     };
 }
diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.cpp b/noncore/net/opietooth/manager/rfcommconfhandler.cpp
index 1f7ba65..f82d2c8 100644
--- a/noncore/net/opietooth/manager/rfcommconfhandler.cpp
+++ b/noncore/net/opietooth/manager/rfcommconfhandler.cpp
@@ -93,24 +93,24 @@ void RfCommConfHandler::load()  {
             QString tmpLine = ( *line ).stripWhiteSpace();
 
             if ( tmpLine.startsWith("rfcomm") )  {
                 QString number = tmpLine.mid( 6,1 );
-                odebug << tmpLine << oendl; 
-                odebug << "TEST " + number << oendl; 
+                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 );
-                odebug << "mac" + mac << oendl; 
+                odebug << "mac" + mac << oendl;
             } else if ( tmpLine.startsWith( "channel" ) ) {
                 channel = tmpLine.mid( 8, 1 );
-                qDebug ( "Channel :" + channel );
+                odebug << "Channel :" << channel << oendl;
             } else if ( tmpLine.startsWith( "comment" ) ) {
                 comment = tmpLine.mid( 9, tmpLine.find( ';' ) - 9 - 1 );
-                odebug << "Comment: " + comment << oendl; 
+                odebug << "Comment: " + comment << oendl;
             }
         }
         rfCommConf.close();
     }
     save( m_foundEntries );
-    odebug << QString( "ENTries: %1").arg( m_foundEntries.count() ) << oendl; 
+    odebug << QString( "ENTries: %1").arg( m_foundEntries.count() ) << oendl;
 }
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index c605111..9e8aa72 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -128,10 +128,11 @@ void MScanListView::addNewItem( const QString& type,
 {
     QString macaddr = mac.toString(true);
 
     #ifdef DEBUG
-    qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", (const char*) type,
-            (const char*) essid, (const char*) macaddr, channel );
+    odebug << "MScanList::addNewItem( " << (const char*) type << " / "
+           << (const char*) essid << " / " << (const char*) macaddr
+           << " [" << channel << "]" << oendl;
     #endif
 
     // search, if we already have seen this net
 
@@ -393,10 +394,10 @@ void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, in
     if ( !item ) return;
 
     MScanListItem* itm = static_cast<MScanListItem*>( item );
 
-    qDebug( "contextMenuRequested on item '%s' (%s) in column: '%d'",
-            (const char*) itm->text(0), (const char*) itm->type, col );
+    odebug << "contextMenuRequested on item '" << (const char*) itm->text(0) << "' ("
+           << (const char*) itm->type << ") in column: '" << col << "'" << oendl;
 
     if ( itm->type == "adhoc" || itm->type == "managed" )
     {
         QString entry = QString().sprintf( "&Join %s Net '%s'...", (const char*) itm->type, (const char*) itm->essid() );
@@ -488,13 +489,11 @@ void MScanListItem::serializeFrom( QDataStream& s )
 
 void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed )
 {
     #ifdef DEBUG
-    qDebug( "decorating scanlist item %s / %s / %s [%d]",
-        (const char*) type,
-        (const char*) essid,
-        (const char*) macaddr,
-        channel );
+    odebug << "decorating scanlist item " << (const char*) type << " / "
+           << (const char*) essid << " / " << (const char*) macaddr
+           << "[" << channel << "]" << oendl;
     #endif
 
     // set icon for managed or adhoc mode
     QString name;
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 2f85790..e801ce7 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -741,14 +741,11 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch
         QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Stop sniffing before\njoining a net." ) );
         return;
     }
 
-    qDebug( "joinNetwork() with Interface %s: %s, %s, %d, %s",
-        (const char*) iface->name(),
-        (const char*) type,
-        (const char*) essid,
-        channel,
-        (const char*) macaddr );
+    odebug << "joinNetwork() with Interface " << (const char*) iface->name()
+           << ": " << (const char*) type << ", " << (const char*) essid
+           << ", " << channel << ", " << (const char*) macaddr << oendl;
 
     QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" );
     int count = 3;
     odebug << "sending " << count << " messages" << oendl;