diff options
Diffstat (limited to 'tdehtml/java/kjavaappletviewer.cpp')
| -rw-r--r-- | tdehtml/java/kjavaappletviewer.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp index f80690aa9..237d74408 100644 --- a/tdehtml/java/kjavaappletviewer.cpp +++ b/tdehtml/java/kjavaappletviewer.cpp @@ -79,7 +79,7 @@ public: void setServer (KJavaAppletServer * s); TQGuardedPtr <KJavaAppletServer> server; private: - typedef TQMap <QPair <TQObject*, TQString>, QPair <KJavaAppletContext*, int> > + typedef TQMap <TQPair <TQObject*, TQString>, TQPair <KJavaAppletContext*, int> > ContextMap; ContextMap m_contextmap; }; @@ -303,7 +303,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, // check codebase first const KURL kbaseURL( baseurl ); const KURL newURL(kbaseURL, codebase); - if (kapp->authorizeURLAction("redirect", KURL(baseurl), newURL)) + if (tdeApp->authorizeURLAction("redirect", KURL(baseurl), newURL)) applet->setCodeBase (newURL.url()); applet->setAppletClass (classname); KJavaAppletContext* const cxt = serverMaintainer->getContext (parent, baseurl); @@ -329,7 +329,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, TQDataStream stream(params, IO_WriteOnly); stream << info << m_view->topLevelWidget()->winId(); - if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) { + if (!tdeApp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) { kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl; } else if ( replyType == "TDEIO::AuthInfo" ) { TQDataStream stream2( reply, IO_ReadOnly ); @@ -347,10 +347,10 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, setInstance (KJavaAppletViewerFactory::instance ()); KParts::Part::setWidget (m_view); - connect (applet->getContext(), TQT_SIGNAL(appletLoaded()), this, TQT_SLOT(appletLoaded())); - connect (applet->getContext(), TQT_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQT_SLOT(showDocument(const TQString&, const TQString&))); - connect (applet->getContext(), TQT_SIGNAL(showStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &))); - connect (applet, TQT_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQT_SLOT(jsEvent (const TQStringList &))); + connect (applet->getContext(), TQ_SIGNAL(appletLoaded()), this, TQ_SLOT(appletLoaded())); + connect (applet->getContext(), TQ_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQ_SLOT(showDocument(const TQString&, const TQString&))); + connect (applet->getContext(), TQ_SIGNAL(showStatus(const TQString &)), this, TQ_SLOT(infoMessage(const TQString &))); + connect (applet, TQ_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQ_SLOT(jsEvent (const TQStringList &))); } bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) { @@ -369,7 +369,7 @@ bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) { KJavaAppletViewer::~KJavaAppletViewer () { m_view = 0L; - serverMaintainer->releaseContext (TQT_TQOBJECT(parent()), baseurl); + serverMaintainer->releaseContext (parent(), baseurl); if (m_statusbar_icon) { m_statusbar->removeStatusBarItem (m_statusbar_icon); delete m_statusbar_icon; @@ -404,7 +404,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) { if (applet->size().width() > 0 || m_view->isVisible()) w->showApplet (); else - TQTimer::singleShot (10, this, TQT_SLOT (delayedCreateTimeOut ())); + TQTimer::singleShot (10, this, TQ_SLOT (delayedCreateTimeOut ())); if (!applet->failed ()) emit started (0L); return url.isValid (); |