diff options
Diffstat (limited to 'kppp/kpppwidget.cpp')
| -rw-r--r-- | kppp/kpppwidget.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index a6dfae00..dafde781 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -237,17 +237,17 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) stats = new PPPStats; - KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); + KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon()); // constructor of con_win reads position from config file con_win = new ConWindow(0, "conw", this, stats); - KWin::setIcons(con_win->winId(), kapp->icon(), kapp->miniIcon()); + KWin::setIcons(con_win->winId(), tdeApp->icon(), tdeApp->miniIcon()); statdlg = new PPPStatsDlg(0, "stats", this, stats); statdlg->hide(); debugwindow = new DebugWidget(0,"debugwindow"); - KWin::setIcons(debugwindow->winId(), kapp->icon(), kapp->miniIcon()); + KWin::setIcons(debugwindow->winId(), tdeApp->icon(), tdeApp->miniIcon()); debugwindow->hide(); // load up the accounts combo box @@ -255,7 +255,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) resetaccounts(); resetmodems(); con = new ConnectWidget(0, "con", stats); - KWin::setIcons(con->winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons(con->winId(), tdeApp->icon(), tdeApp->miniIcon() ); connect(this, TQ_SIGNAL(begin_connect()),con, TQ_SLOT(preinit())); TQRect desk = TDEGlobalSettings::desktopGeometry(topLevelWidget()); @@ -274,9 +274,9 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) this, TQ_SLOT(startAccounting())); connect(con, TQ_SIGNAL(stopAccounting()), this, TQ_SLOT(stopAccounting())); - connect(TDEApplication::kApplication(), TQ_SIGNAL(saveYourself()), + connect(tdeApp, TQ_SIGNAL(saveYourself()), this, TQ_SLOT(saveMyself())); - connect(TDEApplication::kApplication(), TQ_SIGNAL(shutDown()), + connect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shutDown())); debugwindow->setGeometry(desk.center().x()+190, desk.center().y()-55, @@ -334,10 +334,10 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) #endif // attach to the DCOP server, if possible - if (!kapp->dcopClient()->attach()) + if (!tdeApp->dcopClient()->attach()) kdDebug(5002) << "Error: Could not connect to the DCOP server" << endl; else - kapp->dcopClient()->registerAs(kapp->name(), true); + tdeApp->dcopClient()->registerAs(tdeApp->name(), true); // this timer will delay the actual disconnection DISCONNECTION_DELAY ms // to give applications time to shutdown, logout, whatever.. @@ -383,10 +383,10 @@ void KPPPWidget::prepareSetupDialog() { if(tabWindow == 0) { tabWindow = new KDialogBase( KDialogBase::Tabbed, i18n("KPPP Configuration"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, - kapp->mainWidget(), 0, true); + tdeApp->mainWidget(), 0, true); - KWin::setIcons(tabWindow->winId(), kapp->icon(), kapp->miniIcon()); + KWin::setIcons(tabWindow->winId(), tdeApp->icon(), tdeApp->miniIcon()); // tabWindow->setFixedSize( 365, 375 ); @@ -580,7 +580,7 @@ void KPPPWidget::sigPPPDDied() { // stop the disconnect timer (just in case) disconnectTimer->stop(); // signal other applications that we are disconnected now - kapp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray()); kdDebug(5002) << "Executing command on disconnect since pppd has died." << endl; TQApplication::flushX(); @@ -797,7 +797,7 @@ void KPPPWidget::disconnect() { if (disconnectTimer->isActive()) return; // you had already pressed disconnect before // signal other applications that we are about to go offline now - kapp->dcopClient()->emitDCOPSignal("KpppIface", "aboutToDisconnect()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("KpppIface", "aboutToDisconnect()", TQByteArray()); con_win->hide(); con->show(); con->disableButtons(); // will reenable them later in delayedDisconnect() @@ -806,13 +806,13 @@ void KPPPWidget::disconnect() { if (!gpppdata.command_before_disconnect().isEmpty()) { con->setMsg(i18n("Executing command before disconnection.")); - kapp->processEvents(); + tdeApp->processEvents(); TQApplication::flushX(); pid_t id = execute_command(gpppdata.command_before_disconnect()); int i, status; do { - kapp->processEvents(); + tdeApp->processEvents(); i = waitpid(id, &status, WNOHANG); usleep(500000); } while (i == 0 && errno == 0); @@ -821,7 +821,7 @@ void KPPPWidget::disconnect() { con->setMsg(i18n("Announcing disconnection.")); // this is no longer necessary since I'm delaying disconnection usign a TQTimer - // kapp->processEvents(); + // tdeApp->processEvents(); // set the timer to call delayedDisconnect() in DISCONNECT_DELAY ms disconnectTimer->start(DISCONNECT_DELAY, true); @@ -835,7 +835,7 @@ void KPPPWidget::delayedDisconnect() { Requester::rq->killPPPDaemon(); // signal other applications that we are disconnected now - kapp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray()); TQApplication::flushX(); execute_command(gpppdata.command_on_disconnect()); @@ -854,7 +854,7 @@ void KPPPWidget::delayedDisconnect() { DockWidget::dock_widget->hide(); if(m_bQuitOnDisconnect) - kapp->exit(0); + tdeApp->exit(0); else { quit_b->setFocus(); show(); @@ -863,7 +863,7 @@ void KPPPWidget::delayedDisconnect() { void KPPPWidget::helpbutton() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } @@ -879,7 +879,7 @@ void KPPPWidget::quitbutton() { disconnectTimer->stop(); // signal other applications that we are disconnected now - kapp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("KpppIface", "disconnected()", TQByteArray()); TQApplication::flushX(); execute_command(gpppdata.command_on_disconnect()); @@ -891,7 +891,7 @@ void KPPPWidget::quitbutton() { gpppdata.setStoredPassword(""); } gpppdata.save(); - kapp->quit(); + tdeApp->quit(); } |