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

This reverts commit 882bcd26b3d60be72ea2b35921969a9850c52db9.

1 files changed, 15 insertions, 15 deletions

diff --git a/src/newbasketdialog.cpp b/src/newbasketdialog.cpp
index 6cc2b3d..82ee60e 100644
--- a/src/newbasketdialog.cpp
+++ b/src/newbasketdialog.cpp
@@ -21,7 +21,7 @@
 #include <kicondialog.h>
 #include <tqlineedit.h>
 #include <kiconview.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
@@ -98,7 +98,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro
 	m_icon->setIconType(KIcon::NoGroup, KIcon::Action);
 	m_icon->setIconSize(16);
 	m_icon->setIcon(m_defaultProperties.icon.isEmpty() ? "basket" : m_defaultProperties.icon);
-	int size = TQMAX(m_icon->sizeHint().width(), m_icon->sizeHint().height());
+	int size = TQMAX(m_icon->tqsizeHint().width(), m_icon->tqsizeHint().height());
 	m_icon->setFixedSize(size, size); // Make it square!
 	TQToolTip::add(m_icon, i18n("Icon"));
 	m_name = new TQLineEdit(/*i18n("Basket"), */page);
@@ -108,7 +108,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro
 	TQToolTip::add(m_name, i18n("Name"));
 	m_backgroundColor = new KColorCombo2(TQColor(), KGlobalSettings::baseColor(), page);
 	m_backgroundColor->setColor(TQColor());
-	m_backgroundColor->setFixedSize(m_backgroundColor->sizeHint());
+	m_backgroundColor->setFixedSize(m_backgroundColor->tqsizeHint());
 	m_backgroundColor->setColor(m_defaultProperties.backgroundColor);
 	TQToolTip::add(m_backgroundColor, i18n("Background color"));
 	nameLayout->addWidget(m_icon);
@@ -116,7 +116,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro
 	nameLayout->addWidget(m_backgroundColor);
 	topLayout->addLayout(nameLayout);
 
-	TQHBoxLayout *layout = new TQHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint());
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint());
 	KPushButton *button = new KPushButton( KGuiItem(i18n("&Manage Templates..."), "configure"), page );
 	connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(manageTemplates()) );
 	button->hide();
@@ -200,16 +200,16 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro
 	painter.end();
 	lastTemplate = new KIconViewItem(m_templates, lastTemplate, i18n("Mind map"), icon);*/
 
-	m_templates->setMinimumHeight(topLayout->minimumSize().width() * 9 / 16);
+	m_templates->setMinimumHeight(topLayout->tqminimumSize().width() * 9 / 16);
 
 	TQLabel *label = new TQLabel(m_templates, i18n("&Template:"), page);
-	layout->addWidget(label, /*stretch=*/0, TQt::AlignBottom);
-	layout->addStretch();
-	layout->addWidget(button, /*stretch=*/0, TQt::AlignBottom);
-	topLayout->addLayout(layout);
+	tqlayout->addWidget(label, /*stretch=*/0, TQt::AlignBottom);
+	tqlayout->addStretch();
+	tqlayout->addWidget(button, /*stretch=*/0, TQt::AlignBottom);
+	topLayout->addLayout(tqlayout);
 	topLayout->addWidget(m_templates);
 
-	layout = new TQHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint());
+	tqlayout = new TQHBoxLayout(/*parent=*/0, /*margin=*/0, spacingHint());
 	m_createIn = new TQComboBox(page);
 	m_createIn->insertItem(i18n("(Baskets)"));
 	label = new TQLabel(m_createIn, i18n("C&reate in:"), page);
@@ -219,11 +219,11 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro
 		"<li>Grouping baskets in folders for different projects;</li>"
 		"<li>Making sections with sub-baskets representing chapters or pages;</li>"
 		"<li>Making a group of baskets to export together (to eg. email them to people).</li></ul>"), page);
-	layout->addWidget(label);
-	layout->addWidget(m_createIn);
-	layout->addWidget(helpLabel);
-	layout->addStretch();
-	topLayout->addLayout(layout);
+	tqlayout->addWidget(label);
+	tqlayout->addWidget(m_createIn);
+	tqlayout->addWidget(helpLabel);
+	tqlayout->addStretch();
+	topLayout->addLayout(tqlayout);
 
 	m_basketsMap.clear();
 	m_basketsMap.insert(/*index=*/0, /*basket=*/0L);