From ae6cafee5339716bd01aa6c66aa4f366bdc5d43b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:55:33 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 882bcd26b3d60be72ea2b35921969a9850c52db9. --- src/variouswidgets.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/variouswidgets.cpp') diff --git a/src/variouswidgets.cpp b/src/variouswidgets.cpp index 31d2c64..d24725a 100644 --- a/src/variouswidgets.cpp +++ b/src/variouswidgets.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include #include #include @@ -42,14 +42,14 @@ RunCommandRequester::RunCommandRequester(const TQString &runCommand, const TQStr { m_message = message; - TQHBoxLayout *layout = new TQHBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this, /*margin=*/0, KDialogBase::spacingHint()); m_runCommand = new TQLineEdit(runCommand, this); TQPushButton *pb = new TQPushButton(/*"C&hoose..."*/i18n("..."), this); - pb->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + pb->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - layout->addWidget(m_runCommand); - layout->addWidget(pb); + tqlayout->addWidget(m_runCommand); + tqlayout->addWidget(pb); connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelCommand()) ); } @@ -129,11 +129,11 @@ ViewSizeDialog::ViewSizeDialog(TQWidget *parent, int w, int h) "Resize the window to select the image size\n" "and close it or press Escape to accept changes."), this); label->move(8, 8); - label->setFixedSize( label->sizeHint() ); + label->setFixedSize( label->tqsizeHint() ); // setSizeGripEnabled(true) doesn't work (the grip stay at the same place), so we emulate it: m_sizeGrip = new TQSizeGrip(this); - m_sizeGrip->setFixedSize( m_sizeGrip->sizeHint() ); + m_sizeGrip->setFixedSize( m_sizeGrip->tqsizeHint() ); setGeometry(x(), y(), w, h); } @@ -144,7 +144,7 @@ ViewSizeDialog::~ViewSizeDialog() void ViewSizeDialog::resizeEvent(TQResizeEvent *) { - setCaption( i18n("%1 by %2 pixels").arg(TQString::number(width())).arg(TQString::number(height())) ); + setCaption( i18n("%1 by %2 pixels").tqarg(TQString::number(width())).tqarg(TQString::number(height())) ); m_sizeGrip->move( width() - m_sizeGrip->width(), height() - m_sizeGrip->height() ); } @@ -269,7 +269,7 @@ FontSizeCombo::FontSizeCombo(bool rw, bool withDefault, TQWidget *parent, const insertItem(i18n("(Default)")); TQFontDatabase fontDB; - TQValueList sizes = fontDB.standardSizes(); + TQValueList sizes = fontDB.tqstandardSizes(); for (TQValueList::Iterator it = sizes.begin(); it != sizes.end(); ++it) insertItem(TQString::number(*it)); -- cgit v1.2.1