summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/mail/composemail.cpp20
-rw-r--r--noncore/net/opietooth/manager/hciconfwrapper.cpp2
-rw-r--r--noncore/net/opietooth/manager/rfcommconfhandler.cpp2
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp17
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp9
5 files changed, 25 insertions, 25 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,5 +1,12 @@
-#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>
@@ -7,12 +14,9 @@
#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;
@@ -188,8 +192,8 @@ void ComposeMail::accept()
}
#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;
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
@@ -23,7 +23,7 @@ namespace OpieTooth {
}
void HciConfWrapper::setName( const QString &name ) {
- qDebug ("NAME : " + name);
+ odebug << "NAME : " << name << oendl;
setValue( "name" , "\"" + name + "\"" );
}
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
@@ -103,7 +103,7 @@ void RfCommConfHandler::load() {
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;
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
@@ -129,8 +129,9 @@ 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
@@ -394,8 +395,8 @@ void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, in
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" )
{
@@ -489,11 +490,9 @@ 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
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
@@ -742,12 +742,9 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch
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;