From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- khtml/java/kjavaappletviewer.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'khtml/java/kjavaappletviewer.cpp') diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp index d4c8e266f..2000dd6fa 100644 --- a/khtml/java/kjavaappletviewer.cpp +++ b/khtml/java/kjavaappletviewer.cpp @@ -90,7 +90,7 @@ KJavaServerMaintainer::~KJavaServerMaintainer () { KJavaAppletContext * KJavaServerMaintainer::getContext (TQObject * w, const TQString & doc) { ContextMap::key_type key = qMakePair (w, doc); - ContextMap::iterator it = m_contextmap.find (key); + ContextMap::iterator it = m_contextmap.tqfind (key); if (it != m_contextmap.end ()) { ++((*it).second); return (*it).first; @@ -101,7 +101,7 @@ KJavaAppletContext * KJavaServerMaintainer::getContext (TQObject * w, const TQSt } void KJavaServerMaintainer::releaseContext (TQObject * w, const TQString & doc) { - ContextMap::iterator it = m_contextmap.find (qMakePair (w, doc)); + ContextMap::iterator it = m_contextmap.tqfind (qMakePair (w, doc)); if (it != m_contextmap.end () && --(*it).second <= 0) { kdDebug(6100) << "KJavaServerMaintainer::releaseContext" << endl; (*it).first->deleteLater (); @@ -230,7 +230,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, TQStringList::const_iterator it = args.begin(); const TQStringList::const_iterator itEnd = args.end(); for ( ; it != itEnd; ++it) { - const int equalPos = (*it).find("="); + const int equalPos = (*it).tqfind("="); if (equalPos > 0) { const TQString name = (*it).left (equalPos).upper (); TQString value = (*it).right ((*it).length () - equalPos - 1); @@ -245,27 +245,27 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, baseurl = KURL (KURL (value), TQString (".")).url (); } else if (name == "__KHTML__CODEBASE") khtml_codebase = value; - else if (name_lower == TQString::fromLatin1("codebase") || - name_lower == TQString::fromLatin1("java_codebase")) { + else if (name_lower == TQString::tqfromLatin1("codebase") || + name_lower == TQString::tqfromLatin1("java_codebase")) { if (!value.isEmpty ()) codebase = value; } else if (name == "__KHTML__CLASSID") - //else if (name.lower()==TQString::fromLatin1("classid")) + //else if (name.lower()==TQString::tqfromLatin1("classid")) classid = value; - else if (name_lower == TQString::fromLatin1("code") || - name_lower == TQString::fromLatin1("java_code")) + else if (name_lower == TQString::tqfromLatin1("code") || + name_lower == TQString::tqfromLatin1("java_code")) classname = value; - else if (name_lower == TQString::fromLatin1("src")) + else if (name_lower == TQString::tqfromLatin1("src")) src_param = value; - else if (name_lower == TQString::fromLatin1("archive") || - name_lower == TQString::fromLatin1("java_archive") || + else if (name_lower == TQString::tqfromLatin1("archive") || + name_lower == TQString::tqfromLatin1("java_archive") || name_lower.startsWith ("cache_archive")) applet->setArchives (value); - else if (name_lower == TQString::fromLatin1("name")) + else if (name_lower == TQString::tqfromLatin1("name")) applet->setAppletName (value); - else if (name_lower == TQString::fromLatin1("width")) + else if (name_lower == TQString::tqfromLatin1("width")) width = value.toInt(); - else if (name_lower == TQString::fromLatin1("height")) + else if (name_lower == TQString::tqfromLatin1("height")) height = value.toInt(); if (!name.startsWith ("__KHTML__")) { applet->setParameter (name, value); @@ -277,7 +277,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, applet->setParameter ("CLSID", classid); kdDebug(6100) << "classid=" << classid << classid.startsWith("clsid:")<< endl; if (classid.startsWith ("clsid:")) - // codeBase contains the URL to the plugin page + // codeBase tqcontains the URL to the plugin page khtml_codebase = baseurl; else if (classname.isEmpty () && classid.startsWith ("java:")) classname = classid.mid(5); @@ -327,7 +327,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, info.verifyPath = true; TQDataStream stream(params, IO_WriteOnly); - stream << info << m_view->topLevelWidget()->winId(); + stream << info << m_view->tqtopLevelWidget()->winId(); if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) { kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl; @@ -342,14 +342,14 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, /* install event filter for close events */ if (wparent) - wparent->topLevelWidget ()->installEventFilter (this); + wparent->tqtopLevelWidget ()->installEventFilter (this); 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->getContext(), TQT_SIGNAL(showtqStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &))); connect (applet, TQT_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQT_SLOT(jsEvent (const TQStringList &))); } @@ -391,7 +391,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) { } else applet->setAppletClass (url.url ()); AppletParameterDialog (w).exec (); - applet->setSize (w->sizeHint()); + applet->setSize (w->tqsizeHint()); } if (!m_statusbar_icon) { KStatusBar *sb = m_statusbar->statusBar(); @@ -500,7 +500,7 @@ void KJavaAppletViewerBrowserExtension::restoreState (TQDataStream & stream) { applet->setParameter (key, val); kdDebug(6100) << "restoreState key:" << key << " val:" << val << endl; } - applet->setSize (w->sizeHint ()); + applet->setSize (w->tqsizeHint ()); if (w->isVisible()) w->showApplet (); } -- cgit v1.2.3