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

7 files changed, 34 insertions, 33 deletions

diff --git a/kopete/libkopete/avdevice/kxv.cpp b/kopete/libkopete/avdevice/kxv.cpp
index f573bd50..33ea9391 100644
--- a/kopete/libkopete/avdevice/kxv.cpp
+++ b/kopete/libkopete/avdevice/kxv.cpp
@@ -338,7 +338,7 @@ KXvDevice::KXvDevice()
     xv_attr = NULL;
     xv_port = -1;
     xv_encoding = -1;
-    xv_name = TQString::null;
+    xv_name = TQString();
     xv_type = -1;
     xv_adaptor = -1;
     _shm = false;
diff --git a/kopete/libkopete/avdevice/qvideo.cpp b/kopete/libkopete/avdevice/qvideo.cpp
index d8d91602..a85589ab 100644
--- a/kopete/libkopete/avdevice/qvideo.cpp
+++ b/kopete/libkopete/avdevice/qvideo.cpp
@@ -64,7 +64,7 @@ unsigned int QVideo::bytesppForFormat(ImageFormat fmt)
 bool QVideo::findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& bitsperpixel, int& bytesperpixel)
 {
     XVisualInfo *vi_in, vi_out;
-    long mask = VisualScreenMask;
+    long tqmask = VisualScreenMask;
     int  nvis = 0;
 
     ImageFormat p = FORMAT_NONE;
@@ -72,7 +72,7 @@ bool QVideo::findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& b
     int d         = 0;
     
 	vi_out.screen = TQPaintDevice::x11AppScreen();
-	vi_in         = XGetVisualInfo(qt_xdisplay(), mask, &vi_out, &nvis);
+	vi_in         = XGetVisualInfo(qt_xdisplay(), tqmask, &vi_out, &nvis);
 
 	if (vi_in) {
 		for (int i = 0; i < nvis; i++) {
diff --git a/kopete/libkopete/avdevice/qvideo.h b/kopete/libkopete/avdevice/qvideo.h
index d49fecbf..5b27f31a 100644
--- a/kopete/libkopete/avdevice/qvideo.h
+++ b/kopete/libkopete/avdevice/qvideo.h
@@ -24,8 +24,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef QVIDEO_H
-#define QVIDEO_H
+#ifndef TQVIDEO_H
+#define TQVIDEO_H
 
 class QVideo
 {
@@ -64,5 +64,5 @@ public:
     static bool findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& bitsperpixel, int& bytesperpixel);
 };
 
-#endif //QVIDEO_H
+#endif //TQVIDEO_H
 
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);
 
diff --git a/kopete/libkopete/avdevice/qvideostream.h b/kopete/libkopete/avdevice/qvideostream.h
index 24b7fb40..90df7131 100644
--- a/kopete/libkopete/avdevice/qvideostream.h
+++ b/kopete/libkopete/avdevice/qvideostream.h
@@ -21,8 +21,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _QVIDEOSTREAM_H
-#define _QVIDEOSTREAM_H
+#ifndef _TQVIDEOSTREAM_H
+#define _TQVIDEOSTREAM_H
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -44,6 +44,7 @@ class QVideoStreamPrivate;
 class QVideoStream : public TQObject, public QVideo
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	QVideoStream(TQWidget *widget, const char* name = 0);
diff --git a/kopete/libkopete/avdevice/videodevice.cpp b/kopete/libkopete/avdevice/videodevice.cpp
index 00ab8266..ea235441 100644
--- a/kopete/libkopete/avdevice/videodevice.cpp
+++ b/kopete/libkopete/avdevice/videodevice.cpp
@@ -71,7 +71,7 @@ void VideoDevice::enumerateMenu (void)
 	{
 		if (0 == xioctl (VIDIOC_QUERYMENU, &querymenu))
 		{
-			kdDebug(14010) <<  k_funcinfo << "  " << TQString::fromLocal8Bit((const char*)querymenu.name) << endl;
+			kdDebug(14010) <<  k_funcinfo << "  " << TQString(TQString::fromLocal8Bit((const char*)querymenu.name)) << endl;
                 }
 		else
 		{
@@ -301,7 +301,7 @@ for (currentid = V4L2_CID_BASE; currentid < V4L2_CID_LASTP1; currentid++)
 			continue;
 
 //kdDebug(14010) <<  k_funcinfo << " Control: " << TQString::fromLocal8Bit((const char*)queryctrl.name) << endl;
-kdDebug(14010) <<  k_funcinfo << " Control: " << TQString::fromLocal8Bit((const char*)queryctrl.name) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl;
+kdDebug(14010) <<  k_funcinfo << " Control: " << TQString(TQString::fromLocal8Bit((const char*)queryctrl.name)) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl;
 
 /*		switch (queryctrl.type)
 		{
@@ -332,7 +332,7 @@ for (currentid = V4L2_CID_PRIVATE_BASE;; currentid++)
 		if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED)
 			continue;
 
-kdDebug(14010) <<  k_funcinfo << " Control: " << TQString::fromLocal8Bit((const char*)queryctrl.name) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl;
+kdDebug(14010) <<  k_funcinfo << " Control: " << TQString(TQString::fromLocal8Bit((const char*)queryctrl.name)) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl;
 
 		if (queryctrl.type == V4L2_CTRL_TYPE_MENU)
 			enumerateMenu ();
@@ -1336,7 +1336,7 @@ int VideoDevice::getImage(TQImage *qimage)
 					if (b<0) b=0;   if (b>255) b=255;
 
 					uint *p = (uint*)qimage->scanLine(y)+x;
-					*p = qRgba(r,g,b,255);
+					*p = tqRgba(r,g,b,255);
 
 				}
 // Jump to next line
diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp
index 39f6a7c7..1107a54d 100644
--- a/kopete/libkopete/avdevice/videodevicepool.cpp
+++ b/kopete/libkopete/avdevice/videodevicepool.cpp
@@ -414,7 +414,7 @@ int VideoDevicePool::getFrame()
 }
 
 /*!
-    \fn VideoDevicePool::getQImage(TQImage *qimage)
+    \fn VideoDevicePool::getTQImage(TQImage *qimage)
  */
 int VideoDevicePool::getImage(TQImage *qimage)
 {
@@ -623,7 +623,7 @@ int VideoDevicePool::scanDevices()
         videodevice_dir.setSorting( TQDir::Name );
 
 	kdDebug(14010) <<  k_funcinfo << "Looking for devices in " << videodevice_dir_path << endl;
-	const QFileInfoList *list = videodevice_dir.entryInfoList();
+	const TQFileInfoList *list = videodevice_dir.entryInfoList();
 
 	if (!list)
 	{
@@ -639,7 +639,7 @@ int VideoDevicePool::scanDevices()
         	videodevice_dir.setSorting( TQDir::Name );
 
 		kdDebug(14010) <<  k_funcinfo << "Looking for devices in " << videodevice_dir_path << endl;
-		const QFileInfoList *list = videodevice_dir.entryInfoList();
+		const TQFileInfoList *list = videodevice_dir.entryInfoList();
 
 		if (!list)
 		{
@@ -647,7 +647,7 @@ int VideoDevicePool::scanDevices()
 			return EXIT_FAILURE;
 		}
 
-		QFileInfoListIterator fileiterator ( *list );
+		TQFileInfoListIterator fileiterator ( *list );
 		TQFileInfo *fileinfo;
 
 		kdDebug(14010) <<  k_funcinfo << "scanning devices in " << videodevice_dir_path << "..." << endl;
@@ -655,7 +655,7 @@ int VideoDevicePool::scanDevices()
 		{
 			videodevice.setFileName(fileinfo->absFilePath());
 			kdDebug(14010) <<  k_funcinfo << "Found device " << videodevice.full_filename << endl;
-			videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using QFile
+			videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using TQFile
 			if(videodevice.isOpen())
 			{
 				kdDebug(14010) <<  k_funcinfo << "File " << videodevice.full_filename << " was opened successfuly" << endl;
@@ -675,7 +675,7 @@ int VideoDevicePool::scanDevices()
 		return EXIT_SUCCESS;
 
 	}
-	QFileInfoListIterator fileiterator ( *list );
+	TQFileInfoListIterator fileiterator ( *list );
 	TQFileInfo *fileinfo;
 
 	kdDebug(14010) <<  k_funcinfo << "scanning devices in " << videodevice_dir_path << "..." << endl;
@@ -683,7 +683,7 @@ int VideoDevicePool::scanDevices()
 	{
 		videodevice.setFileName(fileinfo->absFilePath());
 		kdDebug(14010) <<  k_funcinfo << "Found device " << videodevice.full_filename << endl;
-		videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using QFile
+		videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using TQFile
 		if(videodevice.isOpen())
 		{
 			kdDebug(14010) <<  k_funcinfo << "File " << videodevice.full_filename << " was opened successfuly" << endl;
@@ -760,7 +760,7 @@ void VideoDevicePool::loadConfig()
 	{
 		KConfig *config = KGlobal::config();
 		config->setGroup("Video Device Settings");
-		const TQString currentdevice = config->readEntry("Current Device", TQString::null);
+		const TQString currentdevice = config->readEntry("Current Device", TQString());
 		kdDebug(14010) << k_funcinfo << "Current device: " << currentdevice << endl;
 
 //		m_current_device = 0; // Must check this thing because of the fact that multiple loadConfig in other methodas can do bad things. Watch out!
@@ -833,7 +833,7 @@ void VideoDevicePool::saveConfig()
 		}
 */
 // Stores what is the current video device in use
-		const TQString currentdevice = TQString::fromLocal8Bit ( "Model %1 Device %2" ) .arg(m_videodevice[m_current_device].m_model) .arg(m_videodevice[m_current_device].m_modelindex);
+		const TQString currentdevice = TQString(TQString::fromLocal8Bit ( "Model %1 Device %2" )) .tqarg(m_videodevice[m_current_device].m_model) .tqarg(m_videodevice[m_current_device].m_modelindex);
 		config->writeEntry( "Current Device", currentdevice);
 
 		VideoDeviceVector::iterator vditerator;