summaryrefslogtreecommitdiffstats
path: root/nsplugins/viewer
diff options
context:
space:
mode:
Diffstat (limited to 'nsplugins/viewer')
-rw-r--r--nsplugins/viewer/NSPluginClassIface.h12
-rw-r--r--nsplugins/viewer/kxt.cpp14
-rw-r--r--nsplugins/viewer/kxt.h2
-rw-r--r--nsplugins/viewer/nsplugin.cpp62
-rw-r--r--nsplugins/viewer/nsplugin.h14
-rw-r--r--nsplugins/viewer/qxteventloop.cpp40
6 files changed, 72 insertions, 72 deletions
diff --git a/nsplugins/viewer/NSPluginClassIface.h b/nsplugins/viewer/NSPluginClassIface.h
index c9051821d..7eb71f27d 100644
--- a/nsplugins/viewer/NSPluginClassIface.h
+++ b/nsplugins/viewer/NSPluginClassIface.h
@@ -47,10 +47,10 @@ class NSPluginClassIface : virtual public DCOPObject
k_dcop:
- virtual DCOPRef newInstance(TQString url, TQString mimeType, TQ_INT8 embed,
+ virtual DCOPRef newInstance(TQString url, TQString mimeType, Q_INT8 embed,
TQStringList argn, TQStringList argv,
- TQString appId, TQString callbackId, TQ_INT8 reload,
- TQ_INT8 doPost, TQByteArray postData, TQ_UINT32 xembed) = 0;
+ TQString appId, TQString callbackId, Q_INT8 reload,
+ Q_INT8 doPost, TQByteArray postData, Q_UINT32 xembed) = 0;
virtual TQString getMIMEDescription() = 0;
};
@@ -66,11 +66,11 @@ k_dcop:
virtual int winId() = 0;
- virtual int setWindow(TQ_INT8 remove=0) = 0;
+ virtual int setWindow(Q_INT8 remove=0) = 0;
- virtual void resizePlugin(TQ_INT32 w, TQ_INT32 h) = 0;
+ virtual void resizePlugin(Q_INT32 w, Q_INT32 h) = 0;
- virtual void javascriptResult(TQ_INT32 id, TQString result) = 0;
+ virtual void javascriptResult(Q_INT32 id, TQString result) = 0;
virtual void displayPlugin() = 0;
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp
index 2443ce739..9f5f43d51 100644
--- a/nsplugins/viewer/kxt.cpp
+++ b/nsplugins/viewer/kxt.cpp
@@ -159,11 +159,11 @@ void reparentChildrenOf(TQWidget* parent)
void qwidget_realize(
Widget widget,
- XtValueMask* tqmask,
+ XtValueMask* mask,
XSetWindowAttributes* attributes
)
{
- widgetClassRec.core_class.realize(widget, tqmask, attributes);
+ widgetClassRec.core_class.realize(widget, mask, attributes);
KXtWidget* qxtw = ((QWidgetRec*)widget)->qwidget.qxtwidget;
if (XtWindow(widget) != qxtw->winId()) {
qxtw->create(XtWindow(widget), FALSE, FALSE);
@@ -205,7 +205,7 @@ QWidgetClassRec qwidgetClassRec = {
/* version */ XtVersion,
/* callback_private */ 0,
/* tm_table */ XtInheritTranslations,
- /* query_tqgeometry */ XtInheritQueryGeometry,
+ /* query_geometry */ XtInheritQueryGeometry,
/* display_accelerator */ XtInheritDisplayAccelerator,
/* extension */ 0
},
@@ -255,7 +255,7 @@ static
void np_event_proc( XEvent* e )
{
Widget xtw = XtWindowToWidget( e->xany.display, e->xany.window );
- if ( xtw && tqApp->loopLevel() > 0 ) {
+ if ( xtw && qApp->loopLevel() > 0 ) {
// Allow Xt to process the event
qt_np_cascade_event_handler[e->type]( e );
}
@@ -442,7 +442,7 @@ void KXtWidget::init(const char* name, WidgetClass widget_class,
Use this constructor to utilize Qt widgets in an Xt/Motif
application. The KXtWidget is a TQWidget, so you can create
- subwidgets, tqlayouts, etc. using Qt functionality.
+ subwidgets, layouts, etc. using Qt functionality.
*/
KXtWidget::KXtWidget(const char* name, Widget parent, bool managed) :
TQWidget( 0, name, WResizeNoErase )
@@ -505,7 +505,7 @@ KXtWidget::~KXtWidget()
if ( need_reroot ) {
hide();
- XReparentWindow(qt_xdisplay(), winId(), tqApp->desktop()->winId(),
+ XReparentWindow(qt_xdisplay(), winId(), qApp->desktop()->winId(),
x(), y());
}
@@ -567,7 +567,7 @@ bool KXtWidget::isActiveWindow() const
TQWidget *w = find( (WId)win );
if ( w ) {
// We know that window
- return w->tqtopLevelWidget() == tqtopLevelWidget();
+ return w->topLevelWidget() == topLevelWidget();
} else {
// Window still may be a parent (if top-level is foreign window)
Window root, parent;
diff --git a/nsplugins/viewer/kxt.h b/nsplugins/viewer/kxt.h
index 89b168069..44f05db19 100644
--- a/nsplugins/viewer/kxt.h
+++ b/nsplugins/viewer/kxt.h
@@ -75,7 +75,7 @@ class KXtWidget : public TQWidget {
Widget parent, TQWidget* qparent,
ArgList args, Cardinal num_args,
bool managed);
- friend void qwidget_realize( Widget widget, XtValueMask* tqmask,
+ friend void qwidget_realize( Widget widget, XtValueMask* mask,
XSetWindowAttributes* attributes );
public:
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index a32653039..be313b52b 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -138,7 +138,7 @@ void g_NPN_ForceRedraw(NPP /*instance*/)
}
-// tqinvalidate rect
+// invalidate 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*/)
}
-// tqinvalidate region
+// invalidate 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<NSPluginInstance*>(instance->ndata);
if (inst) {
- inst->requestURL( TQString::tqfromLatin1(url), TQString::null,
- TQString::tqfromLatin1(target), 0 );
+ inst->requestURL( TQString::fromLatin1(url), TQString::null,
+ TQString::fromLatin1(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<NSPluginInstance*>(instance->ndata);
if (inst) {
kdDebug(1431) << "g_NPN_GetURLNotify: ndata=" << (void*)inst << endl;
- inst->requestURL( TQString::tqfromLatin1(url), TQString::null,
- TQString::tqfromLatin1(target), notifyData, true );
+ inst->requestURL( TQString::fromLatin1(url), TQString::null,
+ TQString::fromLatin1(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::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
+ TQString thisLine = TQString::fromLatin1(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<NSPluginInstance*>(instance->ndata);
- if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) {
- inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(),
- TQString::tqfromLatin1(target), notifyData, args, true );
+ if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) {
+ inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(),
+ TQString::fromLatin1(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::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
+ TQString thisLine = TQString::fromLatin1(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<NSPluginInstance*>(instance->ndata);
- if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) {
- inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(),
- TQString::tqfromLatin1(target), 0L, args, false );
+ if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) {
+ inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(),
+ TQString::fromLatin1(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_tqStatus(NPP instance, const char *message)
+void g_NPN_Status(NPP instance, const char *message)
{
- kdDebug(1431) << "g_NPN_tqStatus(): " << message << endl;
+ kdDebug(1431) << "g_NPN_Status(): " << message << endl;
if (!instance)
return;
@@ -480,7 +480,7 @@ void g_NPN_tqStatus(NPP instance, const char *message)
// turn into an instance signal
NSPluginInstance *inst = (NSPluginInstance*) instance->ndata;
- inst->emittqStatus(message);
+ inst->emitStatus(message);
}
@@ -816,11 +816,11 @@ void NSPluginInstance::timer()
kdDebug() << "posting to " << url << endl;
- emittqStatus( i18n("Submitting data to %1").arg(url) );
+ emitStatus( 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 TQ_INT32 _jsrequestid = 0;
+ static Q_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;
- emittqStatus( i18n("Requesting %1").arg(url) );
+ emitStatus( 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::emittqStatus(const TQString &message)
+void NSPluginInstance::emitStatus(const TQString &message)
{
if( _callback )
_callback->statusMessage( message );
@@ -907,7 +907,7 @@ void NSPluginInstance::emittqStatus(const TQString &message)
void NSPluginInstance::streamFinished( NSPluginStreamBase* strm )
{
kdDebug(1431) << "-> NSPluginInstance::streamFinished" << endl;
- emittqStatus( TQString::null );
+ emitStatus( 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(TQ_INT8 remove)
+int NSPluginInstance::setWindow(Q_INT8 remove)
{
if (remove)
{
@@ -980,7 +980,7 @@ static void resizeWidgets(Window w, int width, int height) {
}
-void NSPluginInstance::resizePlugin(TQ_INT32 w, TQ_INT32 h)
+void NSPluginInstance::resizePlugin(Q_INT32 w, Q_INT32 h)
{
if (w == _width && h == _height)
return;
@@ -1021,7 +1021,7 @@ void NSPluginInstance::resizePlugin(TQ_INT32 w, TQ_INT32 h)
}
-void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) {
+void NSPluginInstance::javascriptResult(Q_INT32 id, TQString result) {
TQMap<int, Request*>::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
- tqApp->quit();
+ qApp->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_tqStatus;
+ _nsFuncs.status = g_NPN_Status;
_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.tqinvalidaterect = g_NPN_InvalidateRect;
- _nsFuncs.tqinvalidateregion = g_NPN_InvalidateRegion;
+ _nsFuncs.invalidaterect = g_NPN_InvalidateRect;
+ _nsFuncs.invalidateregion = g_NPN_InvalidateRegion;
_nsFuncs.forceredraw = g_NPN_ForceRedraw;
// initialize plugin
@@ -1458,10 +1458,10 @@ void NSPluginClass::shutdown()
}
-DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, TQ_INT8 embed,
+DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, Q_INT8 embed,
TQStringList argn, TQStringList argv,
TQString appId, TQString callbackId,
- TQ_INT8 reload, TQ_INT8 doPost, TQByteArray postData, TQ_UINT32 xembed )
+ Q_INT8 reload, Q_INT8 doPost, TQByteArray postData, Q_UINT32 xembed )
{
kdDebug(1431) << "-> NSPluginClass::NewInstance" << endl;
diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h
index 893b1c292..da92edd76 100644
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@@ -172,9 +172,9 @@ public:
// DCOP functions
void shutdown();
int winId() { return _form != 0 ? XtWindow(_form) : 0; }
- int setWindow(TQ_INT8 remove=0);
- void resizePlugin(TQ_INT32 w, TQ_INT32 h);
- void javascriptResult(TQ_INT32 id, TQString result);
+ int setWindow(Q_INT8 remove=0);
+ void resizePlugin(Q_INT32 w, Q_INT32 h);
+ void javascriptResult(Q_INT32 id, TQString result);
void displayPlugin();
void gotFocusIn();
void gotFocusOut();
@@ -200,7 +200,7 @@ public:
uint16 HandleEvent(void *event);
// signal emitters
- void emittqStatus( const TQString &message);
+ void emitStatus( const TQString &message);
void requestURL( const TQString &url, const TQString &mime,
const TQString &target, void *notify, bool forceNotify = false, bool reload = false );
void postURL( const TQString &url, const TQByteArray& data, const TQString &mime,
@@ -281,10 +281,10 @@ public:
~NSPluginClass();
TQString getMIMEDescription();
- DCOPRef newInstance(TQString url, TQString mimeType, TQ_INT8 embed,
+ DCOPRef newInstance(TQString url, TQString mimeType, Q_INT8 embed,
TQStringList argn, TQStringList argv,
- TQString appId, TQString callbackId, TQ_INT8 reload, TQ_INT8 post,
- TQByteArray postData, TQ_UINT32 xembed );
+ TQString appId, TQString callbackId, Q_INT8 reload, Q_INT8 post,
+ TQByteArray postData, Q_UINT32 xembed );
void destroyInstance( NSPluginInstance* inst );
bool error() { return _error; }
diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp
index b6eac9a4c..b34c1e03c 100644
--- a/nsplugins/viewer/qxteventloop.cpp
+++ b/nsplugins/viewer/qxteventloop.cpp
@@ -174,7 +174,7 @@ Boolean qmotif_event_dispatcher( XEvent *event )
}
last_xevent = event;
- bool delivered = ( tqApp->x11ProcessEvent( event ) != -1 );
+ bool delivered = ( qApp->x11ProcessEvent( event ) != -1 );
last_xevent = 0;
if ( qMotif ) {
switch ( event->type ) {
@@ -309,15 +309,15 @@ XtAppContext QXtEventLoop::applicationContext() const
void QXtEventLoop::appStartingUp()
{
- int argc = tqApp->argc();
+ int argc = qApp->argc();
XtDisplayInitialize( d->appContext,
TQPaintDevice::x11AppDisplay(),
- tqApp->name(),
+ qApp->name(),
d->applicationClass,
d->options,
d->numOptions,
&argc,
- tqApp->argv() );
+ qApp->argv() );
d->hookMeUp();
}
@@ -362,18 +362,18 @@ void qmotif_socknot_handler( XtPointer pointer, int *, XtInputId *id )
*/
void QXtEventLoop::registerSocketNotifier( TQSocketNotifier *notifier )
{
- XtInputMask tqmask;
+ XtInputMask mask;
switch ( notifier->type() ) {
case TQSocketNotifier::Read:
- tqmask = XtInputReadMask;
+ mask = XtInputReadMask;
break;
case TQSocketNotifier::Write:
- tqmask = XtInputWriteMask;
+ mask = XtInputWriteMask;
break;
case TQSocketNotifier::Exception:
- tqmask = XtInputExceptMask;
+ mask = XtInputExceptMask;
break;
default:
@@ -382,7 +382,7 @@ void QXtEventLoop::registerSocketNotifier( TQSocketNotifier *notifier )
}
XtInputId id = XtAppAddInput( d->appContext,
- notifier->socket(), (XtPointer) tqmask,
+ notifier->socket(), (XtPointer) mask,
qmotif_socknot_handler, this );
d->socknotDict.insert( id, notifier );
@@ -420,7 +420,7 @@ void qmotif_timeout_handler( XtPointer, XtIntervalId * )
*/
bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
{
- // Qt uses posted events to do lots of delayed operations, like tqrepaints... these
+ // Qt uses posted events to do lots of delayed operations, like repaints... these
// need to be delivered before we go to sleep
TQApplication::sendPostedEvents();
@@ -436,23 +436,23 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
qmotif_timeout_handler, 0 );
}
- // get the pending event tqmask from Xt and process the next event
- XtInputMask pendingtqmask = XtAppPending( d->appContext );
- XtInputMask tqmask = pendingtqmask;
- if ( pendingtqmask & XtIMTimer ) {
- tqmask &= ~XtIMTimer;
+ // get the pending event mask from Xt and process the next event
+ XtInputMask pendingmask = XtAppPending( d->appContext );
+ XtInputMask mask = pendingmask;
+ if ( pendingmask & XtIMTimer ) {
+ mask &= ~XtIMTimer;
// zero timers will starve the Xt X event dispatcher... so process
// something *instead* of a timer first...
- if ( tqmask != 0 )
- XtAppProcessEvent( d->appContext, tqmask );
+ if ( mask != 0 )
+ XtAppProcessEvent( d->appContext, mask );
// and process a timer afterwards
- tqmask = pendingtqmask & XtIMTimer;
+ mask = pendingmask & XtIMTimer;
}
if ( ( flags & WaitForMore ) )
XtAppProcessEvent( d->appContext, XtIMAll );
else
- XtAppProcessEvent( d->appContext, tqmask );
+ XtAppProcessEvent( d->appContext, mask );
int nevents = 0;
if ( ! ( flags & ExcludeSocketNotifiers ) )
@@ -463,7 +463,7 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
}
d->activate_timers = FALSE;
- return ( (flags & WaitForMore) || ( pendingtqmask != 0 ) || nevents > 0 );
+ return ( (flags & WaitForMore) || ( pendingmask != 0 ) || nevents > 0 );
}
#include "qxteventloop.moc"
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 08:18:54 +0000