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

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.

2 files changed, 13 insertions, 13 deletions

diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index b68b234b3..2a9085b97 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -16,7 +16,7 @@
 #include <tqcombobox.h>
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqslider.h>
 #include <tqvgroupbox.h>
@@ -440,7 +440,7 @@ void KColorScheme::sliderValueChanged( int val )
 
 void KColorScheme::slotSave( )
 {
-    KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
+    KColorSchemeEntry *entry = mSchemeList->tqat(sList->currentItem()-nSysSchemes);
     if (!entry) return;
     sCurrentScheme = entry->path;
     KSimpleConfig *config = new KSimpleConfig(sCurrentScheme );
@@ -482,7 +482,7 @@ void KColorScheme::slotSave( )
 void KColorScheme::slotRemove()
 {
     uint ind = sList->currentItem();
-    KColorSchemeEntry *entry = mSchemeList->at(ind-nSysSchemes);
+    KColorSchemeEntry *entry = mSchemeList->tqat(ind-nSysSchemes);
     if (!entry) return;
 
     if (unlink(TQFile::encodeName(entry->path).data())) {
@@ -497,7 +497,7 @@ void KColorScheme::slotRemove()
     mSchemeList->remove(entry);
 
     ind = sList->currentItem();
-    entry = mSchemeList->at(ind-nSysSchemes);
+    entry = mSchemeList->tqat(ind-nSysSchemes);
     if (!entry) return;
     removeBt->setEnabled(entry ? entry->local : false);
 }
@@ -795,7 +795,7 @@ void KColorScheme::readScheme( int index )
       config->setGroup("General");
     } else {
       // Open scheme file
-      KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
+      KColorSchemeEntry *entry = mSchemeList->tqat(sList->currentItem()-nSysSchemes);
       if (!entry) return;
       sCurrentScheme = entry->path;
       config = new KSimpleConfig(sCurrentScheme, true);
@@ -941,7 +941,7 @@ void KColorScheme::slotPreviewScheme(int indx)
        removeBt->setEnabled(false);
     else
     {
-       KColorSchemeEntry *entry = mSchemeList->at(indx-nSysSchemes);
+       KColorSchemeEntry *entry = mSchemeList->tqat(indx-nSysSchemes);
        removeBt->setEnabled(entry ? entry->local : false);
     }
 
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index f9fd0a97f..450b140a5 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -327,7 +327,7 @@ void WidgetCanvas::drawSampleWidgets()
 #ifndef __osf__
     TQPainter::redirect( vertScrollBar, &pm );
 #endif
-    vertScrollBar->repaint();
+    vertScrollBar->tqrepaint();
     TQPainter::redirect( vertScrollBar, 0 );
     vertScrollBar->hide();
 
@@ -338,7 +338,7 @@ void WidgetCanvas::drawSampleWidgets()
 
     smplw.resize(width(), height());
     //smplw.fill( parentWidget()->back() );
-    smplw.fill( parentWidget()->colorGroup().mid() );
+    smplw.fill( parentWidget()->tqcolorGroup().mid() );
 
     // Actually start painting in
 
@@ -567,9 +567,9 @@ void WidgetCanvas::drawSampleWidgets()
 	popup->setItemEnabled( id, false );
 
 	// HACK: Force Layouting
-	//Sad Eagle: sizeHint() forces layouting too, and it's a lot less visible
-	//popup->sizeHint(); // Breaks with Qt 3.3
-	popup->resize(popup->sizeHint());
+	//Sad Eagle: tqsizeHint() forces layouting too, and it's a lot less visible
+	//popup->tqsizeHint(); // Breaks with Qt 3.3
+	popup->resize(popup->tqsizeHint());
 
 	pm = TQPixmap::grabWidget( popup );
 	delete popup;
@@ -585,12 +585,12 @@ void WidgetCanvas::drawSampleWidgets()
     // Valance
 
     qDrawWinPanel ( &paint, 0, 0, width(), height(),
-                    parentWidget()->colorGroup(), TRUE, 0);
+                    parentWidget()->tqcolorGroup(), TRUE, 0);
 
     // Stop the painting
 
     hotspots[ spot++ ] =
         HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ?
 
-    repaint( FALSE );
+    tqrepaint( FALSE );
 }