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

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.

14 files changed, 87 insertions, 87 deletions

diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index a96ee76de..2c450aed1 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -31,7 +31,7 @@
 #include <tqheader.h>
 #include <tqpainter.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstyle.h>
 
 #include <kdebug.h>
@@ -54,7 +54,7 @@ ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name)
 	TQDataStream stream(data, IO_WriteOnly);
 	stream << btn.name;
 	stream << btn.icon;
-	stream << btn.type.unicode();
+	stream << btn.type.tqunicode();
 	stream << (int) btn.duplicate;
 	stream << (int) btn.supported;
 	setEncodedData( data );
@@ -123,7 +123,7 @@ TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color)
 ButtonSource::ButtonSource(TQWidget *parent, const char* name)
 	: KListView(parent, name)
 {
-	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 
 	setResizeMode(TQListView::AllColumns);
 	setDragEnabled(true);
@@ -140,19 +140,19 @@ ButtonSource::~ButtonSource()
 {
 }
 
-TQSize ButtonSource::sizeHint() const
+TQSize ButtonSource::tqsizeHint() const
 {
-	// make the sizeHint height a bit smaller than the one of TQListView...
+	// make the tqsizeHint height a bit smaller than the one of TQListView...
 
 	if ( cachedSizeHint().isValid() )
 		return cachedSizeHint();
 
 	constPolish();
 
-	TQSize s( header()->sizeHint() );
+	TQSize s( header()->tqsizeHint() );
 
 	if ( verticalScrollBar()->isVisible() )
-		s.setWidth( s.width() + tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent) );
+		s.setWidth( s.width() + tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) );
 	s += TQSize(frameWidth()*2,frameWidth()*2);
 
 	// size hint: 4 lines of text...
@@ -167,7 +167,7 @@ void ButtonSource::hideAllButtons()
 {
 	TQListViewItemIterator it(this);
 	while (it.current() ) {
-		it.current()->setVisible(false);
+		it.current()->tqsetVisible(false);
 		++it;
 	}
 }
@@ -176,7 +176,7 @@ void ButtonSource::showAllButtons()
 {
 	TQListViewItemIterator it(this);
 	while (it.current() ) {
-		it.current()->setVisible(true);
+		it.current()->tqsetVisible(true);
 		++it;
 	}
 }
@@ -187,7 +187,7 @@ void ButtonSource::showButton( TQChar btn )
 	while (it.current() ) {
 		ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() );
 		if (item && item->button().type == btn) {
-			it.current()->setVisible(true);
+			it.current()->tqsetVisible(true);
 			return;
 		}
 		++it;
@@ -200,7 +200,7 @@ void ButtonSource::hideButton( TQChar btn )
 	while (it.current() ) {
 		ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() );
 		if (item && item->button().type == btn && !item->button().duplicate) {
-			it.current()->setVisible(false);
+			it.current()->tqsetVisible(false);
 			return;
 		}
 		++it;
@@ -218,7 +218,7 @@ TQDragObject *ButtonSource::dragObject()
 
 	if (i) {
 		ButtonDrag *bd = new ButtonDrag(i->button(), viewport(), "button_drag");
-		bd->setPixmap(bitmapPixmap(i->button().icon, colorGroup().foreground() ));
+		bd->setPixmap(bitmapPixmap(i->button().icon, tqcolorGroup().foreground() ));
 		return bd;
 	}
 
@@ -487,7 +487,7 @@ void ButtonDropSite::mousePressEvent( TQMouseEvent* e )
 	m_selected = buttonAt(e->pos() );
 	if (m_selected) {
 		ButtonDrag *bd = new ButtonDrag(m_selected->button(), this);
-		bd->setPixmap(bitmapPixmap(m_selected->button().icon, colorGroup().foreground() ) );
+		bd->setPixmap(bitmapPixmap(m_selected->button().icon, tqcolorGroup().foreground() ) );
 		bd->dragMove();
 	}
 }
@@ -572,7 +572,7 @@ bool ButtonDropSite::removeSelectedButton()
 		delete m_selected;
 		m_selected = 0;
 		recalcItemGeometry();
-		update(); // repaint...
+		update(); // tqrepaint...
 	}
 
 	return succ;
@@ -581,9 +581,9 @@ bool ButtonDropSite::removeSelectedButton()
 void ButtonDropSite::drawButtonList(TQPainter *p, const ButtonList& btns, int offset)
 {
 	for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) {
-		TQRect itemRect = (*it)->rect;
-		if (itemRect.isValid() ) {
-			(*it)->draw(p, colorGroup(), itemRect);
+		TQRect tqitemRect = (*it)->rect;
+		if (tqitemRect.isValid() ) {
+			(*it)->draw(p, tqcolorGroup(), tqitemRect);
 		}
 		offset += (*it)->width();
 	}
@@ -675,11 +675,11 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name)
       m_factory(0)
 {
 	TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
-	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
+	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
 
 	TQLabel* label = new TQLabel( this );
 	m_dropSite = new ButtonDropSite( this );
-	label->setAlignment( int( TQLabel::WordBreak ) );
+	label->tqsetAlignment( int( TQLabel::WordBreak ) );
 	label->setText( i18n( "To add or remove titlebar buttons, simply <i>drag</i> items "
 		"between the available item list and the titlebar preview. Similarly, "
 		"drag items within the titlebar preview to re-position them.") );
diff --git a/twin/kcmtwin/twindecoration/buttons.h b/twin/kcmtwin/twindecoration/buttons.h
index e1dbbc812..088d3414d 100644
--- a/twin/kcmtwin/twindecoration/buttons.h
+++ b/twin/kcmtwin/twindecoration/buttons.h
@@ -117,7 +117,7 @@ class ButtonSource : public KListView
 		ButtonSource(TQWidget *parent = 0, const char* name = 0);
 		virtual ~ButtonSource();
 
-		TQSize sizeHint() const;
+		TQSize tqsizeHint() const;
 
 		void hideAllButtons();
 		void showAllButtons();
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index 573971f27..ee8c59c75 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -49,7 +49,7 @@ KDecorationPreview::KDecorationPreview( TQWidget* parent, const char* name )
                                    "Most probably there\n"
                                    "was a problem loading the plugin." ), this );
 
-    no_preview->setAlignment( AlignCenter );
+    no_preview->tqsetAlignment( AlignCenter );
 
     setMinimumSize( 100, 100 );
     no_preview->resize( size());
@@ -127,15 +127,15 @@ void KDecorationPreview::positionPreviews()
 
     // Resize the active window
     size = TQSize( width() - xoffset, height() - titleBarHeight )
-                .expandedTo( deco[Active]->minimumSize() );
+                .expandedTo( deco[Active]->tqminimumSize() );
     geometry = TQRect( TQPoint( 0, titleBarHeight ), size );
-    deco[Active]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) );
+    deco[Active]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) );
 
     // Resize the inactive window
     size = TQSize( width() - xoffset, height() - titleBarHeight )
-                .expandedTo( deco[Inactive]->minimumSize() );
+                .expandedTo( deco[Inactive]->tqminimumSize() );
     geometry = TQRect( TQPoint( xoffset, 0 ), size );
-    deco[Inactive]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) );
+    deco[Inactive]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) );
     }
 
 void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool active )
@@ -150,7 +150,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act
         }
     else
         {
-        TQMemArray< TQRect > rects = reg.rects();
+        TQMemArray< TQRect > rects = reg.tqrects();
         XRectangle* xrects = new XRectangle[ rects.count() ];
         for( unsigned int i = 0;
              i < rects.count();
@@ -166,7 +166,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act
         delete[] xrects;
         }
     if( active )
-        mask = reg; // keep shape of the active window for unobscuredRegion()
+        mask = reg; // keep tqshape of the active window for unobscuredRegion()
     }
 
 TQRect KDecorationPreview::windowGeometry( bool active ) const
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index e48f4e234..4ef509e5a 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -32,7 +32,7 @@
 
 #include <tqdir.h>
 #include <tqfileinfo.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
@@ -112,13 +112,13 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." ));
 	lBorder->hide();
 	cBorder->hide();
-	TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() );
+	TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->tqlayout() );
 	borderSizeLayout->addWidget(lBorder);
 	borderSizeLayout->addWidget(cBorder);
 	borderSizeLayout->addStretch();
 
 	pluginConfigWidget = new TQVBox(pluginSettingsGrp);
-	pluginSettingsGrp->layout()->add( pluginConfigWidget );
+	pluginSettingsGrp->tqlayout()->add( pluginConfigWidget );
 
 	// Page 2 (Button Selector)
 	TQWidget* buttonPage = new TQWidget( tabWidget );
@@ -154,8 +154,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	preview = new KDecorationPreview( this );
 	previewLayout->addWidget(preview);
 
-	preview->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
-	tabWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
+	preview->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	tabWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
 
 	// Page 3 (Window Shadows)
 	TQHBox *inactiveShadowColourHBox, *shadowColourHBox;
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index a7ddf2739..a10269eca 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <dcopclient.h>
 
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index bab6deabe..30692d87f 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqwhatsthis.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvgroupbox.h>
 #include <tqgrid.h>
 #include <tqsizepolicy.h>
@@ -163,7 +163,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
   combo->insertItem(i18n("Lower"));
   combo->insertItem(i18n("On All Desktops"));
   combo->insertItem(i18n("Nothing"));
-  combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+  combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
   connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
   hlayout->addWidget(combo);
   coTiDbl = combo;
@@ -188,7 +188,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
   comboW->insertItem(i18n("Move to Previous/Next Desktop"));  
   comboW->insertItem(i18n("Change Opacity"));  
   comboW->insertItem(i18n("Nothing"));  
-  comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+  comboW->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
   connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
   hlayoutW->addWidget(comboW);
   coTiAct4 = comboW;
@@ -235,7 +235,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
 
 
   label = new TQLabel(i18n("Active"), grid);
-  label->setAlignment(AlignCenter);
+  label->tqsetAlignment(AlignCenter);
   TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
                                " or the frame of an active window.") );
 
@@ -292,7 +292,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
   if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3);
 
   label = new TQLabel(i18n("Inactive"), grid);
-  label->setAlignment(AlignCenter);
+  label->tqsetAlignment(AlignCenter);
   TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
                                " or the frame of an inactive window.") );
 
@@ -356,14 +356,14 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
 
     TQLabel * label = new TQLabel(strMouseButton[b], box);
     TQWhatsThis::add( label,    txtButton[b] );
-    label   ->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
+    label   ->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
 
     coMax[b] = new ToolTipComboBox(box, tbl_Max);
     for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]);
     connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
     connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed()));
     TQWhatsThis::add( coMax[b], txtButton[b] );
-    coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
+    coMax[b]->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
   }
 
   connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 4f2133848..80185a427 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include <tqdir.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include <tqwhatsthis.h>
 #include <tqvbuttongroup.h>
@@ -110,7 +110,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
     //iTLabel = new TQLabel(i18n("  Allowed overlap:\n"
     //                         "(% of desktop space)"),
     //             plcBox);
-    //iTLabel->setAlignment(AlignTop|AlignHCenter);
+    //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
     //pLay->addWidget(iTLabel,1,1);
 
     //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
@@ -124,7 +124,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
     fcsBox = new TQButtonGroup(i18n("Focus"),this);
     fcsBox->setColumnLayout( 0, Qt::Horizontal );
 
-    TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(),
+    TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->tqlayout(),
         KDialog::spacingHint());
 
     TQBoxLayout *cLay = new TQHBoxLayout(fLay);
@@ -192,8 +192,8 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
     connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool)));
     fLay->addWidget(clickRaiseOn);
 
-//     fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(),
-//                                clickRaiseOn->sizeHint().width()) + 15);
+//     fLay->addColSpacing(0,QMAX(autoRaiseOn->tqsizeHint().width(),
+//                                clickRaiseOn->tqsizeHint().width()) + 15);
 
     TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically"
                                        " come to the front when the mouse pointer has been over it for some time.") );
@@ -236,7 +236,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
 
     kbdBox = new TQButtonGroup(i18n("Navigation"), this);
     kbdBox->setColumnLayout( 0, Qt::Horizontal );
-    TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint());
+    TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->tqlayout(), KDialog::spacingHint());
 
     altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox );
     kLay->addWidget( altTabPopup );
@@ -573,7 +573,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget *
     //iTLabel = new TQLabel(i18n("  Allowed overlap:\n"
     //                         "(% of desktop space)"),
     //             plcBox);
-    //iTLabel->setAlignment(AlignTop|AlignHCenter);
+    //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
     //pLay->addWidget(iTLabel,1,1);
 
     //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
@@ -831,7 +831,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
     windowsBox = new TQButtonGroup(i18n("Windows"), this);
     windowsBox->setColumnLayout( 0, Qt::Horizontal );
 
-    TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint());
+    TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->tqlayout(), KDialog::spacingHint());
 
     TQBoxLayout *bLay = new TQVBoxLayout;
     wLay->addLayout(bLay);
@@ -877,11 +877,11 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
     connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int)));
 
     minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox);
-    minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft);
+    minimizeAnimSlowLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignLeft);
     rLay->addWidget(minimizeAnimSlowLabel,1,1);
 
     minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox);
-    minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight);
+    minimizeAnimFastLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignRight);
     rLay->addWidget(minimizeAnimFastLabel,1,2);
 
     wtstr = i18n("Here you can set the speed of the animation shown when windows are"
@@ -940,7 +940,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
     //iTLabel = new TQLabel(i18n("  Allowed overlap:\n"
     //                         "(% of desktop space)"),
     //             plcBox);
-    //iTLabel->setAlignment(AlignTop|AlignHCenter);
+    //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
     //pLay->addWidget(iTLabel,1,1);
 
     //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
diff --git a/twin/kcmtwin/twinrules/detectwidgetbase.ui b/twin/kcmtwin/twinrules/detectwidgetbase.ui
index b13e7948a..af4ca9670 100644
--- a/twin/kcmtwin/twinrules/detectwidgetbase.ui
+++ b/twin/kcmtwin/twinrules/detectwidgetbase.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/twin/kcmtwin/twinrules/editshortcutbase.ui b/twin/kcmtwin/twinrules/editshortcutbase.ui
index 702816263..af704c0a2 100644
--- a/twin/kcmtwin/twinrules/editshortcutbase.ui
+++ b/twin/kcmtwin/twinrules/editshortcutbase.ui
@@ -66,7 +66,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -91,7 +91,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -116,7 +116,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp
index 45b09cfea..c7cdc7587 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -19,7 +19,7 @@
 #include "kcm.h"
 
 #include <kglobal.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <dcopclient.h>
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index b589d5005..db3a9fc48 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -151,7 +151,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who
     Rules* ret = new Rules;
     if( whole_app )
         {
-        ret->description = i18n( "Application settings for %1" ).arg( static_cast<const char *>(wmclass_class) );
+        ret->description = i18n( "Application settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) );
         // TODO maybe exclude some types? If yes, then also exclude them above
         // when searching.
         ret->types = NET::AllTypesMask; 
@@ -175,7 +175,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who
             }
         return ret;
         }
-    ret->description = i18n( "Window settings for %1" ).arg( static_cast<const char *>(wmclass_class) );
+    ret->description = i18n( "Window settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) );
     if( type == NET::Unknown )
         ret->types = NET::NormalMask;
     else
diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui
index 8ab21412b..5fc5fd6ed 100644
--- a/twin/kcmtwin/twinrules/ruleslistbase.ui
+++ b/twin/kcmtwin/twinrules/ruleslistbase.ui
@@ -77,7 +77,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>294</height>
diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp
index 8680018d7..cfe96458e 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.cpp
+++ b/twin/kcmtwin/twinrules/ruleswidget.cpp
@@ -661,7 +661,7 @@ bool RulesWidget::finalCheck()
             all_types = false;
     if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types )
         {
-        if( KMessageBox::warningContinueCancel( topLevelWidget(),
+        if( KMessageBox::warningContinueCancel( tqtopLevelWidget(),
             i18n( "You have specified the window class as unimportant.\n"
                   "This means the settings will possibly apply to windows from all applications. "
                   "If you really want to create a generic setting, it is recommended you at least "
@@ -680,7 +680,7 @@ void RulesWidget::prepareWindowSpecific( WId window )
 
 void RulesWidget::shortcutEditClicked()
     {
-    EditShortcutDialog dlg( topLevelWidget());
+    EditShortcutDialog dlg( tqtopLevelWidget());
     dlg.setShortcut( shortcut->text());
     if( dlg.exec() == TQDialog::Accepted )
         shortcut->setText( dlg.shortcut());
@@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name )
 
 void EditShortcut::editShortcut()
     {
-    ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget());
+    ShortcutDialog dlg( KShortcut( shortcut->text()), tqtopLevelWidget());
     if( dlg.exec() == TQDialog::Accepted )
         shortcut->setText( dlg.shortcut().toString());
     }
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index c83bbef92..5a5640ca2 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -87,7 +87,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -129,7 +129,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>212</width>
                                 <height>20</height>
@@ -157,7 +157,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>211</width>
                                 <height>20</height>
@@ -199,7 +199,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>212</width>
                                 <height>20</height>
@@ -230,7 +230,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>211</width>
                                 <height>20</height>
@@ -271,7 +271,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>270</width>
                                         <height>20</height>
@@ -296,7 +296,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>269</width>
                                         <height>20</height>
@@ -470,7 +470,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -501,7 +501,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -543,7 +543,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -574,7 +574,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -616,7 +616,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -647,7 +647,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -1181,7 +1181,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -1347,7 +1347,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>171</width>
                                 <height>20</height>
@@ -1364,7 +1364,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1381,7 +1381,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1398,7 +1398,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1415,7 +1415,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1432,7 +1432,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1449,7 +1449,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1466,7 +1466,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1796,7 +1796,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>80</height>
@@ -1847,7 +1847,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>181</width>
                                 <height>20</height>
@@ -2278,7 +2278,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>160</height>