1 files changed, 15 insertions, 15 deletions

diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp
index a2f77c5..cd5d21c 100644
--- a/noncore/settings/networksettings/ppp/modem.cpp
+++ b/noncore/settings/networksettings/ppp/modem.cpp
@@ -103,3 +103,3 @@ speed_t Modem::modemspeed() {
   // other systems may not have them
-    int i = gpppdata.speed().toInt()/100;
+    int i = PPPData::data()->speed().toInt()/100;
 
@@ -153,3 +153,3 @@ bool Modem::opentty() {
     close(modemfd);
-//    device = "/dev/modem";//deviceByIndex(request.modem.deviceNum);
+    device = PPPData::data()->modemDevice();
     if ((modemfd = open(device, O_RDWR|O_NDELAY|O_NOCTTY)) == -1) {
@@ -163,3 +163,3 @@ bool Modem::opentty() {
 #if 0
-  if(gpppdata.UseCDLine()) {
+  if(PPPData::data()->UseCDLine()) {
     if(ioctl(modemfd, TIOCMGET, &flags) == -1) {
@@ -211,4 +211,4 @@ bool Modem::opentty() {
 
-  if(gpppdata.flowcontrol() != "None") {
-      if(gpppdata.flowcontrol() == "CRTSCTS") {
+  if(PPPData::data()->flowcontrol() != "None") {
+      if(PPPData::data()->flowcontrol() == "CRTSCTS") {
       tty.c_cflag |= CRTSCTS;
@@ -341,3 +341,3 @@ bool Modem::writeLine(const char *buf) {
   // different modems seem to need different line terminations
-  QString term = gpppdata.enter();
+  QString term = PPPData::data()->enter();
   if(term == "LF")
@@ -381,5 +381,5 @@ bool Modem::hangup() {
     // Then hangup command
-    writeLine(gpppdata.modemHangupStr().local8Bit());
+    writeLine(PPPData::data()->modemHangupStr().local8Bit());
 
-    usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 sec
+    usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 sec
 
@@ -419,3 +419,3 @@ bool Modem::hangup() {
 
-    usleep(gpppdata.modemInitDelay() * 10000); // 0.01 - 3.0 secs
+    usleep(PPPData::data()->modemInitDelay() * 10000); // 0.01 - 3.0 secs
 
@@ -442,7 +442,7 @@ void Modem::escape_to_command_mode() {
   // +3 because quiet time must be greater than guard time.
-  usleep((gpppdata.modemEscapeGuardTime()+3)*20000);
-  QCString tmp = gpppdata.modemEscapeStr().local8Bit();
+  usleep((PPPData::data()->modemEscapeGuardTime()+3)*20000);
+  QCString tmp = PPPData::data()->modemEscapeStr().local8Bit();
   write(modemfd, tmp.data(), tmp.length());
   tcflush(modemfd, TCIOFLUSH);
-  usleep((gpppdata.modemEscapeGuardTime()+3)*20000);
+  usleep((PPPData::data()->modemEscapeGuardTime()+3)*20000);
 
@@ -562,3 +562,3 @@ int Modem::lockdevice() {
 
-  if(!gpppdata.modemLockFile()) {
+  if(!PPPData::data()->modemLockFile()) {
     qDebug("The user doesn't want a lockfile.");
@@ -571,3 +571,3 @@ int Modem::lockdevice() {
   QString lockfile = LOCK_DIR"/LCK..";
-  lockfile += gpppdata.modemDevice().mid(5); // append everything after /dev/
+  lockfile += PPPData::data()->modemDevice().mid(5); // append everything after /dev/
 
@@ -602,3 +602,3 @@ if ((fd = openLockfile(QFile::encodeName(lockfile), O_RDONLY)) >= 0) {
 
-  fd = openLockfile(gpppdata.modemDevice(),O_WRONLY|O_TRUNC|O_CREAT);
+  fd = openLockfile(PPPData::data()->modemDevice(),O_WRONLY|O_TRUNC|O_CREAT);
   if(fd >= 0) {