1 files changed, 13 insertions, 13 deletions

diff --git a/noncore/settings/networksettings/ppp/conwindow.cpp b/noncore/settings/networksettings/ppp/conwindow.cpp
index d6b3fbe..ad89005 100644
--- a/noncore/settings/networksettings/ppp/conwindow.cpp
+++ b/noncore/settings/networksettings/ppp/conwindow.cpp
@@ -66,38 +66,38 @@ ConWindow::ConWindow(QWidget *parent, const char *name, QDialog *mainwidget )
   cancelbutton->setText(i18n("Disconnect"));
   connect(cancelbutton, SIGNAL(clicked()), mainwidget, SLOT(disconnect()));
 
  //  statsbutton = new QPushButton(this);
 //   statsbutton->setText(i18n("Details"));
 //   statsbutton->setFocus();
 //   connect(statsbutton, SIGNAL(clicked()), mainwidget, SLOT(showStats()));
 
   clocktimer = new QTimer(this);
   connect(clocktimer, SIGNAL(timeout()), SLOT(timeclick()));
 
   // read window position from config file
-  int p_x, p_y;
-  gpppdata.winPosConWin(p_x, p_y);
-  setGeometry(p_x, p_y, 320, 110);
+//  int p_x, p_y;
+//   PPPData::data()->winPosConWin(p_x, p_y);
+//   setGeometry(p_x, p_y, 320, 110);
 }
 
 ConWindow::~ConWindow() {
   stopClock();
 }
 
 // save window position when window was closed
 bool ConWindow::event(QEvent *e) {
   if (e->type() == QEvent::Hide)
   {
-    gpppdata.setWinPosConWin(x(), y());
+//    PPPData::data()->setWinPosConWin(x(), y());
     return true;
   }
   else
     return QWidget::event(e);
 }
 
 QString ConWindow::prettyPrintVolume(unsigned int n) {
   int idx = 0;
   const QString quant[] = {i18n("Byte"), i18n("KB"),
                    i18n("MB"), i18n("GB"), QString::null};
 
   float n1 = n;
@@ -109,40 +109,40 @@ QString ConWindow::prettyPrintVolume(unsigned int n) {
   int i = idx;
   while(i--)
     n1 = n1 / 1024.0;
 
   QString s = QString::number( n1, 'f', idx==0 ? 0 : 1 ); //KGlobal::locale()->formatNumber( n1, idx==0 ? 0 : 1 );
   s += " " + quant[idx];
   return s;
 }
 
 void ConWindow::accounting(bool on) {
   // cache accounting settings
   accountingEnabled = on;
-  volumeAccountingEnabled = gpppdata.VolAcctEnabled();
+  volumeAccountingEnabled = PPPData::data()->VolAcctEnabled();
 
   // delete old layout
   if(tl1 != 0)
     delete tl1;
 
   // add layout now
   tl1 = new QVBoxLayout(this, 10, 10);
   tl1->addSpacing(5);
   QHBoxLayout *tl = new QHBoxLayout;
   tl1->addLayout(tl);
   tl->addSpacing(20);
   QGridLayout *l1;
 
   int vol_lines = 0;
-  if(gpppdata.VolAcctEnabled())
+  if(PPPData::data()->VolAcctEnabled())
     vol_lines = 1;
 
   if(accountingEnabled)
     l1 = new QGridLayout(4 + vol_lines, 2, 5);
   else
     l1 = new QGridLayout(2 + vol_lines, 2, 5);
   tl->addLayout(l1);
   l1->setColStretch(0, 0);
   l1->setColStretch(1, 1);
 
   info2->setAlignment(AlignRight|AlignVCenter);
   timelabel2->setAlignment(AlignRight|AlignVCenter);
@@ -230,61 +230,61 @@ void ConWindow::accounting(bool on) {
 void ConWindow::dock() {
 //  DockWidget::dock_widget->show();
   this->hide();
 }
 
 
 void ConWindow::startClock() {
   minutes = 0;
   seconds = 0;
   hours = 0;
   QString title ;
 
-  title = gpppdata.accname();
+  title = PPPData::data()->accname();
 
-  if(gpppdata.get_show_clock_on_caption()){
+  if(PPPData::data()->get_show_clock_on_caption()){
     title += " 00:00" ;
   }
   this->setCaption(title);
 
   timelabel2->setText("00:00:00");
   clocktimer->start(1000);
 }
 
 
 void ConWindow::setConnectionSpeed(const QString &speed) {
   info2->setText(speed);
 }
 
 
 void ConWindow::stopClock() {
   clocktimer->stop();
 }
 
 
 void ConWindow::timeclick() {
   QString tooltip = i18n("Connection: %1\n"
                          "Connected at: %2\n"
                          "Time connected: %3")
-                    .arg(gpppdata.accname()).arg(info2->text())
+                    .arg(PPPData::data()->accname()).arg(info2->text())
                     .arg(time_string2);
 
   if(accountingEnabled)
       tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2")
                  .arg(session_bill->text()).arg(total_bill->text());
   // volume accounting
   if(volumeAccountingEnabled) {
 
     volinfo->setEnabled(TRUE);
-    int bytes = gpppdata.totalBytes();
+    int bytes = PPPData::data()->totalBytes();
     volinfo->setText(prettyPrintVolume(bytes));
   }
 
   seconds++;
 
   if(seconds >= 60 ) {
     minutes ++;
     seconds = 0;
   }
 
   if (minutes >= 60){
     minutes = 0;
@@ -296,46 +296,46 @@ void ConWindow::timeclick() {
     hours = 0;
   }
 
   time_string.sprintf("%02d:%02d",hours,minutes);
   time_string2 = "";
   if (days)
       time_string2.sprintf("%d d %02d:%02d:%02d",
                            days,hours,minutes,seconds);
 
   else
     time_string2.sprintf("%02d:%02d:%02d",hours,minutes,seconds);
 
-  caption_string = gpppdata.accname();
+  caption_string = PPPData::data()->accname();
   caption_string += " ";
   caption_string += time_string;
 
 
   timelabel2->setText(time_string2);
 
-  if(gpppdata.get_show_clock_on_caption() && (seconds == 1)){
+  if(PPPData::data()->get_show_clock_on_caption() && (seconds == 1)){
     // we update the Caption only once per minute not every second
     // otherwise I get a flickering icon
     this->setCaption(caption_string);
   }
 
 //  QToolTip::add(DockWidget::dock_widget, tooltip);
 }
 
 
 void ConWindow::closeEvent( QCloseEvent *e ){
   // we don't want to lose the
   // conwindow since this is our last connection kppp.
   // if we lost it we could only kill the program by hand to get on with life.
   e->ignore();
 
-  if(gpppdata.get_dock_into_panel())
+  if(PPPData::data()->get_dock_into_panel())
     dock();
 }
 
 
 void ConWindow::slotAccounting(QString total, QString session) {
   total_bill->setText(total);
   session_bill->setText(session);
 }