From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:58:25 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
---
 kcontrol/usbview/kcmusb.cpp     | 6 +++---
 kcontrol/usbview/usbdevices.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kcontrol/usbview')

diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index d6ff42252..5939e5997 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -10,10 +10,10 @@
 
 #include <tqgroupbox.h>
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 #include <tqsplitter.h>
-#include <textview.h>
+#include <tqtextview.h>
 #include <tqtimer.h>
 
 #include <kaboutdata.h>
@@ -39,7 +39,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
   gbox->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(gbox);
 
-  TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint());
+  TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->tqlayout(), KDialog::spacingHint());
 
   TQSplitter *splitter = new TQSplitter(gbox);
   vvbox->addWidget(splitter);
diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp
index 466fd9a98..440a87edc 100644
--- a/kcontrol/usbview/usbdevices.cpp
+++ b/kcontrol/usbview/usbdevices.cpp
@@ -226,9 +226,9 @@ TQString USBDevice::dump()
 		r += i18n("<tr><td><i>Power Consumption</i></td><td>%1 mA</td></tr>").arg(_power);
 	else
 		r += i18n("<tr><td><i>Power Consumption</i></td><td>self powered</td></tr>");
-	r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.at(0));
+	r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.tqat(0));
 	if ( _devnodes.count() > 1 )
-		for ( TQStringList::Iterator it = _devnodes.at(1); it != _devnodes.end(); ++it )
+		for ( TQStringList::Iterator it = _devnodes.tqat(1); it != _devnodes.end(); ++it )
 			r += "<tr><td></td><td>" + *it + "</td></tr>";
 #else  
   r += i18n("<tr><td><i>Max. Packet Size</i></td><td>%1</td></tr>").arg(_maxPacketSize);
@@ -332,10 +332,10 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent)
 	
 	_bus          = di.udi_bus;
 	_device       = di.udi_addr;
-	_product      = TQString::fromLatin1(di.udi_product);
+	_product      = TQString::tqfromLatin1(di.udi_product);
 	if ( _device == 1 )
 		_product += " " + TQString::number( _bus );
-	_manufacturer = TQString::fromLatin1(di.udi_vendor);
+	_manufacturer = TQString::tqfromLatin1(di.udi_vendor);
 	_prodID       = di.udi_productNo;
 	_vendorID     = di.udi_vendorNo;
 	_class        = di.udi_class;
-- 
cgit v1.2.1