summaryrefslogtreecommitdiffstats
path: root/kcontrol/usbview
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/usbview')
-rw-r--r--kcontrol/usbview/kcmusb.cpp6
-rw-r--r--kcontrol/usbview/usbdevices.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index 5939e5997..d6ff42252 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -10,10 +10,10 @@
#include <tqgroupbox.h>
#include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistview.h>
#include <tqsplitter.h>
-#include <tqtextview.h>
+#include <textview.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->tqlayout(), KDialog::spacingHint());
+ TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint());
TQSplitter *splitter = new TQSplitter(gbox);
vvbox->addWidget(splitter);
diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp
index 440a87edc..466fd9a98 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.tqat(0));
+ r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.at(0));
if ( _devnodes.count() > 1 )
- for ( TQStringList::Iterator it = _devnodes.tqat(1); it != _devnodes.end(); ++it )
+ for ( TQStringList::Iterator it = _devnodes.at(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::tqfromLatin1(di.udi_product);
+ _product = TQString::fromLatin1(di.udi_product);
if ( _device == 1 )
_product += " " + TQString::number( _bus );
- _manufacturer = TQString::tqfromLatin1(di.udi_vendor);
+ _manufacturer = TQString::fromLatin1(di.udi_vendor);
_prodID = di.udi_productNo;
_vendorID = di.udi_vendorNo;
_class = di.udi_class;