From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: 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 --- kcontrol/usbview/kcmusb.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kcontrol/usbview/kcmusb.cpp') 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 TQIntDicttext(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) { -- cgit v1.2.1