modem and pppdata is now member of interfaceppp

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
@@ -34,14 +34,15 @@
 #include <qapplication.h>
 #include "modeminfo.h"
 #include "modem.h"
 //#include <klocale.h>
 #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"));
 //  KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 
   QVBoxLayout *tl = new QVBoxLayout(this, 10, 10);
 
@@ -94,14 +95,14 @@ ModemTransfer::ModemTransfer(QWidget *parent, const char *name)
 }
 
 
 void ModemTransfer::ati_done() {
   scripttimer->stop();
   timeout_timer->stop();
-  Modem::modem->closetty();
-  Modem::modem->unlockdevice();
+  _modem->closetty();
+  _modem->unlockdevice();
   hide();
 
   // open the result window
   ModemInfo *mi = new ModemInfo(this);
   for(int i = 0; i < NUM_OF_ATI; i++)
     mi->setAtiString(i, ati_query_strings[i]);
@@ -123,13 +124,13 @@ void ModemTransfer::time_out_slot() {
 
 
 void ModemTransfer::init() {
 
   qApp->processEvents();
 
-  int lock = Modem::modem->lockdevice();
+  int lock = _modem->lockdevice();
   if (lock == 1) {
 
     statusBar->setText(i18n("Modem device is locked."));
     return;
   }
 
@@ -137,48 +138,48 @@ void ModemTransfer::init() {
 
     statusBar->setText(i18n("Unable to create modem lock file."));
     return;
   }
 
 
-  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"));
       qApp->processEvents();
       usleep(100000);  // wait 0.1 secs
       qApp->processEvents();
               scripttimer->start(1000);          // this one does the ati query
 
       // clear modem buffer
-      Modem::modem->flush();
+      _modem->flush();
 
-      Modem::modem->notify(this, SLOT(readChar(unsigned char)));
+      _modem->notify(this, SLOT(readChar(unsigned char)));
       return;
     }
   }
 
   // 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();
 }
 
 
 void ModemTransfer::do_script() {
   QString msg;
   QString query;
 
   switch(step) {
   case 0:
     readtty();
     statusBar->setText("ATI...");
     progressBar->setProgress( progressBar->progress() + 1);
-    Modem::modem->writeLine("ATI\n");
+    _modem->writeLine("ATI\n");
     break;
 
   case 1:
   case 2:
   case 3:
   case 4:
@@ -187,13 +188,13 @@ void ModemTransfer::do_script() {
   case 7:
     readtty();
     msg.sprintf("ATI %d ...", step);
     query.sprintf("ATI%d\n", step);
     statusBar->setText(msg);
     progressBar->setProgress( progressBar->progress() + 1);
-    Modem::modem->writeLine(query.local8Bit());
+    _modem->writeLine(query.local8Bit());
     break;
 
   default:
     readtty();
     ati_done();
   }
@@ -220,22 +221,22 @@ void ModemTransfer::readtty() {
   readbuffer = "";
 }
 
 
 void ModemTransfer::cancelbutton() {
   scripttimer->stop();
-  Modem::modem->stop();
+  _modem->stop();
   timeout_timer->stop();
 
   statusBar->setText(i18n("One moment please..."));
   qApp->processEvents();
 
-  Modem::modem->hangup();
+  _modem->hangup();
 
-  Modem::modem->closetty();
-  Modem::modem->unlockdevice();
+  _modem->closetty();
+  _modem->unlockdevice();
   reject();
 }
 
 
 void ModemTransfer::closeEvent( QCloseEvent *e ) {
   cancelbutton();