Rename obsolete tq methods to standard names

1 files changed, 16 insertions, 16 deletions

diff --git a/src/entryeditdialog.cpp b/src/entryeditdialog.cpp
index 91096d9..a6d5dd5 100644
--- a/src/entryeditdialog.cpp
+++ b/src/entryeditdialog.cpp
@@ -153,7 +153,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
       continue;
     }
 
-    // if this tqlayout model is changed, be sure to check slotUpdateField()
+    // if this layout model is changed, be sure to check slotUpdateField()
     TQWidget* page = new TQWidget(m_tabs);
     // (parent, margin, spacing)
     TQVBoxLayout* boxLayout = new TQVBoxLayout(page, 0, 0);
@@ -163,10 +163,10 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
     // (parent, nrows, ncols, margin, spacing)
     // spacing gets a bit weird, if there are absolutely no Choice fields,
     // then spacing should be 5, which is set later
-    TQGridLayout* tqlayout = new TQGridLayout(grid, 0, NCOLS, 8, 2);
+    TQGridLayout* layout = new TQGridLayout(grid, 0, NCOLS, 8, 2);
     // keramik styles make big widget, cut down the spacing a bit
-    if(TQCString(tqstyle().name()).lower().find("keramik", 0, false) > -1) {
-      tqlayout->setSpacing(0);
+    if(TQCString(style().name()).lower().find("keramik", 0, false) > -1) {
+      layout->setSpacing(0);
     }
 
     boxLayout->addWidget(grid, 0);
@@ -202,8 +202,8 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
 
       int r = count/NCOLS;
       int c = count%NCOLS;
-      tqlayout->addWidget(widget, r, c);
-      tqlayout->setRowStretch(r, 1);
+      layout->addWidget(widget, r, c);
+      layout->setRowStretch(r, 1);
 
       m_widgetDict.insert(TQString::number(m_currColl->id()) + field->name(), widget);
 
@@ -231,7 +231,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
     // update stretch factors for columns with a line edit
     for(int col = 0; col < NCOLS; ++col) {
       if(expands[col]) {
-        tqlayout->setColStretch(col, 1);
+        layout->setColStretch(col, 1);
       }
     }
 
@@ -240,7 +240,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
 
   // Now, go through and set all the field widgets to the same height
   for(TQPtrListIterator<TQWidget> it(gridList); it.current(); ++it) {
-    TQGridLayout* l = static_cast<TQGridLayout*>(it.current()->tqlayout());
+    TQGridLayout* l = static_cast<TQGridLayout*>(it.current()->layout());
     if(noChoices) {
       l->setSpacing(5);
     }
@@ -250,7 +250,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
     // I don't want anything to be hidden, Keramik has a bug if I don't do this
     it.current()->setMinimumHeight(it.current()->sizeHint().height());
     // the parent of the grid is the page that got added to the tabs
-    it.current()->parentWidget()->tqlayout()->invalidate();
+    it.current()->parentWidget()->layout()->invalidate();
     it.current()->parentWidget()->setMinimumHeight(it.current()->parentWidget()->sizeHint().height());
   }
 
@@ -258,7 +258,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
 // this doesn't seem to work
 //  setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
 // so do this instead
-  tqlayout()->invalidate(); // needed so the sizeHint() gets recalculated
+  layout()->invalidate(); // needed so the sizeHint() gets recalculated
   m_tabs->setMinimumHeight(m_tabs->minimumSizeHint().height());
   m_tabs->setMinimumWidth(m_tabs->sizeHint().width());
 
@@ -566,8 +566,8 @@ void EntryEditDialog::removeField(Data::CollPtr, Data::FieldPtr field_) {
       delete w; // automatically deletes child widget
     } else {
       // much of this replicates code in setLayout()
-      TQGridLayout* tqlayout = static_cast<TQGridLayout*>(widget->parentWidget()->tqlayout());
-      delete widget; // automatically removes from tqlayout
+      TQGridLayout* layout = static_cast<TQGridLayout*>(widget->parentWidget()->layout());
+      delete widget; // automatically removes from layout
 
       TQValueVector<bool> expands(NCOLS, false);
       TQValueVector<int> maxWidth(NCOLS, 0);
@@ -577,8 +577,8 @@ void EntryEditDialog::removeField(Data::CollPtr, Data::FieldPtr field_) {
       for(int count = 0; it != vec.end(); ++it) {
         GUI::FieldWidget* widget = m_widgetDict.find(TQString::number(m_currColl->id()) + it->name());
         if(widget) {
-          tqlayout->remove(widget);
-          tqlayout->addWidget(widget, count/NCOLS, count%NCOLS);
+          layout->remove(widget);
+          layout->addWidget(widget, count/NCOLS, count%NCOLS);
 
           maxWidth[count%NCOLS] = TQMAX(maxWidth[count%NCOLS], widget->labelWidth());
           if(widget->expands()) {
@@ -602,7 +602,7 @@ void EntryEditDialog::removeField(Data::CollPtr, Data::FieldPtr field_) {
       // update stretch factors for columns with a line edit
       for(int col = 0; col < NCOLS; ++col) {
         if(expands[col]) {
-          tqlayout->setColStretch(col, 1);
+          layout->setColStretch(col, 1);
         }
       }
     }
@@ -687,7 +687,7 @@ void EntryEditDialog::modifyField(Data::CollPtr coll_, Data::FieldPtr oldField_,
     m_currColl = coll_;
   }
 
-  // if the field type changed, go ahead and redo the whole tqlayout
+  // if the field type changed, go ahead and redo the whole layout
   // also if the category changed for a non-single field, since a new tab must be created
   if(oldField_->type() != newField_->type()
      || (oldField_->category() != newField_->category() && !newField_->isSingleCategory())) {