summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/composemail.cpp26
-rw-r--r--noncore/net/opietooth/manager/hciconfwrapper.cpp18
-rw-r--r--noncore/net/opietooth/manager/rfcommconfhandler.cpp12
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp17
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp9
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,4 +1,11 @@
-#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>
@@ -8,10 +15,7 @@
#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;
@@ -185,10 +189,10 @@ 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;
@@ -258,5 +262,5 @@ void ComposeMail::reject()
txt.append( sigMultiLine->text() );
}
- odebug << txt << oendl;
+ odebug << txt << oendl;
mail->setMessage( txt );
@@ -294,5 +298,5 @@ AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
{
attachment = att;
- odebug << att->getMimeType() << oendl;
+ odebug << att->getMimeType() << oendl;
setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ?
Resource::loadPixmap( "UnknownDocument-14" ) :
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
@@ -24,5 +24,5 @@ namespace OpieTooth {
void HciConfWrapper::setName( const QString &name ) {
- qDebug ("NAME : " + name);
+ odebug << "NAME : " << name << oendl;
setValue( "name" , "\"" + name + "\"" );
}
@@ -78,8 +78,8 @@ namespace OpieTooth {
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 + ";");
@@ -87,5 +87,5 @@ namespace OpieTooth {
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 );
@@ -102,9 +102,9 @@ namespace OpieTooth {
*/
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;
}
@@ -123,5 +123,5 @@ namespace OpieTooth {
}
void HciConfWrapper::save() {
- owarn << "save" << oendl;
+ owarn << "save" << oendl;
if (m_file.isEmpty() ) // load first
return;
@@ -129,5 +129,5 @@ namespace OpieTooth {
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;
}
@@ -138,5 +138,5 @@ namespace OpieTooth {
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
@@ -95,17 +95,17 @@ void RfCommConfHandler::load() {
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;
}
}
@@ -113,4 +113,4 @@ void RfCommConfHandler::load() {
}
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
@@ -130,6 +130,7 @@ void MScanListView::addNewItem( const QString& type,
#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
@@ -395,6 +396,6 @@ 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" )
@@ -490,9 +491,7 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr,
{
#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
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
@@ -743,10 +743,7 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch
}
- 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)" );