author | zecke <zecke> | 2004-10-16 21:06:28 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-16 21:06:28 (UTC) |
commit | 999a0f2d22f132005bde62558ace48a0ce8b1dcc (patch) (unidiff) | |
tree | 75f528b52a8a89289925e62bbd4c48d316c8ddcf /noncore/apps/opie-console/io_modem.cpp | |
parent | e70f226f5c4c2f488f6c4406034a04e128c0ca93 (diff) | |
download | opie-999a0f2d22f132005bde62558ace48a0ce8b1dcc.zip opie-999a0f2d22f132005bde62558ace48a0ce8b1dcc.tar.gz opie-999a0f2d22f132005bde62558ace48a0ce8b1dcc.tar.bz2 |
-Remove never finished classes by ibotty for the console widget
-Put setCurrent into ComboboxHelper and remove duplication from the
dialogs
-Remove old and unneeded debug output
-IOBt, IOIrda can share the implementation for sening,recieving
and supports with IOSerial
Diffstat (limited to 'noncore/apps/opie-console/io_modem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp index c499dfe..915a1d2 100644 --- a/noncore/apps/opie-console/io_modem.cpp +++ b/noncore/apps/opie-console/io_modem.cpp | |||
@@ -1,32 +1,28 @@ | |||
1 | 1 | ||
2 | #include "io_modem.h" | 2 | #include "io_modem.h" |
3 | #include "dialer.h" | 3 | #include "dialer.h" |
4 | 4 | ||
5 | /* OPIE */ | ||
6 | #include <opie2/odebug.h> | ||
7 | using namespace Opie::Core; | ||
8 | |||
9 | IOModem::IOModem( const Profile &profile ) | 5 | IOModem::IOModem( const Profile &profile ) |
10 | : IOSerial( profile ) { | 6 | : IOSerial( profile ) { |
11 | m_profile = profile; | 7 | m_profile = profile; |
12 | } | 8 | } |
13 | 9 | ||
14 | 10 | ||
15 | IOModem::~IOModem() { | 11 | IOModem::~IOModem() { |
16 | } | 12 | } |
17 | 13 | ||
18 | 14 | ||
19 | void IOModem::close() { | 15 | void IOModem::close() { |
20 | // Hangup, discarding result | 16 | // Hangup, discarding result |
21 | //int fd = rawIO(); | 17 | //int fd = rawIO(); |
22 | internDetach(); | 18 | internDetach(); |
23 | Dialer d(m_profile, m_fd); | 19 | Dialer d(m_profile, m_fd); |
24 | d.setHangupOnly(); | 20 | d.setHangupOnly(); |
25 | //d.exec(); | 21 | //d.exec(); |
26 | internAttach(); | 22 | internAttach(); |
27 | //closeRawIO(fd); | 23 | //closeRawIO(fd); |
28 | 24 | ||
29 | IOSerial::close(); | 25 | IOSerial::close(); |
30 | } | 26 | } |
31 | 27 | ||
32 | bool IOModem::open() { | 28 | bool IOModem::open() { |
@@ -67,42 +63,24 @@ void IOModem::reload( const Profile &config ) { | |||
67 | m_dialPref2 = config.readEntry("DialPrefix2", MODEM_DEFAULT_DIAL_PREFIX1 ); | 63 | m_dialPref2 = config.readEntry("DialPrefix2", MODEM_DEFAULT_DIAL_PREFIX1 ); |
68 | m_dialSuf2 = config.readEntry("DialSuffix2", MODEM_DEFAULT_DIAL_SUFFIX1 ); | 64 | m_dialSuf2 = config.readEntry("DialSuffix2", MODEM_DEFAULT_DIAL_SUFFIX1 ); |
69 | m_dialPref3 = config.readEntry("DialPrefix3", MODEM_DEFAULT_DIAL_PREFIX1 ); | 65 | m_dialPref3 = config.readEntry("DialPrefix3", MODEM_DEFAULT_DIAL_PREFIX1 ); |
70 | m_dialSuf3 = config.readEntry("DialSuffix3", MODEM_DEFAULT_DIAL_SUFFIX1 ); | 66 | m_dialSuf3 = config.readEntry("DialSuffix3", MODEM_DEFAULT_DIAL_SUFFIX1 ); |
71 | m_connect = config.readEntry("DefaultConnect" MODEM_DEFAULT_CONNECT_STRING ); | 67 | m_connect = config.readEntry("DefaultConnect" MODEM_DEFAULT_CONNECT_STRING ); |
72 | m_hangup = config.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ); | 68 | m_hangup = config.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ); |
73 | m_cancel = config.readEntry("CancelString", MODEM_DEFAULT_CANCEL_STRING ); | 69 | m_cancel = config.readEntry("CancelString", MODEM_DEFAULT_CANCEL_STRING ); |
74 | m_dialTime = config.readNumEntry("DialTime", MODEM_DEFAULT_DIAL_TIME ); | 70 | m_dialTime = config.readNumEntry("DialTime", MODEM_DEFAULT_DIAL_TIME ); |
75 | m_delayRedial = config.readNumEntry("DelayRedial", MODEM_DEFAULT_DELAY_REDIAL ); | 71 | m_delayRedial = config.readNumEntry("DelayRedial", MODEM_DEFAULT_DELAY_REDIAL ); |
76 | m_numberTries = config.readNumEntry("NumberTries", MODEM_DEFAULT_NUMBER_TRIES ); | 72 | m_numberTries = config.readNumEntry("NumberTries", MODEM_DEFAULT_NUMBER_TRIES ); |
77 | m_dtrDropTime = config.readNumEntry("DTRDRopTime", MODEM_DEFAULT_DTR_DROP_TIME ); | 73 | m_dtrDropTime = config.readNumEntry("DTRDRopTime", MODEM_DEFAULT_DTR_DROP_TIME ); |
78 | m_bpsDetect = config.readBoolEntry("BPSDetect", MODEM_DEFAULT_BPS_DETECT ); | 74 | m_bpsDetect = config.readBoolEntry("BPSDetect", MODEM_DEFAULT_BPS_DETECT ); |
79 | m_dcdLines = config.readBoolEntry("DCDLines", MODEM_DEFAULT_DCD_LINES ); | 75 | m_dcdLines = config.readBoolEntry("DCDLines", MODEM_DEFAULT_DCD_LINES ); |
80 | m_multiLineUntag = config.readBoolEntry("MultiLineUntag", MODEM_DEFAULT_MULTI_LINE_UNTAG ); | 76 | m_multiLineUntag = config.readBoolEntry("MultiLineUntag", MODEM_DEFAULT_MULTI_LINE_UNTAG ); |
81 | } | 77 | } |
82 | 78 | ||
83 | 79 | ||
84 | QString IOModem::identifier() const { | 80 | QString IOModem::identifier() const { |
85 | return "modem"; | 81 | return "modem"; |
86 | } | 82 | } |
87 | 83 | ||
88 | QString IOModem::name() const { | 84 | QString IOModem::name() const { |
89 | return "Modem IO Layer"; | 85 | return "Modem IO Layer"; |
90 | } | 86 | } |
91 | |||
92 | void IOModem::slotExited(OProcess* proc ){ | ||
93 | close(); | ||
94 | /* delete it afterwards */ | ||
95 | delete proc; | ||
96 | } | ||
97 | |||
98 | QBitArray IOModem::supports()const { | ||
99 | return QBitArray( 3 ); | ||
100 | } | ||
101 | |||
102 | bool IOModem::isConnected() { | ||
103 | return false; | ||
104 | } | ||
105 | |||
106 | void IOModem::send(const QByteArray &data) { | ||
107 | odebug << "Please overload me..." << oendl; | ||
108 | } | ||