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

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)
 	{