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

This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.

1 files changed, 21 insertions, 21 deletions

diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp
index b22cc232..e799883b 100644
--- a/libtdegames/highscore/kscoredialog.cpp
+++ b/libtdegames/highscore/kscoredialog.cpp
@@ -25,7 +25,7 @@ this software.
 #include "config.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqwidgetstack.h>
 #include <tqtimer.h>
@@ -44,7 +44,7 @@ class KScoreDialog::KScoreDialogPrivate
 public:  
    TQPtrList<FieldInfo> scores;
    TQWidget *page;
-   TQGridLayout *layout;
+   TQGridLayout *tqlayout;
    TQLineEdit *edit;
    TQPtrVector<TQWidgetStack> stack;
    TQPtrVector<TQLabel> labels;
@@ -126,36 +126,36 @@ void KScoreDialog::setupDialog()
          d->col[field] = d->nrCols++;
    }
       
-   d->layout = new TQGridLayout(d->page, 15, d->nrCols, marginHint() + 20, spacingHint());
-   d->layout->addRowSpacing(4, 15);
+   d->tqlayout = new TQGridLayout(d->page, 15, d->nrCols, marginHint() + 20, spacingHint());
+   d->tqlayout->addRowSpacing(4, 15);
 
    d->commentLabel = new TQLabel(d->page);
-   d->commentLabel->setAlignment(AlignVCenter | AlignHCenter);
-   d->layout->addMultiCellWidget(d->commentLabel, 1, 1, 0, d->nrCols-1);
+   d->commentLabel->tqsetAlignment(AlignVCenter | AlignHCenter);
+   d->tqlayout->addMultiCellWidget(d->commentLabel, 1, 1, 0, d->nrCols-1);
 
    TQFont bold = font();
    bold.setBold(true);
 
    TQLabel *label;
-   d->layout->addColSpacing(0, 50);
+   d->tqlayout->addColSpacing(0, 50);
    label = new TQLabel(i18n("Rank"), d->page);
-   d->layout->addWidget(label, 3, 0);
+   d->tqlayout->addWidget(label, 3, 0);
    label->setFont(bold);
 
    for(int field = 1; field < d->fields; field = field * 2)
    {
       if (d->fields & field)
       {
-         d->layout->addColSpacing(d->col[field], 50);
+         d->tqlayout->addColSpacing(d->col[field], 50);
 
          label = new TQLabel(d->header[field], d->page);
-         d->layout->addWidget(label, 3, d->col[field], field <= Name ? AlignLeft : AlignRight);
+         d->tqlayout->addWidget(label, 3, d->col[field], field <= Name ? AlignLeft : AlignRight);
          label->setFont(bold);
       }
    }
 
    KSeparator *sep = new KSeparator(Qt::Horizontal, d->page);
-   d->layout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1);
+   d->tqlayout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1);
 
    d->labels.resize(d->nrCols * 10);
    d->stack.resize(10);
@@ -164,14 +164,14 @@ void KScoreDialog::setupDialog()
    for (int i = 1; i <= 10; ++i) {
       TQLabel *label;
       num.setNum(i);
-      label = new TQLabel(i18n("#%1").arg(num), d->page);
+      label = new TQLabel(i18n("#%1").tqarg(num), d->page);
       d->labels.insert((i-1)*d->nrCols + 0, label);
-      d->layout->addWidget(label, i+4, 0);
+      d->tqlayout->addWidget(label, i+4, 0);
       if (d->fields & Name)
       {
          TQWidgetStack *stack = new TQWidgetStack(d->page);
          d->stack.insert(i-1, stack);
-         d->layout->addWidget(stack, i+4, d->col[Name]);
+         d->tqlayout->addWidget(stack, i+4, d->col[Name]);
          label = new TQLabel(d->page);
          d->labels.insert((i-1)*d->nrCols + d->col[Name], label);
          stack->addWidget(label);
@@ -183,7 +183,7 @@ void KScoreDialog::setupDialog()
          {
            label = new TQLabel(d->page);
            d->labels.insert((i-1)*d->nrCols + d->col[field], label);
-           d->layout->addWidget(label, i+4, d->col[field], AlignRight);
+           d->tqlayout->addWidget(label, i+4, d->col[field], AlignRight);
          }
       }
    }
@@ -202,15 +202,15 @@ void KScoreDialog::aboutToShow()
    {
       d->commentLabel->setMinimumSize(TQSize(1,1));
       d->commentLabel->hide();    
-      d->layout->addRowSpacing(0, -15);
-      d->layout->addRowSpacing(2, -15);
+      d->tqlayout->addRowSpacing(0, -15);
+      d->tqlayout->addRowSpacing(2, -15);
    } 
    else
    {
-      d->commentLabel->setMinimumSize(d->commentLabel->sizeHint());
+      d->commentLabel->setMinimumSize(d->commentLabel->tqsizeHint());
       d->commentLabel->show();
-      d->layout->addRowSpacing(0, -10);
-      d->layout->addRowSpacing(2, 10);
+      d->tqlayout->addRowSpacing(0, -10);
+      d->tqlayout->addRowSpacing(2, 10);
    }
    d->comment = TQString();
 
@@ -267,7 +267,7 @@ void KScoreDialog::aboutToShow()
       }
    }
    d->latest = -1;
-   setFixedSize(minimumSizeHint());
+   setFixedSize(tqminimumSizeHint());
 }
 
 void KScoreDialog::loadScores()