From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- nsplugins/viewer/nsplugin.cpp | 62 +++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'nsplugins/viewer/nsplugin.cpp') diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index be313b52b..a32653039 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -138,7 +138,7 @@ void g_NPN_ForceRedraw(NPP /*instance*/) } -// invalidate rect +// tqinvalidate rect void g_NPN_InvalidateRect(NPP /*instance*/, NPRect* /*invalidRect*/) { // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api7.html#999503 @@ -147,7 +147,7 @@ void g_NPN_InvalidateRect(NPP /*instance*/, NPRect* /*invalidRect*/) } -// invalidate region +// tqinvalidate region void g_NPN_InvalidateRegion(NPP /*instance*/, NPRegion /*invalidRegion*/) { // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api8.html#999528 @@ -252,8 +252,8 @@ NPError g_NPN_GetURL(NPP instance, const char *url, const char *target) NSPluginInstance *inst = static_cast(instance->ndata); if (inst) { - inst->requestURL( TQString::fromLatin1(url), TQString::null, - TQString::fromLatin1(target), 0 ); + inst->requestURL( TQString::tqfromLatin1(url), TQString::null, + TQString::tqfromLatin1(target), 0 ); } return NPERR_NO_ERROR; @@ -267,8 +267,8 @@ NPError g_NPN_GetURLNotify(NPP instance, const char *url, const char *target, NSPluginInstance *inst = static_cast(instance->ndata); if (inst) { kdDebug(1431) << "g_NPN_GetURLNotify: ndata=" << (void*)inst << endl; - inst->requestURL( TQString::fromLatin1(url), TQString::null, - TQString::fromLatin1(target), notifyData, true ); + inst->requestURL( TQString::tqfromLatin1(url), TQString::null, + TQString::tqfromLatin1(target), notifyData, true ); } return NPERR_NO_ERROR; @@ -318,7 +318,7 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target, break; } - TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); + TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); previousStart = &buf[l]; previousCR = true; @@ -360,9 +360,9 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target, } NSPluginInstance *inst = static_cast(instance->ndata); - if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) { - inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(), - TQString::fromLatin1(target), notifyData, args, true ); + if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { + inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), + TQString::tqfromLatin1(target), notifyData, args, true ); } else { // Unsupported / insecure return NPERR_INVALID_URL; @@ -415,7 +415,7 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target, break; } - TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); + TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); previousStart = &buf[l]; previousCR = true; @@ -457,9 +457,9 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target, } NSPluginInstance *inst = static_cast(instance->ndata); - if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) { - inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(), - TQString::fromLatin1(target), 0L, args, false ); + if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { + inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), + TQString::tqfromLatin1(target), 0L, args, false ); } else { // Unsupported / insecure return NPERR_INVALID_URL; @@ -470,9 +470,9 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target, // display status message -void g_NPN_Status(NPP instance, const char *message) +void g_NPN_tqStatus(NPP instance, const char *message) { - kdDebug(1431) << "g_NPN_Status(): " << message << endl; + kdDebug(1431) << "g_NPN_tqStatus(): " << message << endl; if (!instance) return; @@ -480,7 +480,7 @@ void g_NPN_Status(NPP instance, const char *message) // turn into an instance signal NSPluginInstance *inst = (NSPluginInstance*) instance->ndata; - inst->emitStatus(message); + inst->emittqStatus(message); } @@ -816,11 +816,11 @@ void NSPluginInstance::timer() kdDebug() << "posting to " << url << endl; - emitStatus( i18n("Submitting data to %1").arg(url) ); + emittqStatus( i18n("Submitting data to %1").arg(url) ); s->post( url, req.data, req.mime, req.notify, req.args ); } else if (url.lower().startsWith("javascript:")){ if (_callback) { - static Q_INT32 _jsrequestid = 0; + static TQ_INT32 _jsrequestid = 0; _jsrequests.insert(_jsrequestid, new Request(req)); _callback->evalJavaScript(_jsrequestid++, url.mid(11)); } else { @@ -835,7 +835,7 @@ void NSPluginInstance::timer() kdDebug() << "getting " << url << endl; - emitStatus( i18n("Requesting %1").arg(url) ); + emittqStatus( i18n("Requesting %1").arg(url) ); s->get( url, req.mime, req.notify, req.reload ); } @@ -897,7 +897,7 @@ void NSPluginInstance::postURL( const TQString &url, const TQByteArray& data, } -void NSPluginInstance::emitStatus(const TQString &message) +void NSPluginInstance::emittqStatus(const TQString &message) { if( _callback ) _callback->statusMessage( message ); @@ -907,7 +907,7 @@ void NSPluginInstance::emitStatus(const TQString &message) void NSPluginInstance::streamFinished( NSPluginStreamBase* strm ) { kdDebug(1431) << "-> NSPluginInstance::streamFinished" << endl; - emitStatus( TQString::null ); + emittqStatus( TQString::null ); _streams.setAutoDelete(false); // Don't delete it yet!! we get called from // its slot! _streams.remove(strm); @@ -916,7 +916,7 @@ void NSPluginInstance::streamFinished( NSPluginStreamBase* strm ) _timer->start( 100, true ); } -int NSPluginInstance::setWindow(Q_INT8 remove) +int NSPluginInstance::setWindow(TQ_INT8 remove) { if (remove) { @@ -980,7 +980,7 @@ static void resizeWidgets(Window w, int width, int height) { } -void NSPluginInstance::resizePlugin(Q_INT32 w, Q_INT32 h) +void NSPluginInstance::resizePlugin(TQ_INT32 w, TQ_INT32 h) { if (w == _width && h == _height) return; @@ -1021,7 +1021,7 @@ void NSPluginInstance::resizePlugin(Q_INT32 w, Q_INT32 h) } -void NSPluginInstance::javascriptResult(Q_INT32 id, TQString result) { +void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) { TQMap::iterator i = _jsrequests.find( id ); if (i != _jsrequests.end()) { Request *req = i.data(); @@ -1295,7 +1295,7 @@ void NSPluginViewer::shutdown() #if QT_VERSION < 0x030100 quitXt(); #else - qApp->quit(); + tqApp->quit(); #endif } @@ -1422,7 +1422,7 @@ int NSPluginClass::initialize() _nsFuncs.newstream = g_NPN_NewStream; _nsFuncs.write = g_NPN_Write; _nsFuncs.destroystream = g_NPN_DestroyStream; - _nsFuncs.status = g_NPN_Status; + _nsFuncs.status = g_NPN_tqStatus; _nsFuncs.uagent = g_NPN_UserAgent; _nsFuncs.memalloc = g_NPN_MemAlloc; _nsFuncs.memfree = g_NPN_MemFree; @@ -1434,8 +1434,8 @@ int NSPluginClass::initialize() _nsFuncs.posturlnotify = g_NPN_PostURLNotify; _nsFuncs.getvalue = g_NPN_GetValue; _nsFuncs.setvalue = g_NPN_SetValue; - _nsFuncs.invalidaterect = g_NPN_InvalidateRect; - _nsFuncs.invalidateregion = g_NPN_InvalidateRegion; + _nsFuncs.tqinvalidaterect = g_NPN_InvalidateRect; + _nsFuncs.tqinvalidateregion = g_NPN_InvalidateRegion; _nsFuncs.forceredraw = g_NPN_ForceRedraw; // initialize plugin @@ -1458,10 +1458,10 @@ void NSPluginClass::shutdown() } -DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, Q_INT8 embed, +DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, TQ_INT8 embed, TQStringList argn, TQStringList argv, TQString appId, TQString callbackId, - Q_INT8 reload, Q_INT8 doPost, TQByteArray postData, Q_UINT32 xembed ) + TQ_INT8 reload, TQ_INT8 doPost, TQByteArray postData, TQ_UINT32 xembed ) { kdDebug(1431) << "-> NSPluginClass::NewInstance" << endl; -- cgit v1.2.3