From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:34 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
---
 ksirc/KSTicker/ksticker.cpp        |  8 ++++----
 ksirc/KSTicker/ksttest.cpp         |  4 ++--
 ksirc/KSTicker/speeddialog.dlg     | 14 +++++++-------
 ksirc/KSTicker/speeddialogData.cpp |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'ksirc/KSTicker')

diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index 84821e7d..4f3933db 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -110,7 +110,7 @@ void KSTicker::show()
   if(currentStr.length() != 0)
     startTicker();
   currentChar = 0;
-  repaint(TRUE);
+  tqrepaint(TRUE);
 }
 
 void KSTicker::hide()
@@ -129,7 +129,7 @@ void KSTicker::setString(TQString str)
 {
     strlist.clear();
     strlist.append(str);
-    repaint(TRUE);
+    tqrepaint(TRUE);
     startTicker();
 }
 
@@ -138,7 +138,7 @@ void KSTicker::mergeString(TQString str, TQColor c)
   int num = KSPainter::colour2num(c);
 
   if(num != -1){
-      str.prepend(TQString("~%1").arg(num));
+      str.prepend(TQString("~%1").tqarg(num));
   }
   mergeString(str);
 
@@ -150,7 +150,7 @@ void KSTicker::mergeString(TQString str)
     if(rx.search(str) >= 0){
 	int value = nickColourMaker::colourMaker()->findIdx(rx.cap(1));
 	if(value >= 0){
-	    TQString newText = TQString("~%1\\1~c").arg(value);
+	    TQString newText = TQString("~%1\\1~c").tqarg(value);
 	    str.replace(rx, newText);
 	}
     }
diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp
index 36ad249a..581bd2dc 100644
--- a/ksirc/KSTicker/ksttest.cpp
+++ b/ksirc/KSTicker/ksttest.cpp
@@ -35,8 +35,8 @@ StdInTicker::~StdInTicker()
   kConfig->writeEntry("font", KSTicker::font());
   kConfig->writeEntry("tick", tick);
   kConfig->writeEntry("step", step);
-  kConfig->writeEntry("text", colorGroup().text() );
-  kConfig->writeEntry("background", colorGroup().background() );
+  kConfig->writeEntry("text", tqcolorGroup().text() );
+  kConfig->writeEntry("background", tqcolorGroup().background() );
   kConfig->sync();
 }
 
diff --git a/ksirc/KSTicker/speeddialog.dlg b/ksirc/KSTicker/speeddialog.dlg
index 08526647..aff83de2 100644
--- a/ksirc/KSTicker/speeddialog.dlg
+++ b/ksirc/KSTicker/speeddialog.dlg
@@ -31,7 +31,7 @@ Slider {
 		Name {Slider_1}
 		Variable {sliderTick}
 		Signal {[Protected]  valueChanged --> updateTick  (int)}
-		LayoutStatus {NoLayout}
+		LayouttqStatus {NoLayout}
 		MinimumSize {10 10}
 		MaximumSize {32767 32767}
 }
@@ -49,7 +49,7 @@ Slider {
 		Name {Slider_2}
 		Variable {sliderStep}
 		Signal {[Protected]  valueChanged --> updateStep  (int)}
-		LayoutStatus {NoLayout}
+		LayouttqStatus {NoLayout}
 		MinimumSize {10 10}
 		MaximumSize {32767 32767}
 }
@@ -62,7 +62,7 @@ LCDNumber {
 		Rect {200 5 60 30}
 		Name {LCDNumber_1}
 		Variable {lcdTick}
-		LayoutStatus {NoLayout}
+		LayouttqStatus {NoLayout}
 		MinimumSize {10 10}
 		MaximumSize {32767 32767}
 }
@@ -75,7 +75,7 @@ LCDNumber {
 		Rect {200 40 60 30}
 		Name {LCDNumber_2}
 		Variable {lcdStep}
-		LayoutStatus {NoLayout}
+		LayouttqStatus {NoLayout}
 		MinimumSize {10 10}
 		MaximumSize {32767 32767}
 }
@@ -85,7 +85,7 @@ Label {
 		Margin {-1}
 		Rect {10 5 80 30}
 		Name {Label_1}
-		LayoutStatus {NoLayout}
+		LayouttqStatus {NoLayout}
 		MinimumSize {10 10}
 		MaximumSize {32767 32767}
 }
@@ -95,7 +95,7 @@ Label {
 		Margin {-1}
 		Rect {10 40 80 30}
 		Name {Label_2}
-		LayoutStatus {NoLayout}
+		LayouttqStatus {NoLayout}
 		MinimumSize {10 10}
 		MaximumSize {32767 32767}
 }
@@ -109,7 +109,7 @@ PushButton {
 		Rect {140 80 120 30}
 		Name {PushButton_2}
 		Signal {[Protected]  pressed --> terminate  ()}
-		LayoutStatus {NoLayout}
+		LayouttqStatus {NoLayout}
 		MinimumSize {10 10}
 		MaximumSize {32767 32767}
 }
diff --git a/ksirc/KSTicker/speeddialogData.cpp b/ksirc/KSTicker/speeddialogData.cpp
index eaa0c8af..04102569 100644
--- a/ksirc/KSTicker/speeddialogData.cpp
+++ b/ksirc/KSTicker/speeddialogData.cpp
@@ -16,7 +16,7 @@
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kdialog.h>
 
 speeddialogData::speeddialogData ( TQWidget* parent, const char* name )
@@ -66,7 +66,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name )
     TQLabel* dlgedit_Label_1;
     dlgedit_Label_1 = new TQLabel( this, "Label_1" );
     dlgedit_Label_1->setText( i18n("Tick interval:") );
-    dlgedit_Label_1->setAlignment( 289 );
+    dlgedit_Label_1->tqsetAlignment( 289 );
     dlgedit_Label_1->setMargin( -1 );
     grid->addWidget( dlgedit_Label_1, 0, 0 );
 
@@ -74,7 +74,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name )
     TQLabel* dlgedit_Label_2;
     dlgedit_Label_2 = new TQLabel( this, "Label_2" );
     dlgedit_Label_2->setText( i18n("Step size:") );
-    dlgedit_Label_2->setAlignment( 289 );
+    dlgedit_Label_2->tqsetAlignment( 289 );
     dlgedit_Label_2->setMargin( -1 );
     grid->addWidget( dlgedit_Label_2, 1, 0 );
 
-- 
cgit v1.2.1