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

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.
---
 juk/filerenameroptions.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'juk/filerenameroptions.cpp')

diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp
index 2db9e26d..d800d2e2 100644
--- a/juk/filerenameroptions.cpp
+++ b/juk/filerenameroptions.cpp
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 #include <knuminput.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqradiobutton.h>
 #include <tqlineedit.h>
@@ -29,28 +29,28 @@ FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *parent,
                                              const TagRenamerOptions &options) :
     FileRenamerTagOptionsBase(parent), m_options(options)
 {
-    layout()->setSpacing(KDialog::spacingHint());
-    layout()->setMargin(0);
+    tqlayout()->setSpacing(KDialog::spacingHint());
+    tqlayout()->setMargin(0);
 
-    m_emptyTagGroup->layout()->setSpacing(KDialog::spacingHint());
-    m_trackGroup->layout()->setSpacing(KDialog::spacingHint());
+    m_emptyTagGroup->tqlayout()->setSpacing(KDialog::spacingHint());
+    m_trackGroup->tqlayout()->setSpacing(KDialog::spacingHint());
     m_emptyValueLayout->setSpacing(KDialog::spacingHint());
     m_exampleLayout->setSpacing(KDialog::spacingHint());
     m_spinLayout->setSpacing(KDialog::spacingHint());
     m_widthLayout->setSpacing(KDialog::spacingHint());
     m_tagLayout->setSpacing(KDialog::spacingHint());
-    m_tagFormatGroup->layout()->setSpacing(KDialog::spacingHint());
+    m_tagFormatGroup->tqlayout()->setSpacing(KDialog::spacingHint());
 
     if(m_options.category() != Track)
         m_trackGroup->hide();
 
     TQString tagText = m_options.tagTypeText();
 
-    setCaption(caption().arg(tagText));
-    m_tagFormatGroup->setTitle(m_tagFormatGroup->title().arg(tagText));
-    m_emptyTagGroup->setTitle(m_emptyTagGroup->title().arg(tagText));
-    m_description->setText(m_description->text().arg(tagText));
-    m_tagLabel->setText(m_tagLabel->text().arg(tagText));
+    setCaption(caption().tqarg(tagText));
+    m_tagFormatGroup->setTitle(m_tagFormatGroup->title().tqarg(tagText));
+    m_emptyTagGroup->setTitle(m_emptyTagGroup->title().tqarg(tagText));
+    m_description->setText(m_description->text().tqarg(tagText));
+    m_tagLabel->setText(m_tagLabel->text().tqarg(tagText));
 
     m_prefixText->setText(options.prefix());
     m_suffixText->setText(options.suffix());
-- 
cgit v1.2.1