convert core/applets/* to Opie debug framework

2 files changed, 37 insertions, 33 deletions

diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index cd8d58e..f3dd11c 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -1,2 +1,12 @@
+#include "obex.h"
+#include "obexsend.h"
+using namespace OpieObex;
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qcopenvelope_qws.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qpushbutton.h>
 #include <qlabel.h>
@@ -4,15 +14,6 @@
 #include <qtimer.h>
 
-
-#include <qpe/qcopenvelope_qws.h>
-
-#include "obex.h"
-#include "obexsend.h"
-
-using namespace OpieObex;
-
 /* TRANSLATOR OpieObex::SendWidget */
 
-
 SendWidget::SendWidget( QWidget* parent, const char* name )
     : QWidget( parent, name ) {
@@ -105,5 +106,5 @@ void SendWidget::send( const QString& file, const QString& desc ) {
 }
 void SendWidget::slotIrDaDevices( const QStringList& list) {
-    qWarning("slot it irda devices ");
+    owarn << "slot it irda devices " << oendl;
     for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
         int id = m_devBox->addDevice( (*it), DeviceBox::IrDa, tr("Scheduling for beam.") );
@@ -124,5 +125,5 @@ void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
 }
 void SendWidget::slotSelectedDevice( int name, int dev ) {
-    qWarning("Start beam? %d %d", name, dev );
+    owarn << "Start beam? " << name << " " << dev << "" << oendl;
     if ( name ==  m_irDeSearch ) {
         for (QMap<int, QString>::Iterator it= m_irDa.begin(); it != m_irDa.end(); ++it )
@@ -133,5 +134,5 @@ void SendWidget::slotSelectedDevice( int name, int dev ) {
 }
 void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) {
-    qWarning("dispatch irda %s", str.data() );
+    owarn << "dispatch irda " << str.data() << "" << oendl;
     if ( str == "devices(QStringList)" ) {
         QDataStream stream( ar, IO_ReadOnly );
@@ -148,5 +149,5 @@ void SendWidget::slotIrError( int ) {
 }
 void SendWidget::slotIrSent( bool b) {
-    qWarning("irda sent!!");
+    owarn << "irda sent!!" << oendl;
     QString text = b ? tr("Sent") : tr("Failure");
     m_devBox->setStatus( m_irDaIt.key(), text );
@@ -205,5 +206,5 @@ void DeviceBox::setStatus( int id, const QString& status ) {
 }
 void DeviceBox::setSource( const QString& str ) {
-    qWarning("SetSource:%d", str.toInt() );
+    owarn << "SetSource:" << str.toInt() << "" << oendl;
     int id = str.toInt();
     emit selectedDevice( id, m_dev[id].device() );
diff --git a/core/obex/receiver.cpp b/core/obex/receiver.cpp
index ee2668b..8885256 100644
--- a/core/obex/receiver.cpp
+++ b/core/obex/receiver.cpp
@@ -1,10 +1,14 @@
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <stdlib.h> // int system
-#include <unistd.h>
+#include "obex.h"
+#include "receiver.h"
+using namespace OpieObex;
 
-#include <fcntl.h>
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/applnk.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/qcopenvelope_qws.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qfileinfo.h>
 #include <qlabel.h>
@@ -12,12 +16,11 @@
 #include <qpushbutton.h>
 
-#include <qpe/applnk.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.h>
-
-#include "obex.h"
-#include "receiver.h"
-
-using namespace OpieObex;
+/* STD */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <stdlib.h> // int system
+#include <unistd.h>
+#include <fcntl.h>
 
 /* TRANSLATOR OpieObex::Receiver */
@@ -76,5 +79,5 @@ void Receiver::tidyUp( QString& _file, const QString& ending) {
     _file = QString::fromLatin1( foo );
     QString cmd = QString("sed -e \"s/^\\(X-MICROSOFT-BODYINK\\)\\;/\\1:/;\" < %2 > %2 ").arg( Global::shellQuote(file)).arg( Global::shellQuote(_file) );
-    qWarning("Executing: %s", cmd.latin1() );
+    owarn << "Executing: " << cmd << "" << oendl;
     (void)::system( cmd.latin1() );
 
@@ -83,5 +86,5 @@ void Receiver::tidyUp( QString& _file, const QString& ending) {
 }
 int Receiver::checkFile( QString& file ) {
-    qWarning("check file!! %s", file.latin1() );
+    owarn << "check file!! " << file << "" << oendl;
     int ret;
     QString ending;
@@ -108,5 +111,5 @@ int Receiver::checkFile( QString& file ) {
     tidyUp( file, ending );
 
-    qWarning("check it now %d", ret );
+    owarn << "check it now " << ret << "" << oendl;
     return ret;
 }
@@ -149,5 +152,5 @@ void OtherHandler::handle( const QString& file ) {
     m_na->setText(file);
     DocLnk lnk(file);
-    qWarning(" %s %s", lnk.type().latin1(), lnk.icon().latin1() );
+    owarn << " " << lnk.type() << " " << lnk.icon() << "" << oendl;
 
     QString str = tr("<p>You received a file of type %1 (<img src=\"%2\"> )What do you want to do?").arg(lnk.type() ).arg(lnk.icon() );
@@ -192,5 +195,5 @@ QString OtherHandler::targetName( const QString& file ) {
 /* fast cpy */
 void OtherHandler::copy(const QString& src, const QString& file) {
-    qWarning("src %s, dest %s", src.latin1(),file.latin1() );
+    owarn << "src " << src << ", dest " << file << "" << oendl;
     QString cmd = QString("mv %1 %2").arg( Global::shellQuote( src )).
                   arg( Global::shellQuote( file ) );