diff options
Diffstat (limited to 'klinkstatus/src/klinkstatus.cpp')
| -rw-r--r-- | klinkstatus/src/klinkstatus.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index f4154f3c..be1d4b0e 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -54,7 +54,7 @@ KLinkStatus::KLinkStatus() { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this, "klinkstatus_part", "KParts::ReadOnlyPart" )); if (m_part) @@ -73,8 +73,8 @@ KLinkStatus::KLinkStatus() // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n("Could not find the KLinkStatus part; did you configure with '--prefix=/$TDEDIR' and perform 'make install'?")); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -97,13 +97,13 @@ void KLinkStatus::load(const KURL& url) void KLinkStatus::setupActions() { - // KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + // KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); // The above causes a segfault when using File->Quit. // Here's Waldo's explanation: /* I had a look. The problem is due to the SessionWidget destructor calling KLSConfig. If you use the window button, the window and the SessionWidget is destructed first and then later the application is destructed. - If you use File->Quit it calls kapp->quit which destructs the application + If you use File->Quit it calls tdeApp->quit which destructs the application without destructing the window first. The application first destructs all static deleters and its administration, and then goes on to kill the remaining windows that it owns. Therein lies the problem because by then the @@ -113,13 +113,13 @@ void KLinkStatus::setupActions() administration. The easiest solution is to call close() on the mainwindow instead of TDEApplication::quit()*/ - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); - //m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - //m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + //m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + //m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void KLinkStatus::setupPartActions() @@ -199,8 +199,8 @@ void KLinkStatus::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } |