summaryrefslogtreecommitdiffstats
path: root/kcontrol/usbview
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kcontrol/usbview
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/usbview')
-rw-r--r--kcontrol/usbview/kcmusb.cpp18
-rw-r--r--kcontrol/usbview/usbdevices.cpp10
2 files changed, 14 insertions, 14 deletions
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index f3a5a85df..8d85b2fb5 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -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);
@@ -87,12 +87,12 @@ void USBViewer::load()
refresh();
}
-static Q_UINT32 key( USBDevice &dev )
+static TQ_UINT32 key( USBDevice &dev )
{
return dev.bus()*256 + dev.device();
}
-static Q_UINT32 key_parent( USBDevice &dev )
+static TQ_UINT32 key_parent( USBDevice &dev )
{
return dev.bus()*256 + dev.parent();
}
@@ -104,7 +104,7 @@ static void delete_recursive( TQListViewItem *item, const TQIntDict<TQListViewIt
TQListViewItemIterator it( item );
while ( it.current() ) {
- if (!new_items.find(it.current()->text(1).toUInt())) {
+ if (!new_items.tqfind(it.current()->text(1).toUInt())) {
delete_recursive( it.current()->firstChild(), new_items);
delete it.current();
}
@@ -130,10 +130,10 @@ void USBViewer::refresh()
for ( ; it.current(); ++it)
if (it.current()->level() == level)
{
- Q_UINT32 k = key(*it.current());
+ TQ_UINT32 k = key(*it.current());
if (level == 0)
{
- TQListViewItem *item = _items.find(k);
+ TQListViewItem *item = _items.tqfind(k);
if (!item) {
item = new TQListViewItem(_devices,
it.current()->product(),
@@ -144,10 +144,10 @@ void USBViewer::refresh()
}
else
{
- TQListViewItem *parent = new_items.find(key_parent(*it.current()));
+ TQListViewItem *parent = new_items.tqfind(key_parent(*it.current()));
if (parent)
{
- TQListViewItem *item = _items.find(k);
+ TQListViewItem *item = _items.tqfind(k);
if (!item) {
item = new TQListViewItem(parent,
@@ -178,7 +178,7 @@ void USBViewer::selectionChanged(TQListViewItem *item)
{
if (item)
{
- Q_UINT32 busdev = item->text(1).toUInt();
+ TQ_UINT32 busdev = item->text(1).toUInt();
USBDevice *dev = USBDevice::find(busdev>>8, busdev&255);
if (dev)
{
diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp
index 466fd9a98..63a049742 100644
--- a/kcontrol/usbview/usbdevices.cpp
+++ b/kcontrol/usbview/usbdevices.cpp
@@ -103,7 +103,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, TQString dname)
TQStringList list = dir.entryList();
for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
- if ((*it).contains(':'))
+ if ((*it).tqcontains(':'))
continue;
USBDevice* dev = new USBDevice();
@@ -277,8 +277,8 @@ bool USBDevice::parse(TQString fname)
// read in the device infos
USBDevice *device = 0;
int start=0, end;
- result.replace(TQRegExp("^\n"),"");
- while ((end = result.find('\n', start)) > 0)
+ result.tqreplace(TQRegExp("^\n"),"");
+ while ((end = result.tqfind('\n', start)) > 0)
{
TQString line = result.mid(start, end-start);
@@ -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;