convert to Opie Debugging Framework

1 files changed, 16 insertions, 11 deletions

diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp
index 67ad10e..7010594 100644
--- a/noncore/apps/opie-console/dialer.cpp
+++ b/noncore/apps/opie-console/dialer.cpp
@@ -1,3 +1,9 @@
 #include "dialer.h"
+#include "io_modem.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qlayout.h>
@@ -10,2 +16,3 @@
 
+/* STD */
 #include <unistd.h>
@@ -15,4 +22,2 @@
 
-#include "io_modem.h"
-
 // State machine:          | When an error occurs, we don't have to
@@ -106,3 +111,3 @@ void Dialer::reset()
 {
-    qWarning("reset");
+    owarn << "reset" << oendl; 
 	switchState(state_cancel);
@@ -138,3 +143,3 @@ void Dialer::trydial(const QString& number)
 {
-    qWarning("TryDial:%s", number.latin1() );
+    owarn << "TryDial:" << number.latin1() << "" << oendl; 
 	if(state != state_cancel) switchState(state_preinit);
@@ -142,3 +147,3 @@ void Dialer::trydial(const QString& number)
 	{
-            qWarning("HangupString " + m_profile.readEntry("HangupString",  MODEM_DEFAULT_HANGUP_STRING));
+            owarn << "HangupString " << m_profile.readEntry("HangupString") << oendl; 
             send(m_profile.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ) + "\r");
@@ -149,3 +154,3 @@ void Dialer::trydial(const QString& number)
 		switchState(state_init);
-//                qWarning("Init String " + m_profile.readEntry("InitString") );
+//                owarn << "Init String " + m_profile.readEntry("InitString") << oendl; 
 		send(m_profile.readEntry("InitString",MODEM_DEFAULT_INIT_STRING ) + "\r");
@@ -160,3 +165,3 @@ void Dialer::trydial(const QString& number)
 
-                qWarning("ATM3l3");
+                owarn << "ATM3l3" << oendl; 
 		send("ATM3L3\r");
@@ -180,3 +185,3 @@ void Dialer::trydial(const QString& number)
 	{
-            qWarning("progress");
+            owarn << "progress" << oendl; 
 		switchState(state_dialing);
@@ -216,3 +221,3 @@ void Dialer::send(const QString& msg)
 
-	qWarning("Sending: %s", m.latin1());
+	owarn << "Sending: " << m.latin1() << "" << oendl; 
 
@@ -249,3 +254,3 @@ QString Dialer::receive()
 			buffer[ret] = 0;
-			qWarning("Got: %s", buffer);
+			owarn << "Got: " << buffer << "" << oendl; 
 			buf.append(QString(buffer));
@@ -253,3 +258,3 @@ QString Dialer::receive()
 			{
-				//qWarning("Receiving: '%s'", buf.latin1());
+				//owarn << "Receiving: '" << buf.latin1() << "'" << oendl; 
 				cleanshutdown = 1;