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

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.

22 files changed, 53 insertions, 53 deletions

diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index 5ed7264ee..1767bec5f 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -8,7 +8,7 @@
 *
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqbuttongroup.h>
diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp
index 167d8b41e..1773c47f9 100644
--- a/tdeui/tests/kbuttonboxtest.cpp
+++ b/tdeui/tests/kbuttonboxtest.cpp
@@ -18,7 +18,7 @@
 */
 #include <kapplication.h>
 #include "kbuttonbox.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqdialog.h>
 #include <tqpushbutton.h>
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 50aa0995d..44b849b44 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -14,7 +14,7 @@
 #include <ksimpleconfig.h>
 
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqlabel.h>
 #include <tqhbox.h>
diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp
index 916944063..bdd47ab48 100644
--- a/tdeui/tests/kcompletiontest.cpp
+++ b/tdeui/tests/kcompletiontest.cpp
@@ -13,7 +13,7 @@
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp
index 28f7d4cf2..e75b320a7 100644
--- a/tdeui/tests/kdesattest.cpp
+++ b/tdeui/tests/kdesattest.cpp
@@ -23,7 +23,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name)
 
 void KDesatWidget::change(double) {
     desat_value = slide->value();
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KDesatWidget::paintEvent(TQPaintEvent */*ev*/)
diff --git a/tdeui/tests/kdialogbasetest.cpp b/tdeui/tests/kdialogbasetest.cpp
index 35b9da4fe..35da840a1 100644
--- a/tdeui/tests/kdialogbasetest.cpp
+++ b/tdeui/tests/kdialogbasetest.cpp
@@ -2,7 +2,7 @@
 #include <kdialogbase.h>
 
 #include <tqstring.h>
-#include <textview.h>
+#include <tqtextview.h>
 
 int main(int argc, char** argv)
 {
@@ -64,7 +64,7 @@ int main(int argc, char** argv)
      widget may change before the dialog is shown. Additionally, setting a
      help chapter may cause a need for adjustment since it modifies the height
      of the upper frame. */
-  dialog.resize(dialog.minimumSize());
+  dialog.resize(dialog.tqminimumSize());
   /* The dialog object is used just as any other TQDialog: */
   if(dialog.exec())
     {
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index a08cb78ba..9b65db594 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -3,10 +3,10 @@
 #include <tqheader.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
-#include <textview.h>
+#include <tqtextview.h>
 #include <tqfileinfo.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqmultilineedit.h>
@@ -82,7 +82,7 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const
 :TQDialog(0L,name,true)
 {
   KConfig* config = kapp->config();
-  config->setGroup( TQString::fromLatin1("SFileDialogData:") + name );
+  config->setGroup( TQString::tqfromLatin1("SFileDialogData:") + name );
   if ( initially.isNull() ){
     initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() );
   }
@@ -242,7 +242,7 @@ void PixmapView::setPixmap( const TQPixmap &pix )
 {
     pixmap = pix;
     resizeContents( pixmap.size().width(), pixmap.size().height() );
-    viewport()->repaint( true );
+    viewport()->tqrepaint( true );
 }
 
 void PixmapView::drawContents( TQPainter *p, int, int, int, int )
@@ -643,7 +643,7 @@ void Directory::setOpen( bool o )
     return;
   }
 
-  listView()->setUpdatesEnabled( false );
+  listView()->tqsetUpdatesEnabled( false );
   const QFileInfoList * files = thisDir.entryInfoList();
   if ( files ){
     QFileInfoListIterator it( *files );
@@ -654,7 +654,7 @@ void Directory::setOpen( bool o )
         (void)new Directory( this, f->fileName() );
       }
     }
-    listView()->setUpdatesEnabled( true );
+    listView()->tqsetUpdatesEnabled( true );
   }
   TQListViewItem::setOpen( o );
 }
@@ -777,13 +777,13 @@ int main(int argc, char* argv[]) {
 #endif
 
 #if 0
-  qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::fromLatin1("All (*)"),
-                                         TQString::fromLatin1("DockWidget Demo"), "dialog1" ) );
+  qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::tqfromLatin1("All (*)"),
+                                         TQString::tqfromLatin1("DockWidget Demo"), "dialog1" ) );
 #endif
 
 #if 1
-  TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::fromLatin1("All (*)"),
-                                                TQString::fromLatin1("DockWidget Demo"), "dialog1" );
+  TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::tqfromLatin1("All (*)"),
+                                                TQString::tqfromLatin1("DockWidget Demo"), "dialog1" );
   TQStringList::Iterator it = s.begin();
   for ( ; it != s.end(); ++it ){
     qDebug( "%s", (*it).local8Bit().data() );
diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp
index 6ed2715a0..942d52f8d 100644
--- a/tdeui/tests/kdualcolortest.cpp
+++ b/tdeui/tests/kdualcolortest.cpp
@@ -2,16 +2,16 @@
 #include <kdualcolorbutton.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <layout.h>
-#include <palette.h>
+#include <tqlayout.h>
+#include <tqpalette.h>
 
 KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
 {
     lbl = new TQLabel("Testing, testing, 1, 2, 3...", this);
     KDualColorButton *colorBtn =
-        new KDualColorButton(lbl->colorGroup().text(),
-                             lbl->colorGroup().background(), this);
+        new KDualColorButton(lbl->tqcolorGroup().text(),
+                             lbl->tqcolorGroup().background(), this);
     connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)),
             TQT_SLOT(slotFgChanged(const TQColor &)));
     connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)),
diff --git a/tdeui/tests/keditlistboxtest.cpp b/tdeui/tests/keditlistboxtest.cpp
index 90dbb74d0..fdc90a742 100644
--- a/tdeui/tests/keditlistboxtest.cpp
+++ b/tdeui/tests/keditlistboxtest.cpp
@@ -7,14 +7,14 @@ int main( int argc, char **argv )
     KApplication app( argc, argv, "keditlistboxtest" );
 
     KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) );
-    KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"),
+    KEditListBox *box = new KEditListBox( TQString::tqfromLatin1("KEditListBox"),
                                           editor );
     
-    box->insertItem( TQString::fromLatin1("Test") );
-    box->insertItem( TQString::fromLatin1("for") );
-    box->insertItem( TQString::fromLatin1("this") );
-    box->insertItem( TQString::fromLatin1("KEditListBox") );
-    box->insertItem( TQString::fromLatin1("Widget") );
+    box->insertItem( TQString::tqfromLatin1("Test") );
+    box->insertItem( TQString::tqfromLatin1("for") );
+    box->insertItem( TQString::tqfromLatin1("this") );
+    box->insertItem( TQString::tqfromLatin1("KEditListBox") );
+    box->insertItem( TQString::tqfromLatin1("Widget") );
     box->show();
 
     return app.exec();
diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp
index d68f1e366..f8d031530 100644
--- a/tdeui/tests/kledtest.cpp
+++ b/tdeui/tests/kledtest.cpp
@@ -50,14 +50,14 @@ KLedTest::KLedTest(TQWidget* parent)
   }
   else {
     y=Grid; index=0;
-    for( int shape=0; (int)shape<2; shape=(KLed::Shape)(shape+1)) {
+    for( int tqshape=0; (int)tqshape<2; tqshape=(KLed::Shape)(tqshape+1)) {
       x=Grid;
       for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) {
 	for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1))
 	    {
 	      leds[index]=new KLed(Qt::yellow, state,
 				   (KLed::Look)(look+1),
-				   (KLed::Shape)(shape+1), this);
+				   (KLed::Shape)(tqshape+1), this);
 	      leds[index]->setGeometry(x, y, LedWidth, LedHeight);
 	      ++index;
 	      x+=Grid+LedWidth;
@@ -108,7 +108,7 @@ KLedTest::nextLook() {
   ledlook = static_cast<KLed::Look>(tmp);
   l->setLook(ledlook);
   //qDebug("painting look %i", ledlook);
-  //l->repaint(); 
+  //l->tqrepaint(); 
 }
 
 
diff --git a/tdeui/tests/kledtest.h b/tdeui/tests/kledtest.h
index 5652e306e..5d660f5a3 100644
--- a/tdeui/tests/kledtest.h
+++ b/tdeui/tests/kledtest.h
@@ -15,7 +15,7 @@ protected:
   const int LedWidth;
   const int LedHeight;
   const int Grid;
-  KLed::Shape shape;
+  KLed::Shape tqshape;
   KLed::Look look;
   KLed::State state;
   int x, y, index;
diff --git a/tdeui/tests/klineeditdlgtest.cpp b/tdeui/tests/klineeditdlgtest.cpp
index be7decb82..e43085c0c 100644
--- a/tdeui/tests/klineeditdlgtest.cpp
+++ b/tdeui/tests/klineeditdlgtest.cpp
@@ -2,7 +2,7 @@
 #include <klineeditdlg.h>
 
 #include <tqstring.h>
-#include <textview.h>
+#include <tqtextview.h>
 
 int main(int argc, char** argv)
 {
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index 7ddab8182..3508982fa 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -1,6 +1,6 @@
 #include <tqstring.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqtimer.h>
 
diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp
index d5b84095a..31f8f1735 100644
--- a/tdeui/tests/kmessageboxtest.cpp
+++ b/tdeui/tests/kmessageboxtest.cpp
@@ -1,7 +1,7 @@
 #include "kmessagebox.h"
 
 #include <tqdialog.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <stdlib.h>
 
@@ -79,11 +79,11 @@ case 1:
   i = KMessageBox::warningContinueCancel(w, 
                 "You are about to <Print>.\n"
 		"Are you sure?",
-                "Print", TQString::fromLatin1("&Print"), "dontask", false);
+                "Print", TQString::tqfromLatin1("&Print"), "dontask", false);
   i = KMessageBox::warningContinueCancel(0, 
                 "You are about to <Print>.\n"
 		"Are you sure?",
-                "Print", TQString::fromLatin1("&Print"), "dontask", KMessageBox::AllowLink);
+                "Print", TQString::tqfromLatin1("&Print"), "dontask", KMessageBox::AllowLink);
   i = KMessageBox::questionYesNo(0, "<p>Do you have a printer? thisisaverylongdkldhklghklghklashgkllasghkdlsghkldfghklsabla bla bbla bla. It also has <a href=http://www.kde.org>this URL</a>.</p>",
   	TQString("Bla"), TQString("Yes"), TQString("No"), "bla", KMessageBox::AllowLink);
   break;
@@ -96,7 +96,7 @@ case 2:
 case 3:
   i = KMessageBox::questionYesNo(0,
                 "Does your printer support color or only black and white?",
-                "Printer setup", TQString::fromLatin1("&Color"), TQString::fromLatin1("&Black & White"));
+                "Printer setup", TQString::tqfromLatin1("&Color"), TQString::tqfromLatin1("&Black & White"));
   break;
 
 case 4:
@@ -123,13 +123,13 @@ case 6:
   i = KMessageBox::warningContinueCancel(0, 
                 "You are about to print.\n"
 		"Are you sure?",
-                "Print", TQString::fromLatin1("&Print"));
+                "Print", TQString::tqfromLatin1("&Print"));
   break;
 case 7:
   i = KMessageBox::warningContinueCancel(0, 
                 "You are about to <Print>.\n"
 		"Are you sure?",
-                "Print", TQString::fromLatin1("&Print"), "dontask", false);
+                "Print", TQString::tqfromLatin1("&Print"), "dontask", false);
   break;
 
 case 8:
@@ -142,14 +142,14 @@ case 9:
   i = KMessageBox::warningYesNoCancel(0,
                 "Your document contains unsaved changes.\n"
                 "Do you want to save your changes?\n",
-                TQString::fromLatin1("Close"));
+                TQString::tqfromLatin1("Close"));
   break;
 
 case 10:
   i = KMessageBox::warningYesNoCancel(0,
                 "Your document contains unsaved changes.\n"
                 "Do you want to save or discard your changes?\n",
-                "Close", TQString::fromLatin1("&Save"), TQString::fromLatin1("&Discard") );
+                "Close", TQString::tqfromLatin1("&Save"), TQString::tqfromLatin1("&Discard") );
   break;
 
 case 11:
diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp
index 4a3dece9f..fdf8697e9 100644
--- a/tdeui/tests/knuminputtest.cpp
+++ b/tdeui/tests/knuminputtest.cpp
@@ -8,7 +8,7 @@
 *
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvgroupbox.h>
 
 #include <kapplication.h>
diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp
index bd7fcb2f5..ad2f5630a 100644
--- a/tdeui/tests/krulertest.cpp
+++ b/tdeui/tests/krulertest.cpp
@@ -3,7 +3,7 @@
 #include "krulertest.h"
 
 #include "kruler.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 
diff --git a/tdeui/tests/kseparatortest.cpp b/tdeui/tests/kseparatortest.cpp
index 181722f8e..17e965ca8 100644
--- a/tdeui/tests/kseparatortest.cpp
+++ b/tdeui/tests/kseparatortest.cpp
@@ -19,7 +19,7 @@
 
 
 #include <kapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 
 #include "kseparator.h"
diff --git a/tdeui/tests/kspelltest.cpp b/tdeui/tests/kspelltest.cpp
index 5d7c4852c..9180ed376 100644
--- a/tdeui/tests/kspelltest.cpp
+++ b/tdeui/tests/kspelltest.cpp
@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 #include <tqlabel.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 int main(int argc, char **argv)
 {
diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp
index b8fc19104..33e7fc5b7 100644
--- a/tdeui/tests/ktabctltest.cpp
+++ b/tdeui/tests/ktabctltest.cpp
@@ -17,7 +17,7 @@
 #include <tqtooltip.h>
 #include <tqmessagebox.h>
 #include <tqtabbar.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqmultilineedit.h>
 
 #include <stdio.h>
diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp
index be7b1cd26..5f9fb3dcc 100644
--- a/tdeui/tests/ktabwidgettest.cpp
+++ b/tdeui/tests/ktabwidgettest.cpp
@@ -1,5 +1,5 @@
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdragobject.h>
 
 #include <kapplication.h>
@@ -73,9 +73,9 @@ Test::Test( TQWidget* parent, const char *name )
   gridlayout->addWidget( mTabsBottom, 3, 0 );
   connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) );
 
-  TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid );
-  gridlayout->addWidget( tabshape, 3, 1 );
-  connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
+  TQCheckBox * tabtqshape = new TQCheckBox( "Triangular tab tqshape", grid );
+  gridlayout->addWidget( tabtqshape, 3, 1 );
+  connect( tabtqshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
 
   TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid );
   gridlayout->addWidget( tabClose, 4, 0 );
diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp
index 1297d1ac8..9f616496d 100644
--- a/tdeui/tests/kunbalancedgrdtest.cpp
+++ b/tdeui/tests/kunbalancedgrdtest.cpp
@@ -3,7 +3,7 @@
 #include <kpixmapeffect.h>
 #include <tqpainter.h>
 #include <tqstring.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 int cols = 3, rows = 3; // how many
 
@@ -159,7 +159,7 @@ void myTopWidget::rebalance()
 
   if ((otime - itime )> 500)
     {
-      grds->repaint(false);
+      grds->tqrepaint(false);
       itime = time.elapsed();
     }
 }
diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp
index 0f10fed89..91974263e 100644
--- a/tdeui/tests/kwizardtest.cpp
+++ b/tdeui/tests/kwizardtest.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kapplication.h>
 #include <kwizard.h>