Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 20 insertions, 20 deletions

diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index 5939e5997..f3a5a85df 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->tqlayout(), KDialog::spacingHint());
+  TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint());
 
   TQSplitter *splitter = new TQSplitter(gbox);
   vvbox->addWidget(splitter);
@@ -87,12 +87,12 @@ void USBViewer::load()
   refresh();
 }
 
-static TQ_UINT32 key( USBDevice &dev )
+static Q_UINT32 key( USBDevice &dev )
 {
   return dev.bus()*256 + dev.device();
 }
 
-static TQ_UINT32 key_parent( USBDevice &dev )
+static Q_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)
 	  {
-	    TQ_UINT32 k = key(*it.current());
+	    Q_UINT32 k = key(*it.current());
 	    if (level == 0)
 	      {
 		TQListViewItem *item = _items.find(k);
@@ -178,7 +178,7 @@ void USBViewer::selectionChanged(TQListViewItem *item)
 {
   if (item)
     {
-      TQ_UINT32 busdev = item->text(1).toUInt();
+      Q_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 8a0f5afb9..76729bb5d 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 tqmaskinen
+Comment[nb]=Se hvilke USB-enheter som er koblet til denne maskinen
 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 datatqmaskina
+Comment[nn]=Viser USB-einingane knytte til datamaskina
 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 d05480250..c2d3e4da9 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 tqlayout]
-	020d  Apple Pro Keyboard [Mitsumi, A1048/JIS tqlayout]
+	020b  Apple Pro Keyboard [Mitsumi, A1048/US layout]
+	020d  Apple Pro Keyboard [Mitsumi, A1048/JIS layout]
 	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 tqStatus
+	08B  Block Load Status
 	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 tqStatus
+	02d  Display Status
 	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 tqStatus
-	003  Changed tqStatus
+	002  Present Status
+	003  Changed Status
 	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 tqStatus
+	002  SMB Battery Status
 	003  SMB Alarm Warning
 	004  SMB Charger Mode
-	005  SMB Charger tqStatus
+	005  SMB Charger Status
 	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 tqStatus
+	0f4  Cash Drawer Status
 HUT ff  Vendor Specific
 
 # List of Languages
diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp
index 8c116eb16..466fd9a98 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,7 +277,7 @@ bool USBDevice::parse(TQString fname)
   // read in the device infos
   USBDevice *device = 0;
   int start=0, end;
-  result.tqreplace(TQRegExp("^\n"),"");
+  result.replace(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::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;