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

This reverts commit 6cdf35ab11c322f33feca5baf090ef56068b6049.

4 files changed, 16 insertions, 16 deletions

diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp
index e469b68..c7051a7 100644
--- a/kmoon/kmoonapplet.cpp
+++ b/kmoon/kmoonapplet.cpp
@@ -27,7 +27,7 @@
 #include <tqtooltip.h>
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <dcopclient.h>
 #include <kdebug.h>
@@ -104,7 +104,7 @@ void MoonPAWidget::showAbout()
                                 KStdGuiItem::ok() );
 
     TQPixmap ret = DesktopIcon("kmoon");
-    TQString text = i18n(description) + TQString::fromLatin1("\n\n") +
+    TQString text = i18n(description) + TQString::tqfromLatin1("\n\n") +
 		   i18n("Written by Stephan Kulow <coolo@kde.org>\n"
                             "\n"
                             "Made an applet by M G Berberich "
@@ -136,7 +136,7 @@ void MoonPAWidget::settings()
                 config->writeEntry("Mask", moon->mask());
                 config->sync();
 	}
-	repaint();
+	tqrepaint();
 }
 
 void MoonPAWidget::timerEvent( TQTimerEvent * )
@@ -144,8 +144,8 @@ void MoonPAWidget::timerEvent( TQTimerEvent * )
     time_t clock;
     time(&clock);
     struct tm *t = localtime(&clock);
-    moon->calcStatus(mktime(t));
-    moon->repaint();
+    moon->calctqStatus(mktime(t));
+    moon->tqrepaint();
 }
 
 void MoonPAWidget::mousePressEvent( TQMouseEvent *e)
diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp
index 7c79a6f..d4d750f 100644
--- a/kmoon/kmoondlg.cpp
+++ b/kmoon/kmoondlg.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
@@ -94,7 +94,7 @@ void KMoonDlg::angleChanged(int value) {
 }
 
 void KMoonDlg::help() {
-    kapp->invokeHelp(TQString::fromLatin1("config"));
+    kapp->invokeHelp(TQString::tqfromLatin1("config"));
 }
 
 void KMoonDlg::toggleHemi() {
diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp
index fd4dcf1..89858c8 100644
--- a/kmoon/kmoonwidget.cpp
+++ b/kmoon/kmoonwidget.cpp
@@ -70,14 +70,14 @@ MoonWidget::MoonWidget(TQWidget *parent, const char *name)
     time(&clock);
     t = gmtime(&clock);
     // kdDebug() << "time " << t->tm_isdst << " " << timezone << " " << daylight << endl ;
-    calcStatus(mktime(t));
+    calctqStatus(mktime(t));
 }
 
 MoonWidget::~MoonWidget()
 {
 }
 
-void MoonWidget::calcStatus( time_t time )
+void MoonWidget::calctqStatus( time_t time )
 {
     uint lun = 0;
     time_t last_new = 0;
@@ -217,14 +217,14 @@ void MoonWidget::calcStatus( time_t time )
     }
     
     renderGraphic();
-    repaint();
+    tqrepaint();
 }
 
 TQImage MoonWidget::loadMoon(int index)
 {
     if (index == 0) // the new moon has the wrong filename
         index = 29;
-    TQString filename = TQString("kmoon/pics/moon%1.png").arg(index);
+    TQString filename = TQString("kmoon/pics/moon%1.png").tqarg(index);
     TQString path = locate("data", filename);
     if (path.isNull())
         kdFatal() << "cound't find " << filename << ". Exiting.\n";
@@ -238,21 +238,21 @@ void MoonWidget::setAngle(int value)
 {
     _angle = value;
     renderGraphic();
-    repaint();
+    tqrepaint();
 }
 
 void MoonWidget::setNorthHemi(bool n)
 {
     _north = n;
     renderGraphic();
-    repaint();
+    tqrepaint();
 }
 
 void MoonWidget::setMask(bool value)
 {
     _mask = value;
     renderGraphic();
-    repaint();
+    tqrepaint();
 }
 
 void MoonWidget::paintEvent(TQPaintEvent *)
@@ -263,7 +263,7 @@ void MoonWidget::paintEvent(TQPaintEvent *)
 void MoonWidget::resizeEvent(TQResizeEvent *)
 {
     renderGraphic();
-    repaint();
+    tqrepaint();
 }
 
 void MoonWidget::renderGraphic()
diff --git a/kmoon/kmoonwidget.h b/kmoon/kmoonwidget.h
index f636b60..3b2415f 100644
--- a/kmoon/kmoonwidget.h
+++ b/kmoon/kmoonwidget.h
@@ -37,7 +37,7 @@ public:
     MoonWidget(TQWidget *parent = 0, const char *name = 0);
     ~MoonWidget();
 
-    void calcStatus( time_t time );
+    void calctqStatus( time_t time );
 
     int angle() const { return _angle; }
     void setAngle(int angle);