From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/libkopete/avdevice/kxv.cpp | 32 ++++----- kopete/libkopete/avdevice/kxv.h | 40 +++++------ kopete/libkopete/avdevice/qvideo.cpp | 4 +- kopete/libkopete/avdevice/qvideostream.cpp | 82 +++++++++++----------- kopete/libkopete/avdevice/qvideostream.h | 24 +++---- kopete/libkopete/avdevice/videocontrol.h | 6 +- kopete/libkopete/avdevice/videodevice.cpp | 44 ++++++------ kopete/libkopete/avdevice/videodevice.h | 36 +++++----- kopete/libkopete/avdevice/videodevicemodelpool.cpp | 2 +- kopete/libkopete/avdevice/videodevicemodelpool.h | 10 +-- kopete/libkopete/avdevice/videodevicepool.cpp | 78 ++++++++++---------- kopete/libkopete/avdevice/videodevicepool.h | 16 ++--- kopete/libkopete/avdevice/videoinput.h | 8 +-- 13 files changed, 191 insertions(+), 191 deletions(-) (limited to 'kopete/libkopete/avdevice') 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 -#include -#include +#include +#include #include @@ -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++) { diff --git a/kopete/libkopete/avdevice/kxv.h b/kopete/libkopete/avdevice/kxv.h index 6f7602bf..8b3e14dd 100644 --- a/kopete/libkopete/avdevice/kxv.h +++ b/kopete/libkopete/avdevice/kxv.h @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include class QWidget; class QImage; @@ -35,7 +35,7 @@ class KXvPrivate; class KXvDevice; class KXvDevicePrivate; -typedef QPtrList KXvDeviceList; +typedef TQPtrList KXvDeviceList; class KXv @@ -81,7 +81,7 @@ private: class KXvDeviceAttribute { public: - QString name; + TQString name; int min; int max; int flags; @@ -89,7 +89,7 @@ public: Atom atom(); }; -typedef QPtrList KXvDeviceAttributes; +typedef TQPtrList KXvDeviceAttributes; class KXvDevice @@ -108,41 +108,41 @@ public: /* * return the range for a given attribute */ - bool getAttributeRange(const QString& attribute, int *min, int *max); + bool getAttributeRange(const TQString& attribute, int *min, int *max); /* * get the current value of a given attribute */ - bool getAttribute(const QString& attribute, int *val); + bool getAttribute(const TQString& attribute, int *val); /* * set the current value of a given attribute */ - bool setAttribute(const QString& attribute, int val); + bool setAttribute(const TQString& attribute, int val); - bool grabStill(QImage *pix, int dw, int dh); + bool grabStill(TQImage *pix, int dw, int dh); /* * True if this device can operate on the given widget */ - bool supportsWidget(QWidget *w); + bool supportsWidget(TQWidget *w); /* * Display the given image with Xv. */ - int displayImage(QWidget *widget, const unsigned char *const data, int w, int h, int dw, int dh); + int displayImage(TQWidget *widget, const unsigned char *const data, int w, int h, int dw, int dh); int displayImage(Window win, const unsigned char *const data, int w, int h, int dw, int dh); /* * Display a portion of the given image with Xv. */ - int 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 displayImage(TQWidget *widget, const unsigned char *const data, int w, int h, int x, int y, int sw, int sh, int dw, int dh); int displayImage(Window win, const unsigned char *const data, int w, int h, int x, int y, int sw, int sh, int dw, int dh); /* * Start a video stream in widget w, width dw, height dh */ - bool startVideo(QWidget *w, int dw, int dh); + bool startVideo(TQWidget *w, int dw, int dh); bool startVideo(Window w, int dw, int dh); /* @@ -168,7 +168,7 @@ public: /* * Name of the device */ - const QString& name() const; + const TQString& name() const; /* * The Xv port for this device @@ -178,17 +178,17 @@ public: /* * The list of encodings/norms available */ - const QStringList& encodings() const; + const TQStringList& encodings() const; /* * get encoding */ - bool encoding(QString& encoding); + bool encoding(TQString& encoding); /* * Set the encoding to the given one. This should be taken from the list. */ - bool setEncoding(const QString& e); + bool setEncoding(const TQString& e); /* * Set the image format. (ex YUV) @@ -218,7 +218,7 @@ protected: KXvDeviceAttributes _attrs; int xv_type, xv_adaptor; - QString xv_name; + TQString xv_name; int xv_port; unsigned int xv_encodings; int xv_encoding; @@ -228,7 +228,7 @@ protected: GC xv_gc; Window xv_last_win; - QStringList _encodingList; + TQStringList _encodingList; int xv_formats; void *xv_formatvalues; diff --git a/kopete/libkopete/avdevice/qvideo.cpp b/kopete/libkopete/avdevice/qvideo.cpp index 8d153e58..d8d91602 100644 --- a/kopete/libkopete/avdevice/qvideo.cpp +++ b/kopete/libkopete/avdevice/qvideo.cpp @@ -27,7 +27,7 @@ #include "qvideo.h" #include -#include +#include #include #include @@ -71,7 +71,7 @@ bool QVideo::findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& b int bpp = 0; int d = 0; - vi_out.screen = QPaintDevice::x11AppScreen(); + vi_out.screen = TQPaintDevice::x11AppScreen(); vi_in = XGetVisualInfo(qt_xdisplay(), mask, &vi_out, &nvis); if (vi_in) { diff --git a/kopete/libkopete/avdevice/qvideostream.cpp b/kopete/libkopete/avdevice/qvideostream.cpp index 18773946..05bbf209 100644 --- a/kopete/libkopete/avdevice/qvideostream.cpp +++ b/kopete/libkopete/avdevice/qvideostream.cpp @@ -20,9 +20,9 @@ */ #include "qvideostream.h" -#include -#include -#include +#include +#include +#include #include #include "kxv.h" @@ -43,30 +43,30 @@ extern "C" { class QVideoStreamGLWidget : public QGLWidget { public: - QVideoStreamGLWidget(QWidget* parent = 0, const char* name = 0); + QVideoStreamGLWidget(TQWidget* parent = 0, const char* name = 0); virtual ~QVideoStreamGLWidget(); - void setInputSize(const QSize& sz); + void setInputSize(const TQSize& sz); void display(const unsigned char *const img, int x, int y, int sw, int sh); private: virtual void resizeGL(int w, int h); void initializeGL(); - virtual bool eventFilter( QObject *o, QEvent *e ); - void calc(QPoint& p, QPoint& v); + virtual bool eventFilter( TQObject *o, TQEvent *e ); + void calc(TQPoint& p, TQPoint& v); - QSize _inputSize; + TQSize _inputSize; GLuint _tex; int _tw, _th; - QWidget* _w; + TQWidget* _w; int _maxGL; - QSize _sz; + TQSize _sz; bool _glfun; - QPoint _ul, _ur, _ll, _lr; - QPoint _vul, _vur, _vll, _vlr; - QTimer* _glfunTimer; + TQPoint _ul, _ur, _ll, _lr; + TQPoint _vul, _vur, _vll, _vlr; + TQTimer* _glfunTimer; }; #endif @@ -98,8 +98,8 @@ QVideoStreamPrivate::~QVideoStreamPrivate() delete xvHandle; } -QVideoStream::QVideoStream(QWidget *widget, const char* name) - : QObject(widget, name), +QVideoStream::QVideoStream(TQWidget *widget, const char* name) + : TQObject(widget, name), d(new QVideoStreamPrivate), _w(widget), _methods(METHOD_NONE), @@ -127,7 +127,7 @@ QVideoStream::QVideoStream(QWidget *widget, const char* name) } #ifdef HAVE_GL - if (QGLFormat::hasOpenGL()) { + if (TQGLFormat::hasOpenGL()) { _methods = (VideoMethod)(_methods | METHOD_GL); } #endif @@ -309,7 +309,7 @@ QVideo::VideoMethod QVideoStream::setMethod(VideoMethod method) return _method; } -QSize QVideoStream::maxSize() const +TQSize QVideoStream::maxSize() const { return _size; } @@ -324,7 +324,7 @@ int QVideoStream::maxHeight() const return _size.height(); } -QSize QVideoStream::size() const +TQSize QVideoStream::size() const { return _size; } @@ -339,7 +339,7 @@ int QVideoStream::height() const return _size.height(); } -QSize QVideoStream::setSize(const QSize& sz) +TQSize QVideoStream::setSize(const TQSize& sz) { _size = sz; return _size; @@ -365,7 +365,7 @@ int QVideoStream::setHeight(int height) return _size.height(); } -QSize QVideoStream::inputSize() const +TQSize QVideoStream::inputSize() const { return _inputSize; } @@ -380,7 +380,7 @@ int QVideoStream::inputHeight() const return _inputSize.height(); } -QSize QVideoStream::setInputSize(const QSize& sz) +TQSize QVideoStream::setInputSize(const TQSize& sz) { if (sz == _inputSize) return _inputSize; @@ -532,19 +532,19 @@ QVideoStream& QVideoStream::operator<<(const unsigned char *const img) // --------------------------------------------------------------------------------------- #ifdef HAVE_GL -QVideoStreamGLWidget::QVideoStreamGLWidget(QWidget* parent, const char* name) - : QGLWidget(QGLFormat(QGL::DoubleBuffer | QGL::Rgba | QGL::DirectRendering), parent, name), +QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* parent, const char* name) + : TQGLWidget(TQGLFormat(TQGL::DoubleBuffer | TQGL::Rgba | TQGL::DirectRendering), parent, name), _tex(0), _w(parent), _glfun(false) { kdDebug() << "QVideoStreamGLWidget::QVideoStreamGLWidget()" << endl; - connect(_w, SIGNAL(resized(int, int)), - this, SLOT(resize(int, int))); + connect(_w, TQT_SIGNAL(resized(int, int)), + this, TQT_SLOT(resize(int, int))); topLevelWidget()->installEventFilter(this); - _glfunTimer = new QTimer(); + _glfunTimer = new TQTimer(); } QVideoStreamGLWidget::~QVideoStreamGLWidget() @@ -558,12 +558,12 @@ QVideoStreamGLWidget::~QVideoStreamGLWidget() } } -bool QVideoStreamGLWidget::eventFilter(QObject*, QEvent* e) +bool QVideoStreamGLWidget::eventFilter(TQObject*, TQEvent* e) { - // For some reason, KeyPress does not work (yields 2), QEvent::KeyPress is unknown... What the f...???? + // 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) { - QKeyEvent* ke = static_cast(e); + TQKeyEvent* ke = static_cast(e); if(ke->key() == Qt::Key_Pause) { _glfunTimer->start(500, true); } else if (_glfunTimer->isActive() && (ke->key() == Qt::Key_Escape)) { @@ -578,7 +578,7 @@ void QVideoStreamGLWidget::initializeGL() kdDebug() << "QVideoStreamGLWidget::initializeGL()" << endl; setAutoBufferSwap(false); - QGLFormat f = format(); + TQGLFormat f = format(); glGetIntegerv(GL_MAX_TEXTURE_SIZE, &_maxGL); kdDebug() << "OpenGL capabilities (* = required):" << endl; kdDebug() << " Valid context*: " << isValid() << endl; @@ -598,15 +598,15 @@ void QVideoStreamGLWidget::initializeGL() glShadeModel(GL_FLAT); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - _vul = QPoint( 4, 10); - _vur = QPoint(-8, 4); - _vll = QPoint(10, -4); - _vlr = QPoint(-8, -10); + _vul = TQPoint( 4, 10); + _vur = TQPoint(-8, 4); + _vll = TQPoint(10, -4); + _vlr = TQPoint(-8, -10); } void QVideoStreamGLWidget::resizeGL(int w, int h) { - _sz = QSize(w, h); + _sz = TQSize(w, h); glViewport(0, 0, w, h); glMatrixMode(GL_PROJECTION); @@ -615,13 +615,13 @@ void QVideoStreamGLWidget::resizeGL(int w, int h) glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - _ul = QPoint(0, 0); - _ur = QPoint(w, 0); - _ll = QPoint(0, h); - _lr = QPoint(w, h); + _ul = TQPoint(0, 0); + _ur = TQPoint(w, 0); + _ll = TQPoint(0, h); + _lr = TQPoint(w, h); } -void QVideoStreamGLWidget::setInputSize(const QSize& sz) +void QVideoStreamGLWidget::setInputSize(const TQSize& sz) { makeCurrent(); @@ -705,7 +705,7 @@ void QVideoStreamGLWidget::display(const unsigned char *const img, int x, int y, glDisable(GL_TEXTURE_2D); } -void QVideoStreamGLWidget::calc(QPoint& p, QPoint& v) +void QVideoStreamGLWidget::calc(TQPoint& p, TQPoint& v) { p += v; diff --git a/kopete/libkopete/avdevice/qvideostream.h b/kopete/libkopete/avdevice/qvideostream.h index f1b0ca24..24b7fb40 100644 --- a/kopete/libkopete/avdevice/qvideostream.h +++ b/kopete/libkopete/avdevice/qvideostream.h @@ -29,11 +29,11 @@ #endif #ifdef HAVE_GL -#include +#include #include #endif -#include +#include #include "qvideo.h" class QVideoStreamPrivate; @@ -41,12 +41,12 @@ class QVideoStreamPrivate; /** * QT-style video stream driver. */ -class QVideoStream : public QObject, public QVideo +class QVideoStream : public TQObject, public QVideo { Q_OBJECT public: - QVideoStream(QWidget *widget, const char* name = 0); + QVideoStream(TQWidget *widget, const char* name = 0); ~QVideoStream(); /* output method */ @@ -55,25 +55,25 @@ public: VideoMethod setMethod(VideoMethod method); /* max output sizes */ - QSize maxSize() const; + TQSize maxSize() const; int maxWidth() const; int maxHeight() const; /* output sizes */ - QSize size() const; + TQSize size() const; int width() const; int height() const; - QSize setSize(const QSize& sz); + TQSize setSize(const TQSize& sz); int setWidth(int width); int setHeight(int height); /* input sizes */ - QSize inputSize() const; + TQSize inputSize() const; int inputWidth() const; int inputHeight() const; - QSize setInputSize(const QSize& sz); + TQSize setInputSize(const TQSize& sz); int setInputWidth(int width); int setInputHeight(int height); @@ -95,12 +95,12 @@ public slots: private: QVideoStreamPrivate* d; - QWidget* _w; + TQWidget* _w; VideoMethod _methods; // list of methods VideoMethod _method; // the current method ImageFormat _format; - QSize _size; - QSize _inputSize; + TQSize _size; + TQSize _inputSize; bool _init; ImageFormat _xFormat; diff --git a/kopete/libkopete/avdevice/videocontrol.h b/kopete/libkopete/avdevice/videocontrol.h index 2675be6e..c4db3b9d 100644 --- a/kopete/libkopete/avdevice/videocontrol.h +++ b/kopete/libkopete/avdevice/videocontrol.h @@ -30,9 +30,9 @@ #define __s64 long long #endif // __s64 -#include +#include #include -#include +#include #include "kopete_export.h" namespace Kopete { @@ -67,7 +67,7 @@ public: protected: __u32 m_id; control_type m_type; - QString m_name; + TQString m_name; __s32 m_minimum; __s32 m_maximum; __s32 m_step; diff --git a/kopete/libkopete/avdevice/videodevice.cpp b/kopete/libkopete/avdevice/videodevice.cpp index ada02ae5..00ab8266 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 << " " << QString::fromLocal8Bit((const char*)querymenu.name) << endl; + kdDebug(14010) << k_funcinfo << " " << TQString::fromLocal8Bit((const char*)querymenu.name) << endl; } else { @@ -111,9 +111,9 @@ int VideoDevice::errnoReturn(const char* s) } /*! - \fn VideoDevice::setFileName(QString name) + \fn VideoDevice::setFileName(TQString name) */ -int VideoDevice::setFileName(QString filename) +int VideoDevice::setFileName(TQString filename) { /// @todo implement me full_filename=filename; @@ -133,7 +133,7 @@ int VideoDevice::open() kdDebug(14010) << k_funcinfo << "Device is already open" << endl; return EXIT_SUCCESS; } - descriptor = ::open (QFile::encodeName(full_filename), O_RDWR, 0); + descriptor = ::open (TQFile::encodeName(full_filename), O_RDWR, 0); if(isOpen()) { kdDebug(14010) << k_funcinfo << "File " << full_filename << " was opened successfuly" << endl; @@ -200,7 +200,7 @@ int VideoDevice::checkDevice() m_videocapture=true; kdDebug(14010) << k_funcinfo << "checkDevice(): " << full_filename << " is a V4L2 device." << endl; m_driver = VIDEODEV_DRIVER_V4L2; - m_model=QString::fromLocal8Bit((const char*)V4L2_capabilities.card); + m_model=TQString::fromLocal8Bit((const char*)V4L2_capabilities.card); // Detect maximum and minimum resolution supported by the V4L2 device @@ -259,7 +259,7 @@ int VideoDevice::checkDevice() if(inputisok==EXIT_SUCCESS) { VideoInput tempinput; - tempinput.name = QString::fromLocal8Bit((const char*)videoinput.name); + tempinput.name = TQString::fromLocal8Bit((const char*)videoinput.name); tempinput.hastuner = videoinput.type & V4L2_INPUT_TYPE_TUNER; tempinput.m_standards = videoinput.std; m_input.push_back(tempinput); @@ -300,8 +300,8 @@ for (currentid = V4L2_CID_BASE; currentid < V4L2_CID_LASTP1; currentid++) if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) continue; -//kdDebug(14010) << k_funcinfo << " Control: " << QString::fromLocal8Bit((const char*)queryctrl.name) << endl; -kdDebug(14010) << k_funcinfo << " Control: " << QString::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::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; /* 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: " << QString::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::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 (); @@ -376,7 +376,7 @@ kdDebug(14010) << k_funcinfo << " Control: " << QString::fromLocal8Bit((const c { kdDebug(14010) << k_funcinfo << full_filename << " is a V4L device." << endl; m_driver = VIDEODEV_DRIVER_V4L; - m_model=QString::fromLocal8Bit((const char*)V4L_capabilities.name); + m_model=TQString::fromLocal8Bit((const char*)V4L_capabilities.name); if(V4L_capabilities.type & VID_TYPE_CAPTURE) m_videocapture=true; if(V4L_capabilities.type & VID_TYPE_CHROMAKEY) @@ -405,7 +405,7 @@ kdDebug(14010) << k_funcinfo << " Control: " << QString::fromLocal8Bit((const c if(inputisok==EXIT_SUCCESS) { VideoInput tempinput; - tempinput.name = QString::fromLocal8Bit((const char*)videoinput.name); + tempinput.name = TQString::fromLocal8Bit((const char*)videoinput.name); tempinput.hastuner=videoinput.flags & VIDEO_VC_TUNER; // TODO: The routine to detect the appropriate video standards for V4L must be placed here m_input.push_back(tempinput); @@ -1190,15 +1190,15 @@ int VideoDevice::getFrame(imagebuffer *imgbuffer) } /*! - \fn Kopete::AV::VideoDevice::getImage(const QImage *qimage) + \fn Kopete::AV::VideoDevice::getImage(const TQImage *qimage) */ -int VideoDevice::getImage(QImage *qimage) +int VideoDevice::getImage(TQImage *qimage) { /// @todo implement me // do NOT delete qimage here, as it is received as a parameter if (qimage->width() != width() || qimage->height() != height()) - qimage->create(width(), height(),32, QImage::IgnoreEndian); + qimage->create(width(), height(),32, TQImage::IgnoreEndian); uchar *bits=qimage->bits(); // kDebug() << "Capturing in " << pixelFormatName(m_currentbuffer.pixelformat); @@ -2106,9 +2106,9 @@ int VideoDevice::pixelFormatDepth(pixel_format pixelformat) return 0; } -QString VideoDevice::pixelFormatName(pixel_format pixelformat) +TQString VideoDevice::pixelFormatName(pixel_format pixelformat) { - QString returnvalue; + TQString returnvalue; returnvalue = "None"; switch(pixelformat) { @@ -2156,9 +2156,9 @@ QString VideoDevice::pixelFormatName(pixel_format pixelformat) return returnvalue; } -QString VideoDevice::pixelFormatName(int pixelformat) +TQString VideoDevice::pixelFormatName(int pixelformat) { - QString returnvalue; + TQString returnvalue; returnvalue = "None"; switch(m_driver) { @@ -2410,9 +2410,9 @@ __u64 VideoDevice::signalStandardCode(signal_standard standard) return STANDARD_NONE; } -QString VideoDevice::signalStandardName(signal_standard standard) +TQString VideoDevice::signalStandardName(signal_standard standard) { - QString returnvalue; + TQString returnvalue; returnvalue = "None"; switch(standard) { @@ -2455,9 +2455,9 @@ QString VideoDevice::signalStandardName(signal_standard standard) return returnvalue; } -QString VideoDevice::signalStandardName(int standard) +TQString VideoDevice::signalStandardName(int standard) { - QString returnvalue; + TQString returnvalue; returnvalue = "None"; switch(m_driver) { diff --git a/kopete/libkopete/avdevice/videodevice.h b/kopete/libkopete/avdevice/videodevice.h index 982ab5f3..2482c183 100644 --- a/kopete/libkopete/avdevice/videodevice.h +++ b/kopete/libkopete/avdevice/videodevice.h @@ -61,10 +61,10 @@ #endif // __linux__ -#include -#include -#include -#include +#include +#include +#include +#include #include #include "videoinput.h" @@ -191,7 +191,7 @@ struct imagebuffer int height; int width; pixel_format pixelformat; - QValueVector data; // maybe it should be a rawbuffer instead of it? It could make us avoid a memory copy + TQValueVector data; // maybe it should be a rawbuffer instead of it? It could make us avoid a memory copy }; struct rawbuffer // raw buffer { @@ -204,7 +204,7 @@ class VideoDevice{ public: VideoDevice(); ~VideoDevice(); - int setFileName(QString filename); + int setFileName(TQString filename); int open(); bool isOpen(); int checkDevice(); @@ -223,13 +223,13 @@ public: int pixelFormatCode(pixel_format pixelformat); pixel_format pixelFormatForPalette( int palette ); int pixelFormatDepth(pixel_format pixelformat); - QString pixelFormatName(pixel_format pixelformat); - QString pixelFormatName(int pixelformat); + TQString pixelFormatName(pixel_format pixelformat); + TQString pixelFormatName(int pixelformat); int detectPixelFormats(); __u64 signalStandardCode(signal_standard standard); - QString signalStandardName(signal_standard standard); - QString signalStandardName(int standard); + TQString signalStandardName(signal_standard standard); + TQString signalStandardName(int standard); int detectSignalStandards(); int currentInput(); @@ -238,7 +238,7 @@ public: int startCapturing(); int getFrame(); int getFrame(imagebuffer *imgbuffer); - int getImage(QImage *qimage); + int getImage(TQImage *qimage); int stopCapturing(); int close(); @@ -268,10 +268,10 @@ public: bool canAsyncIO(); bool canStream(); - QString m_model; - QString m_name; + TQString m_model; + TQString m_name; size_t m_modelindex; // Defines what's the number of a device when more than 1 device of a given model is present; - QString full_filename; + TQString full_filename; videodev_driver m_driver; int descriptor; @@ -292,16 +292,16 @@ void enumerateMenu (void); struct video_capability V4L_capabilities; struct video_buffer V4L_videobuffer; #endif - QValueVector m_input; - QValueVector m_control; -// QFile file; + TQValueVector m_input; + TQValueVector m_control; +// TQFile file; protected: int currentwidth, minwidth, maxwidth, currentheight, minheight, maxheight; bool m_disablemmap; bool m_workaroundbrokendriver; - QValueVector m_rawbuffers; + TQValueVector m_rawbuffers; unsigned int m_streambuffers; imagebuffer m_currentbuffer; int m_buffer_size; diff --git a/kopete/libkopete/avdevice/videodevicemodelpool.cpp b/kopete/libkopete/avdevice/videodevicemodelpool.cpp index c6fc533e..875d926b 100644 --- a/kopete/libkopete/avdevice/videodevicemodelpool.cpp +++ b/kopete/libkopete/avdevice/videodevicemodelpool.cpp @@ -40,7 +40,7 @@ size_t VideoDeviceModelPool::size() return m_devicemodel.size(); } -size_t VideoDeviceModelPool::addModel( QString newmodel ) +size_t VideoDeviceModelPool::addModel( TQString newmodel ) { VideoDeviceModel newdevicemodel; newdevicemodel.model=newmodel; diff --git a/kopete/libkopete/avdevice/videodevicemodelpool.h b/kopete/libkopete/avdevice/videodevicemodelpool.h index 54d801c4..76499033 100644 --- a/kopete/libkopete/avdevice/videodevicemodelpool.h +++ b/kopete/libkopete/avdevice/videodevicemodelpool.h @@ -18,8 +18,8 @@ #ifndef KOPETE_AVVIDEODEVICEMODELPOOL_H #define KOPETE_AVVIDEODEVICEMODELPOOL_H -#include -#include +#include +#include #include #include "kopete_export.h" @@ -34,16 +34,16 @@ class VideoDeviceModelPool{ struct VideoDeviceModel { - QString model; + TQString model; size_t count; }; - QValueVector m_devicemodel; + TQValueVector m_devicemodel; public: VideoDeviceModelPool(); ~VideoDeviceModelPool(); void clear(); size_t size(); - size_t addModel(QString newmodel); + size_t addModel(TQString newmodel); }; } diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp index 2651addb..39f6a7c7 100644 --- a/kopete/libkopete/avdevice/videodevicepool.cpp +++ b/kopete/libkopete/avdevice/videodevicepool.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include "videodevice.h" #include "videodevicepool.h" @@ -414,9 +414,9 @@ int VideoDevicePool::getFrame() } /*! - \fn VideoDevicePool::getQImage(QImage *qimage) + \fn VideoDevicePool::getQImage(TQImage *qimage) */ -int VideoDevicePool::getImage(QImage *qimage) +int VideoDevicePool::getImage(TQImage *qimage) { // kdDebug(14010) << k_funcinfo << "VideoDevicePool::getImage() called." << endl; if(m_videodevice.size()) @@ -424,7 +424,7 @@ int VideoDevicePool::getImage(QImage *qimage) else { kdDebug(14010) << k_funcinfo << "VideoDevicePool::getImage() fallback for no device." << endl; - qimage->create(m_buffer.width, m_buffer.height,32, QImage::IgnoreEndian); + qimage->create(m_buffer.width, m_buffer.height,32, TQImage::IgnoreEndian); uchar *bits=qimage->bits(); switch(m_buffer.pixelformat) { @@ -609,9 +609,9 @@ int VideoDevicePool::scanDevices() kdDebug(14010) << k_funcinfo << "called" << endl; #if defined(__linux__) && defined(ENABLE_AV) - QDir videodevice_dir; - const QString videodevice_dir_path=QString::fromLocal8Bit("/dev/v4l/"); - const QString videodevice_dir_filter=QString::fromLocal8Bit("video*"); + TQDir videodevice_dir; + const TQString videodevice_dir_path=TQString::fromLocal8Bit("/dev/v4l/"); + const TQString videodevice_dir_filter=TQString::fromLocal8Bit("video*"); VideoDevice videodevice; m_videodevice.clear(); @@ -619,8 +619,8 @@ int VideoDevicePool::scanDevices() videodevice_dir.setPath(videodevice_dir_path); videodevice_dir.setNameFilter(videodevice_dir_filter); - videodevice_dir.setFilter( QDir::System | QDir::NoSymLinks | QDir::Readable | QDir::Writable ); - videodevice_dir.setSorting( QDir::Name ); + videodevice_dir.setFilter( TQDir::System | TQDir::NoSymLinks | TQDir::Readable | TQDir::Writable ); + videodevice_dir.setSorting( TQDir::Name ); kdDebug(14010) << k_funcinfo << "Looking for devices in " << videodevice_dir_path << endl; const QFileInfoList *list = videodevice_dir.entryInfoList(); @@ -628,15 +628,15 @@ int VideoDevicePool::scanDevices() if (!list) { kdDebug(14010) << k_funcinfo << "Found no suitable devices in " << videodevice_dir_path << endl; - QDir videodevice_dir; - const QString videodevice_dir_path=QString::fromLocal8Bit("/dev/"); - const QString videodevice_dir_filter=QString::fromLocal8Bit("video*"); + TQDir videodevice_dir; + const TQString videodevice_dir_path=TQString::fromLocal8Bit("/dev/"); + const TQString videodevice_dir_filter=TQString::fromLocal8Bit("video*"); VideoDevice videodevice; videodevice_dir.setPath(videodevice_dir_path); videodevice_dir.setNameFilter(videodevice_dir_filter); - videodevice_dir.setFilter( QDir::System | QDir::NoSymLinks | QDir::Readable | QDir::Writable ); - videodevice_dir.setSorting( QDir::Name ); + videodevice_dir.setFilter( TQDir::System | TQDir::NoSymLinks | TQDir::Readable | TQDir::Writable ); + videodevice_dir.setSorting( TQDir::Name ); kdDebug(14010) << k_funcinfo << "Looking for devices in " << videodevice_dir_path << endl; const QFileInfoList *list = videodevice_dir.entryInfoList(); @@ -648,7 +648,7 @@ int VideoDevicePool::scanDevices() } QFileInfoListIterator fileiterator ( *list ); - QFileInfo *fileinfo; + TQFileInfo *fileinfo; kdDebug(14010) << k_funcinfo << "scanning devices in " << videodevice_dir_path << "..." << endl; while ( (fileinfo = fileiterator.current()) != 0 ) @@ -676,7 +676,7 @@ int VideoDevicePool::scanDevices() } QFileInfoListIterator fileiterator ( *list ); - QFileInfo *fileinfo; + TQFileInfo *fileinfo; kdDebug(14010) << k_funcinfo << "scanning devices in " << videodevice_dir_path << "..." << endl; while ( (fileinfo = fileiterator.current()) != 0 ) @@ -760,7 +760,7 @@ void VideoDevicePool::loadConfig() { KConfig *config = KGlobal::config(); config->setGroup("Video Device Settings"); - const QString currentdevice = config->readEntry("Current Device", QString::null); + const TQString currentdevice = config->readEntry("Current Device", TQString::null); 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! @@ -768,28 +768,28 @@ void VideoDevicePool::loadConfig() VideoDeviceVector::iterator vditerator; for( vditerator = m_videodevice.begin(); vditerator != m_videodevice.end(); ++vditerator ) { - const QString modelindex = QString::fromLocal8Bit ( "Model %1 Device %2") .arg ((*vditerator).m_name ) .arg ((*vditerator).m_modelindex); + const TQString modelindex = TQString::fromLocal8Bit ( "Model %1 Device %2") .arg ((*vditerator).m_name ) .arg ((*vditerator).m_modelindex); if(modelindex == currentdevice) { m_current_device = vditerator - m_videodevice.begin(); // kdDebug(14010) << k_funcinfo << "This place will be used to set " << modelindex << " as the current device ( " << (vditerator - m_videodevice.begin()) << " )." << endl; } - const QString name = config->readEntry((QString::fromLocal8Bit ( "Model %1 Device %2 Name") .arg ((*vditerator).m_name ) .arg ((*vditerator).m_modelindex)), (*vditerator).m_model); - const int currentinput = config->readNumEntry((QString::fromLocal8Bit ( "Model %1 Device %2 Current input") .arg ((*vditerator).m_name ) .arg ((*vditerator).m_modelindex)), 0); + const TQString name = config->readEntry((TQString::fromLocal8Bit ( "Model %1 Device %2 Name") .arg ((*vditerator).m_name ) .arg ((*vditerator).m_modelindex)), (*vditerator).m_model); + const int currentinput = config->readNumEntry((TQString::fromLocal8Bit ( "Model %1 Device %2 Current input") .arg ((*vditerator).m_name ) .arg ((*vditerator).m_modelindex)), 0); kdDebug(14010) << k_funcinfo << "Device name: " << name << endl; kdDebug(14010) << k_funcinfo << "Device current input: " << currentinput << endl; (*vditerator).selectInput(currentinput); for (size_t input = 0 ; input < (*vditerator).m_input.size(); input++) { - const float brightness = config->readDoubleNumEntry((QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Brightness").arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , 0.5 ); - const float contrast = config->readDoubleNumEntry((QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Contrast") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , 0.5 ); - const float saturation = config->readDoubleNumEntry((QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Saturation").arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , 0.5 ); - const float whiteness = config->readDoubleNumEntry((QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Whiteness") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , 0.5 ); - const float hue = config->readDoubleNumEntry((QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Hue") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , 0.5 ); - const bool autobrightnesscontrast = config->readBoolEntry((QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 AutoBrightnessContrast") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , false ); - const bool autocolorcorrection = config->readBoolEntry((QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 AutoColorCorrection") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , false ); - const bool imageasmirror = config->readBoolEntry((QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 mageAsMirror") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , false ); + const float brightness = config->readDoubleNumEntry((TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Brightness").arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , 0.5 ); + const float contrast = config->readDoubleNumEntry((TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Contrast") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , 0.5 ); + const float saturation = config->readDoubleNumEntry((TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Saturation").arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , 0.5 ); + const float whiteness = config->readDoubleNumEntry((TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Whiteness") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , 0.5 ); + const float hue = config->readDoubleNumEntry((TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Hue") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , 0.5 ); + const bool autobrightnesscontrast = config->readBoolEntry((TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 AutoBrightnessContrast") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , false ); + const bool autocolorcorrection = config->readBoolEntry((TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 AutoColorCorrection") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , false ); + const bool imageasmirror = config->readBoolEntry((TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 mageAsMirror") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input)) , false ); (*vditerator).setBrightness(brightness); (*vditerator).setContrast(contrast); (*vditerator).setSaturation(saturation); @@ -833,7 +833,7 @@ void VideoDevicePool::saveConfig() } */ // Stores what is the current video device in use - const QString currentdevice = QString::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::fromLocal8Bit ( "Model %1 Device %2" ) .arg(m_videodevice[m_current_device].m_model) .arg(m_videodevice[m_current_device].m_modelindex); config->writeEntry( "Current Device", currentdevice); VideoDeviceVector::iterator vditerator; @@ -843,8 +843,8 @@ void VideoDevicePool::saveConfig() kdDebug(14010) << "Model:" << (*vditerator).m_model << ":Index:" << (*vditerator).m_modelindex << ":Current input:" << (*vditerator).currentInput() << endl; // Stores current input for the given video device - const QString name = QString::fromLocal8Bit ( "Model %1 Device %2 Name") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex); - const QString currentinput = QString::fromLocal8Bit ( "Model %1 Device %2 Current input") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex); + const TQString name = TQString::fromLocal8Bit ( "Model %1 Device %2 Name") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex); + const TQString currentinput = TQString::fromLocal8Bit ( "Model %1 Device %2 Current input") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex); config->writeEntry( name, (*vditerator).m_name); config->writeEntry( currentinput, (*vditerator).currentInput()); @@ -859,14 +859,14 @@ void VideoDevicePool::saveConfig() kdDebug(14010) << "Model:" << (*vditerator).m_model << ":Index:" << (*vditerator).m_modelindex << ":Input:" << input << ":Automatic color correction : " << (*vditerator).m_input[input].getAutoColorCorrection() << endl; // Stores configuration about each channel - const QString brightness = QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Brightness") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); - const QString contrast = QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Contrast") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); - const QString saturation = QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Saturation") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); - const QString whiteness = QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Whiteness") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); - const QString hue = QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Hue") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); - const QString autobrightnesscontrast = QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 AutoBrightnessContrast") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); - const QString autocolorcorrection = QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 AutoColorCorrection") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); - const QString imageasmirror = QString::fromLocal8Bit ( "Model %1 Device %2 Input %3 ImageAsMirror") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); + const TQString brightness = TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Brightness") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); + const TQString contrast = TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Contrast") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); + const TQString saturation = TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Saturation") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); + const TQString whiteness = TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Whiteness") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); + const TQString hue = TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 Hue") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); + const TQString autobrightnesscontrast = TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 AutoBrightnessContrast") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); + const TQString autocolorcorrection = TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 AutoColorCorrection") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); + const TQString imageasmirror = TQString::fromLocal8Bit ( "Model %1 Device %2 Input %3 ImageAsMirror") .arg ((*vditerator).m_model ) .arg ((*vditerator).m_modelindex) .arg (input); config->writeEntry( brightness, (*vditerator).m_input[input].getBrightness()); config->writeEntry( contrast, (*vditerator).m_input[input].getContrast()); config->writeEntry( saturation, (*vditerator).m_input[input].getSaturation()); diff --git a/kopete/libkopete/avdevice/videodevicepool.h b/kopete/libkopete/avdevice/videodevicepool.h index 1fbdb3e1..75ed9ed4 100644 --- a/kopete/libkopete/avdevice/videodevicepool.h +++ b/kopete/libkopete/avdevice/videodevicepool.h @@ -18,16 +18,16 @@ #ifndef KOPETE_AVVIDEODEVICE_H #define KOPETE_AVVIDEODEVICE_H -#include +#include #include #include "videoinput.h" #include "videodevicemodelpool.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include "videodevice.h" #include "kopete_export.h" @@ -45,7 +45,7 @@ This class allows kopete to check for the existence, open, configure, test, set @author Cláudio da Silveira Pinheiro */ -typedef QValueVector VideoDeviceVector; +typedef TQValueVector VideoDeviceVector; class VideoDevicePoolPrivate; @@ -68,7 +68,7 @@ public: int startCapturing(); int stopCapturing(); int readFrame(); - int getImage(QImage *qimage); + int getImage(TQImage *qimage); int selectInput(int newinput); int setInputParameters(); int scanDevices(); @@ -113,7 +113,7 @@ protected: unsigned int m_current_device; struct imagebuffer m_buffer; // only used when no devices were found - QMutex m_ready; + TQMutex m_ready; private: VideoDevicePool(); static VideoDevicePool* s_self; diff --git a/kopete/libkopete/avdevice/videoinput.h b/kopete/libkopete/avdevice/videoinput.h index 3381663e..9fc109ad 100644 --- a/kopete/libkopete/avdevice/videoinput.h +++ b/kopete/libkopete/avdevice/videoinput.h @@ -28,9 +28,9 @@ #define __u64 unsigned long long #endif // __u64*/ -#include +#include #include -#include +#include #include "kopete_export.h" #include "videocontrol.h" @@ -46,7 +46,7 @@ class KOPETE_EXPORT VideoInput{ public: VideoInput(); ~VideoInput(); - QString name; + TQString name; int hastuner; __u64 m_standards; @@ -69,7 +69,7 @@ public: bool setImageAsMirror(bool imageasmirror); protected: - QValueVector m_control; + TQValueVector m_control; float m_brightness; float m_contrast; float m_saturation; -- cgit v1.2.1