Rename obsolete tq methods to standard names

1 files changed, 17 insertions, 17 deletions

diff --git a/src/collectionfieldsdialog.cpp b/src/collectionfieldsdialog.cpp
index 68e958f..d2f8982 100644
--- a/src/collectionfieldsdialog.cpp
+++ b/src/collectionfieldsdialog.cpp
@@ -96,11 +96,11 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
   m_btnUp = new KPushButton(hb2);
   m_btnUp->setPixmap(BarIcon(TQString::fromLatin1("up"), KIcon::SizeSmall));
   TQWhatsThis::add(m_btnUp, i18n("Move this field up in the list. The list order is important "
-                                "for the tqlayout of the entry editor."));
+                                "for the layout of the entry editor."));
   m_btnDown = new KPushButton(hb2);
   m_btnDown->setPixmap(BarIcon(TQString::fromLatin1("down"), KIcon::SizeSmall));
   TQWhatsThis::add(m_btnDown, i18n("Move this field down in the list. The list order is important "
-                                  "for the tqlayout of the entry editor."));
+                                  "for the layout of the entry editor."));
 
   connect(m_btnUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()) );
   connect(m_btnDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown()));
@@ -113,13 +113,13 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
 
   TQWidget* grid = new TQWidget(propGroup);
   // (parent, nrows, ncols, margin, spacing)
-  TQGridLayout* tqlayout = new TQGridLayout(grid, 4, 4, 0, KDialog::spacingHint());
+  TQGridLayout* layout = new TQGridLayout(grid, 4, 4, 0, KDialog::spacingHint());
 
   int row = -1;
   TQLabel* label = new TQLabel(i18n("&Title:"), grid);
-  tqlayout->addWidget(label, ++row, 0);
+  layout->addWidget(label, ++row, 0);
   m_titleEdit = new KLineEdit(grid);
-  tqlayout->addWidget(m_titleEdit, row, 1);
+  layout->addWidget(m_titleEdit, row, 1);
   label->setBuddy(m_titleEdit);
   TQString whats = i18n("The title of the field");
   TQWhatsThis::add(label, whats);
@@ -127,9 +127,9 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
   connect(m_titleEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified()));
 
   label = new TQLabel(i18n("T&ype:"), grid);
-  tqlayout->addWidget(label, row, 2);
+  layout->addWidget(label, row, 2);
   m_typeCombo = new KComboBox(grid);
-  tqlayout->addWidget(m_typeCombo, row, 3);
+  layout->addWidget(m_typeCombo, row, 3);
   label->setBuddy(m_typeCombo);
   whats = TQString::fromLatin1("<qt>");
   whats += i18n("The type of the field determines what values may be used. ");
@@ -155,9 +155,9 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
   connect(m_typeCombo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotTypeChanged(const TQString&)));
 
   label = new TQLabel(i18n("Cate&gory:"), grid);
-  tqlayout->addWidget(label, ++row, 0);
+  layout->addWidget(label, ++row, 0);
   m_catCombo = new KComboBox(true, grid);
-  tqlayout->addWidget(m_catCombo, row, 1);
+  layout->addWidget(m_catCombo, row, 1);
   label->setBuddy(m_catCombo);
   whats = i18n("The field category determines where the field is placed in the editor.");
   TQWhatsThis::add(label, whats);
@@ -177,10 +177,10 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
   connect(m_catCombo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified()));
 
   label = new TQLabel(i18n("Descr&iption:"), grid);
-  tqlayout->addWidget(label, ++row, 0);
+  layout->addWidget(label, ++row, 0);
   m_descEdit = new KLineEdit(grid);
   m_descEdit->setMinimumWidth(150);
-  tqlayout->addMultiCellWidget(m_descEdit, row, row, 1, 3);
+  layout->addMultiCellWidget(m_descEdit, row, row, 1, 3);
   label->setBuddy(m_descEdit);
   /* TRANSLATORS: Do not translate %{year} and %{title}. */
   whats = i18n("The description is a useful reminder of what information is contained in the "
@@ -191,9 +191,9 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
   connect(m_descEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified()));
 
   label = new TQLabel(i18n("&Default value:"), grid);
-  tqlayout->addWidget(label, ++row, 0);
+  layout->addWidget(label, ++row, 0);
   m_defaultEdit = new KLineEdit(grid);
-  tqlayout->addMultiCellWidget(m_defaultEdit, row, row, 1, 3);
+  layout->addMultiCellWidget(m_defaultEdit, row, row, 1, 3);
   label->setBuddy(m_defaultEdit);
   whats = i18n("<qt>A default value can be set for new entries.</qt>");
   TQWhatsThis::add(label, whats);
@@ -201,9 +201,9 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
   connect(m_defaultEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified()));
 
   label = new TQLabel(i18n("A&llowed values:"), grid);
-  tqlayout->addWidget(label, ++row, 0);
+  layout->addWidget(label, ++row, 0);
   m_allowEdit = new KLineEdit(grid);
-  tqlayout->addMultiCellWidget(m_allowEdit, row, row, 1, 3);
+  layout->addMultiCellWidget(m_allowEdit, row, row, 1, 3);
   label->setBuddy(m_allowEdit);
   whats = i18n("<qt>For <i>Choice</i>-type fields, these are the only values allowed. They are "
                "placed in a combo box. The possible values have to be separated by a semi-colon, "
@@ -213,10 +213,10 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
   connect(m_allowEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified()));
 
   label = new TQLabel(i18n("Extended &properties:"), grid);
-  tqlayout->addWidget(label, ++row, 0);
+  layout->addWidget(label, ++row, 0);
   m_btnExtended = new KPushButton(i18n("&Set..."), grid);
   m_btnExtended->setIconSet(BarIcon(TQString::fromLatin1("bookmark"), KIcon::SizeSmall));
-  tqlayout->addWidget(m_btnExtended, row, 1);
+  layout->addWidget(m_btnExtended, row, 1);
   label->setBuddy(m_btnExtended);
   whats = i18n("Extended field properties are used to specify things such as the corresponding bibtex field.");
   TQWhatsThis::add(label, whats);