1 files changed, 13 insertions, 13 deletions

diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp
index c62b7745..6a7d198a 100644
--- a/lib/kofficeui/tkaction.cpp
+++ b/lib/kofficeui/tkaction.cpp
@@ -22,7 +22,7 @@
 #include "tkcombobox.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <ktoolbar.h>
 #include <kiconloader.h>
@@ -120,19 +120,19 @@ void TKAction::updateLayout()
   }
 }
 
-TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children)
+TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* tqchildren)
 {
   TQWidget* base = new TQWidget(parent,"KTToolBarLayout");
   TQLabel* textLabel = new TQLabel(base,"text");
   textLabel->setMinimumHeight(1);
   TQLabel* pixLabel = new TQLabel(base,"pixmap");
-  children->reparent(base,TQPoint(0,0));
-  children->setName("widget");
-  TQHBoxLayout* layout = new TQHBoxLayout(base,0,3);
-  layout->setResizeMode(TQLayout::Minimum);
-  layout->addWidget(textLabel);
-  layout->addWidget(pixLabel);
-  layout->addWidget(children,1);
+  tqchildren->reparent(base,TQPoint(0,0));
+  tqchildren->setName("widget");
+  TQHBoxLayout* tqlayout = new TQHBoxLayout(base,0,3);
+  tqlayout->setResizeMode(TQLayout::Minimum);
+  tqlayout->addWidget(textLabel);
+  tqlayout->addWidget(pixLabel);
+  tqlayout->addWidget(tqchildren,1);
 
   updateLayout(base);
   return base;
@@ -166,9 +166,9 @@ void TKAction::updateLayout(TQWidget* base)
   } else
     pixLabel->hide();
 
-  base->setFixedWidth( w->sizeHint().width() +
-                       (textLabel->isVisible() ? textLabel->sizeHint().width():0) +
-                       (pixLabel->isVisible() ? pixLabel->sizeHint().width():0) );
+  base->setFixedWidth( w->tqsizeHint().width() +
+                       (textLabel->isVisible() ? textLabel->tqsizeHint().width():0) +
+                       (pixLabel->isVisible() ? pixLabel->tqsizeHint().width():0) );
 }
 /******************************************************************************/
 TKBaseSelectAction::TKBaseSelectAction( TQObject* parent, const char* name )
@@ -191,7 +191,7 @@ int TKBaseSelectAction::plug(TQWidget* widget, int index)
 
     TKComboBox* cb = new TKComboBox(m_editable,bar);
     initComboBox(cb);
-    cb->setMinimumWidth( cb->sizeHint().width() );
+    cb->setMinimumWidth( cb->tqsizeHint().width() );
     TQWidget* base = createLayout(bar,cb);
 
     bar->insertWidget( id_, 100, base, index );