7 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/fieldwidget.cpp b/src/gui/fieldwidget.cpp
index 82ad186..4ac43df 100644
--- a/src/gui/fieldwidget.cpp
+++ b/src/gui/fieldwidget.cpp
@@ -93,7 +93,7 @@ FieldWidget::FieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* n
     : TQWidget(parent_, name_), m_field(field_) {
   TQHBoxLayout* l = new TQHBoxLayout(this, 2, 2); // parent, margin, spacing
   l->addSpacing(4); // add some more space in the columns between widgets
-  if(TQCString(tqstyle().name()).lower().find("keramik", 0, false) > -1) {
+  if(TQCString(style().name()).lower().find("keramik", 0, false) > -1) {
     l->setMargin(1);
   }
 
@@ -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*/);
diff --git a/src/gui/imagewidget.cpp b/src/gui/imagewidget.cpp
index 06e5fbf..ada1ad2 100644
--- a/src/gui/imagewidget.cpp
+++ b/src/gui/imagewidget.cpp
@@ -56,7 +56,7 @@ ImageWidget::ImageWidget(TQWidget* parent_, const char* name_) : TQWidget(parent
   KButtonBox* box = new KButtonBox(this,Qt::Vertical);
   box->addButton(i18n("Select Image..."), TQT_TQOBJECT(this), TQT_SLOT(slotGetImage()));
   box->addButton(i18n("Clear"), TQT_TQOBJECT(this), TQT_SLOT(slotClear()));
-  box->tqlayout();
+  box->layout();
   boxLayout->addWidget(box);
 
   boxLayout->addSpacing(8);
diff --git a/src/gui/kwidgetlister.cpp b/src/gui/kwidgetlister.cpp
index 0d0d47d..9611152 100644
--- a/src/gui/kwidgetlister.cpp
+++ b/src/gui/kwidgetlister.cpp
@@ -135,7 +135,7 @@ void KWidgetLister::addWidgetAtEnd(TQWidget *w)
 
 void KWidgetLister::removeLastWidget()
 {
-  // The tqlayout will take care that the
+  // The layout will take care that the
   // widget is removed from screen, too.
   mWidgetList.removeLast();
   enableControls();
diff --git a/src/gui/kwidgetlister.h b/src/gui/kwidgetlister.h
index 0124b65..262500c 100644
--- a/src/gui/kwidgetlister.h
+++ b/src/gui/kwidgetlister.h
@@ -71,19 +71,19 @@ protected slots:
   /** Called whenever the user clicks on the 'more' button.
       Reimplementations should call this method, because this
       implementation does all the dirty work with adding the widgets
-      to the tqlayout (through @ref addWidgetAtEnd) and enabling/disabling
+      to the layout (through @ref addWidgetAtEnd) and enabling/disabling
       the control buttons. */
   virtual void slotMore();
   /** Called whenever the user clicks on the 'fewer' button.
       Reimplementations should call this method, because this
       implementation does all the dirty work with removing the widgets
-      from the tqlayout (through @ref removelastWidget) and
+      from the layout (through @ref removelastWidget) and
       enabling/disabling the control buttons. */
   virtual void slotFewer();
   /** Called whenever the user clicks on the 'clear' button.
       Reimplementations should call this method, because this
       implementation does all the dirty work with removing all but
-      @ref mMinWidets widgets from the tqlayout and enabling/disabling
+      @ref mMinWidets widgets from the layout and enabling/disabling
       the control buttons. */
   virtual void slotClear();
 
diff --git a/src/gui/numberfieldwidget.cpp b/src/gui/numberfieldwidget.cpp
index 19147b4..0284e84 100644
--- a/src/gui/numberfieldwidget.cpp
+++ b/src/gui/numberfieldwidget.cpp
@@ -116,19 +116,19 @@ void NumberFieldWidget::updateFieldHook(Data::FieldPtr, Data::FieldPtr newField_
 
   TQString value = text();
   if(wasLineEdit && !nowLineEdit) {
-    tqlayout()->remove(m_lineEdit);
+    layout()->remove(m_lineEdit);
     delete m_lineEdit;
     m_lineEdit = 0;
     initSpinBox();
   } else if(!wasLineEdit && nowLineEdit) {
-    tqlayout()->remove(m_spinBox);
+    layout()->remove(m_spinBox);
     delete m_spinBox;
     m_spinBox = 0;
     initLineEdit();
   }
 
   // should really be FIELD_EDIT_WIDGET_INDEX from fieldwidget.cpp
-  static_cast<TQBoxLayout*>(tqlayout())->insertWidget(2, widget(), 1 /*stretch*/);
+  static_cast<TQBoxLayout*>(layout())->insertWidget(2, widget(), 1 /*stretch*/);
   widget()->show();
   setText(value);
 }
diff --git a/src/gui/overlaywidget.cpp b/src/gui/overlaywidget.cpp
index 3bea8db..3977ce1 100644
--- a/src/gui/overlaywidget.cpp
+++ b/src/gui/overlaywidget.cpp
@@ -34,7 +34,7 @@ void OverlayWidget::setCorner(Corner corner_) {
 }
 
 void OverlayWidget::addWidget(TQWidget* widget_) {
-  tqlayout()->add(widget_);
+  layout()->add(widget_);
   adjustSize();
 }
 
diff --git a/src/gui/ratingwidget.cpp b/src/gui/ratingwidget.cpp
index ae30dcd..eda5cf7 100644
--- a/src/gui/ratingwidget.cpp
+++ b/src/gui/ratingwidget.cpp
@@ -65,7 +65,7 @@ RatingWidget::RatingWidget(Data::FieldPtr field_, TQWidget* parent_, const char*
   }
   init();
 
-  TQBoxLayout* l = dynamic_cast<TQBoxLayout*>(tqlayout());
+  TQBoxLayout* l = dynamic_cast<TQBoxLayout*>(layout());
   if(l) {
     l->addStretch(1);
   }