Trinity Qt initial conversion

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

1 files changed, 16 insertions, 16 deletions

diff --git a/kopete/libkopete/avdevice/kxv.cpp b/kopete/libkopete/avdevice/kxv.cpp
index 942a823b..f573bd50 100644
--- a/kopete/libkopete/avdevice/kxv.cpp
+++ b/kopete/libkopete/avdevice/kxv.cpp
@@ -21,8 +21,8 @@
 
 #include <assert.h>
 
-#include <qwindowdefs.h>
-#include <qwidget.h>
+#include <tqwindowdefs.h>
+#include <tqwidget.h>
 
 #include <kdebug.h>
 
@@ -177,7 +177,7 @@ bool KXv::init(Drawable d)
 #endif
 }
 
-bool KXvDevice::grabStill(QImage* /*pix*/, int /*dw*/, int /*dh*/)
+bool KXvDevice::grabStill(TQImage* /*pix*/, int /*dw*/, int /*dh*/)
 {
 #ifndef HAVE_LIBXV
     return false;
@@ -186,14 +186,14 @@ bool KXvDevice::grabStill(QImage* /*pix*/, int /*dw*/, int /*dh*/)
 #endif
 }
 
-int KXvDevice::displayImage(QWidget *widget, const unsigned char *const data, int w, int h, int dw, int dh)
+int KXvDevice::displayImage(TQWidget *widget, const unsigned char *const data, int w, int h, int dw, int dh)
 {
     if (!widget)
         return -1;
     return displayImage(widget->winId(), data, w, h, 0, 0, w, h, dw, dh);
 }
 
-int KXvDevice::displayImage(QWidget *widget, const unsigned char *const data, int w, int h, int x, int y, int sw, int sh, int dw, int dh)
+int KXvDevice::displayImage(TQWidget *widget, const unsigned char *const data, int w, int h, int x, int y, int sw, int sh, int dw, int dh)
 {
     if (!widget)
         return -1;
@@ -255,7 +255,7 @@ int KXvDevice::displayImage(Window win, const unsigned char *const data, int w,
 }
 
 
-bool KXvDevice::startVideo(QWidget *w, int dw, int dh)
+bool KXvDevice::startVideo(TQWidget *w, int dw, int dh)
 {
     if (!w) return false;
     return startVideo(w->winId(), dw, dh);
@@ -338,7 +338,7 @@ KXvDevice::KXvDevice()
     xv_attr = NULL;
     xv_port = -1;
     xv_encoding = -1;
-    xv_name = QString::null;
+    xv_name = TQString::null;
     xv_type = -1;
     xv_adaptor = -1;
     _shm = false;
@@ -443,7 +443,7 @@ bool KXvDevice::init()
     kdDebug() << "Image formats for port " << xv_port << endl;
     for (int i = 0; i < xv_formats; i++) {
         assert(fo);
-        QString imout;
+        TQString imout;
         imout.sprintf("   0x%x (%c%c%c%c) %s",
                       fo[i].id,
                       fo[i].id        & 0xff,
@@ -463,7 +463,7 @@ bool KXvDevice::init()
 }
 
 
-bool KXvDevice::supportsWidget(QWidget *w)
+bool KXvDevice::supportsWidget(TQWidget *w)
 {
 #ifndef HAVE_LIBXV
     return false;
@@ -509,7 +509,7 @@ const KXvDeviceAttributes& KXvDevice::attributes()
 }
 
 
-bool KXvDevice::getAttributeRange(const QString& attribute, int *min, int *max)
+bool KXvDevice::getAttributeRange(const TQString& attribute, int *min, int *max)
 {
     for (KXvDeviceAttribute *at = _attrs.first(); at != NULL; at = _attrs.next()) {
         if (at->name == attribute) {
@@ -522,7 +522,7 @@ bool KXvDevice::getAttributeRange(const QString& attribute, int *min, int *max)
 }
 
 
-bool KXvDevice::getAttribute(const QString& attribute, int *val)
+bool KXvDevice::getAttribute(const TQString& attribute, int *val)
 {
 #ifndef HAVE_LIBXV
     return false;
@@ -539,7 +539,7 @@ bool KXvDevice::getAttribute(const QString& attribute, int *val)
 }
 
 
-bool KXvDevice::setAttribute(const QString& attribute, int val)
+bool KXvDevice::setAttribute(const TQString& attribute, int val)
 {
 #ifndef HAVE_LIBXV
     return false;
@@ -556,7 +556,7 @@ bool KXvDevice::setAttribute(const QString& attribute, int val)
 }
 
 
-const QString& KXvDevice::name() const
+const TQString& KXvDevice::name() const
 {
     return xv_name;
 }
@@ -567,12 +567,12 @@ int KXvDevice::port() const
     return xv_port;
 }
 
-const QStringList& KXvDevice::encodings() const
+const TQStringList& KXvDevice::encodings() const
 {
     return _encodingList;
 }
 
-bool KXvDevice::encoding(QString& encoding)
+bool KXvDevice::encoding(TQString& encoding)
 {
 #ifndef HAVE_LIBXV
     return false;
@@ -591,7 +591,7 @@ bool KXvDevice::encoding(QString& encoding)
 #endif
 }
 
-bool KXvDevice::setEncoding(const QString& e)
+bool KXvDevice::setEncoding(const TQString& e)
 {
 #ifdef HAVE_LIBXV
     for (unsigned int i = 0; i < xv_encodings; i++) {