Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 54 insertions, 53 deletions

diff --git a/nsplugins/viewer/NSPluginClassIface.h b/nsplugins/viewer/NSPluginClassIface.h
index 7eb71f27d..c9051821d 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, Q_INT8 embed,
+  virtual DCOPRef 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) = 0;
+                              TQString appId, TQString callbackId, TQ_INT8 reload,
+                              TQ_INT8 doPost, TQByteArray postData, TQ_UINT32 xembed) = 0;
   virtual TQString getMIMEDescription() = 0;
 
 };
@@ -66,11 +66,11 @@ k_dcop:
 
   virtual int winId() = 0;
 
-  virtual int setWindow(Q_INT8 remove=0) = 0;
+  virtual int setWindow(TQ_INT8 remove=0) = 0;
 
-  virtual void resizePlugin(Q_INT32 w, Q_INT32 h) = 0;
+  virtual void resizePlugin(TQ_INT32 w, TQ_INT32 h) = 0;
 
-  virtual void javascriptResult(Q_INT32 id, TQString result) = 0;
+  virtual void javascriptResult(TQ_INT32 id, TQString result) = 0;
 
   virtual void displayPlugin() = 0;
   
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp
index 9f5f43d51..dbc865fb5 100644
--- a/nsplugins/viewer/kxt.cpp
+++ b/nsplugins/viewer/kxt.cpp
@@ -255,7 +255,7 @@ static
 void np_event_proc( XEvent* e )
 {
     Widget xtw = XtWindowToWidget( e->xany.display, e->xany.window );
-    if ( xtw && qApp->loopLevel() > 0 ) {
+    if ( xtw && tqApp->loopLevel() > 0 ) {
         // Allow Xt to process the event
         qt_np_cascade_event_handler[e->type]( e );
     }
@@ -505,7 +505,7 @@ KXtWidget::~KXtWidget()
 
     if ( need_reroot ) {
         hide();
-        XReparentWindow(qt_xdisplay(), winId(), qApp->desktop()->winId(),
+        XReparentWindow(qt_xdisplay(), winId(), tqApp->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->topLevelWidget() == topLevelWidget();
+        return w->tqtopLevelWidget() == tqtopLevelWidget();
     } else {
         // Window still may be a parent (if top-level is foreign window)
         Window root, parent;
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index be313b52b..f91e3fd9f 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<NSPluginInstance*>(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<NSPluginInstance*>(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<NSPluginInstance*>(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<NSPluginInstance*>(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;
@@ -820,7 +820,7 @@ void NSPluginInstance::timer()
                     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 {
@@ -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,8 +1021,8 @@ void NSPluginInstance::resizePlugin(Q_INT32 w, Q_INT32 h)
 }
 
 
-void NSPluginInstance::javascriptResult(Q_INT32 id, TQString result) {
-    TQMap<int, Request*>::iterator i = _jsrequests.find( id );
+void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) {
+    TQMap<int, Request*>::iterator i = _jsrequests.tqfind( id );
     if (i != _jsrequests.end()) {
         Request *req = i.data();
         _jsrequests.remove( i );
@@ -1295,7 +1295,7 @@ void NSPluginViewer::shutdown()
 #if QT_VERSION < 0x030100
    quitXt();
 #else
-   qApp->quit();
+   tqApp->quit();
 #endif
 }
 
@@ -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;
 
@@ -1670,7 +1670,7 @@ void NSPluginStreamBase::updateURL( const KURL& newURL )
 int NSPluginStreamBase::process( const TQByteArray &data, int start )
 {
    int32 max, sent, to_sent, len;
-   char *d = data.data() + start;
+   char *d = const_cast<TQByteArray&>(data).data() + start;
 
    to_sent = data.size() - start;
    while (to_sent > 0)
diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h
index da92edd76..e968eb684 100644
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@@ -63,7 +63,7 @@ class KLibrary;
 class TQTimer;
 
 
-class NSPluginStreamBase : public QObject
+class NSPluginStreamBase : public TQObject
 {
 Q_OBJECT
 friend class NSPluginInstance;
@@ -172,9 +172,9 @@ public:
   // DCOP functions
   void shutdown();
   int winId() { return _form != 0 ? XtWindow(_form) : 0; }
-  int setWindow(Q_INT8 remove=0);
-  void resizePlugin(Q_INT32 w, Q_INT32 h);
-  void javascriptResult(Q_INT32 id, TQString result);
+  int setWindow(TQ_INT8 remove=0);
+  void resizePlugin(TQ_INT32 w, TQ_INT32 h);
+  void javascriptResult(TQ_INT32 id, TQString result);
   void displayPlugin();
   void gotFocusIn();
   void gotFocusOut();
@@ -281,10 +281,10 @@ public:
   ~NSPluginClass();
 
   TQString getMIMEDescription();
-  DCOPRef newInstance(TQString url, TQString mimeType, Q_INT8 embed,
+  DCOPRef newInstance(TQString url, TQString mimeType, TQ_INT8 embed,
                       TQStringList argn, TQStringList argv,
-                      TQString appId, TQString callbackId, Q_INT8 reload, Q_INT8 post,
-                      TQByteArray postData, Q_UINT32 xembed );
+                      TQString appId, TQString callbackId, TQ_INT8 reload, TQ_INT8 post,
+                      TQByteArray postData, TQ_UINT32 xembed );
   void destroyInstance( NSPluginInstance* inst );
   bool error() { return _error; }
 
diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp
index b34c1e03c..327eaa77e 100644
--- a/nsplugins/viewer/qxteventloop.cpp
+++ b/nsplugins/viewer/qxteventloop.cpp
@@ -154,12 +154,12 @@ Boolean qmotif_event_dispatcher( XEvent *event )
     TQApplication::sendPostedEvents();
 
     TQWidgetIntDict *mapper = &static_d->mapper;
-    TQWidget* qMotif = mapper->find( event->xany.window );
+    TQWidget* qMotif = mapper->tqfind( event->xany.window );
     if ( !qMotif && TQWidget::find( event->xany.window) == 0 ) {
 	// event is not for Qt, try Xt
 	Display* dpy = TQPaintDevice::x11AppDisplay();
 	Widget w = XtWindowToWidget( dpy, event->xany.window );
-	while ( w && ! ( qMotif = mapper->find( XtWindow( w ) ) ) ) {
+	while ( w && ! ( qMotif = mapper->tqfind( XtWindow( w ) ) ) ) {
 	    if ( XtIsShell( w ) ) {
 		break;
 	    }
@@ -174,7 +174,7 @@ Boolean qmotif_event_dispatcher( XEvent *event )
     }
 
     last_xevent = event;
-    bool delivered = ( qApp->x11ProcessEvent( event ) != -1 );
+    bool delivered = ( tqApp->x11ProcessEvent( event ) != -1 );
     last_xevent = 0;
     if ( qMotif ) {
 	switch ( event->type ) {
@@ -309,15 +309,15 @@ XtAppContext QXtEventLoop::applicationContext() const
 
 void QXtEventLoop::appStartingUp()
 {
-    int argc = qApp->argc();
+    int argc = tqApp->argc();
     XtDisplayInitialize( d->appContext,
 			 TQPaintDevice::x11AppDisplay(),
-			 qApp->name(),
+			 tqApp->name(),
 			 d->applicationClass,
 			 d->options,
 			 d->numOptions,
 			 &argc,
-			 qApp->argv() );
+			 tqApp->argv() );
     d->hookMeUp();
 }
 
@@ -352,7 +352,7 @@ void QXtEventLoop::unregisterWidget( TQWidget* w )
 void qmotif_socknot_handler( XtPointer pointer, int *, XtInputId *id )
 {
     QXtEventLoop *eventloop = (QXtEventLoop *) pointer;
-    TQSocketNotifier *socknot = static_d->socknotDict.find( *id );
+    TQSocketNotifier *socknot = static_d->socknotDict.tqfind( *id );
     if ( ! socknot ) // this shouldn't happen
 	return;
     eventloop->setSocketNotifierPending( socknot );
@@ -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 repaints... these
+    // Qt uses posted events to do lots of delayed operations, like tqrepaints... these
     // need to be delivered before we go to sleep
     TQApplication::sendPostedEvents();
 
diff --git a/nsplugins/viewer/qxteventloop.h b/nsplugins/viewer/qxteventloop.h
index 02ed69541..31351f201 100644
--- a/nsplugins/viewer/qxteventloop.h
+++ b/nsplugins/viewer/qxteventloop.h
@@ -38,7 +38,7 @@
 
 #include <tqglobal.h>
 
-#if QT_VERSION >= 0x030100
+// #if QT_VERSION >= 0x030100
 #include <tqeventloop.h>
 
 
@@ -47,9 +47,10 @@
 
 class QXtEventLoopPrivate;
 
-class QXtEventLoop : public QEventLoop
+class QXtEventLoop : public TQEventLoop
 {
     Q_OBJECT
+    TQ_OBJECT
 
 public:
     QXtEventLoop( const char *applicationClass, XtAppContext context = NULL, XrmOptionDescRec *options = 0, int numOptions = 0);
@@ -75,6 +76,6 @@ private:
 
 };
 
-#endif
+// #endif
 
 #endif // QMOTIF_H
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index ba14b0990..e15b52eb0 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -286,7 +286,7 @@ int main(int argc, char** argv)
    }
 
    kdDebug(1430) << "6 - dcop->registerAs" << endl;
-   if (g_dcopId)
+   if (g_dcopId != 0)
       g_dcopId = dcop->registerAs( g_dcopId, false );
    else
       g_dcopId = dcop->registerAs("nspluginviewer");