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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

4 files changed, 9 insertions, 9 deletions

diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc
index ed9df8e6..600dad1c 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cc
@@ -21,12 +21,12 @@
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
 #include <tqtabwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
@@ -54,8 +54,8 @@ KoPalette::KoPalette(TQWidget * parent, const char * name)
     setHorizontallyStretchable(false);
 
     setNewLine(true);
-    layout() -> setSpacing(0);
-    layout() -> setMargin(0);
+    tqlayout() -> setSpacing(0);
+    tqlayout() -> setMargin(0);
 
     resetFont();
 }
@@ -82,7 +82,7 @@ KoPalette::~KoPalette()
 void KoPalette::setMainWidget(TQWidget * widget)
 {
     setWidget(widget);
-    resize( TQSize(285, 233).expandedTo(minimumSizeHint()) );
+    resize( TQSize(285, 233).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
     widget->setFont(m_font);
     m_page = widget;
diff --git a/lib/kopalette/kopalette.h b/lib/kopalette/kopalette.h
index 3ea6c475..48d9cb3c 100644
--- a/lib/kopalette/kopalette.h
+++ b/lib/kopalette/kopalette.h
@@ -25,7 +25,7 @@
 #include <tqpixmap.h>
 #include <tqstring.h>
 #include <tqfont.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <koffice_export.h>
 
 #include "kopalettemanager.h"
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc
index 91d237a3..94ea8d4d 100644
--- a/lib/kopalette/kopalettemanager.cc
+++ b/lib/kopalette/kopalettemanager.cc
@@ -165,8 +165,8 @@ void KoPaletteManager::addWidget(TQWidget * widget,
     }
 
     KToggleAction * a;
-    a = new KToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection);
-    a->setCheckedState(i18n("Hide %1").arg(widget->caption()));
+    a = new KToggleAction(i18n("Show %1").tqarg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection);
+    a->setCheckedState(i18n("Hide %1").tqarg(widget->caption()));
 
     m_mapper->setMapping(a, m_widgetNames->count()); // This is the position at which we'll insert the action
     m_actions->insert( name, a );
diff --git a/lib/kopalette/kopalettemanager.h b/lib/kopalette/kopalettemanager.h
index dd8f1686..be9e7126 100644
--- a/lib/kopalette/kopalettemanager.h
+++ b/lib/kopalette/kopalettemanager.h
@@ -172,7 +172,7 @@ public slots:
     void showAllPalettes(bool shown);
 
     /**
-     * Restores the palette configuration to the default layout, i.e, the layout
+     * Restores the palette configuration to the default tqlayout, i.e, the tqlayout
      * preferred by each docker.
      */
     virtual void slotReset();