TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 12 insertions, 12 deletions

diff --git a/kopete/libkopete/avdevice/qvideostream.cpp b/kopete/libkopete/avdevice/qvideostream.cpp
index 05bbf209..7f4c677d 100644
--- a/kopete/libkopete/avdevice/qvideostream.cpp
+++ b/kopete/libkopete/avdevice/qvideostream.cpp
@@ -40,10 +40,10 @@ extern "C" {
 #endif
 
 #ifdef HAVE_GL
-class QVideoStreamGLWidget : public QGLWidget
+class QVideoStreamGLWidget : public TQGLWidget
 {
 public:
-    QVideoStreamGLWidget(TQWidget* parent = 0, const char* name = 0);
+    QVideoStreamGLWidget(TQWidget* tqparent = 0, const char* name = 0);
     virtual ~QVideoStreamGLWidget();
 
     void setInputSize(const TQSize& sz);
@@ -213,7 +213,7 @@ void QVideoStream::init()
             d->shmh.shmaddr = (char *)shmat(d->shmh.shmid, 0, 0);
             d->xim->data = (char*)d->shmh.shmaddr;
             d->shmh.readOnly = False;
-            Status s = XShmAttach(_w->x11Display(), &(d->shmh));
+            tqStatus s = XShmAttach(_w->x11Display(), &(d->shmh));
             if (s) {
                 XSync(_w->x11Display(), False);
                 shmctl(d->shmh.shmid, IPC_RMID, 0);
@@ -235,7 +235,7 @@ void QVideoStream::init()
         }
         
         d->xim = XCreateImage(_w->x11Display(),
-                              (Visual*)_w->x11Visual(),
+                              (Visual*)TQT_TQPAINTDEVICE(_w)->x11Visual(),
                               _w->x11Depth(),
                               ZPixmap, 0, 0,
                               _inputSize.width(),
@@ -532,10 +532,10 @@ QVideoStream& QVideoStream::operator<<(const unsigned char *const img)
 // ---------------------------------------------------------------------------------------
 #ifdef HAVE_GL
 
-QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* parent, const char* name)
-    : TQGLWidget(TQGLFormat(TQGL::DoubleBuffer | TQGL::Rgba | TQGL::DirectRendering), parent, name),
+QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* tqparent, const char* name)
+    : TQGLWidget(TQGLFormat(TQGL::DoubleBuffer | TQGL::Rgba | TQGL::DirectRendering), tqparent, name),
       _tex(0),
-      _w(parent),
+      _w(tqparent),
       _glfun(false)
 {
     kdDebug() << "QVideoStreamGLWidget::QVideoStreamGLWidget()" << endl;
@@ -543,7 +543,7 @@ QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* parent, const char* name)
     connect(_w, TQT_SIGNAL(resized(int, int)),
             this, TQT_SLOT(resize(int, int)));
 
-    topLevelWidget()->installEventFilter(this);
+    tqtopLevelWidget()->installEventFilter(this);
     _glfunTimer = new TQTimer();
 }
 
@@ -563,10 +563,10 @@ bool QVideoStreamGLWidget::eventFilter(TQObject*, TQEvent* e)
     // For some reason, KeyPress does not work (yields 2), TQEvent::KeyPress is unknown... What the f...????
     // I am too lazy to scan the header files for the reason.
     if(e->type() == 6) {
-        TQKeyEvent* ke = static_cast<TQKeyEvent*>(e);
-        if(ke->key() == Qt::Key_Pause) {
+        TQKeyEvent* ke = TQT_TQKEYEVENT(e);
+        if(ke->key() == TQt::Key_Pause) {
             _glfunTimer->start(500, true);
-        } else if (_glfunTimer->isActive() && (ke->key() == Qt::Key_Escape)) {
+        } else if (_glfunTimer->isActive() && (ke->key() == TQt::Key_Escape)) {
             _glfun = !_glfun;
         }
     }
@@ -594,7 +594,7 @@ void QVideoStreamGLWidget::initializeGL()
     kdDebug() << "    Plane:            " << f.plane()           << endl;
     kdDebug() << "    MAX_TEXTURE_SIZE: " << _maxGL              << endl;
 
-    qglClearColor(Qt::black);
+    qglClearColor(TQt::black);
     glShadeModel(GL_FLAT);
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);