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

This reverts commit 031454e56009d576589c28757f6c6fcf4884095e.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/numberfieldwidget.cpp b/src/gui/numberfieldwidget.cpp
index c016bc6..f2cdaa8 100644
--- a/src/gui/numberfieldwidget.cpp
+++ b/src/gui/numberfieldwidget.cpp
@@ -17,7 +17,7 @@
 
 #include <klineedit.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvalidator.h>
 
 using Tellico::GUI::NumberFieldWidget;
@@ -41,7 +41,7 @@ void NumberFieldWidget::initLineEdit() {
 
   // regexp is any number of digits followed optionally by any number of
   // groups of a semi-colon followed optionally by a space, followed by digits
-  TQRegExp rx(TQString::fromLatin1("-?\\d*(; ?-?\\d*)*"));
+  TQRegExp rx(TQString::tqfromLatin1("-?\\d*(; ?-?\\d*)*"));
   m_lineEdit->setValidator(new TQRegExpValidator(rx, TQT_TQOBJECT(this)));
 }
 
@@ -67,7 +67,7 @@ TQString NumberFieldWidget::text() const {
 
   TQString text = m_lineEdit->text();
   if(field()->flags() & Data::Field::AllowMultiple) {
-    text.replace(s_semiColon, TQString::fromLatin1("; "));
+    text.replace(s_semiColon, TQString::tqfromLatin1("; "));
   }
   return text.simplifyWhiteSpace();
 }
@@ -116,19 +116,19 @@ void NumberFieldWidget::updateFieldHook(Data::FieldPtr, Data::FieldPtr newField_
 
   TQString value = text();
   if(wasLineEdit && !nowLineEdit) {
-    layout()->remove(m_lineEdit);
+    tqlayout()->remove(m_lineEdit);
     delete m_lineEdit;
     m_lineEdit = 0;
     initSpinBox();
   } else if(!wasLineEdit && nowLineEdit) {
-    layout()->remove(m_spinBox);
+    tqlayout()->remove(m_spinBox);
     delete m_spinBox;
     m_spinBox = 0;
     initLineEdit();
   }
 
   // should really be FIELD_EDIT_WIDGET_INDEX from fieldwidget.cpp
-  static_cast<TQBoxLayout*>(layout())->insertWidget(2, widget(), 1 /*stretch*/);
+  static_cast<TQBoxLayout*>(tqlayout())->insertWidget(2, widget(), 1 /*stretch*/);
   widget()->show();
   setText(value);
 }