Rename obsolete tq methods to standard names

11 files changed, 59 insertions, 59 deletions

diff --git a/libtdegames/highscore/kexthighscore_tab.cpp b/libtdegames/highscore/kexthighscore_tab.cpp
index b3fdecd1..cbb30e0a 100644
--- a/libtdegames/highscore/kexthighscore_tab.cpp
+++ b/libtdegames/highscore/kexthighscore_tab.cpp
@@ -120,7 +120,7 @@ StatisticsTab::StatisticsTab(TQWidget *parent)
     : AdditionalTab(parent, "statistics_tab")
 {
     // construct GUI
-    TQVBoxLayout *top = static_cast<TQVBoxLayout *>(tqlayout());
+    TQVBoxLayout *top = static_cast<TQVBoxLayout *>(layout());
 
     TQHBoxLayout *hbox = new TQHBoxLayout(top);
     TQVBoxLayout *vbox = new TQVBoxLayout(hbox);
@@ -209,7 +209,7 @@ HistogramTab::HistogramTab(TQWidget *parent)
     : AdditionalTab(parent, "histogram_tab")
 {
     // construct GUI
-    TQVBoxLayout *top = static_cast<TQVBoxLayout *>(tqlayout());
+    TQVBoxLayout *top = static_cast<TQVBoxLayout *>(layout());
 
     _list = new KListView(this);
     _list->setSelectionMode(TQListView::NoSelection);
diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp
index 03170939..a1ed1988 100644
--- a/libtdegames/highscore/kscoredialog.cpp
+++ b/libtdegames/highscore/kscoredialog.cpp
@@ -44,7 +44,7 @@ class KScoreDialog::KScoreDialogPrivate
 public:  
    TQPtrList<FieldInfo> scores;
    TQWidget *page;
-   TQGridLayout *tqlayout;
+   TQGridLayout *layout;
    TQLineEdit *edit;
    TQPtrVector<TQWidgetStack> stack;
    TQPtrVector<TQLabel> labels;
@@ -126,36 +126,36 @@ void KScoreDialog::setupDialog()
          d->col[field] = d->nrCols++;
    }
       
-   d->tqlayout = new TQGridLayout(d->page, 15, d->nrCols, marginHint() + 20, spacingHint());
-   d->tqlayout->addRowSpacing(4, 15);
+   d->layout = new TQGridLayout(d->page, 15, d->nrCols, marginHint() + 20, spacingHint());
+   d->layout->addRowSpacing(4, 15);
 
    d->commentLabel = new TQLabel(d->page);
    d->commentLabel->setAlignment(AlignVCenter | AlignHCenter);
-   d->tqlayout->addMultiCellWidget(d->commentLabel, 1, 1, 0, d->nrCols-1);
+   d->layout->addMultiCellWidget(d->commentLabel, 1, 1, 0, d->nrCols-1);
 
    TQFont bold = font();
    bold.setBold(true);
 
    TQLabel *label;
-   d->tqlayout->addColSpacing(0, 50);
+   d->layout->addColSpacing(0, 50);
    label = new TQLabel(i18n("Rank"), d->page);
-   d->tqlayout->addWidget(label, 3, 0);
+   d->layout->addWidget(label, 3, 0);
    label->setFont(bold);
 
    for(int field = 1; field < d->fields; field = field * 2)
    {
       if (d->fields & field)
       {
-         d->tqlayout->addColSpacing(d->col[field], 50);
+         d->layout->addColSpacing(d->col[field], 50);
 
          label = new TQLabel(d->header[field], d->page);
-         d->tqlayout->addWidget(label, 3, d->col[field], field <= Name ? AlignLeft : AlignRight);
+         d->layout->addWidget(label, 3, d->col[field], field <= Name ? AlignLeft : AlignRight);
          label->setFont(bold);
       }
    }
 
    KSeparator *sep = new KSeparator(Qt::Horizontal, d->page);
-   d->tqlayout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1);
+   d->layout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1);
 
    d->labels.resize(d->nrCols * 10);
    d->stack.resize(10);
@@ -166,12 +166,12 @@ void KScoreDialog::setupDialog()
       num.setNum(i);
       label = new TQLabel(i18n("#%1").arg(num), d->page);
       d->labels.insert((i-1)*d->nrCols + 0, label);
-      d->tqlayout->addWidget(label, i+4, 0);
+      d->layout->addWidget(label, i+4, 0);
       if (d->fields & Name)
       {
          TQWidgetStack *stack = new TQWidgetStack(d->page);
          d->stack.insert(i-1, stack);
-         d->tqlayout->addWidget(stack, i+4, d->col[Name]);
+         d->layout->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->tqlayout->addWidget(label, i+4, d->col[field], AlignRight);
+           d->layout->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->tqlayout->addRowSpacing(0, -15);
-      d->tqlayout->addRowSpacing(2, -15);
+      d->layout->addRowSpacing(0, -15);
+      d->layout->addRowSpacing(2, -15);
    } 
    else
    {
       d->commentLabel->setMinimumSize(d->commentLabel->sizeHint());
       d->commentLabel->show();
-      d->tqlayout->addRowSpacing(0, -10);
-      d->tqlayout->addRowSpacing(2, 10);
+      d->layout->addRowSpacing(0, -10);
+      d->layout->addRowSpacing(2, 10);
    }
    d->comment = TQString();
 
diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp
index c79a8d78..d6b42986 100644
--- a/libtdegames/kcarddialog.cpp
+++ b/libtdegames/kcarddialog.cpp
@@ -271,11 +271,11 @@ void KCardDialog::setupDialog(bool showResizeBox)
 
   if (! (flags() & NoDeck))
   {
-    TQHBoxLayout* tqlayout = new TQHBoxLayout(cardLayout);
+    TQHBoxLayout* layout = new TQHBoxLayout(cardLayout);
 
     // Deck iconview
     TQGroupBox* grp1 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Backside"), plainPage());
-    tqlayout->addWidget(grp1);
+    layout->addWidget(grp1);
 
     d->deckIconView = new KIconView(grp1,"decks");
     d->deckIconView->setSpacing(8);
@@ -293,7 +293,7 @@ void KCardDialog::setupDialog(bool showResizeBox)
     d->deckIconView->showToolTips();
 
     // deck select
-    TQVBoxLayout* l = new TQVBoxLayout(tqlayout);
+    TQVBoxLayout* l = new TQVBoxLayout(layout);
     TQGroupBox* grp3 = new TQGroupBox(i18n("Backside"), plainPage());
     grp3->setFixedSize(100, 130);
     l->addWidget(grp3, 0, AlignTop|AlignHCenter);
@@ -325,9 +325,9 @@ void KCardDialog::setupDialog(bool showResizeBox)
   if (! (flags() & NoCards))
   {
     // Cards iconview
-    TQHBoxLayout* tqlayout = new TQHBoxLayout(cardLayout);
+    TQHBoxLayout* layout = new TQHBoxLayout(cardLayout);
     TQGroupBox* grp2 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Frontside"), plainPage());
-    tqlayout->addWidget(grp2);
+    layout->addWidget(grp2);
 
     d->cardIconView =new KIconView(grp2,"cards");
     /*
@@ -343,7 +343,7 @@ void KCardDialog::setupDialog(bool showResizeBox)
     d->cardIconView->showToolTips();
 
     // Card select
-    TQVBoxLayout* l = new TQVBoxLayout(tqlayout);
+    TQVBoxLayout* l = new TQVBoxLayout(layout);
     TQGroupBox* grp4 = new TQGroupBox(i18n("Frontside"), plainPage());
     grp4->setFixedSize(100, 130);
     l->addWidget(grp4, 0, AlignTop|AlignHCenter);
@@ -422,10 +422,10 @@ void KCardDialog::setupDialog(bool showResizeBox)
     // large. This is desired behaviour as i don't want to make the box even
     // larger but i want the complete pixmap to be displayed. the dialog is not
     // resized if you make the pixmap smaller again.
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(topLayout);
+    TQVBoxLayout* layout = new TQVBoxLayout(topLayout);
     TQGroupBox* grp = new TQGroupBox(1,Qt::Horizontal, i18n("Resize Cards"), plainPage());
-    tqlayout->setResizeMode(TQLayout::Fixed);
-    tqlayout->addWidget(grp);
+    layout->setResizeMode(TQLayout::Fixed);
+    layout->addWidget(grp);
     TQWidget* box = new TQWidget(grp);
     TQHBoxLayout* hbox = new TQHBoxLayout(box, 0, spacingHint());
     TQVBoxLayout* boxLayout = new TQVBoxLayout(hbox);
diff --git a/libtdegames/kchatdialog.cpp b/libtdegames/kchatdialog.cpp
index 7e0df7e8..9cfbefff 100644
--- a/libtdegames/kchatdialog.cpp
+++ b/libtdegames/kchatdialog.cpp
@@ -80,42 +80,42 @@ void KChatDialog::init()
  d = new KChatDialogPrivate;
 // d->mTextPage = addPage(i18n("&Messages"));// not a good name - game Messages?
  d->mTextPage = plainPage();
- TQGridLayout* tqlayout = new TQGridLayout(d->mTextPage, 7, 2, KDialog::marginHint(), KDialog::spacingHint());
+ TQGridLayout* layout = new TQGridLayout(d->mTextPage, 7, 2, KDialog::marginHint(), KDialog::spacingHint());
 
 // General fonts
  TQPushButton* nameFont = new TQPushButton(i18n("Name Font..."), d->mTextPage);
  connect(nameFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetNameFont()));
- tqlayout->addWidget(nameFont, 0, 0);
+ layout->addWidget(nameFont, 0, 0);
  TQPushButton* textFont = new TQPushButton(i18n("Text Font..."), d->mTextPage);
  connect(textFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetTextFont()));
- tqlayout->addWidget(textFont, 0, 1);
+ layout->addWidget(textFont, 0, 1);
 
  TQFrame* messagePreview = new TQFrame(d->mTextPage);
  messagePreview->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
  TQHBoxLayout* messageLayout = new TQHBoxLayout(messagePreview);
- tqlayout->addMultiCellWidget(messagePreview, 1, 1, 0, 1);
+ layout->addMultiCellWidget(messagePreview, 1, 1, 0, 1);
 
  d->mNamePreview = new TQLabel(i18n("Player: "), messagePreview);
  messageLayout->addWidget(d->mNamePreview, 0);
  d->mTextPreview = new TQLabel(i18n("This is a player message"), messagePreview);
  messageLayout->addWidget(d->mTextPreview, 1);
 
- tqlayout->addRowSpacing(2, 10);
+ layout->addRowSpacing(2, 10);
  
 // System Message fonts
  TQLabel* systemMessages = new TQLabel(i18n("System Messages - Messages directly sent from the game"), d->mTextPage);
- tqlayout->addMultiCellWidget(systemMessages, 3, 3, 0, 1);
+ layout->addMultiCellWidget(systemMessages, 3, 3, 0, 1);
  TQPushButton* systemNameFont = new TQPushButton(i18n("Name Font..."), d->mTextPage);
  connect(systemNameFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetSystemNameFont()));
- tqlayout->addWidget(systemNameFont, 4, 0);
+ layout->addWidget(systemNameFont, 4, 0);
  TQPushButton* systemTextFont = new TQPushButton(i18n("Text Font..."), d->mTextPage);
  connect(systemTextFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetSystemTextFont()));
- tqlayout->addWidget(systemTextFont, 4, 1);
+ layout->addWidget(systemTextFont, 4, 1);
 
  TQFrame* systemMessagePreview = new TQFrame(d->mTextPage);
  systemMessagePreview->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
  TQHBoxLayout* systemMessageLayout = new TQHBoxLayout(systemMessagePreview);
- tqlayout->addMultiCellWidget(systemMessagePreview, 5, 5, 0, 1);
+ layout->addMultiCellWidget(systemMessagePreview, 5, 5, 0, 1);
  
  d->mSystemNamePreview = new TQLabel(i18n("--- Game: "), systemMessagePreview);
  systemMessageLayout->addWidget(d->mSystemNamePreview, 0);
@@ -124,10 +124,10 @@ void KChatDialog::init()
 
 // message count
  TQLabel* maxMessages = new TQLabel(i18n("Maximal number of messages (-1 = unlimited):"), d->mTextPage);
- tqlayout->addWidget(maxMessages, 6, 0);
+ layout->addWidget(maxMessages, 6, 0);
  d->mMaxMessages = new TQLineEdit(d->mTextPage);
  d->mMaxMessages->setText(TQString::number(-1));
- tqlayout->addWidget(d->mMaxMessages, 6, 1);
+ layout->addWidget(d->mMaxMessages, 6, 1);
 }
 
 void KChatDialog::slotGetNameFont()
diff --git a/libtdegames/kgame/COMPAT b/libtdegames/kgame/COMPAT
index 4551c679..b85ec9b6 100644
--- a/libtdegames/kgame/COMPAT
+++ b/libtdegames/kgame/COMPAT
@@ -38,7 +38,7 @@
             too!
             The API stays the same.
 11.10.2001  KGameDialogGeneralConfig now doesn't provide setMin/maxPlayers()
-            anymore. The game should manage this internally. tqlayout() is
+            anymore. The game should manage this internally. layout() is
             obsolete as well 
 18.10.2001  KPlayer::signalNetworkData contained QDataStream& instead of const
             QByteArray& parameter (oops!). This is fixed now. All apps which
diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
index 6b56432c..9775edc4 100644
--- a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
+++ b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
@@ -142,18 +142,18 @@ void KGameDebugDialog::initGamePage()
 {
  d->mGamePage = addPage(i18n("Debug &KGame"));
  TQVBoxLayout* topLayout = new TQVBoxLayout(d->mGamePage, marginHint(), spacingHint());
- TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
+ TQHBoxLayout* layout = new TQHBoxLayout(topLayout);
 
  KListView* v = new KListView(d->mGamePage);
  v->addColumn(i18n("Data"));
  v->addColumn(i18n("Value"));
- tqlayout->addWidget(v);
+ layout->addWidget(v);
 
  d->mGameProperties = new KListView(d->mGamePage);
  d->mGameProperties->addColumn(i18n("Property"));
  d->mGameProperties->addColumn(i18n("Value"));
  d->mGameProperties->addColumn(i18n("Policy"));
- tqlayout->addWidget(d->mGameProperties);
+ layout->addWidget(d->mGameProperties);
  
  TQPushButton* b = new TQPushButton(i18n("Update"), d->mGamePage);
  connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUpdateGameData()));
@@ -177,10 +177,10 @@ void KGameDebugDialog::initPlayerPage()
 {
  d->mPlayerPage = addPage(i18n("Debug &Players"));
  TQVBoxLayout* topLayout = new TQVBoxLayout(d->mPlayerPage, marginHint(), spacingHint());
- TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
+ TQHBoxLayout* layout = new TQHBoxLayout(topLayout);
 
  //TODO: connect to the KGame signals for joined/removed players!!!
- TQVBoxLayout* listLayout = new TQVBoxLayout(tqlayout);
+ TQVBoxLayout* listLayout = new TQVBoxLayout(layout);
  TQLabel* listLabel = new TQLabel(i18n("Available Players"), d->mPlayerPage);
  listLayout->addWidget(listLabel);
  d->mPlayerList = new KListBox(d->mPlayerPage);
@@ -189,7 +189,7 @@ void KGameDebugDialog::initPlayerPage()
  d->mPlayerList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
 
  KListView* v = new KListView(d->mPlayerPage);
- tqlayout->addWidget(v);
+ layout->addWidget(v);
  v->addColumn(i18n("Data"));
  v->addColumn(i18n("Value"));
  
@@ -197,7 +197,7 @@ void KGameDebugDialog::initPlayerPage()
  d->mPlayerProperties->addColumn(i18n("Property"));
  d->mPlayerProperties->addColumn(i18n("Value"));
  d->mPlayerProperties->addColumn(i18n("Policy"));
- tqlayout->addWidget(d->mPlayerProperties);
+ layout->addWidget(d->mPlayerProperties);
  
  TQPushButton* b = new TQPushButton(i18n("Update"), d->mPlayerPage);
  connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUpdatePlayerList()));
@@ -220,9 +220,9 @@ void KGameDebugDialog::initPlayerPage()
 void KGameDebugDialog::initMessagePage()
 {
  d->mMessagePage = addPage(i18n("Debug &Messages"));
- TQGridLayout* tqlayout = new TQGridLayout(d->mMessagePage, 11, 7, marginHint(), spacingHint());
+ TQGridLayout* layout = new TQGridLayout(d->mMessagePage, 11, 7, marginHint(), spacingHint());
  d->mMessageList = new KListView(d->mMessagePage);
- tqlayout->addMultiCellWidget(d->mMessageList, 0, 9, 0, 3);
+ layout->addMultiCellWidget(d->mMessageList, 0, 9, 0, 3);
  d->mMessageList->addColumn(i18n("Time"));
  d->mMessageList->addColumn(i18n("ID"));
  d->mMessageList->addColumn(i18n("Receiver"));
@@ -231,20 +231,20 @@ void KGameDebugDialog::initMessagePage()
 
  TQPushButton* hide = new TQPushButton(i18n("&>>"), d->mMessagePage);
  connect(hide, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotHideId()));
- tqlayout->addWidget(hide, 4, 4);
+ layout->addWidget(hide, 4, 4);
  
  TQPushButton* show = new TQPushButton(i18n("&<<"), d->mMessagePage);
  connect(show, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotShowId()));
- tqlayout->addWidget(show, 6, 4);
+ layout->addWidget(show, 6, 4);
 
  TQLabel* l = new TQLabel(i18n("Do not show IDs:"), d->mMessagePage);
- tqlayout->addMultiCellWidget(l, 0, 0, 5, 6);
+ layout->addMultiCellWidget(l, 0, 0, 5, 6);
  d->mHideIdList = new KListBox(d->mMessagePage);
- tqlayout->addMultiCellWidget(d->mHideIdList, 1, 8, 5, 6);
+ layout->addMultiCellWidget(d->mHideIdList, 1, 8, 5, 6);
 
  TQPushButton* clear = new KPushButton(KStdGuiItem::clear(), d->mMessagePage);
  connect(clear, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearMessages()));
- tqlayout->addMultiCellWidget(clear, 10, 10, 0, 6);
+ layout->addMultiCellWidget(clear, 10, 10, 0, 6);
  //TODO: "show all but..." and "show nothing but..."
 }
 
diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
index a3f11835..dacbde82 100644
--- a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
+++ b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
@@ -122,7 +122,7 @@ KGameDialogNetworkConfig::KGameDialogNetworkConfig(TQWidget* parent)
 // kdDebug(11001) << k_funcinfo << ": this=" << this << endl;
  d = new KGameDialogNetworkConfigPrivate();
 
- TQVBoxLayout* topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "toptqlayout");
+ TQVBoxLayout* topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "toplayout");
 
  TQHBoxLayout *hb = new TQHBoxLayout(topLayout, KDialog::spacingHint());
 
diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.h b/libtdegames/kgame/dialogs/kgamedialogconfig.h
index c2c36e2a..b91f05d0 100644
--- a/libtdegames/kgame/dialogs/kgamedialogconfig.h
+++ b/libtdegames/kgame/dialogs/kgamedialogconfig.h
@@ -157,7 +157,7 @@ public:
 	 *
 	 * @param parent Parent widget for this dialog.
 	 * @param initializeGUI If you really don't want to use the 
-	 * predefined widget and/or tqlayout use FALSE here. Note that then none
+	 * predefined widget and/or layout use FALSE here. Note that then none
 	 * of the predefined widgets (currently only the name of the player) 
 	 * will exist anymore.
 	 *
diff --git a/libtdegames/kgamelcd.cpp b/libtdegames/kgamelcd.cpp
index fc814f18..c99a3401 100644
--- a/libtdegames/kgamelcd.cpp
+++ b/libtdegames/kgamelcd.cpp
@@ -232,11 +232,11 @@ void KGameLCDList::append(const TQString &leading, TQLCDNumber *lcd)
     TQLabel *label = 0;
     if ( !leading.isEmpty() ) {
       label = new TQLabel(leading, this);
-      static_cast<TQGridLayout *>(tqlayout())->addWidget(label, i+1, 0);
+      static_cast<TQGridLayout *>(layout())->addWidget(label, i+1, 0);
     }
     d->_leadings.push_back(label);
     _lcds.push_back(lcd);
-    static_cast<TQGridLayout *>(tqlayout())->addWidget(lcd, i+1, 1);
+    static_cast<TQGridLayout *>(layout())->addWidget(lcd, i+1, 1);
 }
 
 void KGameLCDList::clear()
diff --git a/libtdegames/kgamelcd.h b/libtdegames/kgamelcd.h
index 6b84f012..f7bc69e6 100644
--- a/libtdegames/kgamelcd.h
+++ b/libtdegames/kgamelcd.h
@@ -184,7 +184,7 @@ private:
 
 //-----------------------------------------------------------------------------
 /**
- * This widget holds a list of @ref TQLCDNumber arranged in a vertical tqlayout.
+ * This widget holds a list of @ref TQLCDNumber arranged in a vertical layout.
  * It also shows a label at the top of the list.
  *
  * @since 3.2
diff --git a/libtdegames/kgameprogress.cpp b/libtdegames/kgameprogress.cpp
index de32cd14..451d9e40 100644
--- a/libtdegames/kgameprogress.cpp
+++ b/libtdegames/kgameprogress.cpp
@@ -213,7 +213,7 @@ void KGameProgress::styleChange(TQStyle&)
 
 void KGameProgress::adjustStyle()
 {
-	switch (tqstyle().styleHint(TQStyle::SH_GUIStyle)) {
+	switch (style().styleHint(TQStyle::SH_GUIStyle)) {
 		case WindowsStyle:
 			setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 			break;