From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 3 Jan 2011 20:16:47 +0000
Subject: 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
---
 kcontrol/info/info.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'kcontrol/info/info.cpp')

diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp
index 770b2cdf3..d5cc677d3 100644
--- a/kcontrol/info/info.cpp
+++ b/kcontrol/info/info.cpp
@@ -80,7 +80,7 @@ static const TQString HexStr(unsigned long val, int digits )
 {
     TQString hexstr;
     int i;
-    hexstr = TQString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/);
+    hexstr = TQString::tqfromLatin1("0x%1").arg(val, digits, 16/*=HEX*/);
     for (i=hexstr.length()-1; i>0; --i)
      if (hexstr[i]==' ')
          hexstr[i] = '0';
@@ -167,7 +167,7 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
         for (i = 0; i < ndepths; i++) {
             txt = txt + Value(depths[i]);
             if (i < ndepths - 1)
-                txt = txt + TQString::fromLatin1(", ");
+                txt = txt + TQString::tqfromLatin1(", ");
         }
 
         last = new TQListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt);
@@ -200,11 +200,11 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
 		      ((DoesBackingStore(s) == Always) ? YES : i18n("When mapped")) )
 		.arg(  DoesSaveUnders(s) ? YES : NO ));
 
-    XQueryBestSize (dpy, CursorShape, RootWindow(dpy,scr), 65535, 65535,
+    XQueryBestSize (dpy, tqCursorShape, RootWindow(dpy,scr), 65535, 65535,
 		    &width, &height);
     last = new TQListViewItem(item, last, i18n("Largest Cursor"),
 		(width == 65535 && height == 65535)
-		? i18n("unlimited") : TQString::fromLatin1("%1 x %2").arg(width).arg(height));
+		? i18n("unlimited") : TQString::tqfromLatin1("%1 x %2").arg(width).arg(height));
 
     last = new TQListViewItem(item, last, i18n("Current Input Event Mask"),
 		HexStr((unsigned long)EventMaskOfScreen(s),HEXDIGITS));
@@ -272,12 +272,12 @@ static bool GetInfo_XServer_Generic( TQListView *lBox )
     last = new TQListViewItem(next, i18n("Name of the Display"),
 		DisplayString(dpy));
 
-    last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::fromLatin1(ServerVendor(dpy)));
+    last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::tqfromLatin1(ServerVendor(dpy)));
     last = new TQListViewItem(next, last, i18n("Vendor Release Number"),
 		Value((int)VendorRelease(dpy)));
 
     last = new TQListViewItem(next, last, i18n("Version Number"),
-		TQString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy))
+		TQString::tqfromLatin1("%1.%2").arg((int)ProtocolVersion(dpy))
     		                  .arg((int)ProtocolRevision(dpy)));
 
     last = item = new TQListViewItem(next, last, i18n("Available Screens"));
@@ -294,7 +294,7 @@ static bool GetInfo_XServer_Generic( TQListView *lBox )
     int extCount;
     char **extensions = XListExtensions( dpy, &extCount );
     for ( i = 0; i < extCount; i++ ) {
-       item = new TQListViewItem( last, item, TQString::fromLatin1( extensions[i] ) );
+       item = new TQListViewItem( last, item, TQString::tqfromLatin1( extensions[i] ) );
     }
     XFreeExtensionList( extensions );
 
@@ -356,7 +356,7 @@ void KInfoListWidget::load()
         retrieve-function. If the function wants the widget to show
         another string, then it change *GetInfo_ErrorString ! */
     ErrorString = i18n("No information available about %1.").arg(title)
-		    + TQString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING;
+		    + TQString::tqfromLatin1("\n\n") + DEFAULT_ERRORSTRING;
     GetInfo_ErrorString = &ErrorString;  /* save the address of ErrorString */
 
     sorting_allowed = true; 	/* the functions may set that */
@@ -414,9 +414,9 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
     setButtons(KCModule::Help);
     getlistbox 	= _getlistbox;
     GetInfo_ErrorString = 0;
-    TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
     widgetStack = new TQWidgetStack(this);
-    layout->addWidget(widgetStack);
+    tqlayout->addWidget(widgetStack);
     lBox 	= new TQListView(widgetStack);
     widgetStack->addWidget(lBox, 0);
     lBox->setMinimumSize(200,120);
@@ -425,7 +425,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
     TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) );
     NoInfoText  = new TQLabel(widgetStack);
     widgetStack->addWidget(NoInfoText, 1);
-    NoInfoText->setAlignment(AlignCenter | WordBreak);
+    NoInfoText->tqsetAlignment(AlignCenter | WordBreak);
     widgetStack->raiseWidget(NoInfoText);
     load();
 }
-- 
cgit v1.2.1