Diffstat (limited to 'noncore/apps/opie-console/dialer.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/dialer.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp index 7010594..8883b83 100644 --- a/noncore/apps/opie-console/dialer.cpp +++ b/noncore/apps/opie-console/dialer.cpp | |||
@@ -2,8 +2,4 @@ | |||
2 | #include "io_modem.h" | 2 | #include "io_modem.h" |
3 | 3 | ||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | using namespace Opie::Core; | ||
7 | |||
8 | /* QT */ | 4 | /* QT */ |
9 | #include <qlayout.h> | 5 | #include <qlayout.h> |
@@ -110,5 +106,4 @@ void Dialer::slotCancel() | |||
110 | void Dialer::reset() | 106 | void Dialer::reset() |
111 | { | 107 | { |
112 | owarn << "reset" << oendl; | ||
113 | switchState(state_cancel); | 108 | switchState(state_cancel); |
114 | } | 109 | } |
@@ -142,9 +137,7 @@ void Dialer::dial(const QString& number) | |||
142 | void Dialer::trydial(const QString& number) | 137 | void Dialer::trydial(const QString& number) |
143 | { | 138 | { |
144 | owarn << "TryDial:" << number.latin1() << "" << oendl; | ||
145 | if(state != state_cancel) switchState(state_preinit); | 139 | if(state != state_cancel) switchState(state_preinit); |
146 | if(cleanshutdown) | 140 | if(cleanshutdown) |
147 | { | 141 | { |
148 | owarn << "HangupString " << m_profile.readEntry("HangupString") << oendl; | ||
149 | send(m_profile.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ) + "\r"); | 142 | send(m_profile.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ) + "\r"); |
150 | } | 143 | } |
@@ -153,5 +146,4 @@ void Dialer::trydial(const QString& number) | |||
153 | { | 146 | { |
154 | switchState(state_init); | 147 | switchState(state_init); |
155 | // owarn << "Init String " + m_profile.readEntry("InitString") << oendl; | ||
156 | send(m_profile.readEntry("InitString",MODEM_DEFAULT_INIT_STRING ) + "\r"); | 148 | send(m_profile.readEntry("InitString",MODEM_DEFAULT_INIT_STRING ) + "\r"); |
157 | QString response2 = receive(); | 149 | QString response2 = receive(); |
@@ -184,5 +176,4 @@ void Dialer::trydial(const QString& number) | |||
184 | if(state != state_cancel) | 176 | if(state != state_cancel) |
185 | { | 177 | { |
186 | owarn << "progress" << oendl; | ||
187 | switchState(state_dialing); | 178 | switchState(state_dialing); |
188 | 179 | ||
@@ -200,5 +191,5 @@ void Dialer::trydial(const QString& number) | |||
200 | QMessageBox::warning(this, | 191 | QMessageBox::warning(this, |
201 | QObject::tr("Failure"), | 192 | QObject::tr("Failure"), |
202 | QObject::tr("Dialing the number failed.")); | 193 | QObject::tr("<qt>Dialing the number failed.</qt>")); |
203 | slotCancel(); | 194 | slotCancel(); |
204 | } | 195 | } |
@@ -220,5 +211,4 @@ void Dialer::send(const QString& msg) | |||
220 | QString termination; | 211 | QString termination; |
221 | 212 | ||
222 | owarn << "Sending: " << m.latin1() << "" << oendl; | ||
223 | 213 | ||
224 | /*termination = "\r"; | 214 | /*termination = "\r"; |
@@ -253,9 +243,7 @@ QString Dialer::receive() | |||
253 | buffer[i] = buffer[i] & 0x7F; | 243 | buffer[i] = buffer[i] & 0x7F; |
254 | buffer[ret] = 0; | 244 | buffer[ret] = 0; |
255 | owarn << "Got: " << buffer << "" << oendl; | ||
256 | buf.append(QString(buffer)); | 245 | buf.append(QString(buffer)); |
257 | if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY"))) | 246 | if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY"))) |
258 | { | 247 | { |
259 | //owarn << "Receiving: '" << buf.latin1() << "'" << oendl; | ||
260 | cleanshutdown = 1; | 248 | cleanshutdown = 1; |
261 | return buf; | 249 | return buf; |