summaryrefslogtreecommitdiffstats
path: root/kcontrol/usbview
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kcontrol/usbview
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/usbview')
-rw-r--r--kcontrol/usbview/kcmusb.cpp10
-rw-r--r--kcontrol/usbview/kcmusb.desktop4
-rw-r--r--kcontrol/usbview/usb.ids18
-rw-r--r--kcontrol/usbview/usbdevices.cpp8
4 files changed, 20 insertions, 20 deletions
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index f3a5a85df..5939e5997 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();
}
@@ -130,7 +130,7 @@ 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);
@@ -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/kcmusb.desktop b/kcontrol/usbview/kcmusb.desktop
index 76729bb5d..8a0f5afb9 100644
--- a/kcontrol/usbview/kcmusb.desktop
+++ b/kcontrol/usbview/kcmusb.desktop
@@ -132,11 +132,11 @@ Comment[mk]=Видете ги USB-уредите закачени на овој
Comment[mn]=Энэ компьютерт залгагдсан USB-төхөөрөмж харуулах
Comment[ms]=Papar peranti USB yang dilekapkan pada komputer
Comment[mt]=Ara l-apparat USB imqabbad ma' dal-kompjuter
-Comment[nb]=Se hvilke USB-enheter som er koblet til denne maskinen
+Comment[nb]=Se hvilke USB-enheter som er koblet til denne tqmaskinen
Comment[nds]=de USB-Reedschappen ankieken, de dissen Reekner tokoppelt sünd
Comment[ne]=यो कम्प्युटरमा सङ्लग्न गरिएका USB यन्त्र देखाउनुहोस्
Comment[nl]=Hier kunt u de USB-apparaten die op deze computer zijn aangesloten bekijken
-Comment[nn]=Viser USB-einingane knytte til datamaskina
+Comment[nn]=Viser USB-einingane knytte til datatqmaskina
Comment[nso]=Bona maano a USB ao a kgwathisitswego go computer ye
Comment[pa]=ਇਸ ਕੰਪਿਊਟਰ ਨਾਲ ਜੁੜੇ USB ਜੰਤਰ ਵੇਖੋ
Comment[pl]=Informacja o urządzeniach USB podłączonych do tego komputera
diff --git a/kcontrol/usbview/usb.ids b/kcontrol/usbview/usb.ids
index c2d3e4da9..d05480250 100644
--- a/kcontrol/usbview/usb.ids
+++ b/kcontrol/usbview/usb.ids
@@ -1833,8 +1833,8 @@
0202 Apple Keyboard [ALPS]
0205 Apple Extended Keyboard [Mitsumi]
0206 Apple Extended Keyboard [Mitsumi]
- 020b Apple Pro Keyboard [Mitsumi, A1048/US layout]
- 020d Apple Pro Keyboard [Mitsumi, A1048/JIS layout]
+ 020b Apple Pro Keyboard [Mitsumi, A1048/US tqlayout]
+ 020d Apple Pro Keyboard [Mitsumi, A1048/JIS tqlayout]
020e Apple Internal Keyboard/Trackpad
020f Apple Internal Keyboard/Trackpad
0301 Apple USB Mouse [Mitsumi, M4848]
@@ -5895,7 +5895,7 @@ HUT 0f PID Page
087 Move Destination
088 Move Length
089 PID Block Load Report
- 08B Block Load Status
+ 08B Block Load tqStatus
08C Block Load Success
08D Block Load Full
08E Block Load Error
@@ -5940,7 +5940,7 @@ HUT 14 Alphanumeric Display
02a Horizontal Scroll
02b Character Report
02c Display Data
- 02d Display Status
+ 02d Display tqStatus
02e Stat Not Ready
02f Stat Ready
030 Err Not a loadable Character
@@ -6015,8 +6015,8 @@ HUT 82 Monitor VESA Virtual Controls
HUT 84 Power Device Page
000 Undefined
001 iName
- 002 Present Status
- 003 Changed Status
+ 002 Present tqStatus
+ 003 Changed tqStatus
004 UPS
005 Power Supply
010 Battery System
@@ -6095,10 +6095,10 @@ HUT 84 Power Device Page
HUT 85 Battery System Page
000 Undefined
001 SMB Battery Mode
- 002 SMB Battery Status
+ 002 SMB Battery tqStatus
003 SMB Alarm Warning
004 SMB Charger Mode
- 005 SMB Charger Status
+ 005 SMB Charger tqStatus
006 SMB Charger Spec Info
007 SMB Selector State
008 SMB Selector Presets
@@ -6195,7 +6195,7 @@ HUT f0 Cash Device
0f1 Cash Drawer
0f2 Cash Drawer Number
0f3 Cash Drawer Set
- 0f4 Cash Drawer Status
+ 0f4 Cash Drawer tqStatus
HUT ff Vendor Specific
# List of Languages
diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp
index 466fd9a98..8c116eb16 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,7 +277,7 @@ bool USBDevice::parse(TQString fname)
// read in the device infos
USBDevice *device = 0;
int start=0, end;
- result.replace(TQRegExp("^\n"),"");
+ result.tqreplace(TQRegExp("^\n"),"");
while ((end = result.find('\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;