Diffstat (limited to 'noncore/settings/networksettings/ppp/modeminfo.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/modeminfo.cpp | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/noncore/settings/networksettings/ppp/modeminfo.cpp b/noncore/settings/networksettings/ppp/modeminfo.cpp index 4dbbcf5..0bec186 100644 --- a/noncore/settings/networksettings/ppp/modeminfo.cpp +++ b/noncore/settings/networksettings/ppp/modeminfo.cpp @@ -38,6 +38,7 @@ #define i18n QObject::tr -ModemTransfer::ModemTransfer(QWidget *parent, const char *name) - : QDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder) +ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name) + : QDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder), + _modem(mo) { setCaption(i18n("ATI Query")); @@ -98,6 +99,6 @@ void ModemTransfer::ati_done() { scripttimer->stop(); timeout_timer->stop(); - Modem::modem->closetty(); - Modem::modem->unlockdevice(); + _modem->closetty(); + _modem->unlockdevice(); hide(); @@ -127,5 +128,5 @@ void ModemTransfer::init() { qApp->processEvents(); - int lock = Modem::modem->lockdevice(); + int lock = _modem->lockdevice(); if (lock == 1) { @@ -141,8 +142,8 @@ void ModemTransfer::init() { - if(Modem::modem->opentty()) { - if(Modem::modem->hangup()) { + if(_modem->opentty()) { + if(_modem->hangup()) { usleep(100000); // wait 0.1 secs - Modem::modem->writeLine("ATE0Q1V1"); // E0 don't echo the commands I send ... + _modem->writeLine("ATE0Q1V1"); // E0 don't echo the commands I send ... statusBar->setText(i18n("Modem Ready")); @@ -153,7 +154,7 @@ void ModemTransfer::init() { // clear modem buffer - Modem::modem->flush(); + _modem->flush(); - Modem::modem->notify(this, SLOT(readChar(unsigned char))); + _modem->notify(this, SLOT(readChar(unsigned char))); return; } @@ -161,7 +162,7 @@ void ModemTransfer::init() { // opentty() or hangup() failed - statusBar->setText(Modem::modem->modemMessage()); + statusBar->setText(_modem->modemMessage()); step = 99; // wait until cancel is pressed - Modem::modem->unlockdevice(); + _modem->unlockdevice(); } @@ -176,5 +177,5 @@ void ModemTransfer::do_script() { statusBar->setText("ATI..."); progressBar->setProgress( progressBar->progress() + 1); - Modem::modem->writeLine("ATI\n"); + _modem->writeLine("ATI\n"); break; @@ -191,5 +192,5 @@ void ModemTransfer::do_script() { statusBar->setText(msg); progressBar->setProgress( progressBar->progress() + 1); - Modem::modem->writeLine(query.local8Bit()); + _modem->writeLine(query.local8Bit()); break; @@ -224,5 +225,5 @@ void ModemTransfer::readtty() { void ModemTransfer::cancelbutton() { scripttimer->stop(); - Modem::modem->stop(); + _modem->stop(); timeout_timer->stop(); @@ -230,8 +231,8 @@ void ModemTransfer::cancelbutton() { qApp->processEvents(); - Modem::modem->hangup(); + _modem->hangup(); - Modem::modem->closetty(); - Modem::modem->unlockdevice(); + _modem->closetty(); + _modem->unlockdevice(); reject(); } |