From 9a3f0aacd44fb866833ebcb852df3cd31475cb33 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/usbview/kcmusb.cpp | 8 ++++---- kcontrol/usbview/usbdevices.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kcontrol/usbview') diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp index 8d85b2fb5..5939e5997 100644 --- a/kcontrol/usbview/kcmusb.cpp +++ b/kcontrol/usbview/kcmusb.cpp @@ -104,7 +104,7 @@ static void delete_recursive( TQListViewItem *item, const TQIntDicttext(1).toUInt())) { + if (!new_items.find(it.current()->text(1).toUInt())) { delete_recursive( it.current()->firstChild(), new_items); delete it.current(); } @@ -133,7 +133,7 @@ void USBViewer::refresh() TQ_UINT32 k = key(*it.current()); if (level == 0) { - TQListViewItem *item = _items.tqfind(k); + TQListViewItem *item = _items.find(k); if (!item) { item = new TQListViewItem(_devices, it.current()->product(), @@ -144,10 +144,10 @@ void USBViewer::refresh() } else { - TQListViewItem *parent = new_items.tqfind(key_parent(*it.current())); + TQListViewItem *parent = new_items.find(key_parent(*it.current())); if (parent) { - TQListViewItem *item = _items.tqfind(k); + TQListViewItem *item = _items.find(k); if (!item) { item = new TQListViewItem(parent, diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp index 74fcf3609..440a87edc 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).tqcontains(':')) + if ((*it).contains(':')) 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.tqreplace(TQRegExp("^\n"),""); - while ((end = result.tqfind('\n', start)) > 0) + result.replace(TQRegExp("^\n"),""); + while ((end = result.find('\n', start)) > 0) { TQString line = result.mid(start, end-start); -- cgit v1.2.1