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 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp index d93dc5a..22a3673 100644 --- a/noncore/apps/opie-console/io_modem.cpp +++ b/noncore/apps/opie-console/io_modem.cpp | |||
@@ -1,77 +1,75 @@ | |||
1 | 1 | ||
2 | #include "io_modem.h" | 2 | #include "io_modem.h" |
3 | 3 | ||
4 | #include "dialer.h" | 4 | #include "dialer.h" |
5 | 5 | ||
6 | IOModem::IOModem( const Profile &profile ) | 6 | IOModem::IOModem( const Profile &profile ) |
7 | : IOSerial( profile ), m_profile( profile ) { | 7 | : IOSerial( profile ) { |
8 | m_profile = profile; | ||
8 | } | 9 | } |
9 | 10 | ||
10 | 11 | ||
11 | IOModem::~IOModem() { | 12 | IOModem::~IOModem() { |
12 | 13 | ||
13 | } | 14 | } |
14 | 15 | ||
15 | 16 | ||
16 | void IOModem::close() { | 17 | void IOModem::close() { |
18 | // maybe do a hangup here just in case...? | ||
17 | 19 | ||
18 | IOSerial::close(); | 20 | IOSerial::close(); |
19 | |||
20 | } | 21 | } |
21 | 22 | ||
22 | bool IOModem::open() { | 23 | bool IOModem::open() { |
23 | bool ret = IOSerial::open(); | 24 | bool ret = IOSerial::open(); |
24 | if(!ret) return false; | 25 | if(!ret) return false; |
25 | 26 | ||
26 | qWarning("IOModem::open continues..."); | ||
27 | |||
28 | Dialer d(m_profile); | 27 | Dialer d(m_profile); |
29 | qWarning("dialer created"); | ||
30 | 28 | ||
31 | int result = d.exec(); | 29 | int result = d.exec(); |
32 | if(result == QDialog::Accepted) | 30 | if(result == QDialog::Accepted) |
33 | { | 31 | { |
34 | return true; | 32 | return true; |
35 | } | 33 | } |
36 | else return false; | 34 | else return false; |
37 | } | 35 | } |
38 | 36 | ||
39 | void IOModem::reload( const Profile &config ) { | 37 | void IOModem::reload( const Profile &config ) { |
40 | 38 | ||
41 | m_device = config.readEntry("Device", MODEM_DEFAULT_DEVICE); | 39 | m_device = config.readEntry("Device", MODEM_DEFAULT_DEVICE); |
42 | m_baud = config.readNumEntry("Baud", MODEM_DEFAULT_BAUD); | 40 | m_baud = config.readNumEntry("Baud", MODEM_DEFAULT_BAUD); |
43 | m_parity = config.readNumEntry("Parity", MODEM_DEFAULT_PARITY); | 41 | m_parity = config.readNumEntry("Parity", MODEM_DEFAULT_PARITY); |
44 | m_dbits = config.readNumEntry("DataBits", MODEM_DEFAULT_DBITS); | 42 | m_dbits = config.readNumEntry("DataBits", MODEM_DEFAULT_DBITS); |
45 | m_sbits = config.readNumEntry("StopBits", MODEM_DEFAULT_SBITS); | 43 | m_sbits = config.readNumEntry("StopBits", MODEM_DEFAULT_SBITS); |
46 | m_flow = config.readNumEntry("Flow", MODEM_DEFAULT_FLOW); | 44 | m_flow = config.readNumEntry("Flow", MODEM_DEFAULT_FLOW); |
47 | 45 | ||
48 | m_initString = config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ); | 46 | m_initString = config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ); |
49 | m_resetString = config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING ); | 47 | m_resetString = config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING ); |
50 | m_dialPref1 = config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ); | 48 | m_dialPref1 = config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ); |
51 | m_dialSuf1 = config.readEntry("DialSuffix1", MODEM_DEFAULT_DIAL_SUFFIX1 ); | 49 | m_dialSuf1 = config.readEntry("DialSuffix1", MODEM_DEFAULT_DIAL_SUFFIX1 ); |
52 | m_dialPref2 = config.readEntry("DialPrefix2", MODEM_DEFAULT_DIAL_PREFIX1 ); | 50 | m_dialPref2 = config.readEntry("DialPrefix2", MODEM_DEFAULT_DIAL_PREFIX1 ); |
53 | m_dialSuf2 = config.readEntry("DialSuffix2", MODEM_DEFAULT_DIAL_SUFFIX1 ); | 51 | m_dialSuf2 = config.readEntry("DialSuffix2", MODEM_DEFAULT_DIAL_SUFFIX1 ); |
54 | m_dialPref3 = config.readEntry("DialPrefix3", MODEM_DEFAULT_DIAL_PREFIX1 ); | 52 | m_dialPref3 = config.readEntry("DialPrefix3", MODEM_DEFAULT_DIAL_PREFIX1 ); |
55 | m_dialSuf3 = config.readEntry("DialSuffix3", MODEM_DEFAULT_DIAL_SUFFIX1 ); | 53 | m_dialSuf3 = config.readEntry("DialSuffix3", MODEM_DEFAULT_DIAL_SUFFIX1 ); |
56 | m_connect = config.readEntry("DefaultConnect" MODEM_DEFAULT_CONNECT_STRING ); | 54 | m_connect = config.readEntry("DefaultConnect" MODEM_DEFAULT_CONNECT_STRING ); |
57 | m_hangup = config.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ); | 55 | m_hangup = config.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ); |
58 | m_cancel = config.readEntry("CancelString", MODEM_DEFAULT_CANCEL_STRING ); | 56 | m_cancel = config.readEntry("CancelString", MODEM_DEFAULT_CANCEL_STRING ); |
59 | m_dialTime = config.readNumEntry("DialTime", MODEM_DEFAULT_DIAL_TIME ); | 57 | m_dialTime = config.readNumEntry("DialTime", MODEM_DEFAULT_DIAL_TIME ); |
60 | m_delayRedial = config.readNumEntry("DelayRedial", MODEM_DEFAULT_DELAY_REDIAL ); | 58 | m_delayRedial = config.readNumEntry("DelayRedial", MODEM_DEFAULT_DELAY_REDIAL ); |
61 | m_numberTries = config.readNumEntry("NumberTries", MODEM_DEFAULT_NUMBER_TRIES ); | 59 | m_numberTries = config.readNumEntry("NumberTries", MODEM_DEFAULT_NUMBER_TRIES ); |
62 | m_dtrDropTime = config.readNumEntry("DTRDRopTime", MODEM_DEFAULT_DTR_DROP_TIME ); | 60 | m_dtrDropTime = config.readNumEntry("DTRDRopTime", MODEM_DEFAULT_DTR_DROP_TIME ); |
63 | m_bpsDetect = config.readBoolEntry("BPSDetect", MODEM_DEFAULT_BPS_DETECT ); | 61 | m_bpsDetect = config.readBoolEntry("BPSDetect", MODEM_DEFAULT_BPS_DETECT ); |
64 | m_dcdLines = config.readBoolEntry("DCDLines", MODEM_DEFAULT_DCD_LINES ); | 62 | m_dcdLines = config.readBoolEntry("DCDLines", MODEM_DEFAULT_DCD_LINES ); |
65 | m_multiLineUntag = config.readBoolEntry("MultiLineUntag", MODEM_DEFAULT_MULTI_LINE_UNTAG ); | 63 | m_multiLineUntag = config.readBoolEntry("MultiLineUntag", MODEM_DEFAULT_MULTI_LINE_UNTAG ); |
66 | } | 64 | } |
67 | 65 | ||
68 | 66 | ||
69 | QString IOModem::identifier() const { | 67 | QString IOModem::identifier() const { |
70 | return "modem"; | 68 | return "modem"; |
71 | } | 69 | } |
72 | 70 | ||
73 | QString IOModem::name() const { | 71 | QString IOModem::name() const { |
74 | return "Modem IO Layer"; | 72 | return "Modem IO Layer"; |
75 | } | 73 | } |
76 | 74 | ||
77 | void IOModem::slotExited(OProcess* proc ){ | 75 | void IOModem::slotExited(OProcess* proc ){ |