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, 18 insertions, 18 deletions

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 <qstring.h>
-#include <qfile.h>
-#include <qimage.h>
-#include <qvaluevector.h>
+#include <tqstring.h>
+#include <tqfile.h>
+#include <tqimage.h>
+#include <tqvaluevector.h>
 #include <kcombobox.h>
 
 #include "videoinput.h"
@@ -191,7 +191,7 @@ struct imagebuffer
 	int height;
 	int width;
 	pixel_format pixelformat;
-	QValueVector <uchar> data; // maybe it should be a rawbuffer instead of it? It could make us avoid a memory copy
+	TQValueVector <uchar> 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<Kopete::AV::VideoInput> m_input;
-	QValueVector<Kopete::AV::VideoControl> m_control;
-//	QFile file;
+	TQValueVector<Kopete::AV::VideoInput> m_input;
+	TQValueVector<Kopete::AV::VideoControl> m_control;
+//	TQFile file;
 protected:
 	int currentwidth, minwidth, maxwidth, currentheight, minheight, maxheight;
 
 	bool m_disablemmap;
 	bool m_workaroundbrokendriver;
 
-	QValueVector<rawbuffer> m_rawbuffers;
+	TQValueVector<rawbuffer> m_rawbuffers;
 	unsigned int m_streambuffers;
 	imagebuffer m_currentbuffer;
 	int m_buffer_size;