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

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.

1 files changed, 21 insertions, 21 deletions

diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index c7d0e06e..c9f866c4 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -33,7 +33,7 @@
 
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdir.h>
 #include <tqvalidator.h>
 #include <tqtooltip.h>
@@ -90,11 +90,11 @@ public:
 	m_width(-1) {}
     void setWidth(int w = -1)
     {
-	m_width = w == -1 ? TQHBoxLayout::minimumSize().width() : w;
+	m_width = w == -1 ? TQHBoxLayout::tqminimumSize().width() : w;
     }
-    virtual TQSize minimumSize() const
+    virtual TQSize tqminimumSize() const
     {
-	TQSize s = TQHBoxLayout::minimumSize();
+	TQSize s = TQHBoxLayout::tqminimumSize();
 	s.setWidth(m_width);
 	return s;
     }
@@ -481,16 +481,16 @@ void TagEditor::setupLayout()
     static const int horizontalSpacing = 12;
     static const int verticalSpacing = 2;
 
-    TQHBoxLayout *layout = new TQHBoxLayout(this, 6, horizontalSpacing);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 6, horizontalSpacing);
 
     //////////////////////////////////////////////////////////////////////////////
-    // define two columns of the bottem layout
+    // define two columns of the bottem tqlayout
     //////////////////////////////////////////////////////////////////////////////
-    TQVBoxLayout *leftColumnLayout = new TQVBoxLayout(layout, verticalSpacing);
-    TQVBoxLayout *rightColumnLayout = new TQVBoxLayout(layout, verticalSpacing);
+    TQVBoxLayout *leftColumnLayout = new TQVBoxLayout(tqlayout, verticalSpacing);
+    TQVBoxLayout *rightColumnLayout = new TQVBoxLayout(tqlayout, verticalSpacing);
 
-    layout->setStretchFactor(leftColumnLayout, 2);
-    layout->setStretchFactor(rightColumnLayout, 3);
+    tqlayout->setStretchFactor(leftColumnLayout, 2);
+    tqlayout->setStretchFactor(rightColumnLayout, 3);
 
     //////////////////////////////////////////////////////////////////////////////
     // put stuff in the left column -- all of the field names are class wide
@@ -560,7 +560,7 @@ void TagEditor::setupLayout()
 	    // addItem(i18n("Length:"), m_lengthBox, trackRowLayout);
 	    m_lengthBox->setMinimumWidth(fontMetrics().width("00:00") + trackRowLayout->spacing());
 	    m_lengthBox->setMaximumWidth(50);
-	    m_lengthBox->setAlignment(TQt::AlignRight);
+	    m_lengthBox->tqsetAlignment(TQt::AlignRight);
 	    m_lengthBox->setReadOnly(true);
 	    trackRowLayout->addWidget(addHidden(m_lengthBox));
 
@@ -572,7 +572,7 @@ void TagEditor::setupLayout()
 	    // addItem(i18n("Bitrate:"), m_bitrateBox, trackRowLayout);
 	    m_bitrateBox->setMinimumWidth(fontMetrics().width("000") + trackRowLayout->spacing());
 	    m_bitrateBox->setMaximumWidth(50);
-	    m_bitrateBox->setAlignment(TQt::AlignRight);
+	    m_bitrateBox->tqsetAlignment(TQt::AlignRight);
 	    m_bitrateBox->setReadOnly(true);
 	    trackRowLayout->addWidget(addHidden(m_bitrateBox));
 
@@ -711,9 +711,9 @@ void TagEditor::saveChangesPrompt()
     }
 }
 
-void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layout, const TQString &iconName)
+void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *tqlayout, const TQString &iconName)
 {
-    if(!item || !layout)
+    if(!item || !tqlayout)
 	return;
 
     TQLabel *label = new TQLabel(item, text, this);
@@ -727,14 +727,14 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou
 
     label->setMinimumHeight(enableBox->height());
 
-    if(layout->direction() == TQBoxLayout::LeftToRight) {
-    	layout->addWidget(iconLabel);
-	layout->addWidget(label);
-	layout->addWidget(item);
-	layout->addWidget(enableBox);
+    if(tqlayout->direction() == TQBoxLayout::LeftToRight) {
+    	tqlayout->addWidget(iconLabel);
+	tqlayout->addWidget(label);
+	tqlayout->addWidget(item);
+	tqlayout->addWidget(enableBox);
     }
     else {
-	TQHBoxLayout *l = new TQHBoxLayout(layout);
+	TQHBoxLayout *l = new TQHBoxLayout(tqlayout);
 	
 	l->addWidget(iconLabel);
 	l->addWidget(label);
@@ -745,7 +745,7 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou
 	l->addWidget(enableBox);
 	l->setStretchFactor(enableBox, 0);
 
-	layout->addWidget(item);
+	tqlayout->addWidget(item);
     }
 
     enableBox->hide();