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

1 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/fieldwidget.cpp b/src/gui/fieldwidget.cpp
index 3940fc4..653db95 100644
--- a/src/gui/fieldwidget.cpp
+++ b/src/gui/fieldwidget.cpp
@@ -28,7 +28,7 @@
 #include <kurllabel.h>
 #include <klocale.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqregexp.h>
 #include <tqlabel.h>
@@ -43,7 +43,7 @@ namespace {
 
 using Tellico::GUI::FieldWidget;
 
-const TQRegExp FieldWidget::s_semiColon = TQRegExp(TQString::tqfromLatin1("\\s*;\\s*"));
+const TQRegExp FieldWidget::s_semiColon = TQRegExp(TQString::fromLatin1("\\s*;\\s*"));
 
 FieldWidget* FieldWidget::create(Data::FieldPtr field_, TQWidget* parent_, const char* name_) {
   switch (field_->type()) {
@@ -98,14 +98,14 @@ FieldWidget::FieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* n
   }
 
   Data::Field::Type type = field_->type();
-  TQString s = i18n("Edit Label", "%1:").tqarg(field_->title());
+  TQString s = i18n("Edit Label", "%1:").arg(field_->title());
   if(type == Data::Field::URL) {
     // set URL to null for now
     m_label = new KURLLabel(TQString(), s, this);
   } else {
     m_label = new TQLabel(s, this);
   }
-  m_label->setFixedWidth(m_label->tqsizeHint().width());
+  m_label->setFixedWidth(m_label->sizeHint().width());
   l->addWidget(m_label);
 
   // expands indicates if the edit widget should expand to full width of widget
@@ -120,7 +120,7 @@ FieldWidget::FieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* n
 
   m_editMultiple = new TQCheckBox(this);
   m_editMultiple->setChecked(true);
-  m_editMultiple->setFixedWidth(m_editMultiple->tqsizeHint().width()); // don't let it have any extra space
+  m_editMultiple->setFixedWidth(m_editMultiple->sizeHint().width()); // don't let it have any extra space
   connect(m_editMultiple, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setEnabled(bool)));
   l->addWidget(m_editMultiple);
 
@@ -147,7 +147,7 @@ void FieldWidget::setEnabled(bool enabled_) {
 }
 
 int FieldWidget::labelWidth() const {
-  return m_label->tqsizeHint().width();
+  return m_label->sizeHint().width();
 }
 
 void FieldWidget::setLabelWidth(int width_) {
@@ -182,7 +182,7 @@ void FieldWidget::registerWidget() {
     setFocusProxy(w);
   }
 
-  TQHBoxLayout* l = static_cast<TQHBoxLayout*>(tqlayout());
+  TQHBoxLayout* l = static_cast<TQHBoxLayout*>(layout());
   l->insertWidget(FIELD_EDIT_WIDGET_INDEX, w, m_expands ? 1 : 0 /*stretch*/);
   if(!m_expands) {
     l->insertStretch(FIELD_EDIT_WIDGET_INDEX+1, 1 /*stretch*/);
@@ -192,7 +192,7 @@ void FieldWidget::registerWidget() {
 
 void FieldWidget::updateField(Data::FieldPtr oldField_, Data::FieldPtr newField_) {
   m_field = newField_;
-  m_label->setText(i18n("Edit Label", "%1:").tqarg(newField_->title()));
+  m_label->setText(i18n("Edit Label", "%1:").arg(newField_->title()));
   updateGeometry();
   TQWhatsThis::add(this, newField_->description());
   updateFieldHook(oldField_, newField_);