Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.

9 files changed, 27 insertions, 27 deletions

diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp
index c18fdf8d9..54f0bdf86 100644
--- a/kcontrol/info/info.cpp
+++ b/kcontrol/info/info.cpp
@@ -29,7 +29,7 @@
 
 #include <tqheader.h>
 #include <tqwhatsthis.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kglobalsettings.h>
 #include <kiconloader.h>
@@ -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);
@@ -204,7 +204,7 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
 		    &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 */
@@ -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();
 }
diff --git a/kcontrol/info/info_fbsd.cpp b/kcontrol/info/info_fbsd.cpp
index 8b0afa385..3ccd1c086 100644
--- a/kcontrol/info/info_fbsd.cpp
+++ b/kcontrol/info/info_fbsd.cpp
@@ -53,7 +53,7 @@
 #include <tqfile.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 class Device {
 public:
diff --git a/kcontrol/info/info_hpux.cpp b/kcontrol/info/info_hpux.cpp
index e60cb174f..82c7cbdad 100644
--- a/kcontrol/info/info_hpux.cpp
+++ b/kcontrol/info/info_hpux.cpp
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <tqfile.h>
 #include <tqfontmetrics.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 
 #define INFO_CPU_AVAILABLE
diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp
index 094a6e048..b779eac29 100644
--- a/kcontrol/info/info_netbsd.cpp
+++ b/kcontrol/info/info_netbsd.cpp
@@ -40,7 +40,7 @@
 #include <tqfile.h>
 #include <tqfontmetrics.h>
 #include <tqstrlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <kio/global.h> /* for KIO::convertSize() */
@@ -296,18 +296,18 @@ bool GetInfo_Partitions (TQListView *lbox)
 
 		// convert to strings
 		vv[0] = KIO::convertSize(big[0]);
-		vv[1] = TQString::fromLatin1("%1 (%2%%)")
+		vv[1] = TQString::tqfromLatin1("%1 (%2%%)")
 				.arg(KIO::convertSize(big[1]))
 				.arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0);
 
 		// FIXME: these two are large enough to punctuate
 		vv[2] = TQString::number(mnt->f_files);
-		vv[3] = TQString::fromLatin1("%1 (%2%%) ")
+		vv[3] = TQString::tqfromLatin1("%1 (%2%%) ")
 				.arg(mnt->f_ffree)
 				.arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0);
 
 		vv[4] = TQString::null;
-#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::fromLatin1(#x " ");
+#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::tqfromLatin1(#x " ");
 		MNTF(ASYNC)
 		MNTF(DEFEXPORTED)
 		MNTF(EXKERB)
diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp
index 7cb1c3e1d..12ec8ee2d 100644
--- a/kcontrol/info/info_openbsd.cpp
+++ b/kcontrol/info/info_openbsd.cpp
@@ -38,7 +38,7 @@
 #include <tqfile.h>
 #include <tqfontmetrics.h>
 #include <tqstrlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 
diff --git a/kcontrol/info/info_osx.cpp b/kcontrol/info/info_osx.cpp
index 204364da7..5f18aebea 100644
--- a/kcontrol/info/info_osx.cpp
+++ b/kcontrol/info/info_osx.cpp
@@ -50,7 +50,7 @@
 #include <tqfontmetrics.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 
diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp
index 9f2b17e1b..6dd215f55 100644
--- a/kcontrol/info/info_solaris.cpp
+++ b/kcontrol/info/info_solaris.cpp
@@ -184,10 +184,10 @@ bool GetInfo_Partitions( TQListView *lBox ) {
 	lBox->addColumn( i18n( "Mount Point" ));
 	lBox->addColumn( i18n( "FS Type" ));
 	lBox->addColumn( i18n( "Total Size" ));
-	// XXX: FIXME: how do I set column alignment correctly?
+	// XXX: FIXME: how do I set column tqalignment correctly?
 	lBox->setColumnAlignment( 3, 2 );
 	lBox->addColumn( i18n( "Free Size" ));
-	// XXX: FIXME: how do I set column alignment correctly?
+	// XXX: FIXME: how do I set column tqalignment correctly?
 	lBox->setColumnAlignment( 4, 2 );
 	lBox->addColumn( i18n( "Mount Time" ));
 	lBox->addColumn( i18n( "Mount Options" ));
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index 373b0b975..cd7c9b010 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -24,7 +24,7 @@
 
 #include <sys/param.h>		/* for BSD */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqdrawutil.h>
 #include <tqtooltip.h>
@@ -163,7 +163,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
 	    break;
 	};
 	Widget = new TQLabel(title, this);
-	Widget->setAlignment(AlignLeft);
+	Widget->tqsetAlignment(AlignLeft);
 	vbox->addWidget(Widget, 1);
     }
 
@@ -174,7 +174,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
 	    if (i == SWAP_MEM)
 		vbox->addSpacing(SPACING);
 	    Widget = new TQLabel(this);
-	    Widget->setAlignment(AlignRight);
+	    Widget->tqsetAlignment(AlignRight);
 	    MemSizeLabel[i][j] = Widget;
 	    vbox->addWidget(Widget, 1);
 	}
@@ -228,7 +228,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
 	  hint = "<qt>" + hint + "</qt>";
 
 	Widget = new TQLabel("<b>" + title + "</b>", this);
-	Widget->setAlignment(AlignCenter);
+	Widget->tqsetAlignment(AlignCenter);
 	TQToolTip::add(Widget, hint);
 	vbox->addWidget(Widget);
 	vbox->addSpacing(SPACING / 2);
@@ -243,7 +243,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
 	vbox->addSpacing(SPACING / 2);
 
 	Widget = new TQLabel(this);	/* xx MB used. */
-	Widget->setAlignment(AlignCenter);
+	Widget->tqsetAlignment(AlignCenter);
 	TQToolTip::add(Widget, hint);
 	GraphLabel[i] = Widget;
 	vbox->addWidget(Widget);
@@ -288,7 +288,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex,
     TQPixmap pm(width, height);
     TQPainter paint;
 
-    paint.begin(&pm, this);
+    paint.tqbegin(&pm, this);
 
     TQPen pen(TQColor(0, 0, 0));
 
@@ -342,7 +342,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex,
     /* draw surrounding box */
     paint.setPen(pen);
     TQRect r = graph->rect();
-    qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), palette().active(), true, 1);
+    qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), tqpalette().active(), true, 1);
     paint.end();
     bitBlt(graph, 0, 0, &pm);
 
diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp
index 061e368e6..f04a93d06 100644
--- a/kcontrol/info/opengl.cpp
+++ b/kcontrol/info/opengl.cpp
@@ -194,7 +194,7 @@ print_extension_list(const char *ext, TQListViewItem *l1)
 
    if (!ext || !ext[0])
       return;
-   TQString qext = TQString::fromLatin1(ext);
+   TQString qext = TQString::tqfromLatin1(ext);
    TQListViewItem *l2 = NULL;
 
    i = j = 0;