- 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,39 +1,43 @@
-#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 )
     : ComposeMailUI( parent, name, modal, flags )
 {
     settings = s;
     m_replyid = "";
 
     QString vfilename = Global::applicationFileName("addressbook",
                 "businesscard.vcf");
     Contact c;
     if (QFile::exists(vfilename)) {
         c = Contact::readVCard( vfilename )[0];
     }
 
     QStringList mails = c.emailList();
     QString defmail = c.defaultEmail();
 
     if (defmail.length()!=0) {
         fromBox->insertItem(defmail);
     }
     QStringList::ConstIterator sit = mails.begin();
     for (;sit!=mails.end();++sit) {
@@ -163,54 +167,54 @@ void ComposeMail::slotAdjustColumns()
 
 void ComposeMail::addAttachment()
 {
     DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" );
     if ( !lnk.name().isEmpty() ) {
         Attachment *att = new Attachment( lnk );
         (void) new AttachViewItem( attList, att );
     }
 }
 
 void ComposeMail::removeAttachment()
 {
     if ( !attList->currentItem() ) {
         QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select a File.</p>" ),
                                   tr( "Ok" ) );
     } else {
         attList->takeItem( attList->currentItem() );
     }
 }
 
 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() );
     mail->setMail(fromBox->currentText());
 
     if ( !toLine->text().isEmpty() ) {
         mail->setTo( toLine->text() );
     } else {
         QMessageBox::warning(0,tr("Sending mail"),
             tr("No Receiver spezified" ) );
         return;
     }
     mail->setName(senderNameEdit->text());
     mail->setCC( ccLine->text() );
     mail->setBCC( bccLine->text() );
     mail->setReply( replyLine->text() );
     mail->setSubject( subjectLine->text() );
     if (!m_replyid.isEmpty()) {
         QStringList ids;
         ids.append(m_replyid);
         mail->setInreply(ids);
     }
     QString txt = message->text();
@@ -236,68 +240,68 @@ void ComposeMail::reject()
     int yesno = QMessageBox::warning(0,tr("Store message"),
                                      tr("Store message into drafts?"),
                                      tr("Yes"),
                                      tr("No"),QString::null,0,1);
 
     if (yesno == 0) {
         Opie::Core::OSmartPointer<Mail> mail=new Mail();
         mail->setMail(fromBox->currentText());
         mail->setTo( toLine->text() );
         mail->setName(senderNameEdit->text());
         mail->setCC( ccLine->text() );
         mail->setBCC( bccLine->text() );
         mail->setReply( replyLine->text() );
         mail->setSubject( subjectLine->text() );
         if (!m_replyid.isEmpty()) {
             QStringList ids;
             ids.append(m_replyid);
             mail->setInreply(ids);
         }
         QString txt = message->text();
         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());
         wrapper.storeMail(mail);
 
         AttachViewItem *it = (AttachViewItem *) attList->firstChild();
         /* attachments we will ignore! */
         if ( it != NULL ) {
             QMessageBox::warning(0,tr("Store message"),
                 tr("<center>Attachments will not be stored in \"Draft\" folder</center>"));
         }
     }
     QDialog::reject();
 }
 
 ComposeMail::~ComposeMail()
 {
 }
 
 void ComposeMail::reEditMail(const RecMailP&current)
 {
     RecMailP data = current;
     message->setText(data->Wrapper()->fetchBody(current)->Bodytext());
     subjectLine->setText( data->getSubject());
     toLine->setText(data->To().join(","));
     ccLine->setText(data->CC().join(","));
     bccLine->setText(data->Bcc().join(","));
     replyLine->setText(data->Replyto());
 }
 
 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() );
     setText( 1, QString::number( att->getSize() ) );
 }
 
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
@@ -2,49 +2,49 @@
 
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qregexp.h>
 
 #include <opie2/odebug.h>
 using namespace Opie::Core;
 
 namespace OpieTooth {
 
 
     HciConfWrapper::HciConfWrapper( const QString &fileName) {
         m_fileName = fileName;
     }
 
     HciConfWrapper::~HciConfWrapper() {
     }
 
 
     void HciConfWrapper::setPinHelper( const QString& app  ) {
         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) {
 
         if ( enable ) {
             setValue( "iscan" , "enable" );
         } else {
             setValue( "iscan" , "disable" );
         }
     }
 
     void HciConfWrapper::setPscan( bool enable) {
 
         if ( enable ) {
             setValue( "pscan" , "enable" );
         } else {
             setValue( "pscan" , "disable" );
         }
     }
 
 
     void HciConfWrapper::setAuth( bool enable) {
 
@@ -56,87 +56,87 @@ namespace OpieTooth {
     }
 
 
     void HciConfWrapper::setEncrypt( bool enable) {
 
         if ( enable ) {
             setValue( "encrypt" , "enable" );
         } else {
             setValue( "encrypt" , "disable" );
         }
     }
 
 
     void HciConfWrapper::setValue(const QString &key, const  QString &value ) {
 
         if (m_file.isEmpty() ) // load first
             return;
 
         QStringList::Iterator it;
 
         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
             }
         }
 
 
     }
 
     /**
      * 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;
         }
 
             /**
              * readAll() into a QByteArray
              * QStringList::split('\n', array )
              * would this be faster? -zecke
              */
             QTextStream stream(&file );
             QString tmp;
             while ( !stream.atEnd() ) {
                 tmp = stream.readLine();
                 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
@@ -73,44 +73,44 @@ void RfCommConfHandler::save( QMap<QString, RfCommConfObject*> devices )  {
 QMap<QString, RfCommConfObject*> RfCommConfHandler::foundEntries()  {
     return m_foundEntries;
 }
 
 void RfCommConfHandler::load()  {
 
     QFile rfCommConf( m_filename );
     if ( rfCommConf.open( IO_ReadOnly ) )  {
 
         QStringList list;
         QTextStream inStream( &rfCommConf );
         list = QStringList::split( "\n", inStream.read() );
 
         QString number;
         QString mac;
         QString channel;
         QString comment;
 
         for ( QStringList::Iterator line=list.begin(); line != list.end(); line++ )  {
 
             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
@@ -108,50 +108,51 @@ void MScanListView::serializeTo( QDataStream& s) const
     odebug << "serializing MScanListView" << oendl;
     OListView::serializeTo( s );
 }
 
 
 void MScanListView::serializeFrom( QDataStream& s)
 {
     odebug << "serializing MScanListView" << oendl;
     OListView::serializeFrom( s );
 }
 
 
 void MScanListView::addNewItem( const QString& type,
                                 const QString& essid,
                                 const OMacAddress& mac,
                                 bool wep,
                                 int channel,
                                 int signal,
                                 const GpsLocation& loc,
                                 bool probe )
 {
     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
 
     QString s;
     MScanListItem* network;
     MScanListItem* item = static_cast<MScanListItem*> ( firstChild() );
 
     while ( item && ( item->text( col_essid ) != essid ) )
     {
         #ifdef DEBUG
         odebug << "itemtext: " << item->text( col_essid ) << "" << oendl;
         #endif
         item = static_cast<MScanListItem*> ( item->nextSibling() );
     }
     if ( item )
     {
         // we have already seen this net, check all childs if MAC exists
 
         network = item;
 
         item = static_cast<MScanListItem*> ( item->firstChild() );
         assert( item ); // this shouldn't fail
 
@@ -373,50 +374,50 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
                 subitem->receivedBeacon(); //FIXME: sent data bit
                 return;
             }
 
             // never seen that - add new item
 
             MScanListItem* item = new MScanListItem( it.current(), "service", "N/A", " ", false, -1, -1 );
             item->setText( col_essid, name );
 
             return;
         }
     }
     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 ) );
 }
 
 
 void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, int col )
 {
     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() );
 
         QPopupMenu m( this );
         m.insertItem( entry, 37773, 0 );
         int result = m.exec( QCursor::pos() );
         if ( result == 37773 )
             emit joinNetwork( itm->type, itm->essid(), itm->channel(), itm->macaddr() );
     }
 }
 
 //============================================================
 // MScanListItem
 //============================================================
 
 MScanListItem::MScanListItem( QListView* parent, const QString& type, const QString& essid, const QString& macaddr,
                               bool wep, int channel, int signal, bool probed )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
                 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
                 _channel( channel ), _signal( signal ), _beacons( 1 )
 {
     #ifdef DEBUG
@@ -468,53 +469,51 @@ void MScanListItem::serializeTo( QDataStream& s ) const
 
 void MScanListItem::serializeFrom( QDataStream& s )
 {
     #ifdef DEBUG
     odebug << "serializing MScanListItem" << oendl;
     #endif
     OListViewItem::serializeFrom( s );
 
     Q_UINT8 wep;
     s >> _type;
     s >> wep;
     _wep = (wep == 'y');
 
     QString name;
     name.sprintf( "wellenreiter/%s", (const char*) _type );
     setPixmap( col_type, Resource::loadPixmap( name ) );
     if ( _wep )
         setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
     listView()->triggerUpdate();
 }
 
 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;
     name.sprintf( "wellenreiter/%s", (const char*) type );
     setPixmap( col_type, Resource::loadPixmap( name ) );
 
     // special case for probed networks FIXME: This is ugly at present
     if ( type == "network" && probed )
     {
         setPixmap( col_type, Resource::loadPixmap( "wellenreiter/network-probed.png" ) );
     }
 
     // set icon for wep (wireless encryption protocol)
     if ( wep )
         setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
 
     // set channel and signal text
 
     if ( signal != -1 )
         setText( col_sig, QString::number( signal ) );
     if ( channel != -1 )
         setText( col_channel, QString::number( channel ) );
 
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
@@ -721,49 +721,46 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa
         logwindow->log( QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
     else if ( action == "MessageBox" )
         QMessageBox::information( this, "Notification!",
         QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
     #else
     #warning Actions do not work with Qt/X11 yet
     #endif
 }
 
 void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int channel, const QString& macaddr)
 {
     #ifdef QWS
     if ( !iface )
     {
         QMessageBox::warning( this, tr( "Can't do that!" ), tr( "No wireless\ninterface available." ) );
         return;
     }
 
     if ( sniffing )
     {
         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;
     msg << QString("count") << QString::number(count);
     odebug << "msg >" << iface->name() << "< Mode >" << type.latin1() << "<" << oendl;
     msg << QString(iface->name()) << QString("Mode") << type;
     odebug << "msg >" << iface->name() << "< essid >" << essid.latin1() << "<" << oendl;
     msg << QString(iface->name()) << QString("ESSID") << essid;
     odebug << "msg >" << iface->name() << "< channel >" << channel << "<" << oendl;
     msg << QString(iface->name()) << QString("Channel") << channel;
 //    odebug << "msg >" << iface->name() << "< mac >" << macaddr << "<" << oendl;
 //    msg << QString(iface->name()) << QString("MacAddr") << macaddr;
     #else
     QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Function only available on Embedded build" ) );
     #endif
 
 }