Rename obsolete tq methods to standard names

151 files changed, 881 insertions, 881 deletions

diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index cb3200f4..f3cf6405 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -96,7 +96,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
 	// set the kcontrol module buttons
 	setButtons(Help | Apply | Cancel | Ok);
 
-	// create a tqlayout with two vertical boxes
+	// create a layout with two vertical boxes
 	TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0);
 	topLayout->setAutoAdd(true);
 	
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 859649eb..9492934b 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -282,7 +282,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
 	TQWidget *page = new TQWidget( this );
 	setMainWidget(page);
 
-	// a tqlayout with vertical boxes
+	// a layout with vertical boxes
 	TQHBoxLayout *topLayout = new TQHBoxLayout(page, 0, KDialog::spacingHint());
 
 	// the models list
diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp
index acf1fd06..ba041c4e 100644
--- a/kcoloredit/colorselector.cpp
+++ b/kcoloredit/colorselector.cpp
@@ -53,7 +53,7 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par
 	topLayout->addWidget(gradientSelection, 10);
 	KSeparator* hLine = new KSeparator(KSeparator::HLine, this);
 	topLayout->addWidget(hLine);
-	TQHBoxLayout* tqlayout = new TQHBoxLayout();
+	TQHBoxLayout* layout = new TQHBoxLayout();
 	TextEditSelection* textEditSelection = new TextEditSelection(this);
 	connect(textEditSelection, TQT_SIGNAL( valueChanged(Color*) ), TQT_SLOT( slotSetColor(Color*) ));
 	connect(this, TQT_SIGNAL( valueChanged(Color*) ), textEditSelection, TQT_SLOT( slotSetValue(Color*) ));
@@ -88,17 +88,17 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par
 	colorChangeLayout->addStretch(10);
 	colorChangeLayout->addWidget(colorChangeSliderWidget);
 	colorChangeLayout->addStretch(10);
-	tqlayout->addLayout(colorChangeLayout, 10);
+	layout->addLayout(colorChangeLayout, 10);
 	m_color.setComponents(RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE);
 	slotColorReplace();
 	KSeparator* vLine = new KSeparator(KSeparator::VLine, this);
-	tqlayout->addWidget(vLine);
-	tqlayout->addWidget(textEditSelection, 1);
+	layout->addWidget(vLine);
+	layout->addWidget(textEditSelection, 1);
 	colorPatch = new KColorPatch(this);
 	connect(colorPatch, TQT_SIGNAL( colorChanged(const TQColor&) ), TQT_SLOT( slotSetColor(const TQColor&) ));
 	colorPatch->setMinimumSize(80, 64);
-	tqlayout->addWidget(colorPatch, 10);
-	topLayout->addLayout(tqlayout);
+	layout->addWidget(colorPatch, 10);
+	topLayout->addLayout(layout);
 }
 ColorSelector::~ColorSelector() {
 }
diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp
index fd1b7a87..37ea901a 100644
--- a/kcoloredit/gradientselection.cpp
+++ b/kcoloredit/gradientselection.cpp
@@ -26,13 +26,13 @@
 
 GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
 	TQGridLayout* topLayout = new TQGridLayout(this, 2, 2, 0);
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(0);
-	tqlayout->setMargin(3);
+	TQHBoxLayout* layout = new TQHBoxLayout(0);
+	layout->setMargin(3);
 	xyColorSelector = new KXYColorSelector(this);
 	connect(xyColorSelector, TQT_SIGNAL( valueChanged(int, int) ),
 		TQT_SLOT( slotXyColorSelectorPosChanged(int, int) ));
-	tqlayout->addWidget(xyColorSelector);
-	topLayout->addLayout(tqlayout, 0, 0);
+	layout->addWidget(xyColorSelector);
+	topLayout->addLayout(layout, 0, 0);
 	topLayout->setRowStretch(0, 10);
 	topLayout->setRowStretch(1, 0);
 	TQVBoxLayout* xyColorSelectorLayout = new TQVBoxLayout();
diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp
index 0669380b..954d64a3 100644
--- a/kcoloredit/kcoloreditdoc.cpp
+++ b/kcoloredit/kcoloreditdoc.cpp
@@ -235,7 +235,7 @@ void KColorEditDoc::copyToClipboard(Palette& palette) {
 	TQString text;
 	TQTextOStream stream(&text);
 	palette.save(stream, 0, false);
-	KApplication::tqclipboard()->setText(text);
+	KApplication::clipboard()->setText(text);
 
     emit clipboardChanged();
 }
@@ -260,7 +260,7 @@ void KColorEditDoc::paste() {
 	Palette palettePaste;
 	TQString text;
 	TQTextIStream stream(&text);
-	text = KApplication::tqclipboard()->text();
+	text = KApplication::clipboard()->text();
 	if(palettePaste.load( stream, false )) {
 		m_paletteHistory.paste(paletteCursorPos(), palettePaste);
 		setPaletteSelection(paletteCursorPos(), paletteCursorPos() +
diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp
index 32e61a06..b52296d7 100644
--- a/kcoloredit/kcoloreditview.cpp
+++ b/kcoloredit/kcoloreditview.cpp
@@ -43,7 +43,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
 	TQVBoxLayout* paletteLayout = new TQVBoxLayout(paletteViewArea);
 	paletteView = new PaletteView(16, 16, 2, this, paletteViewArea);
 	paletteLayout->addWidget(paletteView, 10);
-	TQHBoxLayout* tqlayout = new TQHBoxLayout();
+	TQHBoxLayout* layout = new TQHBoxLayout();
 	TQVBoxLayout* addColorLayout = new TQVBoxLayout(4);
 	addColorLayout->setMargin(8);
 	TQHBoxLayout* buttonsLayout = new TQHBoxLayout(4);
@@ -70,7 +70,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
 	//	paletteView, TQT_SLOT( slotCursorFollowsChosenColor(bool) ));
 	//cursorFollowsChosenColor->toggle();
 	paletteView->slotCursorFollowsChosenColor(true);
-	tqlayout->addLayout(addColorLayout, 0);
+	layout->addLayout(addColorLayout, 0);
 	TQVGroupBox* colorAtCursorFrame = new TQVGroupBox(i18n("Color at Cursor"), paletteViewArea);
 	TQWidget* colorAtCursorFrameArea = new TQWidget(colorAtCursorFrame);
 	TQVBoxLayout* colorAtCursorLayout = new TQVBoxLayout(colorAtCursorFrameArea, 4);
@@ -127,10 +127,10 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(
 	colorAtCursorRgbStringLayout->addWidget(colorAtCursorRgbStringValueLabel);
 	colorAtCursorRgbStringLayout->addStretch();
 	colorAtCursorLayout->addLayout(colorAtCursorRgbStringLayout);
-	tqlayout->addWidget(colorAtCursorFrame, 10);
-	tqlayout->addSpacing(8);
+	layout->addWidget(colorAtCursorFrame, 10);
+	layout->addSpacing(8);
 	paletteLayout->addSpacing(4);
-	paletteLayout->addLayout(tqlayout);
+	paletteLayout->addLayout(layout);
 	paletteLayout->addSpacing(4);
 	inColorNameChanging = false;
 	doNotUpdateColorLabels = false;
diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp
index 12c637cd..d529b8d7 100644
--- a/kcoloredit/paletteviewscrolledarea.cpp
+++ b/kcoloredit/paletteviewscrolledarea.cpp
@@ -249,12 +249,12 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
 	int lastRow = (posY + height() - 1 + rowHeight - 1)/rowHeight;
 	if(viewColorNames)
 		painter.fillRect(0, 0, rowWidth, height(),
-        TQBrush( TQFrame::tqpalette().active().base() ));
-	TQBrush normalBackgroundBrush(TQFrame::tqpalette().active().background());
+        TQBrush( TQFrame::palette().active().base() ));
+	TQBrush normalBackgroundBrush(TQFrame::palette().active().background());
 	TQBrush selectedBackgroundBrush(TQFrame::tqpalette().active().highlight());
 	TQBrush foregroundBrush;
-	TQBrush cursorBrush(TQFrame::tqpalette().active().foreground());
-	TQPen backgroundPen(TQFrame::tqpalette().active().foreground());
+	TQBrush cursorBrush(TQFrame::palette().active().foreground());
+	TQPen backgroundPen(TQFrame::palette().active().foreground());
 	int min = selectionMin();
 	int max = selectionMax();
 	int fontAscent = fontMetrics.ascent();
diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp
index 1b49ec6a..d32e054e 100644
--- a/kcoloredit/texteditselection.cpp
+++ b/kcoloredit/texteditselection.cpp
@@ -59,14 +59,14 @@ TextEditSelection::~TextEditSelection(){
 }
 
 void TextEditSelection::addComponent(const int index, TQLineEdit* lineEdit, const int maxValue,
-	const TQString& labelString, const int row, const int column, TQGridLayout* tqlayout) {
+	const TQString& labelString, const int row, const int column, TQGridLayout* layout) {
 	TQLabel* label = new TQLabel(labelString, this);
 	lineEdit->setValidator(new TQIntValidator( 0, maxValue, TQT_TQOBJECT(lineEdit) ));
 	lineEditTable[index] = lineEdit;
 	lineEdit->setMinimumWidth(lineEdit->fontMetrics().width( TQString("8888") ));
 	lineEdit->setMaximumWidth(lineEdit->fontMetrics().width( TQString("8888888") ));
-	tqlayout->addWidget(label, row, column*3);
-	tqlayout->addWidget(lineEdit, row, column*3 + 1);
+	layout->addWidget(label, row, column*3);
+	layout->addWidget(lineEdit, row, column*3 + 1);
 }
 
 void TextEditSelection::setRgbString(const int red, const int green, const int blue) {
diff --git a/kcoloredit/texteditselection.h b/kcoloredit/texteditselection.h
index e0ef91f5..55e41e41 100644
--- a/kcoloredit/texteditselection.h
+++ b/kcoloredit/texteditselection.h
@@ -48,7 +48,7 @@ public slots:
 protected:
 	/** Adds a component line edit */
 	void addComponent(const int index, TQLineEdit* lineEdit, const int maxValue, const TQString& labelString,
-		const int row, const int column, TQGridLayout* tqlayout);
+		const int row, const int column, TQGridLayout* layout);
 	/** sets RGB string in rgbStringLineEdit */
 	void setRgbString(const int red, const int green, const int blue);
 		
diff --git a/kdvi/TeXFontDefinition.h b/kdvi/TeXFontDefinition.h
index 9097b2cb..a059a405 100644
--- a/kdvi/TeXFontDefinition.h
+++ b/kdvi/TeXFontDefinition.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /*
- * The tqlayout of a font information block.
+ * The layout of a font information block.
  * There is one of these for every loaded font or magnification thereof.
  * Duplicates are eliminated:  this is necessary because of possible recursion
  * in virtual fonts.
diff --git a/kfax/options.cpp b/kfax/options.cpp
index 91ba9287..2f162f7d 100644
--- a/kfax/options.cpp
+++ b/kfax/options.cpp
@@ -60,7 +60,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
   bg->setColumnLayout( 0, Qt::Horizontal );
   mainLayout->addWidget( bg );
 
-  TQVBoxLayout *vbl = new TQVBoxLayout(bg->tqlayout());
+  TQVBoxLayout *vbl = new TQVBoxLayout(bg->layout());
 
   TQHBoxLayout *hbl1 = new TQHBoxLayout();
 
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
index 5fe6ea28..a13fd99a 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
@@ -190,7 +190,7 @@ TQString Document::getInfo( const TQString & type ) const
 	u = s1->getChar(i) & 0xff;
 	++i;
       }
-      result += tqunicodeToTQString( &u, 1 );
+      result += unicodeToTQString( &u, 1 );
     }
     obj.free();
     info.free();
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
index 9ba0fb9d..7e366014 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
@@ -31,11 +31,11 @@
 namespace Poppler {
 
 /* borrowed from kpdf */
-TQString tqunicodeToTQString(Unicode* u, int len)
+TQString unicodeToTQString(Unicode* u, int len)
 {
     TQString ret;
     ret.setLength(len);
-    TQChar* qch = (TQChar*) ret.tqunicode();
+    TQChar* qch = (TQChar*) ret.unicode();
     for (;len;--len)
       *qch++ = (TQChar) *u++;
     return ret;
@@ -69,7 +69,7 @@ TQString UnicodeParsedString(GooString *s1)
             u = s1->getChar(i) & 0xff;
             ++i;
         }
-        result += tqunicodeToTQString( &u, 1 );
+        result += unicodeToTQString( &u, 1 );
     }
     return result;
 }
@@ -79,7 +79,7 @@ GooString *TQStringToGooString(const TQString &s)
     int len = s.length();
     char *cstring = (char *)gmallocn(s.length(), sizeof(char));
     for (int i = 0; i < len; ++i)
-      cstring[i] = s.at(i).tqunicode();
+      cstring[i] = s.at(i).unicode();
     GooString *ret = new GooString(cstring, len);
     gfree(cstring);
     return ret;
@@ -98,7 +98,7 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G
         TQString name;
         Unicode * uniChar = outlineItem->getTitle();
         int titleLength = outlineItem->getTitleLength();
-        name = tqunicodeToTQString(uniChar, titleLength);
+        name = unicodeToTQString(uniChar, titleLength);
         if ( name.isEmpty() )
             continue;
 
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.h b/kfile-plugins/dependencies/poppler-tqt/poppler-private.h
index 8152ffd8..9e9e3292 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-private.h
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-private.h
@@ -39,7 +39,7 @@ namespace Poppler {
     
 class DocumentData;
 
-TQString tqunicodeToTQString(Unicode* u, int len);
+TQString unicodeToTQString(Unicode* u, int len);
 
 TQString UnicodeParsedString(GooString *s1);
 
diff --git a/kfile-plugins/gif/gif-info.1 b/kfile-plugins/gif/gif-info.1
index f5397472..6c36b1c4 100644
--- a/kfile-plugins/gif/gif-info.1
+++ b/kfile-plugins/gif/gif-info.1
@@ -15,7 +15,7 @@ displays information about the given gif (Graphic Interchange Format) image.  If
 .PP
 Write a empty comment ('') to delete the comment block.
 .PP
-The GIF standard allows any number of 256 byte comment blocks in an image file, but most implementations (including this one) restrict you to just one block.  The GIF standard restricts comment blocks to "7 Bit ASCII", but this is widely ignored.  You are welcome to store text in your own native language, and are especially encouraged to use comments in utf-8 tqunicode format.
+The GIF standard allows any number of 256 byte comment blocks in an image file, but most implementations (including this one) restrict you to just one block.  The GIF standard restricts comment blocks to "7 Bit ASCII", but this is widely ignored.  You are welcome to store text in your own native language, and are especially encouraged to use comments in utf-8 unicode format.
 
 .SH "SEE ALSO"
 .BR wrjpgcom (1)
diff --git a/kfile-plugins/jpeg/kfile_jpeg.cpp b/kfile-plugins/jpeg/kfile_jpeg.cpp
index 5bbd394d..6f187c8e 100644
--- a/kfile-plugins/jpeg/kfile_jpeg.cpp
+++ b/kfile-plugins/jpeg/kfile_jpeg.cpp
@@ -178,7 +178,7 @@ bool KJpegPlugin::writeInfo( const KFileMetaInfo& info ) const
     */
     /*
         The jpeg standard does not regulate the contents of the COM block.
-        I'm assuming the best thing to do here is write as tqunicode utf-8,
+        I'm assuming the best thing to do here is write as unicode utf-8,
         which is fully backwards compatible with readers expecting ascii.
         Readers expecting a national character set are out of luck...
     */
diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp
index 97616a26..da36ce06 100644
--- a/kghostview/viewcontrol.cpp
+++ b/kghostview/viewcontrol.cpp
@@ -130,7 +130,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 	connect( closebtn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
 
 
-	bbox->tqlayout();
+	bbox->layout();
 	topLayout->addWidget( bbox );
 
 	topLayout->activate();
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index d6144823..8755e0ac 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -60,9 +60,9 @@ KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
   TQVBoxLayout *ml = new TQVBoxLayout(frame);
   TQGroupBox *grp = new TQGroupBox(i18n("Template"), frame);
   grp->setColumnLayout(0, Qt::Vertical);
-  grp->tqlayout()->setSpacing(spacingHint());
-  grp->tqlayout()->setMargin(marginHint());
-  TQGridLayout *l = new TQGridLayout(grp->tqlayout());
+  grp->layout()->setSpacing(spacingHint());
+  grp->layout()->setMargin(marginHint());
+  TQGridLayout *l = new TQGridLayout(grp->layout());
 
   ln_name = new TQLineEdit( grp );
   connect( ln_name, TQT_SIGNAL( textChanged( const TQString & ) ), 
@@ -130,7 +130,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
   TQVBoxLayout* ml = new TQVBoxLayout( this );
   ml->addWidget( grp );
 
-  TQVBoxLayout* l = new  TQVBoxLayout( grp->tqlayout(), KDialog::spacingHint() );
+  TQVBoxLayout* l = new  TQVBoxLayout( grp->layout(), KDialog::spacingHint() );
   l->addWidget( templates );
 
   for( unsigned int i = 0; i <  KIconTemplateContainer::self()->count(); i++ )
@@ -151,7 +151,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
 	
   bbox->addStretch( 1 );
 	
-  bbox->tqlayout();
+  bbox->layout();
   l->addWidget( bbox );
 }
 
@@ -246,11 +246,11 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent )
 
   TQGroupBox *grp1 = new TQGroupBox( i18n( "Select Background" ), this );
   grp1->setColumnLayout(0, Qt::Vertical );
-  grp1->tqlayout()->setSpacing( KDialog::spacingHint() );
-  grp1->tqlayout()->setMargin( KDialog::marginHint() );
+  grp1->layout()->setSpacing( KDialog::spacingHint() );
+  grp1->layout()->setMargin( KDialog::marginHint() );
   mainLayout->addWidget( grp1 );
 
-  TQGridLayout *grp1Layout = new TQGridLayout( grp1->tqlayout(), 3, 2 );
+  TQGridLayout *grp1Layout = new TQGridLayout( grp1->layout(), 3, 2 );
 
   TQButtonGroup* btngrp = new TQButtonGroup( grp1 );
   btngrp->setExclusive( true );
diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp
index 2316711a..5f5d9387 100644
--- a/kiconedit/kicongrid.cpp
+++ b/kiconedit/kicongrid.cpp
@@ -1118,7 +1118,7 @@ TQImage KIconEditGrid::clipboardImage(bool &ok)
   {
     TQCString format = fileFormats.current();
     TQCString type = "image/" + format.lower();
-    if (kapp->tqclipboard()->data()->provides(type ) )
+    if (kapp->clipboard()->data()->provides(type ) )
     {
       oneIsSupported = true;
     }
diff --git a/kiconedit/kresize.cpp b/kiconedit/kresize.cpp
index ac98e214..b2af86b6 100644
--- a/kiconedit/kresize.cpp
+++ b/kiconedit/kresize.cpp
@@ -37,18 +37,18 @@ KResizeWidget::KResizeWidget( TQWidget* parent, const char* name,
   group->setColumnLayout( 0, Qt::Horizontal );
   genLayout->addWidget( group );
 
-  TQHBoxLayout* tqlayout = new TQHBoxLayout( group->tqlayout(), 6 );
+  TQHBoxLayout* layout = new TQHBoxLayout( group->layout(), 6 );
 
   m_width = new KIntSpinBox( 1, 200, 1, 1, 10, group );
   m_width->setValue( size.width() );
-  tqlayout->addWidget( m_width, 1 );
+  layout->addWidget( m_width, 1 );
 
   TQLabel* label = new TQLabel( "X", group );
-  tqlayout->addWidget( label );
+  layout->addWidget( label );
 
   m_height = new KIntSpinBox( 1, 200, 1, 1, 10, group);
   m_height->setValue( size.height() );
-  tqlayout->addWidget( m_height, 1 );
+  layout->addWidget( m_height, 1 );
 
   setMinimumSize( 200, 100 );
 }
diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp
index 969facac..85b7c6bb 100644
--- a/kiconedit/palettetoolbar.cpp
+++ b/kiconedit/palettetoolbar.cpp
@@ -54,27 +54,27 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
   TQWhatsThis::add(m_currentColorView, i18n( "Current color\n\nThis is the currently selected color" ) );
   m_layout->addWidget( m_currentColorView );
 
-  TQVBoxLayout *vtqlayout = new TQVBoxLayout( m_layout, 0 );
+  TQVBoxLayout *vlayout = new TQVBoxLayout( m_layout, 0 );
   TQLabel *l = new TQLabel( i18n( "System colors:" ), base );
-  vtqlayout->addWidget( l );
+  vlayout->addWidget( l );
   m_sysColors = new KSysColors( base );
   TQWhatsThis::add(m_sysColors, i18n( "System colors\n\nHere you can select"
       " colors from the KDE icon palette" ) );
 
-  vtqlayout->addWidget( m_sysColors );
+  vlayout->addWidget( m_sysColors );
 
   connect( m_sysColors, TQT_SIGNAL( newColor(uint) ), 
       TQT_SIGNAL( newColor(uint) ) );
 
-  vtqlayout = new TQVBoxLayout( m_layout, 0 );
+  vlayout = new TQVBoxLayout( m_layout, 0 );
   l = new TQLabel( i18n( "Custom colors:" ), base );
-  vtqlayout->addWidget( l );
+  vlayout->addWidget( l );
   m_customColors = new KCustomColors( base );
   TQWhatsThis::add(m_customColors, i18n( "Custom colors\n\nHere you can"
       " build a palette of custom colors.\nDouble-click on a box to edit"
       " the color" ) );
 
-  vtqlayout->addWidget( m_customColors );
+  vlayout->addWidget( m_customColors );
 
   connect( m_customColors, TQT_SIGNAL( newColor(uint) ), 
       TQT_SIGNAL( newColor(uint) ) );
diff --git a/kmrml/kmrml/algorithmdialog.cpp b/kmrml/kmrml/algorithmdialog.cpp
index 0678fe6b..7756d432 100644
--- a/kmrml/kmrml/algorithmdialog.cpp
+++ b/kmrml/kmrml/algorithmdialog.cpp
@@ -71,7 +71,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
     TQVBoxLayout *mainLayout = new TQVBoxLayout( box, 0, KDialog::spacingHint(),
                                                 "mainLayout");
 
-    TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll tqlayout");
+    TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll layout");
     collectionLayout->addWidget( new TQLabel( i18n("Collection: "), box ));
 
     m_collectionCombo = new CollectionCombo( box, "collection combo" );
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
index dfee10fd..7a3abca7 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
@@ -58,11 +58,11 @@ KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
     ab->addAuthor( "Carsten Pfeiffer", 0, "[email protected]" );
     setAboutData( ab );
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-    tqlayout->setSpacing( KDialog::spacingHint() );
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    layout->setSpacing( KDialog::spacingHint() );
     m_mainPage = new MainPage( this, "main page" );
 
-    tqlayout->addWidget( m_mainPage );
+    layout->addWidget( m_mainPage );
 
     connect( m_mainPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool )));
 
@@ -90,7 +90,7 @@ void KCMKMrml::checkGiftInstallation()
         KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this ); 
         urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
         connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) );
-        TQLayout *l = tqlayout();
+        TQLayout *l = layout();
         l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
         l->add( errorLabel );
         l->add( urlLabel );
diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp
index e5156148..cc9d5421 100644
--- a/kolourpaint/kpmainwindow_edit.cpp
+++ b/kolourpaint/kpmainwindow_edit.cpp
@@ -129,7 +129,7 @@ void kpMainWindow::setupEditMenuActions ()
 
     // Paste should always be enabled, as long as there is something paste
     // (independent of whether we have a document or not)
-    connect (TQApplication::tqclipboard (), TQT_SIGNAL (dataChanged ()),
+    connect (TQApplication::clipboard (), TQT_SIGNAL (dataChanged ()),
              TQT_TQOBJECT(this), TQT_SLOT (slotEnablePaste ()));
     slotEnablePaste ();
 }
@@ -223,7 +223,7 @@ void kpMainWindow::slotCopy ()
     {
         if (!sel.text ().isEmpty ())
         {
-            TQApplication::tqclipboard ()->setData (new TQTextDrag (sel.text ()),
+            TQApplication::clipboard ()->setData (new TQTextDrag (sel.text ()),
                                                  TQClipboard::Clipboard);
 
             // SYNC: Normally, users highlight text and press CTRL+C.
@@ -243,7 +243,7 @@ void kpMainWindow::slotCopy ()
             //       Once we change KolourPaint to support highlighted text
             //       and CTRL+C to copy only the highlighted text, delete
             //       this code.
-            TQApplication::tqclipboard ()->setData (new TQTextDrag (sel.text ()),
+            TQApplication::clipboard ()->setData (new TQTextDrag (sel.text ()),
                                                  TQClipboard::Selection);
         }
     }
@@ -268,7 +268,7 @@ void kpMainWindow::slotCopy ()
                 rawPixmap,
                 TQt::white));  // CONFIG
         
-        TQApplication::tqclipboard ()->setData (new kpSelectionDrag (sel),
+        TQApplication::clipboard ()->setData (new kpSelectionDrag (sel),
                                              TQClipboard::Clipboard);
     }
 
@@ -288,7 +288,7 @@ static bool HasSomethingToPaste (kpMainWindow *mw)
 
     bool hasSomething = false;
 
-    TQMimeSource *ms = TQApplication::tqclipboard ()->data (TQClipboard::Clipboard);
+    TQMimeSource *ms = TQApplication::clipboard ()->data (TQClipboard::Clipboard);
     if (ms)
     {
         // It's faster to test for TQTextDrag::canDecode() first due to the
@@ -311,7 +311,7 @@ static bool HasSomethingToPaste (kpMainWindow *mw)
     return hasSomething;
 }
 
-// HACK: SYNC: Non-TQt apps do not cause TQApplication::tqtqclipboard() to
+// HACK: SYNC: Non-TQt apps do not cause TQApplication::tqclipboard() to
 //             emit dataChanged().  We don't want to have our paste
 //             action disabled when we can actually paste something.
 //
@@ -683,7 +683,7 @@ void kpMainWindow::slotPaste ()
     // Acquire the pixmap
     //
 
-    TQMimeSource *ms = TQApplication::tqclipboard ()->data (TQClipboard::Clipboard);
+    TQMimeSource *ms = TQApplication::clipboard ()->data (TQClipboard::Clipboard);
     if (!ms)
     {
         kdError () << "kpMainWindow::slotPaste() without mimeSource" << endl;
diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp
index 06949f24..a1de8556 100644
--- a/kolourpaint/kpthumbnail.cpp
+++ b/kolourpaint/kpthumbnail.cpp
@@ -63,16 +63,16 @@ kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name)
     }
 
 
-    TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->minimumSize () : TQSize ();
+    TQSize layoutMinimumSize = layout () ? layout ()->minimumSize () : TQSize ();
 #if DEBUG_KP_THUMBNAIL
-    kdDebug () << "\ttqlayout=" << tqlayout ()
-               << " minSize=" << (tqlayout () ? tqlayout ()->minimumSize () : TQSize ()) << endl;
+    kdDebug () << "\tlayout=" << layout ()
+               << " minSize=" << (layout () ? layout ()->minimumSize () : TQSize ()) << endl;
     kdDebug () << "\tboxLayout=" << boxLayout ()
                << " minSize=" << (boxLayout () ? boxLayout ()->minimumSize () : TQSize ())
                << endl;
 #endif
-    if (tqlayout ())
-        tqlayout ()->setResizeMode (TQLayout::FreeResize);
+    if (layout ())
+        layout ()->setResizeMode (TQLayout::FreeResize);
     setMinimumSize (TQMAX (layoutMinimumSize.width (), 64),
                     TQMAX (layoutMinimumSize.height (), 64));
 
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index dc28e2a9..dd2eea9c 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -944,7 +944,7 @@ void kpTool::mousePressEvent (TQMouseEvent *e)
 
     if (m_mainWindow && e->button () == Qt::MidButton)
     {
-        const TQString text = TQApplication::tqclipboard ()->text (TQClipboard::Selection);
+        const TQString text = TQApplication::clipboard ()->text (TQClipboard::Selection);
     #if DEBUG_KP_TOOL && 1
         kdDebug () << "\tMMB pasteText='" << text << "'" << endl;
     #endif
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp
index 9fb07cf1..c5aaa30e 100644
--- a/kolourpaint/pixmapfx/kpeffectbalance.cpp
+++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp
@@ -275,7 +275,7 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection,
     // TODO: This is what should be shown in the m_gammaInput spinbox
     m_gammaLabel = new TQLabel (this);
     // TODO: This doesn't seem to be wide enough with some fonts so the
-    //       whole tqlayout moves when we drag the gamma slider.
+    //       whole layout moves when we drag the gamma slider.
     m_gammaLabel->setMinimumWidth (m_gammaLabel->fontMetrics ().width (" 10.00 "));
     m_gammaLabel->setAlignment (m_gammaLabel->alignment () | TQt::AlignRight);
     TQPushButton *gammaResetPushButton = new TQPushButton (i18n ("Rese&t"), this);
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
index ce39de75..206fcc91 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
@@ -258,20 +258,20 @@ void kpEffectsDialog::selectEffect (int which)
         TQSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize ();
         TQSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize ();
         TQLayout::ResizeMode previewGroupBoxResizeMode = 
-            m_previewGroupBox->tqlayout () ?
-                m_previewGroupBox->tqlayout ()->resizeMode () :
+            m_previewGroupBox->layout () ?
+                m_previewGroupBox->layout ()->resizeMode () :
                 TQLayout::Auto;
     #if DEBUG_KP_EFFECTS_DIALOG
         kdDebug () << "\tpreviewGroupBox: minSize=" << previewGroupBoxMinSize
                    << " maxSize=" << previewGroupBoxMaxSize
                    << " size=" << m_previewGroupBox->size ()
-                   << " tqlayout=" << m_previewGroupBox->tqlayout ()
+                   << " layout=" << m_previewGroupBox->layout ()
                    << " resizeMode=" << previewGroupBoxResizeMode
                    << endl;
     #endif
 
-        if (m_previewGroupBox->tqlayout ())
-            m_previewGroupBox->tqlayout ()->setResizeMode (TQLayout::FreeResize);
+        if (m_previewGroupBox->layout ())
+            m_previewGroupBox->layout ()->setResizeMode (TQLayout::FreeResize);
     #if DEBUG_KP_EFFECTS_DIALOG
         kdDebug () << "\tafter set resizeMode, previewGroupBox.size="
                    << m_previewGroupBox->size () << endl;
@@ -300,8 +300,8 @@ void kpEffectsDialog::selectEffect (int which)
         kdDebug () << "\tafter set fixedSize, previewGroupBox.size="
                    << m_previewGroupBox->size () << endl;
     #endif
-        if (m_previewGroupBox->tqlayout ())
-            m_previewGroupBox->tqlayout ()->setResizeMode (previewGroupBoxResizeMode);
+        if (m_previewGroupBox->layout ())
+            m_previewGroupBox->layout ()->setResizeMode (previewGroupBoxResizeMode);
     #if DEBUG_KP_EFFECTS_DIALOG
         kdDebug () << "\tafter restore resizeMode, previewGroupBox.size="
                    << m_previewGroupBox->size () << endl;
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index 2ba8d816..4982d7ef 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -144,7 +144,7 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i
     setOrientation (orientation ());
 
 #if DEBUG_KP_TOOL_TOOL_BAR
-    kdDebug () << "kpToolToolBar::<ctor> tqlayout tool widgets msec="
+    kdDebug () << "kpToolToolBar::<ctor> layout tool widgets msec="
                << timer.elapsed () << endl;
 #endif
 
diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
index d27965a6..90167fd2 100644
--- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp
+++ b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
@@ -66,7 +66,7 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *parent, const char *na
         TQPixmap previewPixmap (s, s);
         if (i < 3)
         {
-            // HACK: kpToolWidgetBase's tqlayout code sucks and gives uneven spacing
+            // HACK: kpToolWidgetBase's layout code sucks and gives uneven spacing
             previewPixmap.resize ((width () - 4) / 3, 9);
         }
 
diff --git a/kooka/CHANGES b/kooka/CHANGES
index df5e72c6..9b15cab5 100644
--- a/kooka/CHANGES
+++ b/kooka/CHANGES
@@ -20,7 +20,7 @@ scanned with about 150 dpi.
   via mime mechanism of KDE (KRun). OCR-Parameter get stored via KConfig.
   OCR may be performed on the entire image or the selection.
 
-* Reworked the save assistant: New tqlayout and fully KDE2-Compliant.
+* Reworked the save assistant: New layout and fully KDE2-Compliant.
   Still no new Image format help texts.
 
 * Reworked the startup dialog: Allows to select the scan device from a
diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp
index 0146c1c2..dd346b3c 100644
--- a/kooka/imgprintdialog.cpp
+++ b/kooka/imgprintdialog.cpp
@@ -53,9 +53,9 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
       m_ignoreSignal(false)
 {
     setTitle(i18n("Image Printing"));
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-    // tqlayout->setMargin( KDialog::marginHint() );
-    // tqlayout->setSpacing( KDialog::spacingHint() );
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    // layout->setMargin( KDialog::marginHint() );
+    // layout->setSpacing( KDialog::spacingHint() );
 
     m_scaleRadios = new TQButtonGroup( 2, Qt::Vertical, i18n("Image Print Size"), this );
     m_scaleRadios->setRadioButtonExclusive(true);
@@ -84,11 +84,11 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
     TQToolTip::add( m_rbFitPage, i18n("Printout uses maximum space on the selected pager. Aspect ratio is maintained."));
     m_scaleRadios->insert( m_rbFitPage, ID_FIT_PAGE );
 
-    tqlayout->addWidget( m_scaleRadios );
+    layout->addWidget( m_scaleRadios );
 
 
     TQHBoxLayout *hbox = new TQHBoxLayout( this );
-    tqlayout->addLayout( hbox );
+    layout->addLayout( hbox );
 
     /** Box for Image Resolutions **/
     TQVGroupBox *group1 = new TQVGroupBox( i18n("Resolutions"), this );
@@ -128,7 +128,7 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
 
     TQWidget *spaceEater = new TQWidget( this );
     spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
-    tqlayout->addWidget( spaceEater );
+    layout->addWidget( spaceEater );
 
     /* Set start values */
     m_rbScreen->setChecked(true);
diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp
index b9365767..86796341 100644
--- a/kooka/kocrocrad.cpp
+++ b/kooka/kocrocrad.cpp
@@ -129,7 +129,7 @@ EngineError ocradDialog::setupGui()
     else
         m_ocrCmd = res;
 
-    /** tqlayout detection button **/
+    /** layout detection button **/
     conf->setGroup( CFG_GROUP_OCRAD );
     int layoutDetect = conf->readNumEntry( CFG_OCRAD_LAYOUT_DETECTION, 0 );
     kdDebug(28000) << "Layout detection from config: " << layoutDetect << endl;
@@ -137,7 +137,7 @@ EngineError ocradDialog::setupGui()
     (void) new KSeparator( KSeparator::HLine, page);
     TQHBox *hb1 = new TQHBox(page);
     hb1->setSpacing( KDialog::spacingHint() );
-    (void) new TQLabel( i18n("OCRAD tqlayout analysis mode: "), hb1);
+    (void) new TQLabel( i18n("OCRAD layout analysis mode: "), hb1);
     m_layoutMode = new TQComboBox(hb1);
     m_layoutMode->insertItem(i18n("No Layout Detection"), 0 );
     m_layoutMode->insertItem(i18n("Column Detection"), 1 );
diff --git a/kpdf/conf/dlgaccessibility.ui b/kpdf/conf/dlgaccessibility.ui
index 113a3671..9bb5d46e 100644
--- a/kpdf/conf/dlgaccessibility.ui
+++ b/kpdf/conf/dlgaccessibility.ui
@@ -138,7 +138,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -215,7 +215,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -348,7 +348,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/kpdf/conf/dlggeneral.ui b/kpdf/conf/dlggeneral.ui
index 517db931..430f3dfb 100644
--- a/kpdf/conf/dlggeneral.ui
+++ b/kpdf/conf/dlggeneral.ui
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -96,7 +96,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3_2</cstring>
+                        <cstring>layout3_2</cstring>
                     </property>
                     <vbox>
                         <property name="name">
diff --git a/kpdf/conf/dlgperformance.ui b/kpdf/conf/dlgperformance.ui
index 994e05ff..3676c3ba 100644
--- a/kpdf/conf/dlgperformance.ui
+++ b/kpdf/conf/dlgperformance.ui
@@ -40,7 +40,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -66,7 +66,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6_2</cstring>
+                        <cstring>layout6_2</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -144,7 +144,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -178,7 +178,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <vbox>
                         <property name="name">
diff --git a/kpdf/conf/dlgpresentation.ui b/kpdf/conf/dlgpresentation.ui
index a7bb5c28..d011c2b3 100644
--- a/kpdf/conf/dlgpresentation.ui
+++ b/kpdf/conf/dlgpresentation.ui
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 02ce1148..65e3a55a 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -457,7 +457,7 @@ bool PDFGenerator::print( KPrinter& printer )
     {
         pstitle = m_document->currentDocument().fileName( false );
     }
-    // this looks non-tqunicode-safe and it is. anything other than ASCII is not specified
+    // this looks non-unicode-safe and it is. anything other than ASCII is not specified
     // and some printers actually stop printing when they encounter non-ASCII characters in the
     // Postscript %%Title tag
     TQCString pstitle8Bit = pstitle.latin1();
@@ -528,14 +528,14 @@ static GString *TQStringToGString(const TQString &s) {
     int len = s.length();
     char *cstring = (char *)gmallocn(s.length(), sizeof(char));
     for (int i = 0; i < len; ++i)
-      cstring[i] = s.at(i).tqunicode();
+      cstring[i] = s.at(i).unicode();
     return new GString(cstring, len);
 }
 
-static TQString tqunicodeToTQString(Unicode* u, int len) {
+static TQString unicodeToTQString(Unicode* u, int len) {
     TQString ret;
     ret.setLength(len);
-    TQChar* qch = (TQChar*) ret.tqunicode();
+    TQChar* qch = (TQChar*) ret.unicode();
     for (;len;--len)
       *qch++ = (TQChar) *u++;
     return ret;
@@ -568,7 +568,7 @@ static TQString UnicodeParsedString(GString *s1) {
             u = s1->getChar(i) & 0xff;
             ++i;
         }
-        result += tqunicodeToTQString( &u, 1 );
+        result += unicodeToTQString( &u, 1 );
     }
     return result;
 }
@@ -868,7 +868,7 @@ void PDFGenerator::addSynopsisChildren( TQDomNode * parent, GList * items )
         TQString name;
         Unicode * uniChar = outlineItem->getTitle();
         int titleLength = outlineItem->getTitleLength();
-        name = tqunicodeToTQString(uniChar, titleLength);
+        name = unicodeToTQString(uniChar, titleLength);
         if ( name.isEmpty() )
             continue;
         TQDomElement item = docSyn.createElement( name );
diff --git a/kpdf/core/page.cpp b/kpdf/core/page.cpp
index 0014d26a..cadaacf3 100644
--- a/kpdf/core/page.cpp
+++ b/kpdf/core/page.cpp
@@ -131,11 +131,11 @@ NormalizedRect * KPDFPage::findText( const TQString & text, bool strictCase, Nor
         return 0;
 
     // create a xpf's Unicode (unsigned int) array for the given text
-    const TQChar * str = text.tqunicode();
+    const TQChar * str = text.unicode();
     int len = text.length();
     TQMemArray<Unicode> u(len);
     for (int i = 0; i < len; ++i)
-        u[i] = str[i].tqunicode();
+        u[i] = str[i].unicode();
 
     // find out the direction of search
     enum SearchDir { FromTop, NextMatch, PrevMatch } dir = lastRect ? NextMatch : FromTop;
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 2638e718..1ceb042d 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -80,12 +80,12 @@ class PDFOptionsPage : public KPrintDialogPage
        PDFOptionsPage()
        {
            setTitle( i18n( "PDF Options" ) );
-           TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+           TQVBoxLayout *layout = new TQVBoxLayout(this);
            m_forceRaster = new TQCheckBox(i18n("Force rasterization"), this);
            TQToolTip::add(m_forceRaster, i18n("Rasterize into an image before printing"));
            TQWhatsThis::add(m_forceRaster, i18n("Forces the rasterization of each page into an image before printing it. This usually gives somewhat worse results, but is useful when printing documents that appear to print incorrectly."));
-           tqlayout->addWidget(m_forceRaster);
-           tqlayout->addStretch(1);
+           layout->addWidget(m_forceRaster);
+           layout->addStretch(1);
        }
 
        void getOptions( TQMap<TQString,TQString>& opts, bool incldef = false )
@@ -186,7 +186,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 
 	int index;
 	// [left toolbox: Table of Contents] | []
-	// dummy wrapper with tqlayout to enable horizontal scroll bars (bug: 147233)
+	// dummy wrapper with layout to enable horizontal scroll bars (bug: 147233)
 	TQWidget *tocWrapper = new TQWidget(m_toolBox);
 	TQVBoxLayout *tocWrapperLayout = new TQVBoxLayout(tocWrapper);
 	m_tocFrame = new TOC( tocWrapper, m_document );
diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index 864291c5..baa449af 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -87,7 +87,7 @@ MiniBar::MiniBar( TQWidget * parent, KPDFDocument * document )
     TQSpacerItem * spacerL = new TQSpacerItem( 20, 10, TQSizePolicy::Expanding );
     horLayout->addItem( spacerL );
 
-    // central 2r by 3c grid tqlayout that contains all components
+    // central 2r by 3c grid layout that contains all components
     TQGridLayout * gridLayout = new TQGridLayout( 0, 3,5, 2,1 );
      // top spacer 6x6 px
 //     TQSpacerItem * spacerTop = new TQSpacerItem( 6, 6, TQSizePolicy::Fixed, TQSizePolicy::Fixed );
@@ -318,7 +318,7 @@ void ProgressWidget::paintEvent( TQPaintEvent * e )
         p.drawLine( delta, 0, delta, h );
     }
     // draw a frame-like outline
-    //p.setPen( tqpalette().active().mid() );
+    //p.setPen( palette().active().mid() );
     //p.drawRect( 0,0, w, h );
 }
 
@@ -372,7 +372,7 @@ void PagesEdit::focusOutEvent( TQFocusEvent * e )
 {
     // change background color to a dark tone
     setLineWidth( 1 );
-    setPaletteBackgroundColor( tqpalette().active().background().light( 105 ) );
+    setPaletteBackgroundColor( palette().active().background().light( 105 ) );
     // restore text
     TQLineEdit::setText( backString );
     // call default handler
@@ -428,7 +428,7 @@ void HoverButton::paintEvent( TQPaintEvent * e )
     else
     {
         TQPainter p( this );
-        p.fillRect(e->rect(), parentWidget() ? parentWidget()->tqpalette().brush(TQPalette::Active, TQColorGroup::Background) : paletteBackgroundColor());
+        p.fillRect(e->rect(), parentWidget() ? parentWidget()->palette().brush(TQPalette::Active, TQColorGroup::Background) : paletteBackgroundColor());
         drawButtonLabel( &p );
     }
 }
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index b0b9da30..cf93db68 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -68,7 +68,7 @@ public:
     TQValueVector< PageViewItem * > items;
     TQValueList< PageViewItem * > visibleItems;
 
-    // view tqlayout (columns and continuous in Settings), zoom and mouse
+    // view layout (columns and continuous in Settings), zoom and mouse
     PageView::ZoomMode zoomMode;
     float zoomFactor;
     int rotation;
@@ -392,7 +392,7 @@ void PageView::notifyViewportChanged( bool smoothMove )
         return;
     }
 
-    // retqlayout in "Single Pages" mode or if a retqlayout is pending
+    // relayout in "Single Pages" mode or if a relayout is pending
     d->blockPixmapsRequest = true;
     if ( !KpdfSettings::viewContinuous() || d->dirtyLayout )
         slotRelayoutPages();
@@ -1147,7 +1147,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
                 if ( choice == 3 )
                 {
                     // [2] copy pixmap to clipboard
-                    TQClipboard *cb = TQApplication::tqclipboard();
+                    TQClipboard *cb = TQApplication::clipboard();
                     cb->setPixmap( copyPix, TQClipboard::Clipboard );
                     if ( cb->supportsSelection() )
                         cb->setPixmap( copyPix, TQClipboard::Selection );
@@ -1175,7 +1175,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
                 if ( choice == 1 )
                 {
                     // [1] copy text to clipboard
-                    TQClipboard *cb = TQApplication::tqclipboard();
+                    TQClipboard *cb = TQApplication::clipboard();
                     cb->setText( selectedText, TQClipboard::Clipboard );
                     if ( cb->supportsSelection() )
                         cb->setText( selectedText, TQClipboard::Selection );
@@ -1544,7 +1544,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
 
     if ( newZoomMode != d->zoomMode || (newZoomMode == ZoomFixed && newFactor != d->zoomFactor ) )
     {
-        // rebuild tqlayout and update the whole viewport
+        // rebuild layout and update the whole viewport
         d->zoomMode = newZoomMode;
         d->zoomFactor = newFactor;
         // be sure to block updates to document's viewport
diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp
index 27565753..ce657882 100644
--- a/kpdf/ui/pageviewutils.cpp
+++ b/kpdf/ui/pageviewutils.cpp
@@ -27,7 +27,7 @@ PageViewMessage::PageViewMessage( TQWidget * parent )
     setFocusPolicy( TQ_NoFocus );
     setBackgroundMode( NoBackground );
     setPaletteBackgroundColor(kapp->palette().color(TQPalette::Active, TQColorGroup::Background));
-    // if the tqlayout is LtR, we can safely place it in the right position
+    // if the layout is LtR, we can safely place it in the right position
     if ( !TQApplication::reverseLayout() )
         move( 10, 10 );
     resize( 0, 0 );
@@ -116,7 +116,7 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration
     bufferPainter.setPen( foregroundColor() );
     bufferPainter.drawText( 5 + textXOffset, yText, message );
 
-    // if the tqlayout is RtL, we can move it to the right place only after we
+    // if the layout is RtL, we can move it to the right place only after we
     // know how much size it will take
     if ( TQApplication::reverseLayout() )
         move( parentWidget()->width() - geometry.width() - 10, 10 );
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 12ebe96d..ada517d9 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -314,7 +314,7 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
         m_topBar->alignItemRight( 1 );
         m_topBar->hide();
         // change topbar background color
-        TQPalette p = m_topBar->tqpalette();
+        TQPalette p = m_topBar->palette();
         p.setColor( TQPalette::Active, TQColorGroup::Button, TQt::gray );
         p.setColor( TQPalette::Active, TQColorGroup::Background, TQt::darkGray );
         m_topBar->setPalette( p );
diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp
index 06521692..718a0635 100644
--- a/kpdf/ui/propertiesdialog.cpp
+++ b/kpdf/ui/propertiesdialog.cpp
@@ -24,12 +24,12 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
 {
   // Properties
   TQFrame *page = addPage(i18n("Properties"));
-  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
 
   // get document info, if not present display blank data and a warning
   const DocumentInfo * info = doc->documentInfo();
   if ( !info ) {
-    tqlayout->addWidget( new TQLabel( i18n( "No document opened." ), page ), 0, 0 );
+    layout->addWidget( new TQLabel( i18n( "No document opened." ), page ), 0, 0 );
     return;
   }
 
@@ -49,11 +49,11 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
     if ( titleString.isEmpty() || valueString.isEmpty() )
         continue;
 
-    // create labels and tqlayout them
+    // create labels and layout them
     TQLabel *key = new TQLabel( i18n( "%1:" ).arg( titleString ), page );
     TQLabel *value = new KSqueezedTextLabel( valueString, page );
-    tqlayout->addWidget( key, row, 0, AlignRight );
-    tqlayout->addWidget( value, row, 1 );
+    layout->addWidget( key, row, 0, AlignRight );
+    layout->addWidget( value, row, 1 );
     row++;
 
     // refine maximum width of 'value' labels
@@ -66,8 +66,8 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
     TQLabel *key = new TQLabel( i18n( "Pages:" ), page );
     TQLabel *value = new TQLabel( TQString::number( doc->pages() ), page );
 
-    tqlayout->addWidget( key, row, 0 );
-    tqlayout->addWidget( value, row, 1 );
+    layout->addWidget( key, row, 0 );
+    layout->addWidget( value, row, 1 );
   }
 
   // Fonts
@@ -82,7 +82,7 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
   }
 
   // current width: left column + right column + dialog borders
-  int width = tqlayout->minimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30;
+  int width = layout->minimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30;
   if (page2Layout)
   {
     width = TQMAX( width, page2Layout->sizeHint().width() + marginHint() + spacingHint() + 31 );
diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp
index 7ca3ba49..f21d8b73 100644
--- a/kpdf/ui/searchwidget.cpp
+++ b/kpdf/ui/searchwidget.cpp
@@ -79,10 +79,10 @@ void SearchWidget::clearText()
 void SearchWidget::slotTextChanged( const TQString & text )
 {
     // if 0<length<3 set 'red' text and send a blank string to document
-    TQColor color = text.length() > 0 && text.length() < 3 ? TQt::darkRed : tqpalette().active().text();
+    TQColor color = text.length() > 0 && text.length() < 3 ? TQt::darkRed : palette().active().text();
     KLineEdit * lineEdit = getLined( LEDIT_ID );
     lineEdit->setPaletteForegroundColor( color );
-    lineEdit->setPaletteBackgroundColor( tqpalette().active().base() );
+    lineEdit->setPaletteBackgroundColor( palette().active().base() );
     m_inputDelayTimer->stop();
     m_inputDelayTimer->start(333, true);
 }
diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp
index 8f9359b5..22819cb6 100644
--- a/kpdf/ui/thumbnaillist.cpp
+++ b/kpdf/ui/thumbnaillist.cpp
@@ -82,7 +82,7 @@ ThumbnailList::ThumbnailList( TQWidget *parent, KPDFDocument *document )
 	setDragAutoScroll( false );
 
 	// set contents background to the 'base' color
-	viewport()->setPaletteBackgroundColor( tqpalette().active().base() );
+	viewport()->setPaletteBackgroundColor( palette().active().base() );
 
 	setFrameStyle( StyledPanel | Raised );
 	connect( this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotRequestVisiblePixmaps(int, int)) );
@@ -509,7 +509,7 @@ void ThumbnailWidget::paintEvent( TQPaintEvent * e )
         p.setPen( isBookmarked ? TQColor( 0xFF8000 ) : TQt::black );
         p.drawRect( m_margin/2 - 1, m_margin/2 - 1, m_pixmapWidth + 2, m_pixmapHeight + 2 );
         // draw the clear rect
-        p.setPen( isBookmarked ? TQColor( 0x804000 ) : tqpalette().active().base() );
+        p.setPen( isBookmarked ? TQColor( 0x804000 ) : palette().active().base() );
         // draw the bottom and right shadow edges
         if ( !isBookmarked )
         {
diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp
index 0229c518..d44715e6 100644
--- a/kpovmodeler/pmactions.cpp
+++ b/kpovmodeler/pmactions.cpp
@@ -135,10 +135,10 @@ protected:
    void drawButton( TQPainter* p )
    {
       // Draw the background
-      tqstyle( ).drawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), colorGroup( ),
+      style( ).drawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), colorGroup( ),
                                    TQStyle::Style_Enabled, TQStyle::SC_ToolButton );
       // Draw the label
-      tqstyle( ).drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), colorGroup( ),
+      style( ).drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), colorGroup( ),
                             TQStyle::Style_Enabled );
    }
 };
diff --git a/kpovmodeler/pmbicubicpatchedit.cpp b/kpovmodeler/pmbicubicpatchedit.cpp
index fe91f1e0..8dff49b0 100644
--- a/kpovmodeler/pmbicubicpatchedit.cpp
+++ b/kpovmodeler/pmbicubicpatchedit.cpp
@@ -39,32 +39,32 @@ void PMBicubicPatchEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
 
    m_pType = new TQComboBox( false, this );
    m_pType->insertItem( i18n( "Normal (type 0)" ) );
    m_pType->insertItem( i18n( "Preprocessed (type 1)" ) );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
-   tqlayout->addWidget( m_pType );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
+   layout->addWidget( m_pType );
+   layout->addStretch( 1 );
 
    m_pUSteps = new PMIntEdit( this );
    m_pUSteps->setValidation( true, 0, false, 0 );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Steps:" ) + " u", this ) );
-   tqlayout->addWidget( m_pUSteps );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Steps:" ) + " u", this ) );
+   layout->addWidget( m_pUSteps );
    m_pVSteps = new PMIntEdit( this );
    m_pVSteps->setValidation( true, 0, false, 0 );
-   tqlayout->addWidget( new TQLabel( "v", this ) );
-   tqlayout->addWidget( m_pVSteps );
+   layout->addWidget( new TQLabel( "v", this ) );
+   layout->addWidget( m_pVSteps );
 
    m_pFlatness = new PMFloatEdit( this );
    m_pFlatness->setValidation( true, 0.0, false, 0.0 );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Flatness:" ), this ) );
-   tqlayout->addWidget( m_pFlatness );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Flatness:" ), this ) );
+   layout->addWidget( m_pFlatness );
+   layout->addStretch( 1 );
 
    topLayout( )->addWidget( new TQLabel( i18n( "Points:" ), this ) );
 
diff --git a/kpovmodeler/pmblobcylinderedit.cpp b/kpovmodeler/pmblobcylinderedit.cpp
index 836d7d72..34910df0 100644
--- a/kpovmodeler/pmblobcylinderedit.cpp
+++ b/kpovmodeler/pmblobcylinderedit.cpp
@@ -36,7 +36,7 @@ void PMBlobCylinderEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
    
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQGridLayout* gl;
 
    m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -50,13 +50,13 @@ void PMBlobCylinderEdit::createTopWidgets( )
    gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
    gl->addWidget( m_pEnd2, 1, 1 );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   gl = new TQGridLayout( tqlayout, 2, 2 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   gl = new TQGridLayout( layout, 2, 2 );
    gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
    gl->addWidget( m_pRadius, 0, 1 );
    gl->addWidget( new TQLabel( i18n( "Strength:" ), this ), 1, 0 );
    gl->addWidget( m_pStrength, 1, 1 );
-   tqlayout->addStretch( 1 );
+   layout->addStretch( 1 );
 
    connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmblobsphereedit.cpp b/kpovmodeler/pmblobsphereedit.cpp
index 6bf37b26..ba4e226b 100644
--- a/kpovmodeler/pmblobsphereedit.cpp
+++ b/kpovmodeler/pmblobsphereedit.cpp
@@ -34,23 +34,23 @@ void PMBlobSphereEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
 
    m_pCentre = new PMVectorEdit( "x", "y", "z", this );
    m_pRadius = new PMFloatEdit( this );
    m_pStrength = new PMFloatEdit( this );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
-   tqlayout->addWidget( m_pCentre );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
+   layout->addWidget( m_pCentre );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   TQGridLayout* gl = new TQGridLayout( tqlayout, 2, 2 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   TQGridLayout* gl = new TQGridLayout( layout, 2, 2 );
    gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
    gl->addWidget( m_pRadius, 0, 1 );
    gl->addWidget( new TQLabel( i18n( "Strength:" ), this ), 1, 0 );
    gl->addWidget( m_pStrength, 1, 1 );
-   tqlayout->addStretch( 1 );
+   layout->addStretch( 1 );
 
    connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmcameraedit.cpp b/kpovmodeler/pmcameraedit.cpp
index 23db4104..253d38b5 100644
--- a/kpovmodeler/pmcameraedit.cpp
+++ b/kpovmodeler/pmcameraedit.cpp
@@ -40,7 +40,7 @@ void PMCameraEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQGridLayout* tqlayout;
+   TQGridLayout* layout;
    TQLabel* label;
 
    m_pCameraType = new TQComboBox( false, this );
@@ -75,28 +75,28 @@ void PMCameraEdit::createTopWidgets( )
    hl->addWidget( m_pCylinderTypeLabel );
    hl->addWidget( m_pCylinderType );
 
-   tqlayout = new TQGridLayout( topLayout( ), 7, 2 );
-   tqlayout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 );
-   tqlayout->addWidget( m_pLocation, 0, 1 );
+   layout = new TQGridLayout( topLayout( ), 7, 2 );
+   layout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 );
+   layout->addWidget( m_pLocation, 0, 1 );
 
-   tqlayout->addWidget( new TQLabel( i18n( "Sky:" ), this ), 1, 0 );
-   tqlayout->addWidget( m_pSky, 1, 1 );
+   layout->addWidget( new TQLabel( i18n( "Sky:" ), this ), 1, 0 );
+   layout->addWidget( m_pSky, 1, 1 );
 
-   tqlayout->addWidget( new TQLabel( i18n( "Direction:" ), this ), 2, 0 );
-   tqlayout->addWidget( m_pDirection, 2, 1 );
+   layout->addWidget( new TQLabel( i18n( "Direction:" ), this ), 2, 0 );
+   layout->addWidget( m_pDirection, 2, 1 );
 
-   tqlayout->addWidget( new TQLabel( i18n( "Right:" ), this ), 3, 0 );
-   tqlayout->addWidget( m_pRight, 3, 1 );
+   layout->addWidget( new TQLabel( i18n( "Right:" ), this ), 3, 0 );
+   layout->addWidget( m_pRight, 3, 1 );
 
-   tqlayout->addWidget( new TQLabel( i18n( "Up:" ), this ), 4, 0 );
-   tqlayout->addWidget( m_pUp, 4, 1 );
+   layout->addWidget( new TQLabel( i18n( "Up:" ), this ), 4, 0 );
+   layout->addWidget( m_pUp, 4, 1 );
 
-   tqlayout->addWidget( new TQLabel( i18n( "Look at:" ), this ), 5, 0 );
-   tqlayout->addWidget( m_pLookAt, 5, 1 );
+   layout->addWidget( new TQLabel( i18n( "Look at:" ), this ), 5, 0 );
+   layout->addWidget( m_pLookAt, 5, 1 );
 
    m_pEnableAngle = new TQCheckBox( i18n( "Angle:" ), this );
-   tqlayout->addWidget( m_pEnableAngle, 6, 0 );
-   tqlayout->addWidget( m_pAngle, 6, 1, AlignLeft );
+   layout->addWidget( m_pEnableAngle, 6, 0 );
+   layout->addWidget( m_pAngle, 6, 1, AlignLeft );
 
    m_pFocalBlur = new TQCheckBox( i18n( "Focal blur" ), this );
    topLayout( )->addWidget( m_pFocalBlur );
@@ -116,27 +116,27 @@ void PMCameraEdit::createTopWidgets( )
    m_pVariance->setValidation( true, 0, false, 0 );
    m_focalWidgets.append( m_pVariance );
 
-   tqlayout = new TQGridLayout( topLayout( ), 5, 2 );
+   layout = new TQGridLayout( topLayout( ), 5, 2 );
    label = new TQLabel( i18n( "Aperture:" ), this );
    m_focalWidgets.append( label );
-   tqlayout->addWidget( label, 0, 0 );
-   tqlayout->addWidget( m_pAperture, 0, 1 );
+   layout->addWidget( label, 0, 0 );
+   layout->addWidget( m_pAperture, 0, 1 );
    label = new TQLabel( i18n( "Blur samples:" ), this );
    m_focalWidgets.append( label );
-   tqlayout->addWidget( label, 1, 0 );
-   tqlayout->addWidget( m_pBlurSamples, 1, 1 );
+   layout->addWidget( label, 1, 0 );
+   layout->addWidget( m_pBlurSamples, 1, 1 );
    label = new TQLabel( i18n( "Focal point:" ), this );
    m_focalWidgets.append( label );
-   tqlayout->addWidget( label, 2, 0 );
-   tqlayout->addWidget( m_pFocalPoint, 2, 1 );
+   layout->addWidget( label, 2, 0 );
+   layout->addWidget( m_pFocalPoint, 2, 1 );
    label = new TQLabel( i18n( "Confidence:" ), this );
    m_focalWidgets.append( label );
-   tqlayout->addWidget( label, 3, 0 );
-   tqlayout->addWidget( m_pConfidence, 3, 1 );
+   layout->addWidget( label, 3, 0 );
+   layout->addWidget( m_pConfidence, 3, 1 );
    label = new TQLabel( i18n( "Variance:" ), this );
    m_focalWidgets.append( label );
-   tqlayout->addWidget( label, 4, 0 );
-   tqlayout->addWidget( m_pVariance, 4, 1 );
+   layout->addWidget( label, 4, 0 );
+   layout->addWidget( m_pVariance, 4, 1 );
 
    m_pExport = new TQCheckBox( i18n( "Export to renderer" ), this );
    topLayout( )->addWidget( m_pExport );
diff --git a/kpovmodeler/pmcolorsettings.cpp b/kpovmodeler/pmcolorsettings.cpp
index 4be987ac..c0dafa37 100644
--- a/kpovmodeler/pmcolorsettings.cpp
+++ b/kpovmodeler/pmcolorsettings.cpp
@@ -28,60 +28,60 @@
 PMColorSettings::PMColorSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQGridLayout* grid;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
-   grid = new TQGridLayout( vtqlayout, 6, 3 );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   grid = new TQGridLayout( vlayout, 6, 3 );
    
    grid->addWidget( new TQLabel( i18n( "Background:" ), this ), 0, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 0, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 0, 2 );
    m_pBackgroundColor = new KColorButton( this );
-   htqlayout->addWidget( m_pBackgroundColor );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pBackgroundColor );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Wire frame:" ), this ), 1, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 1, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 1, 2 );
    m_pGraphicalObjectsColor[0] = new KColorButton( this );
-   htqlayout->addWidget( m_pGraphicalObjectsColor[0] );
-   htqlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
+   hlayout->addWidget( m_pGraphicalObjectsColor[0] );
+   hlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
    m_pGraphicalObjectsColor[1] = new KColorButton( this );
-   htqlayout->addWidget( m_pGraphicalObjectsColor[1] );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pGraphicalObjectsColor[1] );
+   hlayout->addStretch( 1 );
    
    grid->addWidget( new TQLabel( i18n( "Control points:" ), this ), 2, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 2, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 2, 2 );
    m_pControlPointsColor[0] = new KColorButton( this );
-   htqlayout->addWidget( m_pControlPointsColor[0] );
-   htqlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
+   hlayout->addWidget( m_pControlPointsColor[0] );
+   hlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) );
    m_pControlPointsColor[1] = new KColorButton( this );
-   htqlayout->addWidget( m_pControlPointsColor[1] );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pControlPointsColor[1] );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Axes:" ), this ), 3, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 3, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 3, 2 );
    grid->addWidget( new TQLabel( "x", this ), 3, 1 );
    m_pAxesColor[0] = new KColorButton( this );
-   htqlayout->addWidget( m_pAxesColor[0] );
-   htqlayout->addWidget( new TQLabel( "y", this ) );
+   hlayout->addWidget( m_pAxesColor[0] );
+   hlayout->addWidget( new TQLabel( "y", this ) );
    m_pAxesColor[1] = new KColorButton( this );
-   htqlayout->addWidget( m_pAxesColor[1] );
-   htqlayout->addWidget( new TQLabel( "z", this ) );
+   hlayout->addWidget( m_pAxesColor[1] );
+   hlayout->addWidget( new TQLabel( "z", this ) );
    m_pAxesColor[2] = new KColorButton( this );
-   htqlayout->addWidget( m_pAxesColor[2] );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pAxesColor[2] );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Field of view:" ), this ), 4, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 4, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 4, 2 );
    m_pFieldOfViewColor = new KColorButton( this );
-   htqlayout->addWidget( m_pFieldOfViewColor );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pFieldOfViewColor );
+   hlayout->addStretch( 1 );
 }
 
 void PMColorSettings::displaySettings( )
diff --git a/kpovmodeler/pmconeedit.cpp b/kpovmodeler/pmconeedit.cpp
index 75a07855..9969e4d7 100644
--- a/kpovmodeler/pmconeedit.cpp
+++ b/kpovmodeler/pmconeedit.cpp
@@ -36,7 +36,7 @@ void PMConeEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
    
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQGridLayout* gl;
 
    m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -51,13 +51,13 @@ void PMConeEdit::createTopWidgets( )
    gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
    gl->addWidget( m_pEnd2, 1, 1 );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   gl = new TQGridLayout( tqlayout, 2, 2 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   gl = new TQGridLayout( layout, 2, 2 );
    gl->addWidget( new TQLabel( i18n( "Radius 1:" ), this ), 0, 0 );
    gl->addWidget( m_pRadius1, 0, 1 );
    gl->addWidget( new TQLabel( i18n( "Radius 2:" ), this ), 1, 0 );
    gl->addWidget( m_pRadius2, 1, 1 );
-   tqlayout->addStretch( 1 );
+   layout->addStretch( 1 );
 
    topLayout( )->addWidget( m_pOpen );
 
diff --git a/kpovmodeler/pmcsgedit.cpp b/kpovmodeler/pmcsgedit.cpp
index 014eb09b..114e22f6 100644
--- a/kpovmodeler/pmcsgedit.cpp
+++ b/kpovmodeler/pmcsgedit.cpp
@@ -34,17 +34,17 @@ void PMCSGEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
    
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    m_pTypeCombo = new TQComboBox( false, this );
    m_pTypeCombo->insertItem( i18n( "Union" ) );
    m_pTypeCombo->insertItem( i18n( "Intersection" ) );
    m_pTypeCombo->insertItem( i18n( "Difference" ) );
    m_pTypeCombo->insertItem( i18n( "Merge" ) );
    
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
-   tqlayout->addWidget( m_pTypeCombo );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Type:" ), this ) );
+   layout->addWidget( m_pTypeCombo );
+   layout->addStretch( 1 );
 
    connect( m_pTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotTypeSelected( int ) ) );
 }
diff --git a/kpovmodeler/pmcylinderedit.cpp b/kpovmodeler/pmcylinderedit.cpp
index b8741ae7..b15a0d16 100644
--- a/kpovmodeler/pmcylinderedit.cpp
+++ b/kpovmodeler/pmcylinderedit.cpp
@@ -36,7 +36,7 @@ void PMCylinderEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
    
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQGridLayout* gl;
 
    m_pEnd1 = new PMVectorEdit( "x", "y", "z", this );
@@ -50,13 +50,13 @@ void PMCylinderEdit::createTopWidgets( )
    gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 );
    gl->addWidget( m_pEnd2, 1, 1 );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
-   tqlayout->addWidget( m_pRadius );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
+   layout->addWidget( m_pRadius );
+   layout->addStretch( 1 );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( m_pOpen );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( m_pOpen );
   
    connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp
index 60446a53..a5086c15 100644
--- a/kpovmodeler/pmdeclareedit.cpp
+++ b/kpovmodeler/pmdeclareedit.cpp
@@ -44,13 +44,13 @@ void PMDeclareEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pNameEdit = new TQLineEdit( this );
    m_pNameEdit->setMaxLength( 40 );
    TQLabel* label = new TQLabel( i18n( "Identifier:" ), this );
 
-   tqlayout->addWidget( label );
-   tqlayout->addWidget( m_pNameEdit );
+   layout->addWidget( label );
+   layout->addWidget( m_pNameEdit );
 
    connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
             TQT_SLOT( slotNameChanged( const TQString& ) ) );
@@ -67,13 +67,13 @@ void PMDeclareEdit::createBottomWidgets( )
             TQT_SLOT( slotItemSelected( TQListBoxItem* ) ) );
    topLayout( )->addWidget( m_pLinkedObjects, 1 );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pSelectButton = new TQPushButton( i18n( "Select..." ), this );
    m_pSelectButton->setEnabled( false );
 
    connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelect( ) ) );
-   tqlayout->addStretch( );
-   tqlayout->addWidget( m_pSelectButton );
+   layout->addStretch( );
+   layout->addWidget( m_pSelectButton );
 
    Base::createBottomWidgets( );
 }
diff --git a/kpovmodeler/pmdetailobjectedit.cpp b/kpovmodeler/pmdetailobjectedit.cpp
index 09b53cbd..661cd892 100644
--- a/kpovmodeler/pmdetailobjectedit.cpp
+++ b/kpovmodeler/pmdetailobjectedit.cpp
@@ -33,7 +33,7 @@ void PMDetailObjectEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pGlobalDetail = new TQCheckBox( i18n( "Global detail" ), this );
    m_pLocalDetailLevelLabel = new TQLabel( i18n( "Detail level:" ), this );
    m_pLocalDetailLevel = new TQComboBox( this );
@@ -43,10 +43,10 @@ void PMDetailObjectEdit::createTopWidgets( )
    m_pLocalDetailLevel->insertItem( i18n( "High" ) );
    m_pLocalDetailLevel->insertItem( i18n( "Very High" ) );
 
-   tqlayout->addWidget( m_pGlobalDetail );
-   tqlayout->addWidget( m_pLocalDetailLevelLabel );
-   tqlayout->addWidget( m_pLocalDetailLevel );
-   tqlayout->addStretch( );
+   layout->addWidget( m_pGlobalDetail );
+   layout->addWidget( m_pLocalDetailLevelLabel );
+   layout->addWidget( m_pLocalDetailLevel );
+   layout->addStretch( );
 
    connect( m_pGlobalDetail, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotGlobalDetailClicked( ) ) );
    connect( m_pLocalDetailLevel, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp
index bd444718..33f3b813 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -519,7 +519,7 @@ void PMDialogEditBase::slotTexturePreview( )
       m_pRenderFrame->setFixedSize( s_previewSize + m_pRenderFrame->frameWidth( ) * 2,
                                     s_previewSize + m_pRenderFrame->frameWidth( ) * 2 );
       m_pRenderFrame->updateGeometry( );
-      m_pTexturePreviewWidget->tqlayout( )->activate( );
+      m_pTexturePreviewWidget->layout( )->activate( );
       emit sizeChanged( );
       m_pOutputWidget->slotClear( );
       m_pRenderWidget->render( scene, mode, m_pPart->url( ) );
diff --git a/kpovmodeler/pmdialogeditbase.h b/kpovmodeler/pmdialogeditbase.h
index 77c37409..e2ae701a 100644
--- a/kpovmodeler/pmdialogeditbase.h
+++ b/kpovmodeler/pmdialogeditbase.h
@@ -42,7 +42,7 @@ class PMPovrayOutputWidget;
 /**
  * Base class for all widgets for editing object attributes.
  *
- * Ensures a consistent tqlayout for all widgets. Widgets should not
+ * Ensures a consistent layout for all widgets. Widgets should not
  * created within the constructor, but with the functions @ref createTopWidgets
  * and @ref createBottomWidgets.
  * 
@@ -276,7 +276,7 @@ protected:
     * of the sub class.
     *
     * First call the function of the base class, then create and append
-    * the widgets to the top tqlayout.
+    * the widgets to the top layout.
     */
    virtual void createTopWidgets( ) { };
 
@@ -284,7 +284,7 @@ protected:
     * Create widgets here, that should be placed under the widgets
     * of the sub class.
     *
-    * First create and append the widgets to the top tqlayout, then
+    * First create and append the widgets to the top layout, then
     * call the function of the base class
     */
    virtual void createBottomWidgets( );
@@ -296,7 +296,7 @@ protected:
    virtual void saveContents( );
 
    /**
-    * Returns a pointer to the top tqlayout
+    * Returns a pointer to the top layout
     */
    TQBoxLayout* topLayout( ) const { return m_pTopLayout; }
 
diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp
index be91b48e..fce0e170 100644
--- a/kpovmodeler/pmdialogview.cpp
+++ b/kpovmodeler/pmdialogview.cpp
@@ -314,10 +314,10 @@ void PMDialogView::slotDataChanged( )
 
 void PMDialogView::slotSizeChanged( )
 {
-   // force recalculating of the tqlayout
+   // force recalculating of the layout
    if( m_pDisplayedWidget )
-      if( m_pDisplayedWidget->tqlayout( ) )
-         m_pDisplayedWidget->tqlayout( )->activate( );
+      if( m_pDisplayedWidget->layout( ) )
+         m_pDisplayedWidget->layout( )->activate( );
    m_pHelper->calculateSize( );
 }
 
diff --git a/kpovmodeler/pmdiscedit.cpp b/kpovmodeler/pmdiscedit.cpp
index e960f869..0197a806 100644
--- a/kpovmodeler/pmdiscedit.cpp
+++ b/kpovmodeler/pmdiscedit.cpp
@@ -37,7 +37,7 @@ void PMDiscEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQGridLayout* gl;
 
    m_pCenter = new PMVectorEdit( "x", "y", "z", this );
@@ -53,18 +53,18 @@ void PMDiscEdit::createTopWidgets( )
    gl->addWidget( new TQLabel( i18n( "Normal:" ), this ), 1, 0 );
    gl->addWidget( m_pNormal, 1, 1 );
    
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   gl = new TQGridLayout( tqlayout, 2, 2 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   gl = new TQGridLayout( layout, 2, 2 );
    gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 );
    gl->addWidget( m_pRadius, 0, 1 );
    gl->addWidget( new TQLabel( i18n( "Hole radius:" ), this ), 1, 0 );
    gl->addWidget( m_pHRadius, 1, 1 );
-   tqlayout->addStretch( 1 );
+   layout->addStretch( 1 );
 
    TQPushButton* nb = new TQPushButton( i18n( "Normalize" ), this );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( nb );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( nb );
+   layout->addStretch( 1 );
 
    connect( m_pCenter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index f340cde4..76aceb1f 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -337,7 +337,7 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
 
   paint.begin( this );
 
-  tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
+  style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
 
   paint.end();
 }
@@ -350,8 +350,8 @@ PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* parent, co
 PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
 :PMDockWidgetAbstractHeader( parent, name )
 {
-  tqlayout = new TQHBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQHBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   drag = new PMDockWidgetHeaderDrag( this, parent );
 
@@ -386,12 +386,12 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
   toDesktopButton->setFixedSize(buttonWidth,buttonHeight);
   connect( toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop()));
 
-  tqlayout->addWidget( drag );
-  tqlayout->addWidget( dockbackButton );
-  tqlayout->addWidget( toDesktopButton );
-  tqlayout->addWidget( stayButton );
-  tqlayout->addWidget( closeButton );
-  tqlayout->activate();
+  layout->addWidget( drag );
+  layout->addWidget( dockbackButton );
+  layout->addWidget( toDesktopButton );
+  layout->addWidget( stayButton );
+  layout->addWidget( closeButton );
+  layout->activate();
   drag->setFixedHeight( tqlayout->minimumSize().height() );
 }
 
@@ -415,7 +415,7 @@ void PMDockWidgetHeader::setTopLevel( bool isTopLevel )
     closeButton->show();
     toDesktopButton->show();
   }
-  tqlayout->activate();
+  layout->activate();
   updateGeometry();
 }
 
@@ -423,19 +423,19 @@ void PMDockWidgetHeader::setDragPanel( PMDockWidgetHeaderDrag* nd )
 {
   if ( !nd ) return;
 
-  delete tqlayout;
-  tqlayout = new TQHBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  delete layout;
+  layout = new TQHBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   delete drag;
   drag = nd;
 
-  tqlayout->addWidget( drag );
-  tqlayout->addWidget( dockbackButton );
-  tqlayout->addWidget( toDesktopButton );
-  tqlayout->addWidget( stayButton );
-  tqlayout->addWidget( closeButton );
-  tqlayout->activate();
+  layout->addWidget( drag );
+  layout->addWidget( dockbackButton );
+  layout->addWidget( toDesktopButton );
+  layout->addWidget( stayButton );
+  layout->addWidget( closeButton );
+  layout->activate();
   drag->setFixedHeight( tqlayout->minimumSize().height() );
 }
 
@@ -481,8 +481,8 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const
 
   d->_parent = parent;
 
-  tqlayout = new TQVBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQVBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   manager = dockManager;
   manager->childDock->append( TQT_TQOBJECT(this) );
@@ -538,15 +538,15 @@ void PMDockWidget::setHeader( PMDockWidgetAbstractHeader* h )
 
   if ( header ){
     delete header;
-    delete tqlayout;
+    delete layout;
     header = h;
-    tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
-    tqlayout->addWidget( header );
+    layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
+    layout->addWidget( header );
      setWidget( widget );
   } else {
     header = h;
-    tqlayout->addWidget( header );
+    layout->addWidget( header );
   }
 }
 
@@ -777,7 +777,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   // MODIFICATION (Zehender):
   // If DockPosition is DockLeft or DockRight, add the widget
   // left or right of the target, so that a new vertical splitter
-  // (a splitter with horizontal widget tqlayout :-) is created
+  // (a splitter with horizontal widget layout :-) is created
   // that spawns the full height of the main view
 
   if( ( dockPos == PMDockWidget::DockLeft ) ||
@@ -1086,13 +1086,13 @@ void PMDockWidget::setWidget( TQWidget* mw )
   }
 
   widget = mw;
-  delete tqlayout;
+  delete layout;
 
-  tqlayout = new TQVBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQVBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
-  tqlayout->addWidget( header );
-  tqlayout->addWidget( widget,1 );
+  layout->addWidget( header );
+  layout->addWidget( widget,1 );
 }
 
 void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
@@ -1316,10 +1316,10 @@ void PMDockManager::activate()
 bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
 {
 /* This doesn't seem to fullfill any sense, other than breaking
-   TQMainWindow's tqlayout all over the place
+   TQMainWindow's layout all over the place
    The first child of the mainwindow is not necessarily a meaningful
    content widget but in TQt3's TQMainWindow it can easily be a TQToolBar.
-   In short: TQMainWindow knows how to tqlayout its children, no need to
+   In short: TQMainWindow knows how to layout its children, no need to
    mess that up.
 
    >>>>>I need this in the PMDockArea at the moment (JoWenn)
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index c240e153..ce7c7aa1 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -305,9 +305,9 @@ protected slots:
 protected:
 
   /**
-   * A tqlayout manager for placing the embedded buttons (close and stay)
+   * A layout manager for placing the embedded buttons (close and stay)
    */
-  TQHBoxLayout* tqlayout;
+  TQHBoxLayout* layout;
 
   /**
    * a little button for closing (undocking and hiding) the dockwidget
@@ -773,9 +773,9 @@ private:
   TQWidget* widget;
 
   /**
-   * the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header
+   * the layout manager that takes care about proper resizing and moving the embedded widget and the header
    */
-  TQVBoxLayout* tqlayout;
+  TQVBoxLayout* layout;
 
   /**
    * the responsible dockmanager
@@ -872,7 +872,7 @@ public:
    * (TQObject::name) in the childDock variable of
    * PMDockManager. This list in turn contains all
    * PMDockWidgets (according to the PMDockWidget constructor).
-   * So in principle, in order to restore a window tqlayout,
+   * So in principle, in order to restore a window layout,
    * one must first construct all widgets, put each of them in a
    * PMDockWidget and then call readConfig(). And for all that
    * to work, each widget must have a unique name.
@@ -884,11 +884,11 @@ public:
 #endif
 
   /**
-   * Saves the current dock window tqlayout into a DOM tree below the given element.
+   * Saves the current dock window layout into a DOM tree below the given element.
    */
   void writeConfig(TQDomElement &base);
   /**
-   * Reads the current dock window tqlayout from a DOM tree below the given element.
+   * Reads the current dock window layout from a DOM tree below the given element.
    */
   void readConfig(TQDomElement &base);
 
@@ -1274,11 +1274,11 @@ public:
   PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ");
 
   /**
-   * Saves the current dock window tqlayout into a DOM tree below the given element.
+   * Saves the current dock window layout into a DOM tree below the given element.
    */
   void writeDockConfig(TQDomElement &base);
   /**
-   * Reads the current dock window tqlayout from a DOM tree below the given element.
+   * Reads the current dock window layout from a DOM tree below the given element.
    */
   void readDockConfig(TQDomElement &base);
 
diff --git a/kpovmodeler/pmfinishedit.cpp b/kpovmodeler/pmfinishedit.cpp
index e3513a5d..38766f94 100644
--- a/kpovmodeler/pmfinishedit.cpp
+++ b/kpovmodeler/pmfinishedit.cpp
@@ -42,80 +42,80 @@ void PMFinishEdit::createTopWidgets( )
    Base::createTopWidgets( );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   TQGridLayout* tqlayout = new TQGridLayout( hl, 2, 2 );
+   TQGridLayout* layout = new TQGridLayout( hl, 2, 2 );
    m_pEnableAmbientEdit = new TQCheckBox( i18n( "Ambient color" ), this );
    m_pAmbientColorLabel = new TQLabel( i18n( "Color:" ), this );
    m_pAmbientColorEdit = new PMColorEdit( true, this );
-   tqlayout->addMultiCellWidget( m_pEnableAmbientEdit, 0, 0, 0, 1 );
-   tqlayout->addWidget( m_pAmbientColorLabel, 1, 0, AlignTop );
-   tqlayout->addWidget( m_pAmbientColorEdit, 1, 1 );
+   layout->addMultiCellWidget( m_pEnableAmbientEdit, 0, 0, 0, 1 );
+   layout->addWidget( m_pAmbientColorLabel, 1, 0, AlignTop );
+   layout->addWidget( m_pAmbientColorEdit, 1, 1 );
    hl->addStretch( 1 );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   tqlayout = new TQGridLayout( hl, 4, 2 );
+   layout = new TQGridLayout( hl, 4, 2 );
    m_pEnableDiffuseEdit = new TQCheckBox( i18n( "Diffuse:" ), this );
    m_pDiffuseEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableDiffuseEdit, 0, 0 );
-   tqlayout->addWidget( m_pDiffuseEdit, 0, 1 );
+   layout->addWidget( m_pEnableDiffuseEdit, 0, 0 );
+   layout->addWidget( m_pDiffuseEdit, 0, 1 );
    m_pEnableBrillianceEdit = new TQCheckBox( i18n( "Brilliance:" ), this );
    m_pBrillianceEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableBrillianceEdit, 1, 0 );
-   tqlayout->addWidget( m_pBrillianceEdit, 1, 1 );
+   layout->addWidget( m_pEnableBrillianceEdit, 1, 0 );
+   layout->addWidget( m_pBrillianceEdit, 1, 1 );
    m_pEnableCrandEdit = new TQCheckBox( i18n( "Crand:" ), this );
    m_pCrandEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableCrandEdit, 2, 0 );
-   tqlayout->addWidget( m_pCrandEdit, 2, 1 );
+   layout->addWidget( m_pEnableCrandEdit, 2, 0 );
+   layout->addWidget( m_pCrandEdit, 2, 1 );
    m_pConserveEnergyEdit = new TQCheckBox(
       i18n( "Conserve energy for reflection" ), this );
-   tqlayout->addMultiCellWidget( m_pConserveEnergyEdit, 3, 3, 0, 1 );
+   layout->addMultiCellWidget( m_pConserveEnergyEdit, 3, 3, 0, 1 );
    hl->addStretch( 1 );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   tqlayout = new TQGridLayout( hl, 2, 2 );
+   layout = new TQGridLayout( hl, 2, 2 );
    m_pEnablePhongEdit = new TQCheckBox( i18n( "Phong:" ), this );
    m_pPhongEdit = new PMFloatEdit( this );
    m_pEnablePhongSizeEdit = new TQCheckBox( i18n( "Phong size:" ), this );
    m_pPhongSizeEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnablePhongEdit, 0, 0 );
-   tqlayout->addWidget( m_pPhongEdit, 0, 1 );
-   tqlayout->addWidget( m_pEnablePhongSizeEdit, 1, 0 );
-   tqlayout->addWidget( m_pPhongSizeEdit, 1, 1 );
+   layout->addWidget( m_pEnablePhongEdit, 0, 0 );
+   layout->addWidget( m_pPhongEdit, 0, 1 );
+   layout->addWidget( m_pEnablePhongSizeEdit, 1, 0 );
+   layout->addWidget( m_pPhongSizeEdit, 1, 1 );
    hl->addStretch( 1 );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   tqlayout = new TQGridLayout( hl, 3, 2 );
+   layout = new TQGridLayout( hl, 3, 2 );
    m_pEnableSpecularEdit = new TQCheckBox( i18n( "Specular:" ), this );
    m_pSpecularEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableSpecularEdit, 0, 0 );
-   tqlayout->addWidget( m_pSpecularEdit, 0, 1 );
+   layout->addWidget( m_pEnableSpecularEdit, 0, 0 );
+   layout->addWidget( m_pSpecularEdit, 0, 1 );
    m_pEnableRoughnessEdit = new TQCheckBox( i18n( "Roughness:" ), this );
    m_pRoughnessEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableRoughnessEdit, 1, 0 );
-   tqlayout->addWidget( m_pRoughnessEdit, 1, 1 );
+   layout->addWidget( m_pEnableRoughnessEdit, 1, 0 );
+   layout->addWidget( m_pRoughnessEdit, 1, 1 );
    m_pEnableMetallicEdit = new TQCheckBox( i18n( "Metallic:" ), this );
    m_pMetallicEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableMetallicEdit, 2, 0 );
-   tqlayout->addWidget( m_pMetallicEdit, 2, 1 );
+   layout->addWidget( m_pEnableMetallicEdit, 2, 0 );
+   layout->addWidget( m_pMetallicEdit, 2, 1 );
    hl->addStretch( 1 );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   tqlayout = new TQGridLayout( hl, 6, 2 );
+   layout = new TQGridLayout( hl, 6, 2 );
    m_pIridEdit = new TQCheckBox( i18n( "Iridiscence" ), this );
-   tqlayout->addMultiCellWidget( m_pIridEdit, 0, 0, 0, 1 );
+   layout->addMultiCellWidget( m_pIridEdit, 0, 0, 0, 1 );
    m_pIridAmountLabel = new TQLabel( i18n( "Amount:" ), this );
    m_pIridAmountEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pIridAmountLabel, 1, 0 );
-   tqlayout->addWidget( m_pIridAmountEdit, 1, 1 );
+   layout->addWidget( m_pIridAmountLabel, 1, 0 );
+   layout->addWidget( m_pIridAmountEdit, 1, 1 );
    m_pIridThicknessLabel = new TQLabel( i18n( "Thickness:" ), this );
    m_pIridThicknessEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pIridThicknessLabel, 2, 0 );
-   tqlayout->addWidget( m_pIridThicknessEdit, 2, 1 );
+   layout->addWidget( m_pIridThicknessLabel, 2, 0 );
+   layout->addWidget( m_pIridThicknessEdit, 2, 1 );
    m_pIridTurbulenceEdit = new PMFloatEdit( this );
    m_pIridTurbulenceLabel = new TQLabel( i18n( "Turbulence:" ), this );
-   tqlayout->addWidget( m_pIridTurbulenceLabel, 3, 0 );
-   tqlayout->addWidget( m_pIridTurbulenceEdit, 3, 1 );
+   layout->addWidget( m_pIridTurbulenceLabel, 3, 0 );
+   layout->addWidget( m_pIridTurbulenceEdit, 3, 1 );
    m_pEnableReflectionEdit = new TQCheckBox( i18n( "Reflection" ), this );
-   tqlayout->addMultiCellWidget( m_pEnableReflectionEdit, 4, 4, 0, 1 );
+   layout->addMultiCellWidget( m_pEnableReflectionEdit, 4, 4, 0, 1 );
    hl->addStretch( 1 );
 
    m_pReflectionWidget = new TQWidget( this );
@@ -151,7 +151,7 @@ void PMFinishEdit::createTopWidgets( )
    gl->addWidget( m_pEnableRefMetallicEdit, 3, 0 );
    gl->addWidget( m_pReflectionMetallicEdit, 3, 1 );
    vl->addStretch( 1 );
-   tqlayout->addMultiCellWidget( m_pReflectionWidget, 5, 5, 0, 1 );
+   layout->addMultiCellWidget( m_pReflectionWidget, 5, 5, 0, 1 );
 
 
    connect( m_pAmbientColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmglobalsettingsedit.cpp b/kpovmodeler/pmglobalsettingsedit.cpp
index 027152e6..7c8eddad 100644
--- a/kpovmodeler/pmglobalsettingsedit.cpp
+++ b/kpovmodeler/pmglobalsettingsedit.cpp
@@ -74,26 +74,26 @@ void PMGlobalSettingsEdit::createTopWidgets( )
    hl->addStretch( 1 );
 
    hl = new TQHBoxLayout( topLayout( ) );
-   TQGridLayout* tqlayout = new TQGridLayout( hl, 4, 2 );
+   TQGridLayout* layout = new TQGridLayout( hl, 4, 2 );
    lbl = new TQLabel( i18n( "Maximum intersections:" ), this );
    m_pMaxIntersectionsEdit = new PMIntEdit( this );
-   tqlayout->addWidget( lbl, 0, 0 );
-   tqlayout->addWidget( m_pMaxIntersectionsEdit, 0, 1 );
+   layout->addWidget( lbl, 0, 0 );
+   layout->addWidget( m_pMaxIntersectionsEdit, 0, 1 );
    lbl = new TQLabel( i18n( "Maximum trace level:" ), this );
    m_pMaxTraceLevelEdit = new PMIntEdit( this );
-   tqlayout->addWidget( lbl, 1, 0 );
-   tqlayout->addWidget( m_pMaxTraceLevelEdit, 1, 1 );
+   layout->addWidget( lbl, 1, 0 );
+   layout->addWidget( m_pMaxTraceLevelEdit, 1, 1 );
    lbl = new TQLabel( i18n( "Number of waves:" ), this );
    m_pNumberWavesEdit = new PMIntEdit( this );
-   tqlayout->addWidget( lbl, 2, 0 );
-   tqlayout->addWidget( m_pNumberWavesEdit, 2, 1 );
+   layout->addWidget( lbl, 2, 0 );
+   layout->addWidget( m_pNumberWavesEdit, 2, 1 );
    lbl = new TQLabel( i18n( "Noise generator:" ), this );
    m_pNoiseGeneratorEdit = new TQComboBox( false, this );
    m_pNoiseGeneratorEdit->insertItem( i18n( "Original" ) );
    m_pNoiseGeneratorEdit->insertItem( i18n( "Range Corrected" ) );
    m_pNoiseGeneratorEdit->insertItem( i18n( "Perlin" ) );
-   tqlayout->addWidget( lbl, 3, 0 );
-   tqlayout->addWidget( m_pNoiseGeneratorEdit, 3, 1 );
+   layout->addWidget( lbl, 3, 0 );
+   layout->addWidget( m_pNoiseGeneratorEdit, 3, 1 );
    hl->addStretch( 1 );
 
    m_pRadiosityEdit = new TQCheckBox( i18n( "Radiosity (Povray 3.1)" ), this );
@@ -101,43 +101,43 @@ void PMGlobalSettingsEdit::createTopWidgets( )
 
    m_pRadiosityWidget = new TQWidget( this );
    hl = new TQHBoxLayout( m_pRadiosityWidget, 0, KDialog::spacingHint( ) );
-   tqlayout = new TQGridLayout( hl, 7, 2 );
+   layout = new TQGridLayout( hl, 7, 2 );
    lbl = new TQLabel( i18n( "Brightness:" ), m_pRadiosityWidget );
    m_pBrightnessEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 0, 0 );
-   tqlayout->addWidget( m_pBrightnessEdit, 0, 1 );
+   layout->addWidget( lbl, 0, 0 );
+   layout->addWidget( m_pBrightnessEdit, 0, 1 );
    lbl = new TQLabel( i18n( "Count:" ), m_pRadiosityWidget );
    m_pCountEdit = new PMIntEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 1, 0 );
-   tqlayout->addWidget( m_pCountEdit, 1, 1 );
+   layout->addWidget( lbl, 1, 0 );
+   layout->addWidget( m_pCountEdit, 1, 1 );
    lbl = new TQLabel( i18n( "Maximum distance:" ), m_pRadiosityWidget );
    m_pDistanceMaximumEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 2, 0 );
-   tqlayout->addWidget( m_pDistanceMaximumEdit, 2, 1 );
+   layout->addWidget( lbl, 2, 0 );
+   layout->addWidget( m_pDistanceMaximumEdit, 2, 1 );
    lbl = new TQLabel( i18n( "Error boundary:" ), m_pRadiosityWidget );
    m_pErrorBoundEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 3, 0 );
-   tqlayout->addWidget( m_pErrorBoundEdit, 3, 1 );
+   layout->addWidget( lbl, 3, 0 );
+   layout->addWidget( m_pErrorBoundEdit, 3, 1 );
    lbl = new TQLabel( i18n( "Gray threshold:" ), m_pRadiosityWidget );
    m_pGrayThresholdEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 4, 0 );
-   tqlayout->addWidget( m_pGrayThresholdEdit, 4, 1 );
+   layout->addWidget( lbl, 4, 0 );
+   layout->addWidget( m_pGrayThresholdEdit, 4, 1 );
    lbl = new TQLabel( i18n( "Low error factor:" ), m_pRadiosityWidget );
    m_pLowErrorFactorEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 5, 0 );
-   tqlayout->addWidget( m_pLowErrorFactorEdit, 5, 1 );
+   layout->addWidget( lbl, 5, 0 );
+   layout->addWidget( m_pLowErrorFactorEdit, 5, 1 );
    lbl = new TQLabel( i18n( "Minimum reuse:" ), m_pRadiosityWidget );
    m_pMinimumReuseEdit = new PMFloatEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 6, 0 );
-   tqlayout->addWidget( m_pMinimumReuseEdit, 6, 1 );
+   layout->addWidget( lbl, 6, 0 );
+   layout->addWidget( m_pMinimumReuseEdit, 6, 1 );
    lbl = new TQLabel( i18n( "Nearest count:" ), m_pRadiosityWidget );
    m_pNearestCountEdit = new PMIntEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 7, 0 );
-   tqlayout->addWidget( m_pNearestCountEdit, 7, 1 );
+   layout->addWidget( lbl, 7, 0 );
+   layout->addWidget( m_pNearestCountEdit, 7, 1 );
    lbl = new TQLabel( i18n( "Recursion limit:" ), m_pRadiosityWidget );
    m_pRecursionLimitEdit = new PMIntEdit( m_pRadiosityWidget );
-   tqlayout->addWidget( lbl, 8, 0 );
-   tqlayout->addWidget( m_pRecursionLimitEdit, 8, 1 );
+   layout->addWidget( lbl, 8, 0 );
+   layout->addWidget( m_pRecursionLimitEdit, 8, 1 );
    hl->addStretch( 1 );
 
    topLayout( )->addWidget( m_pRadiosityWidget );
diff --git a/kpovmodeler/pmglview.h b/kpovmodeler/pmglview.h
index 30ee5d16..a330afba 100644
--- a/kpovmodeler/pmglview.h
+++ b/kpovmodeler/pmglview.h
@@ -568,7 +568,7 @@ public:
 };
 
 /**
- * Configuration widget for the view tqlayout settings dialog
+ * Configuration widget for the view layout settings dialog
  */
 class PMGLViewOptionsWidget : public PMViewOptionsWidget
 {
diff --git a/kpovmodeler/pmgridsettings.cpp b/kpovmodeler/pmgridsettings.cpp
index 644b2ab3..04bdbdd3 100644
--- a/kpovmodeler/pmgridsettings.cpp
+++ b/kpovmodeler/pmgridsettings.cpp
@@ -31,38 +31,38 @@
 PMGridSettings::PMGridSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQVBoxLayout* gvl;
    TQGridLayout* grid;
    TQGroupBox* gb;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
    gb = new TQGroupBox( i18n( "Displayed Grid" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
 
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Color:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Color:" ), gb ) );
    m_pGridColor = new KColorButton( gb );
-   htqlayout->addWidget( m_pGridColor );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pGridColor );
+   hlayout->addStretch( 1 );
 
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Distance:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Distance:" ), gb ) );
    m_pGridDistance = new PMIntEdit( gb );
    m_pGridDistance->setValidation( true, 20, false, 0 );
-   htqlayout->addWidget( m_pGridDistance );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pGridDistance );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Control Point Grid" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
 
-   htqlayout = new TQHBoxLayout( gvl );
-   grid = new TQGridLayout( htqlayout, 3, 2 );
+   hlayout = new TQHBoxLayout( gvl );
+   grid = new TQGridLayout( hlayout, 3, 2 );
    grid->addWidget( new TQLabel( i18n( "2D/3D movement:" ), gb ), 0, 0 );
    m_pMoveGrid = new PMFloatEdit( gb );
    m_pMoveGrid->setValidation( true, 0.001, true, 100 );
@@ -78,9 +78,9 @@ PMGridSettings::PMGridSettings( TQWidget* parent, const char* name )
    m_pRotateGrid->setValidation( true, 0.001, true, 180 );
    grid->addWidget( m_pRotateGrid, 2, 1 );
 
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMGridSettings::displaySettings( )
diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp
index 7f52442e..206d39a7 100644
--- a/kpovmodeler/pmimagemapedit.cpp
+++ b/kpovmodeler/pmimagemapedit.cpp
@@ -247,8 +247,8 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
    TQPixmap removeButtonPixmap = SmallIcon( "pmremovepoint" );
 
    // First let's deal with the filter entries...
-   if( m_pFiltersWidget->tqlayout( ) )
-      delete m_pFiltersWidget->tqlayout( );
+   if( m_pFiltersWidget->layout( ) )
+      delete m_pFiltersWidget->layout( );
 
    m_filterEntries.setAutoDelete( true );
    m_filterAddButtons.setAutoDelete( true );
@@ -313,8 +313,8 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f
    m_transmitRemoveButtons.setAutoDelete( false );
 
    // recreate the entry edits
-   if( m_pTransmitsWidget->tqlayout( ) )
-      delete m_pTransmitsWidget->tqlayout( );
+   if( m_pTransmitsWidget->layout( ) )
+      delete m_pTransmitsWidget->layout( );
 
    gl = new TQGridLayout( m_pTransmitsWidget, ntransmits + 1, 3, 0, KDialog::spacingHint( ) );
 
diff --git a/kpovmodeler/pminterioredit.cpp b/kpovmodeler/pminterioredit.cpp
index d9b427e7..4b8b2381 100644
--- a/kpovmodeler/pminterioredit.cpp
+++ b/kpovmodeler/pminterioredit.cpp
@@ -38,33 +38,33 @@ void PMInteriorEdit::createTopWidgets( )
    Base::createTopWidgets( );
 
    TQHBoxLayout* hl = new TQHBoxLayout( topLayout( ) );
-   TQGridLayout* tqlayout = new TQGridLayout( hl ,17 ,6);
+   TQGridLayout* layout = new TQGridLayout( hl ,17 ,6);
    m_pEnableIorEdit = new TQCheckBox( i18n( "Refraction:" ), this );
    m_pIorEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableIorEdit, 0, 0 );
-   tqlayout->addWidget( m_pIorEdit, 0, 1 );
+   layout->addWidget( m_pEnableIorEdit, 0, 0 );
+   layout->addWidget( m_pIorEdit, 0, 1 );
    m_pEnableCausticsEdit = new TQCheckBox( i18n( "Caustics:" ), this );
    m_pCausticsEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableCausticsEdit, 1, 0 );
-   tqlayout->addWidget( m_pCausticsEdit, 1, 1 );
+   layout->addWidget( m_pEnableCausticsEdit, 1, 0 );
+   layout->addWidget( m_pCausticsEdit, 1, 1 );
    m_pEnableDispersionEdit = new TQCheckBox( i18n( "Dispersion:" ), this );
    m_pDispersionEdit = new PMFloatEdit( this );
    m_pDispersionEdit->setValidation( true, 0, false, 0 );
-   tqlayout->addWidget( m_pEnableDispersionEdit, 2, 0 );
-   tqlayout->addWidget( m_pDispersionEdit, 2, 1 );
+   layout->addWidget( m_pEnableDispersionEdit, 2, 0 );
+   layout->addWidget( m_pDispersionEdit, 2, 1 );
    m_pEnableDispSamplesEdit = new TQCheckBox( i18n( "Dispersion samples:" ), this );
    m_pDispSamplesEdit = new PMIntEdit( this );
    m_pDispSamplesEdit->setValidation( true, 2, false, 0 );
-   tqlayout->addWidget( m_pEnableDispSamplesEdit, 3, 0 );
-   tqlayout->addWidget( m_pDispSamplesEdit, 3, 1 );
+   layout->addWidget( m_pEnableDispSamplesEdit, 3, 0 );
+   layout->addWidget( m_pDispSamplesEdit, 3, 1 );
    m_pEnableFadeDistanceEdit = new TQCheckBox( i18n( "Fade distance:" ), this );
    m_pFadeDistanceEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableFadeDistanceEdit, 4, 0 );
-   tqlayout->addWidget( m_pFadeDistanceEdit, 4, 1 );
+   layout->addWidget( m_pEnableFadeDistanceEdit, 4, 0 );
+   layout->addWidget( m_pFadeDistanceEdit, 4, 1 );
    m_pEnableFadePowerEdit = new TQCheckBox( i18n( "Fade power:" ), this );
    m_pFadePowerEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pEnableFadePowerEdit, 5, 0 );
-   tqlayout->addWidget( m_pFadePowerEdit, 5, 1 );
+   layout->addWidget( m_pEnableFadePowerEdit, 5, 0 );
+   layout->addWidget( m_pFadePowerEdit, 5, 1 );
    hl->addStretch( 1 );
 
    connect( m_pIorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp
index df3c13d3..c379e0b3 100644
--- a/kpovmodeler/pmlayoutsettings.cpp
+++ b/kpovmodeler/pmlayoutsettings.cpp
@@ -34,8 +34,8 @@
 PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQVBoxLayout* gvl;
    TQGridLayout* grid;
    TQGroupBox* gb;
@@ -43,16 +43,16 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
    TQHBoxLayout* ghe;
    TQVBoxLayout* gvle;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
-   htqlayout = new TQHBoxLayout( vtqlayout );
-   htqlayout->addWidget( new TQLabel( i18n( "Default view tqlayout:" ), this ) );
+   hlayout = new TQHBoxLayout( vlayout );
+   hlayout->addWidget( new TQLabel( i18n( "Default view layout:" ), this ) );
    m_pDefaultLayout = new TQComboBox( this );
-   htqlayout->addWidget( m_pDefaultLayout, 1 );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pDefaultLayout, 1 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Available View Layouts" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    
@@ -180,7 +180,7 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
    
    ghl->addStretch( 1 );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMLayoutSettings::displaySettings( )
@@ -220,7 +220,7 @@ bool PMLayoutSettings::validateData( )
          if( ( *eit ).dockPosition( ) != PMDockWidget::DockRight )
          {
             emit showMe( );
-            KMessageBox::error( this, i18n( "The docking position of the first view tqlayout entry has to be 'New Column'." ),
+            KMessageBox::error( this, i18n( "The docking position of the first view layout entry has to be 'New Column'." ),
                                 i18n( "Error" ) );
             return false;
          }
@@ -720,8 +720,8 @@ void PMLayoutSettings::slotMoveDownViewEntryClicked( )
 void PMLayoutSettings::displayCustomOptions( )
 {
    // delete an old widget
-   if( m_pCustomOptionsHolder->tqlayout( ) )
-      delete m_pCustomOptionsHolder->tqlayout( );
+   if( m_pCustomOptionsHolder->layout( ) )
+      delete m_pCustomOptionsHolder->layout( );
    if( m_pCustomOptionsWidget )
    {
       delete m_pCustomOptionsWidget;
diff --git a/kpovmodeler/pmlayoutsettings.h b/kpovmodeler/pmlayoutsettings.h
index 856b423d..250758f7 100644
--- a/kpovmodeler/pmlayoutsettings.h
+++ b/kpovmodeler/pmlayoutsettings.h
@@ -35,7 +35,7 @@ class TQPushButton;
 class TQLabel;
 
 /**
- * View tqlayout configuration dialog page
+ * View layout configuration dialog page
  */
 class PMLayoutSettings : public PMSettingsDialogPage
 {
@@ -57,19 +57,19 @@ public:
    
 protected slots:
    /**
-    * Called when the browse add tqlayout button is clicked
+    * Called when the browse add layout button is clicked
     */
    void slotAddLayout( );
    /**
-    * Called when the remove tqlayout button is clicked
+    * Called when the remove layout button is clicked
     */
    void slotRemoveLayout( );
    /**
-    * Called when the selected tqlayout changes
+    * Called when the selected layout changes
     */
    void slotLayoutSelected( int i );
    /**
-    * Called when the tqlayout name changes
+    * Called when the layout name changes
     */
    void slotLayoutNameChanged( const TQString& text );
    /**
diff --git a/kpovmodeler/pmlightgroupedit.cpp b/kpovmodeler/pmlightgroupedit.cpp
index 73a75c6d..c1e21024 100644
--- a/kpovmodeler/pmlightgroupedit.cpp
+++ b/kpovmodeler/pmlightgroupedit.cpp
@@ -34,12 +34,12 @@ void PMLightGroupEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    m_pGlobalLights = new TQCheckBox( i18n( "Global lights" ), this );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( m_pGlobalLights );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( m_pGlobalLights );
+   layout->addStretch( 1 );
 
    connect( m_pGlobalLights, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
 }
diff --git a/kpovmodeler/pmlinkedit.cpp b/kpovmodeler/pmlinkedit.cpp
index 87f6203c..8ebca5c6 100644
--- a/kpovmodeler/pmlinkedit.cpp
+++ b/kpovmodeler/pmlinkedit.cpp
@@ -64,12 +64,12 @@ void PMLinkEdit::init( )
    m_pIDEdit->setReadOnly( true );
    grid->addWidget( m_pIDEdit, 0, 1 );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( );
-   grid->addLayout( tqlayout, 1, 1 );
+   TQHBoxLayout* layout = new TQHBoxLayout( );
+   grid->addLayout( layout, 1, 1 );
    m_pSelectButton = new TQPushButton( i18n( "Select..." ), this );
-   tqlayout->addWidget( m_pSelectButton );
+   layout->addWidget( m_pSelectButton );
    m_pClearButton = new KPushButton( KStdGuiItem::clear(), this );
-   tqlayout->addWidget( m_pClearButton );
+   layout->addWidget( m_pClearButton );
 
    connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelectClicked( ) ) );
    connect( m_pClearButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotClearClicked( ) ) );
diff --git a/kpovmodeler/pmlistpatternedit.cpp b/kpovmodeler/pmlistpatternedit.cpp
index 1c8c6f34..dec87cb7 100644
--- a/kpovmodeler/pmlistpatternedit.cpp
+++ b/kpovmodeler/pmlistpatternedit.cpp
@@ -41,39 +41,39 @@ void PMListPatternEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQVBoxLayout* vtqlayout = new TQVBoxLayout( topLayout( ) );
+   TQVBoxLayout* vlayout = new TQVBoxLayout( topLayout( ) );
 
    /* Field for Pattern List type */
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( vtqlayout );
+   TQHBoxLayout* layout = new TQHBoxLayout( vlayout );
    TQLabel* label = new TQLabel( i18n( "Type:" ), this );
    m_pTypeCombo = new TQComboBox( false, this );
    m_pTypeCombo->insertItem( i18n( "Checkers" ) );
    m_pTypeCombo->insertItem( i18n( "Brick" ) );
    m_pTypeCombo->insertItem( i18n( "Hexagon" ) );
-   tqlayout->addWidget( label, 0, AlignTop );
-   tqlayout->addWidget( m_pTypeCombo );
-   tqlayout->addStretch( 1 );
+   layout->addWidget( label, 0, AlignTop );
+   layout->addWidget( m_pTypeCombo );
+   layout->addStretch( 1 );
 
    /* The depth field */
-   tqlayout = new TQHBoxLayout( vtqlayout );
+   layout = new TQHBoxLayout( vlayout );
    m_pDepthLabel = new TQLabel( i18n( "Depth:" ), this );
    m_pDepth = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pDepthLabel );
-   tqlayout->addWidget( m_pDepth );
-   tqlayout->addStretch( 1 );
+   layout->addWidget( m_pDepthLabel );
+   layout->addWidget( m_pDepth );
+   layout->addStretch( 1 );
 
    /* The brick information */
-   TQHBoxLayout* bricklayout = new TQHBoxLayout( vtqlayout );
+   TQHBoxLayout* bricklayout = new TQHBoxLayout( vlayout );
    m_pBrickSizeLabel = new TQLabel( i18n( "Brick size:" ), this );
    m_pBrickSize = new PMVectorEdit( "x", "y", "z", this );
    bricklayout->addWidget( m_pBrickSizeLabel );
    bricklayout->addWidget( m_pBrickSize );
-   tqlayout = new TQHBoxLayout( vtqlayout );
+   layout = new TQHBoxLayout( vlayout );
    m_pMortarLabel = new TQLabel( i18n( "Mortar:" ), this );
    m_pMortar = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pMortarLabel );
-   tqlayout->addWidget( m_pMortar );
-   tqlayout->addStretch( 1 );
+   layout->addWidget( m_pMortarLabel );
+   layout->addWidget( m_pMortar );
+   layout->addStretch( 1 );
 
    /* connect all signals to slots/signals */
    connect( m_pBrickSize, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmmeshedit.cpp b/kpovmodeler/pmmeshedit.cpp
index 61bea7a1..6ddf9679 100644
--- a/kpovmodeler/pmmeshedit.cpp
+++ b/kpovmodeler/pmmeshedit.cpp
@@ -35,17 +35,17 @@ void PMMeshEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    m_pHierarchy = new TQCheckBox( i18n( "Hierarchy" ), this );
    m_pEnableInsideVector = new TQCheckBox( i18n( "Inside vector:" ), this );
    m_pInsideVector = new PMVectorEdit( "x", "y", "z", this );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( m_pHierarchy );
-   tqlayout->addStretch( 1 );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( m_pEnableInsideVector );
-   tqlayout->addWidget( m_pInsideVector );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( m_pHierarchy );
+   layout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( m_pEnableInsideVector );
+   layout->addWidget( m_pInsideVector );
+   layout->addStretch( 1 );
 
    connect( m_pHierarchy, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pEnableInsideVector, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotInsideVectorClicked( ) ) );
diff --git a/kpovmodeler/pmnamedobjectedit.cpp b/kpovmodeler/pmnamedobjectedit.cpp
index f9179f74..8f590982 100644
--- a/kpovmodeler/pmnamedobjectedit.cpp
+++ b/kpovmodeler/pmnamedobjectedit.cpp
@@ -34,12 +34,12 @@ void PMNamedObjectEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pNameEdit = new TQLineEdit( this );
    TQLabel* label = new TQLabel( i18n( "Name:" ), this );
 
-   tqlayout->addWidget( label );
-   tqlayout->addWidget( m_pNameEdit );
+   layout->addWidget( label );
+   layout->addWidget( m_pNameEdit );
 
    connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
             TQT_SLOT( slotNameChanged( const TQString& ) ) );
diff --git a/kpovmodeler/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp
index 93f9f419..47a38435 100644
--- a/kpovmodeler/pmobjectlibrarysettings.cpp
+++ b/kpovmodeler/pmobjectlibrarysettings.cpp
@@ -36,16 +36,16 @@
 PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   TQVBoxLayout* vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
    TQGroupBox* gb = new TQGroupBox( i18n( "Libraries" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
 
-   TQHBoxLayout* htqlayout = new TQHBoxLayout( gb, KDialog::marginHint( ) + 5, KDialog::spacingHint( ) );
+   TQHBoxLayout* hlayout = new TQHBoxLayout( gb, KDialog::marginHint( ) + 5, KDialog::spacingHint( ) );
    m_pObjectLibraries = new TQListBox( gb );
    connect( m_pObjectLibraries, TQT_SIGNAL( selectionChanged( ) ), TQT_SLOT( slotObjectLibraryChanged( ) ) );
-   htqlayout->addWidget( m_pObjectLibraries );
-   TQVBoxLayout* gvl = new TQVBoxLayout( htqlayout );
+   hlayout->addWidget( m_pObjectLibraries );
+   TQVBoxLayout* gvl = new TQVBoxLayout( hlayout );
    m_pCreateObjectLibrary = new TQPushButton( i18n( "Create..." ), gb );
    connect( m_pCreateObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCreateObjectLibrary( ) ) );
    gvl->addWidget( m_pCreateObjectLibrary );
@@ -77,9 +77,9 @@ PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char*
    grid->addWidget( m_pLibraryDescription, 2, 1 );
    grid->addMultiCellWidget( m_pReadOnlyText, 3, 3, 0, 1 );
    grid->setColStretch( 1, 1 );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMObjectLibrarySettings::displaySettings( )
diff --git a/kpovmodeler/pmobjectsettings.cpp b/kpovmodeler/pmobjectsettings.cpp
index e9cd33b4..411b0a49 100644
--- a/kpovmodeler/pmobjectsettings.cpp
+++ b/kpovmodeler/pmobjectsettings.cpp
@@ -47,188 +47,188 @@
 PMObjectSettings::PMObjectSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQVBoxLayout* gvl;
    TQGridLayout* grid;
    TQGroupBox* gb;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
    gb = new TQGroupBox( i18n( "Subdivisions" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    grid = new TQGridLayout( gvl, 13, 3 );
 
    grid->addWidget( new TQLabel( i18n( "Sphere:" ), gb ), 0, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 0, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 0, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 0, 1 );
    m_pSphereUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSphereUSteps );
+   hlayout->addWidget( m_pSphereUSteps );
    m_pSphereUSteps->setValidation( true, 2, true, 32 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pSphereVSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSphereVSteps );
+   hlayout->addWidget( m_pSphereVSteps );
    m_pSphereVSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Cylinder:" ), gb ), 1, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 1, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 1, 2 );
    m_pCylinderSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pCylinderSteps );
+   hlayout->addWidget( m_pCylinderSteps );
    m_pCylinderSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Cone:" ), gb ), 2, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 2, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 2, 2 );
    m_pConeSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pConeSteps );
+   hlayout->addWidget( m_pConeSteps );
    m_pConeSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Torus:" ), gb ), 3, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 3, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 3, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 3, 1 );
    m_pTorusUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pTorusUSteps );
+   hlayout->addWidget( m_pTorusUSteps );
    m_pTorusUSteps->setValidation( true, 2, true, 16 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pTorusVSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pTorusVSteps );
+   hlayout->addWidget( m_pTorusVSteps );
    m_pTorusVSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Disc:" ), gb ), 4, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 4, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 4, 2 );
    m_pDiscSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pDiscSteps );
+   hlayout->addWidget( m_pDiscSteps );
    m_pDiscSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Blob sphere:" ), gb ), 5, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 5, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 5, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 5, 1 );
    m_pBlobSphereUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pBlobSphereUSteps );
+   hlayout->addWidget( m_pBlobSphereUSteps );
    m_pBlobSphereUSteps->setValidation( true, 2, true, 32 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pBlobSphereVSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pBlobSphereVSteps );
+   hlayout->addWidget( m_pBlobSphereVSteps );
    m_pBlobSphereVSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Blob cylinder:" ), gb ), 6, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 6, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 6, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 6, 1 );
    m_pBlobCylinderUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pBlobCylinderUSteps );
+   hlayout->addWidget( m_pBlobCylinderUSteps );
    m_pBlobCylinderUSteps->setValidation( true, 2, true, 32 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pBlobCylinderVSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pBlobCylinderVSteps );
+   hlayout->addWidget( m_pBlobCylinderVSteps );
    m_pBlobCylinderVSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Lathe:" ), gb ), 7, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 7, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 7, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 7, 1 );
    m_pLatheUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pLatheUSteps );
+   hlayout->addWidget( m_pLatheUSteps );
    m_pLatheUSteps->setValidation( true, 1, true, 16 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pLatheRSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pLatheRSteps );
+   hlayout->addWidget( m_pLatheRSteps );
    m_pLatheRSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Surface of revolution:" ), gb ), 8, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 8, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 8, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 8, 1 );
    m_pSorUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSorUSteps );
+   hlayout->addWidget( m_pSorUSteps );
    m_pSorUSteps->setValidation( true, 1, true, 16 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pSorRSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSorRSteps );
+   hlayout->addWidget( m_pSorRSteps );
    m_pSorRSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Prism:" ), gb ), 9, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 9, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 9, 2 );
    m_pPrismSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pPrismSteps );
+   hlayout->addWidget( m_pPrismSteps );
    m_pPrismSteps->setValidation( true, 1, true, 16 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Superquadric ellipsoid:" ), gb ), 10, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 10, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 10, 2 );
    grid->addWidget( new TQLabel( "u", gb ), 10, 1 );
    m_pSqeUSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSqeUSteps );
+   hlayout->addWidget( m_pSqeUSteps );
    m_pSqeUSteps->setValidation( true, 2, true, 8 );
-   htqlayout->addWidget( new TQLabel( "v", gb ) );
+   hlayout->addWidget( new TQLabel( "v", gb ) );
    m_pSqeVSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSqeVSteps );
+   hlayout->addWidget( m_pSqeVSteps );
    m_pSqeVSteps->setValidation( true, 2, true, 8 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Sphere sweep:" ), gb ), 11, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 11, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 11, 2 );
    grid->addWidget( new TQLabel( "r", gb ), 11, 1 );
    m_pSphereSweepRSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSphereSweepRSteps );
+   hlayout->addWidget( m_pSphereSweepRSteps );
    m_pSphereSweepRSteps->setValidation( true, 4, true, 64 );
-   htqlayout->addWidget( new TQLabel( "s", gb ) );
+   hlayout->addWidget( new TQLabel( "s", gb ) );
    m_pSphereSweepSSteps = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pSphereSweepSSteps );
+   hlayout->addWidget( m_pSphereSweepSSteps );
    m_pSphereSweepSSteps->setValidation( true, 1, true, 16 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    grid->addWidget( new TQLabel( i18n( "Heightfield:" ), gb ), 12, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 12, 2 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 12, 2 );
    m_pHeightFieldVariance = new PMIntEdit( gb );
-   htqlayout->addWidget( m_pHeightFieldVariance );
+   hlayout->addWidget( m_pHeightFieldVariance );
    m_pHeightFieldVariance->setValidation( true, 1, true, 16 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Sizes" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
 
    grid = new TQGridLayout( gvl, 1, 2 );
 
    grid->addWidget( new TQLabel( i18n( "Plane:" ), gb ), 0, 0 );
-   htqlayout = new TQHBoxLayout( );
-   grid->addLayout( htqlayout, 0, 1 );
+   hlayout = new TQHBoxLayout( );
+   grid->addLayout( hlayout, 0, 1 );
    m_pPlaneSize = new PMFloatEdit( gb );
-   htqlayout->addWidget( m_pPlaneSize );
+   hlayout->addWidget( m_pPlaneSize );
    m_pPlaneSize->setValidation( true, 0.1, false, 0.0 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Camera Views" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
 
    m_pHighDetailCameraViews = new TQCheckBox( i18n( "High detail for enhanced projections" ), gb );
    gvl->addWidget( m_pHighDetailCameraViews );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMObjectSettings::displaySettings( )
diff --git a/kpovmodeler/pmopenglsettings.cpp b/kpovmodeler/pmopenglsettings.cpp
index 07376933..9c125c32 100644
--- a/kpovmodeler/pmopenglsettings.cpp
+++ b/kpovmodeler/pmopenglsettings.cpp
@@ -28,12 +28,12 @@
 PMOpenGLSettings::PMOpenGLSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   TQVBoxLayout* vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
    m_pDirect = new TQCheckBox( i18n( "Direct rendering" ), this );
-   vtqlayout->addWidget( new TQLabel( i18n( "Changes take only effect after a restart!" ), this ) );
-   vtqlayout->addWidget( m_pDirect );
-   vtqlayout->addStretch( 1 );
+   vlayout->addWidget( new TQLabel( i18n( "Changes take only effect after a restart!" ), this ) );
+   vlayout->addWidget( m_pDirect );
+   vlayout->addStretch( 1 );
 }
 
 void PMOpenGLSettings::displaySettings( )
diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp
index 25e1ac64..ca029887 100644
--- a/kpovmodeler/pmpalettevalueedit.cpp
+++ b/kpovmodeler/pmpalettevalueedit.cpp
@@ -39,21 +39,21 @@ PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* parent, const char* name )
       : TQWidget( parent, name )
 {
    TQLabel* lbl;
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
 
    m_pIndexEdit = new PMIntEdit( this );
    m_pValueEdit = new PMFloatEdit( this );
 
-   tqlayout = new TQHBoxLayout( this );
+   layout = new TQHBoxLayout( this );
    lbl = new TQLabel( i18n( "Index" ), this );
-   tqlayout->addWidget( lbl );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
-   tqlayout->addWidget( m_pIndexEdit );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( lbl );
+   layout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_pIndexEdit );
+   layout->addSpacing( KDialog::spacingHint( ) );
    lbl = new TQLabel( i18n( "Value" ), this );
-   tqlayout->addWidget( lbl );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
-   tqlayout->addWidget( m_pValueEdit );
+   layout->addWidget( lbl );
+   layout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_pValueEdit );
 
    connect( m_pIndexEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pValueEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index e8d1a984..b791a9aa 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -145,7 +145,7 @@ PMPart::PMPart( TQWidget* parentWidget, const char* widgetName,
 
    restoreConfig( instance( )->config( ) );
 
-   connect( tqApp->tqclipboard( ), TQT_SIGNAL( dataChanged( ) ),
+   connect( tqApp->clipboard( ), TQT_SIGNAL( dataChanged( ) ),
             TQT_SLOT( slotClipboardDataChanged( ) ) );
    slotClipboardDataChanged( );
    connect( &m_commandManager, TQT_SIGNAL( updateUndoRedo( const TQString&, const TQString& ) ),
@@ -730,7 +730,7 @@ void PMPart::initView( TQWidget* parent, const char* name )
    if( !m_pShell )
    {
       // a part inside konqueror
-      // simple tqlayout
+      // simple layout
       m_pView = new PMView( this, parent, name );
       m_pView->show( );
       setWidget( m_pView );
@@ -1450,7 +1450,7 @@ void PMPart::slotEditCut( )
 
    if( sortedList.count( ) > 0 )
    {
-      TQApplication::tqclipboard( )->setData( new PMObjectDrag( this, sortedList ) );
+      TQApplication::clipboard( )->setData( new PMObjectDrag( this, sortedList ) );
       removeSelection( i18n( "Cut" ) );
    }
 
@@ -1472,7 +1472,7 @@ void PMPart::slotEditCopy( )
    const PMObjectList& sortedList = selectedObjects( );
 
    if( sortedList.count( ) > 0 )
-      TQApplication::tqclipboard( )->setData( new PMObjectDrag( this, sortedList ) );
+      TQApplication::clipboard( )->setData( new PMObjectDrag( this, sortedList ) );
 
    emit setStatusBarText( "" );
 }
@@ -1549,7 +1549,7 @@ void PMPart::slotEditPaste( )
 {
    emit setStatusBarText( i18n( "Inserting clipboard contents..." ) );
 
-   pasteOrDrop( i18n( "Paste" ), tqApp->tqclipboard( )->data( ),
+   pasteOrDrop( i18n( "Paste" ), tqApp->clipboard( )->data( ),
                 m_pActiveObject );
 
    emit setStatusBarText( "" );
@@ -2508,7 +2508,7 @@ void PMPart::slotClipboardDataChanged( )
 {
    if( isReadWrite( ) )
    {
-      m_canDecode = PMObjectDrag::canDecode( tqApp->tqclipboard( )->data( ), this );
+      m_canDecode = PMObjectDrag::canDecode( tqApp->clipboard( )->data( ), this );
       m_pPasteAction->setEnabled( m_canDecode && m_pActiveObject );
    }
    else
diff --git a/kpovmodeler/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp
index c8d815a8..eb65727f 100644
--- a/kpovmodeler/pmpatternedit.cpp
+++ b/kpovmodeler/pmpatternedit.cpp
@@ -48,12 +48,12 @@ void PMPatternEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQGridLayout* tqlayout;
+   TQGridLayout* layout;
    TQHBoxLayout* hl;
    TQVBoxLayout* vl;
    TQGridLayout* gl;
 
-   tqlayout = new TQGridLayout( topLayout( ), 12, 2 );
+   layout = new TQGridLayout( topLayout( ), 12, 2 );
    hl = new TQHBoxLayout( KDialog::spacingHint( ) );
    hl->addWidget( new TQLabel( i18n( "Type:" ), this ) );
    m_pTypeCombo = new TQComboBox( false, this );
@@ -88,12 +88,12 @@ void PMPatternEdit::createTopWidgets( )
    m_pTypeCombo->insertItem( i18n( "Wrinkles" ) );
    hl->addWidget( m_pTypeCombo );
    hl->addStretch( 1 );
-   tqlayout->addMultiCellLayout( hl, 0, 0, 0, 1 );
+   layout->addMultiCellLayout( hl, 0, 0, 0, 1 );
 
    m_pAgateTurbulenceLabel = new TQLabel( i18n( "Turbulence:" ), this );
-   tqlayout->addWidget( m_pAgateTurbulenceLabel, 1, 0 );
+   layout->addWidget( m_pAgateTurbulenceLabel, 1, 0 );
    m_pAgateTurbulenceEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pAgateTurbulenceEdit, 1, 1, AlignLeft );
+   layout->addWidget( m_pAgateTurbulenceEdit, 1, 1, AlignLeft );
 
    m_pCrackleWidget = new TQWidget( this );
    vl = new TQVBoxLayout( m_pCrackleWidget, 0, KDialog::spacingHint( ) );
@@ -114,7 +114,7 @@ void PMPatternEdit::createTopWidgets( )
    m_pCrackleSolid = new TQCheckBox( i18n( "Solid:" ), m_pCrackleWidget );
    gl->addMultiCellWidget( m_pCrackleSolid, 2, 2, 0, 1 );
    hl->addStretch( 1 );
-   tqlayout->addMultiCellWidget( m_pCrackleWidget, 2, 2, 0, 1 );
+   layout->addMultiCellWidget( m_pCrackleWidget, 2, 2, 0, 1 );
 
    m_pDensityWidget = new TQWidget( this );
    vl = new TQVBoxLayout( m_pDensityWidget, 0, KDialog::spacingHint( ) );
@@ -132,17 +132,17 @@ void PMPatternEdit::createTopWidgets( )
    m_pDensityInterpolate->insertItem( i18n( "Trilinear" ) );
    hl->addWidget( m_pDensityInterpolate );
    hl->addStretch( 1 );
-   tqlayout->addMultiCellWidget( m_pDensityWidget, 3, 3, 0, 1 );
+   layout->addMultiCellWidget( m_pDensityWidget, 3, 3, 0, 1 );
 
    m_pGradientLabel = new TQLabel( i18n( "Gradient:" ), this );
-   tqlayout->addWidget( m_pGradientLabel, 4, 0 );
+   layout->addWidget( m_pGradientLabel, 4, 0 );
    m_pGradientEdit = new PMVectorEdit( "x", "y", "z", this );
-   tqlayout->addWidget( m_pGradientEdit, 4, 1 );
+   layout->addWidget( m_pGradientEdit, 4, 1 );
 
    m_pJuliaComplexLabel = new TQLabel( i18n( "Complex number:" ), this );
-   tqlayout->addWidget( m_pJuliaComplexLabel, 5, 0 );
+   layout->addWidget( m_pJuliaComplexLabel, 5, 0 );
    m_pJuliaComplex = new PMVectorEdit( "Real", "Imaginary", this );
-   tqlayout->addWidget( m_pJuliaComplex, 5, 1 );
+   layout->addWidget( m_pJuliaComplex, 5, 1 );
 
    m_pFractalWidget = new TQWidget( this );
    vl = new TQVBoxLayout( m_pFractalWidget, 0, KDialog::spacingHint( ) );
@@ -195,7 +195,7 @@ void PMPatternEdit::createTopWidgets( )
    m_pFractalIntFactor = new PMFloatEdit( m_pFractalWidget );
    gl->addWidget( m_pFractalIntFactor, 1, 3 );
    hl->addStretch( 1 );
-   tqlayout->addMultiCellWidget( m_pFractalWidget, 6, 6, 0, 1 );
+   layout->addMultiCellWidget( m_pFractalWidget, 6, 6, 0, 1 );
 
    m_pQuiltControlsLabel = new TQLabel( i18n( "Quilt controls:" ), this );
    m_pQuiltControl0Edit = new PMFloatEdit( this );
@@ -204,8 +204,8 @@ void PMPatternEdit::createTopWidgets( )
    hl->addWidget( m_pQuiltControl0Edit );
    hl->addWidget( m_pQuiltControl1Edit );
    hl->addStretch( 1 );
-   tqlayout->addWidget( m_pQuiltControlsLabel, 7, 0 );
-   tqlayout->addLayout( hl, 7, 1 );
+   layout->addWidget( m_pQuiltControlsLabel, 7, 0 );
+   layout->addLayout( hl, 7, 1 );
 
    m_pSlopeWidget = new TQWidget( this );
    vl = new TQVBoxLayout( m_pSlopeWidget, 0, KDialog::spacingHint( ) );
@@ -240,17 +240,17 @@ void PMPatternEdit::createTopWidgets( )
    m_pSlopeHiAlt = new PMFloatEdit( m_pSlopeWidget );
    gl->addWidget( m_pSlopeHiAlt, 1, 1 );
    hl->addStretch( 1 );
-   tqlayout->addMultiCellWidget( m_pSlopeWidget, 8, 8, 0, 1 );
+   layout->addMultiCellWidget( m_pSlopeWidget, 8, 8, 0, 1 );
 
    m_pSpiralNumberLabel = new TQLabel( i18n( "Spiral number:" ), this );
    m_pSpiralNumberEdit = new PMIntEdit( this );
-   tqlayout->addWidget( m_pSpiralNumberLabel, 9, 0 );
-   tqlayout->addWidget( m_pSpiralNumberEdit, 9, 1, AlignLeft );
+   layout->addWidget( m_pSpiralNumberLabel, 9, 0 );
+   layout->addWidget( m_pSpiralNumberEdit, 9, 1, AlignLeft );
 
    m_pDepthLabel = new TQLabel( i18n( "Depth:" ), this );
    m_pDepthEdit = new PMFloatEdit( this );
-   tqlayout->addWidget( m_pDepthLabel, 10, 0 );
-   tqlayout->addWidget( m_pDepthEdit, 10, 1, AlignLeft );
+   layout->addWidget( m_pDepthLabel, 10, 0 );
+   layout->addWidget( m_pDepthEdit, 10, 1, AlignLeft );
 
    m_pNoiseGeneratorLabel = new TQLabel( i18n( "Noise generator:" ), this );
    m_pNoiseGenerator = new TQComboBox( false, this );
@@ -258,8 +258,8 @@ void PMPatternEdit::createTopWidgets( )
    m_pNoiseGenerator->insertItem( i18n( "Original" ) );
    m_pNoiseGenerator->insertItem( i18n( "Range Corrected" ) );
    m_pNoiseGenerator->insertItem( i18n( "Perlin" ) );
-   tqlayout->addWidget( m_pNoiseGeneratorLabel, 11, 0 );
-   tqlayout->addWidget( m_pNoiseGenerator, 11, 1 );
+   layout->addWidget( m_pNoiseGeneratorLabel, 11, 0 );
+   layout->addWidget( m_pNoiseGenerator, 11, 1 );
 
    m_pEnableTurbulenceEdit = new TQCheckBox( i18n( "Turbulence" ), this );
    topLayout( )->addWidget( m_pEnableTurbulenceEdit );
diff --git a/kpovmodeler/pmplaneedit.cpp b/kpovmodeler/pmplaneedit.cpp
index 5f90b008..13e28aab 100644
--- a/kpovmodeler/pmplaneedit.cpp
+++ b/kpovmodeler/pmplaneedit.cpp
@@ -38,24 +38,24 @@ void PMPlaneEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
    
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
 
    m_pNormal = new PMVectorEdit( "x", "y", "z", this );
    m_pDistance = new PMFloatEdit( this );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Normal:" ), this ) );
-   tqlayout->addWidget( m_pNormal );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Normal:" ), this ) );
+   layout->addWidget( m_pNormal );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Distance:" ), this ) );
-   tqlayout->addWidget( m_pDistance );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Distance:" ), this ) );
+   layout->addWidget( m_pDistance );
+   layout->addStretch( 1 );
 
    TQPushButton* nb = new TQPushButton( i18n( "Normalize" ), this );
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( nb );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( nb );
+   layout->addStretch( 1 );
 
    connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pDistance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmpluginsettings.cpp b/kpovmodeler/pmpluginsettings.cpp
index c89d1e7e..901bac94 100644
--- a/kpovmodeler/pmpluginsettings.cpp
+++ b/kpovmodeler/pmpluginsettings.cpp
@@ -54,10 +54,10 @@ public:
 PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   TQVBoxLayout* vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
    TQGroupBox* gb = new TQGroupBox( i18n( "Installed Plugins" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
 
    TQVBoxLayout* gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
@@ -77,7 +77,7 @@ PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name )
    hl->addWidget( m_pToggle );
    hl->addStretch( 1 );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMPluginSettings::displaySettings( )
diff --git a/kpovmodeler/pmpolynomedit.cpp b/kpovmodeler/pmpolynomedit.cpp
index ec3176d0..e0e3bebc 100644
--- a/kpovmodeler/pmpolynomedit.cpp
+++ b/kpovmodeler/pmpolynomedit.cpp
@@ -96,8 +96,8 @@ void PMPolynomEdit::displayCoefficients( const PMVector& co, int cOrder,
    {
       if( m_currentOrder > 0 )
       {
-         if( m_pPolyWidget->tqlayout( ) )
-            delete m_pPolyWidget->tqlayout( );
+         if( m_pPolyWidget->layout( ) )
+            delete m_pPolyWidget->layout( );
          
          m_labels.setAutoDelete( true );
          m_labels.clear( );
diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp
index eac93134..3ceaa83b 100644
--- a/kpovmodeler/pmpovraysettings.cpp
+++ b/kpovmodeler/pmpovraysettings.cpp
@@ -40,60 +40,60 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name )
 {
    m_selectionIndex = 0;
 
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQVBoxLayout* gvl;
    TQGroupBox* gb;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
 
    gb = new TQGroupBox( i18n( "Povray Command" ), this );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Command:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Command:" ), gb ) );
    m_pPovrayCommand = new TQLineEdit( gb );
-   htqlayout->addWidget( m_pPovrayCommand );
+   hlayout->addWidget( m_pPovrayCommand );
    m_pBrowsePovrayCommand = new TQPushButton( gb );
    m_pBrowsePovrayCommand->setPixmap( SmallIcon( "fileopen" ) );
    connect( m_pBrowsePovrayCommand, TQT_SIGNAL( clicked( ) ),
             TQT_SLOT( slotBrowsePovrayCommand( ) ) );
-   htqlayout->addWidget( m_pBrowsePovrayCommand );
-   vtqlayout->addWidget( gb );
+   hlayout->addWidget( m_pBrowsePovrayCommand );
+   vlayout->addWidget( gb );
 
    gb = new TQGroupBox( i18n( "Povray User Documentation" ), this );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Path:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Path:" ), gb ) );
    m_pDocumentationPath = new TQLineEdit( gb );
-   htqlayout->addWidget( m_pDocumentationPath );
+   hlayout->addWidget( m_pDocumentationPath );
    m_pBrowseDocumentationPath = new TQPushButton( gb );
    m_pBrowseDocumentationPath->setPixmap( SmallIcon( "fileopen" ) );
    connect( m_pBrowseDocumentationPath, TQT_SIGNAL( clicked( ) ),
             TQT_SLOT( slotBrowsePovrayDocumentation( ) ) );
-   htqlayout->addWidget( m_pBrowseDocumentationPath );
-   vtqlayout->addWidget( gb );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Version:" ), gb ) );
+   hlayout->addWidget( m_pBrowseDocumentationPath );
+   vlayout->addWidget( gb );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Version:" ), gb ) );
    m_pDocumentationVersion = new TQComboBox( false, gb );
    TQValueList<TQString> versions = PMDocumentationMap::theMap( )->availableVersions( );
    TQValueListIterator<TQString> it;
    for( it = versions.begin( ); it != versions.end( ); ++it )
       m_pDocumentationVersion->insertItem( *it );
-   htqlayout->addWidget( m_pDocumentationVersion );
-   htqlayout->addStretch( );
+   hlayout->addWidget( m_pDocumentationVersion );
+   hlayout->addStretch( );
 
    gb = new TQGroupBox( i18n( "Library Paths" ), this );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
-   htqlayout = new TQHBoxLayout( gvl );
+   hlayout = new TQHBoxLayout( gvl );
    m_pLibraryPaths = new TQListBox( gb );
    connect( m_pLibraryPaths, TQT_SIGNAL( highlighted( int ) ),
             TQT_SLOT( slotPathSelected( int ) ) );
-   htqlayout->addWidget( m_pLibraryPaths );
+   hlayout->addWidget( m_pLibraryPaths );
 
-   TQVBoxLayout* bl = new TQVBoxLayout( htqlayout );
+   TQVBoxLayout* bl = new TQVBoxLayout( hlayout );
    m_pAddLibraryPath = new TQPushButton( i18n( "Add..." ), gb );
    connect( m_pAddLibraryPath, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPath( ) ) );
    bl->addWidget( m_pAddLibraryPath );
@@ -113,9 +113,9 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name )
             TQT_SLOT( slotPathDown( ) ) );
    bl->addWidget( m_pLibraryPathDown );
    bl->addStretch( 1 );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
 
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMPovraySettings::displaySettings( )
diff --git a/kpovmodeler/pmpreviewsettings.cpp b/kpovmodeler/pmpreviewsettings.cpp
index a08ff1fe..700c19ee 100644
--- a/kpovmodeler/pmpreviewsettings.cpp
+++ b/kpovmodeler/pmpreviewsettings.cpp
@@ -32,16 +32,16 @@
 PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
 {
-   TQHBoxLayout* htqlayout;
-   TQVBoxLayout* vtqlayout;
+   TQHBoxLayout* hlayout;
+   TQVBoxLayout* vlayout;
    TQVBoxLayout* gvl;
    TQGridLayout* grid;
    TQGroupBox* gb;
 
-   vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
+   vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) );
    
-   htqlayout = new TQHBoxLayout( vtqlayout );
-   grid = new TQGridLayout( htqlayout, 2, 2 );
+   hlayout = new TQHBoxLayout( vlayout );
+   grid = new TQGridLayout( hlayout, 2, 2 );
    grid->addWidget( new TQLabel( i18n( "Size:" ), this ), 0, 0 );
    m_pPreviewSize = new PMIntEdit( this );
    m_pPreviewSize->setValidation( true, 10, true, 400 );
@@ -50,10 +50,10 @@ PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name )
    grid->addWidget( new TQLabel( i18n( "Gamma:" ), this ), 1, 0 );
    m_pPreviewGamma = new PMFloatEdit( this );
    grid->addWidget( m_pPreviewGamma, 1, 1 );
-   htqlayout->addStretch( 1 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Rendered Objects" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    m_pPreviewSphere = new TQCheckBox( i18n( "Sphere" ), gb );
@@ -64,52 +64,52 @@ PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name )
    gvl->addWidget( m_pPreviewBox );
 
    gb = new TQGroupBox( i18n( "Wall" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    m_pPreviewWall = new TQCheckBox( i18n( "Enable wall" ), gb );
    gvl->addWidget( m_pPreviewWall );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) );
    m_pWallColor1 = new KColorButton( gb );
-   htqlayout->addWidget( m_pWallColor1 );
-   htqlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) );
+   hlayout->addWidget( m_pWallColor1 );
+   hlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) );
    m_pWallColor2 = new KColorButton( gb );
-   htqlayout->addWidget( m_pWallColor2 );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pWallColor2 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Floor" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    m_pPreviewFloor = new TQCheckBox( i18n( "Enable floor" ), gb );
    gvl->addWidget( m_pPreviewFloor );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) );
    m_pFloorColor1 = new KColorButton( gb );
-   htqlayout->addWidget( m_pFloorColor1 );
-   htqlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) );
+   hlayout->addWidget( m_pFloorColor1 );
+   hlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) );
    m_pFloorColor2 = new KColorButton( gb );
-   htqlayout->addWidget( m_pFloorColor2 );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pFloorColor2 );
+   hlayout->addStretch( 1 );
 
    gb = new TQGroupBox( i18n( "Antialiasing" ), this );
-   vtqlayout->addWidget( gb );
+   vlayout->addWidget( gb );
    gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) );
    gvl->addSpacing( 10 );
    m_pPreviewAA = new TQCheckBox( i18n( "Enable antialiasing" ), gb );
    gvl->addWidget( m_pPreviewAA );
-   htqlayout = new TQHBoxLayout( gvl );
-   htqlayout->addWidget( new TQLabel( i18n( "Depth:" ), gb ) );
+   hlayout = new TQHBoxLayout( gvl );
+   hlayout->addWidget( new TQLabel( i18n( "Depth:" ), gb ) );
    m_pPreviewAALevel = new PMIntEdit( gb );
    m_pPreviewAALevel->setValidation( true, 1, true, 9 );
-   htqlayout->addWidget( m_pPreviewAALevel );
-   htqlayout->addWidget( new TQLabel( i18n( "Threshold:" ), gb ) );
+   hlayout->addWidget( m_pPreviewAALevel );
+   hlayout->addWidget( new TQLabel( i18n( "Threshold:" ), gb ) );
    m_pPreviewAAThreshold = new PMFloatEdit( gb );
-   htqlayout->addWidget( m_pPreviewAAThreshold );
-   htqlayout->addStretch( 1 );
+   hlayout->addWidget( m_pPreviewAAThreshold );
+   hlayout->addStretch( 1 );
    
-   vtqlayout->addStretch( 1 );
+   vlayout->addStretch( 1 );
 }
 
 void PMPreviewSettings::displaySettings( )
diff --git a/kpovmodeler/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp
index 09039d7e..e5cf8615 100644
--- a/kpovmodeler/pmprismedit.cpp
+++ b/kpovmodeler/pmprismedit.cpp
@@ -332,8 +332,8 @@ void PMPrismEdit::deleteEdits( )
    m_points.clear( );
    m_points.setAutoDelete( false );
    
-   if( m_pEditWidget->tqlayout( ) )
-      delete m_pEditWidget->tqlayout( );
+   if( m_pEditWidget->layout( ) )
+      delete m_pEditWidget->layout( );
 }
 
 TQValueList< TQValueList<PMVector> > PMPrismEdit::splinePoints( )
diff --git a/kpovmodeler/pmquickcoloredit.cpp b/kpovmodeler/pmquickcoloredit.cpp
index 9e0a2d29..cb86c0c0 100644
--- a/kpovmodeler/pmquickcoloredit.cpp
+++ b/kpovmodeler/pmquickcoloredit.cpp
@@ -36,10 +36,10 @@ void PMQuickColorEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pColorEdit = new PMColorEdit( false, this );
-   tqlayout->addWidget( new TQLabel( i18n( "Color:" ), this ), 0, AlignTop );
-   tqlayout->addWidget( m_pColorEdit );
+   layout->addWidget( new TQLabel( i18n( "Color:" ), this ), 0, AlignTop );
+   layout->addWidget( m_pColorEdit );
 
    connect( m_pColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
 }
diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp
index f8c73a80..fa200ba6 100644
--- a/kpovmodeler/pmsettingsdialog.cpp
+++ b/kpovmodeler/pmsettingsdialog.cpp
@@ -111,7 +111,7 @@ PMSettingsDialog::PMSettingsDialog( PMPart* part, TQWidget* parent, const char*
    sl.clear( );
    sl.append( i18n( "View Layout" ) );
    w = addVBoxPage( sl, i18n( "Display Settings for View Layouts" ),
-                    SmallIcon( "pmconfigureviewtqlayout", 22 ) );
+                    SmallIcon( "pmconfigureviewlayout", 22 ) );
    p = new PMLayoutSettings( w );
    registerPage( w, p );
 
diff --git a/kpovmodeler/pmsolidcoloredit.cpp b/kpovmodeler/pmsolidcoloredit.cpp
index 62ce6c9e..3eb326c4 100644
--- a/kpovmodeler/pmsolidcoloredit.cpp
+++ b/kpovmodeler/pmsolidcoloredit.cpp
@@ -35,12 +35,12 @@ void PMSolidColorEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) );
+   TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) );
    m_pColorEdit = new PMColorEdit( true, this );
    TQLabel* label = new TQLabel( i18n( "Color:" ), this );
 
-   tqlayout->addWidget( label, 0, AlignTop );
-   tqlayout->addWidget( m_pColorEdit );
+   layout->addWidget( label, 0, AlignTop );
+   layout->addWidget( m_pColorEdit );
 
    connect( m_pColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
 }
diff --git a/kpovmodeler/pmsphereedit.cpp b/kpovmodeler/pmsphereedit.cpp
index 99bac3ea..c12f95bd 100644
--- a/kpovmodeler/pmsphereedit.cpp
+++ b/kpovmodeler/pmsphereedit.cpp
@@ -36,19 +36,19 @@ void PMSphereEdit::createTopWidgets( )
 {
    Base::createTopWidgets( );
 
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
 
    m_pCentre = new PMVectorEdit( "x", "y", "z", this );
    m_pRadius = new PMFloatEdit( this );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
-   tqlayout->addWidget( m_pCentre );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Center:" ), this ) );
+   layout->addWidget( m_pCentre );
 
-   tqlayout = new TQHBoxLayout( topLayout( ) );
-   tqlayout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
-   tqlayout->addWidget( m_pRadius );
-   tqlayout->addStretch( 1 );
+   layout = new TQHBoxLayout( topLayout( ) );
+   layout->addWidget( new TQLabel( i18n( "Radius:" ), this ) );
+   layout->addWidget( m_pRadius );
+   layout->addStretch( 1 );
 
    connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
    connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) );
diff --git a/kpovmodeler/pmtruetypecache.cpp b/kpovmodeler/pmtruetypecache.cpp
index 41e4296a..f685001a 100644
--- a/kpovmodeler/pmtruetypecache.cpp
+++ b/kpovmodeler/pmtruetypecache.cpp
@@ -217,7 +217,7 @@ FT_UInt PMTrueTypeFont::findGlyphIndex( TQChar c )
 
    if( m_face )
    {
-      // glyphIndex = FT_Get_Char_Index( m_face, c.tqunicode( ) );
+      // glyphIndex = FT_Get_Char_Index( m_face, c.unicode( ) );
       // if( !glyphIndex )
       char ch = c.latin1( );
       if( !ch )
diff --git a/kpovmodeler/pmvectoredit.cpp b/kpovmodeler/pmvectoredit.cpp
index 79075dc3..7b9b6568 100644
--- a/kpovmodeler/pmvectoredit.cpp
+++ b/kpovmodeler/pmvectoredit.cpp
@@ -32,7 +32,7 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
       : TQWidget( parent, name )
 {
    unsigned int i;
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQLabel* label;
 
    m_edits.resize( 2 );
@@ -43,24 +43,24 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
                TQT_SLOT( slotTextChanged( const TQString& ) ) );
    }
 
-   tqlayout = new TQHBoxLayout( this );
+   layout = new TQHBoxLayout( this );
 
    if( !descriptionX.isEmpty( ) )
    {
       label = new TQLabel( descriptionX, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[0] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[0] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionY.isEmpty( ) )
    {
       label = new TQLabel( descriptionY, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[1] );
+   layout->addWidget( m_edits[1] );
 }
 
 PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
@@ -70,7 +70,7 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
       : TQWidget( parent, name )
 {
    unsigned int i;
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQLabel* label;
 
    m_edits.resize( 3 );
@@ -81,33 +81,33 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX,
                TQT_SLOT( slotTextChanged( const TQString& ) ) );
    }
 
-   tqlayout = new TQHBoxLayout( this );
+   layout = new TQHBoxLayout( this );
 
    if( !descriptionX.isEmpty( ) )
    {
       label = new TQLabel( descriptionX, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[0] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[0] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionY.isEmpty( ) )
    {
       label = new TQLabel( descriptionY, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[1] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[1] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionZ.isEmpty( ) )
    {
       label = new TQLabel( descriptionZ, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[2] );
+   layout->addWidget( m_edits[2] );
 }
 
 PMVectorEdit::PMVectorEdit( const TQString& descriptionA,
@@ -118,7 +118,7 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionA,
       : TQWidget( parent, name )
 {
    unsigned int i;
-   TQHBoxLayout* tqlayout;
+   TQHBoxLayout* layout;
    TQLabel* label;
 
    m_edits.resize( 4 );
@@ -129,42 +129,42 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionA,
                TQT_SLOT( slotTextChanged( const TQString& ) ) );
    }
 
-   tqlayout = new TQHBoxLayout( this );
+   layout = new TQHBoxLayout( this );
 
    if( !descriptionA.isEmpty( ) )
    {
       label = new TQLabel( descriptionA, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[0] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[0] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionB.isEmpty( ) )
    {
       label = new TQLabel( descriptionB, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[1] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[1] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionC.isEmpty( ) )
    {
       label = new TQLabel( descriptionC, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[2] );
-   tqlayout->addSpacing( KDialog::spacingHint( ) );
+   layout->addWidget( m_edits[2] );
+   layout->addSpacing( KDialog::spacingHint( ) );
 
    if( !descriptionD.isEmpty( ) )
    {
       label = new TQLabel( descriptionD, this );
-      tqlayout->addWidget( label );
-      tqlayout->addSpacing( KDialog::spacingHint( ) );
+      layout->addWidget( label );
+      layout->addSpacing( KDialog::spacingHint( ) );
    }
-   tqlayout->addWidget( m_edits[3] );
+   layout->addWidget( m_edits[3] );
 }
 
 void PMVectorEdit::setVector( const PMVector& v, int precision )
diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp
index 98fb2f61..2fcd7eb2 100644
--- a/kpovmodeler/pmview.cpp
+++ b/kpovmodeler/pmview.cpp
@@ -39,7 +39,7 @@ PMView::PMView( PMPart* part, TQWidget* parent, const char* name )
 {
    setBackgroundMode( PaletteBase );
 
-   TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+   TQVBoxLayout* layout = new TQVBoxLayout( this );
    m_pMainSplitter = new TQSplitter( Qt::Horizontal, this, "MainSplitter" );
    m_pTreeEditSplitter = new TQSplitter( Qt::Vertical, m_pMainSplitter,
                                         "TreeEditSplitter" );
@@ -68,8 +68,8 @@ PMView::PMView( PMPart* part, TQWidget* parent, const char* name )
    
    m_pMainSplitter->show( );
 
-   tqlayout->addWidget( m_pMainSplitter );
-   tqlayout->activate( );
+   layout->addWidget( m_pMainSplitter );
+   layout->activate( );
 
    m_pPart = part;
 }
diff --git a/kpovmodeler/pmviewbase.h b/kpovmodeler/pmviewbase.h
index 68febcf4..66426987 100644
--- a/kpovmodeler/pmviewbase.h
+++ b/kpovmodeler/pmviewbase.h
@@ -60,7 +60,7 @@ public:
 
 /**
  * Base class for configuration widgets for view types
- * for the tqlayout settings dialog page
+ * for the layout settings dialog page
  */
 class PMViewOptionsWidget : public TQWidget
 {
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp
index e6f9148c..fe3a031d 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -443,7 +443,7 @@ void PMViewLayout::normalize( )
 
 PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell )
 {
-   PMViewLayout tqlayout;
+   PMViewLayout layout;
 
    TQValueList< TQValueList< PMViewLayoutEntry > > cols;
    cols.append( TQValueList< PMViewLayoutEntry >( ) );
@@ -457,7 +457,7 @@ PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell )
 
    for( cit = cols.begin( ); cit != cols.end( ); ++cit )
       for( eit = ( *cit ).begin( ); eit != ( *cit ).end( ); ++eit )
-         tqlayout.addEntry( *eit );
+         layout.addEntry( *eit );
 
    // find floating widgets
    TQPtrList<PMDockWidget> list;
@@ -495,11 +495,11 @@ PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell )
             invalid = true;
 
          if( !invalid )
-            tqlayout.addEntry( e );
+            layout.addEntry( e );
       }
    }
 
-   return tqlayout;
+   return layout;
 }
 
 void PMViewLayout::recursiveExtractColumns(
@@ -666,7 +666,7 @@ void PMViewLayoutManager::loadData( )
    TQString fileName = locate( "data", "kpovmodeler/viewlayouts.xml" );
    if( fileName.isEmpty( ) )
    {
-      // Generate a default tqlayout
+      // Generate a default layout
       // I have a feeling this shouldn't be here but hey, it works for now
       // TODO Must find a way to move this cleanly to PMShell
       PMViewLayout a;
@@ -763,7 +763,7 @@ void PMViewLayoutManager::saveData( )
    {
       TQDomElement l;
 
-      l = doc.createElement( "viewtqlayout" );
+      l = doc.createElement( "viewlayout" );
       ( *it ).saveData( l, doc );
       e.appendChild( l );
    }
@@ -810,7 +810,7 @@ void PMViewLayoutManager::displayLayout( const TQString& name, PMShell* shell )
             flist.remove( );
          }
       }
-      // Create the new tqlayout
+      // Create the new layout
       v_layout->displayLayout( shell );
       m_layoutDisplayed = true;
    }
@@ -879,7 +879,7 @@ PMSaveViewLayoutDialog::PMSaveViewLayoutDialog( PMShell* parent,
    TQWidget* w = new TQWidget( this );
    TQVBoxLayout* vl = new TQVBoxLayout( w, 0, KDialog::spacingHint( ) );
 
-   TQLabel* l = new TQLabel( i18n( "Enter view tqlayout name:" ), w );
+   TQLabel* l = new TQLabel( i18n( "Enter view layout name:" ), w );
    vl->addWidget( l );
 
    m_pLayoutName = new TQLineEdit( w );
@@ -907,13 +907,13 @@ void PMSaveViewLayoutDialog::slotOk( )
    TQString name = m_pLayoutName->text( );
 
    PMViewLayoutManager* m = PMViewLayoutManager::theManager( );
-   PMViewLayout* tqlayout = m->findLayout( name );
+   PMViewLayout* layout = m->findLayout( name );
 
    PMViewLayout newLayout = PMViewLayout::extractViewLayout( m_pShell );
    newLayout.setName( name );
 
-   if( tqlayout )
-      *tqlayout = newLayout;
+   if( layout )
+      *layout = newLayout;
    else
       m->addLayout( newLayout );
 
diff --git a/kpovmodeler/pmviewlayoutmanager.h b/kpovmodeler/pmviewlayoutmanager.h
index c84147fb..a1129406 100644
--- a/kpovmodeler/pmviewlayoutmanager.h
+++ b/kpovmodeler/pmviewlayoutmanager.h
@@ -108,8 +108,8 @@ private:
 /**
  * Class used internally by @ref PMViewLayoutManager
  *
- * This class maintains a named tqlayout. It basically stores all views
- * associated with that tqlayout.
+ * This class maintains a named layout. It basically stores all views
+ * associated with that layout.
  */
 class PMViewLayout
 {
@@ -143,12 +143,12 @@ public:
     */
    void displayLayout( PMShell* shell );
    /**
-    * Sets the name of the tqlayout
+    * Sets the name of the layout
     */
    void setName( const TQString& n );
    /**
     *
-    * Add a new entry to the tqlayout. By default it adds the entry at the end
+    * Add a new entry to the layout. By default it adds the entry at the end
     * of the list. If a position is given it adds the entry at the indicated
     * position
     */
@@ -179,7 +179,7 @@ public:
    void normalize( );
 
    /**
-    * Extracts the view tqlayout from the current window
+    * Extracts the view layout from the current window
     */
    static PMViewLayout extractViewLayout( PMShell* shell );
 private:
@@ -202,7 +202,7 @@ private:
  *
  * It interacts with @ref PMShell to create the view layouts.
  * The class maintains a list of layouts as well as the name of the default
- * tqlayout. The layouts are stored in a XML file caled viewlayouts.xml.
+ * layout. The layouts are stored in a XML file caled viewlayouts.xml.
  */
 class PMViewLayoutManager
 {
@@ -221,11 +221,11 @@ public:
     */
    TQStringList availableLayouts( );
    /**
-    * Sets the default tqlayout
+    * Sets the default layout
     */
    void setDefaultLayout( const TQString& name );
    /**
-    * Returns the default tqlayout
+    * Returns the default layout
     */
    TQString defaultLayout( ) const { return m_defaultLayout; }
    /**
@@ -233,7 +233,7 @@ public:
     */
    void displayLayout( const TQString& name, PMShell* shell );
    /**
-    * Displays the tqlayout indicated as default
+    * Displays the layout indicated as default
     */
    void displayDefaultLayout( PMShell* shell );
    /**
@@ -241,23 +241,23 @@ public:
     */
    void loadData( );
    /**
-    * Saves the current tqlayout collection to the configuration file
+    * Saves the current layout collection to the configuration file
     */
    void saveData( );
    /**
-    * Add a new empty tqlayout
+    * Add a new empty layout
     */
    void addLayout( const TQString& name );
    /**
-    * Add a new tqlayout
+    * Add a new layout
     */
    void addLayout( const PMViewLayout& l ) { m_layouts.append( l ); }
    /**
-    * Remove a tqlayout
+    * Remove a layout
     */
    void removeLayout( const TQString& name );
    /**
-    * Get a known tqlayout
+    * Get a known layout
     */
    PMViewLayout* findLayout( const TQString& name );
    /**
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index 5bfa82a6..05dfd185 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -241,7 +241,7 @@ void KSnapshot::slotSaveAs()
 
 void KSnapshot::slotCopy()
 {
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
     cb->setPixmap( snapshot );
 }
 
diff --git a/ksnapshot/ksnapshot.h b/ksnapshot/ksnapshot.h
index 4850b314..27cdad27 100644
--- a/ksnapshot/ksnapshot.h
+++ b/ksnapshot/ksnapshot.h
@@ -44,14 +44,14 @@ class KSnapshotPreview : public TQLabel
 
             {
                 TQPainter p(&mask);
-                tqstyle().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), tqpalette().active());
+                style().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active());
                 p.end();
                 handle.setMask(mask);
             }
 
             {
                 TQPainter p(&handle);
-                tqstyle().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), tqpalette().active());
+                style().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active());
                 p.end();
             }
 
diff --git a/ksnapshot/ksnapshotwidget.ui b/ksnapshot/ksnapshotwidget.ui
index 86a2e4e2..95590cb4 100644
--- a/ksnapshot/ksnapshotwidget.ui
+++ b/ksnapshot/ksnapshotwidget.ui
@@ -163,7 +163,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
         </widget>
         <widget class="TQLayoutWidget" row="0" column="3">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp
index ddd93b0e..2ba1ea76 100644
--- a/ksnapshot/regiongrabber.cpp
+++ b/ksnapshot/regiongrabber.cpp
@@ -168,7 +168,7 @@ void RegionGrabber::drawRubber()
   p.setPen( TQPen( color0, 1 ) );
   p.setBrush( NoBrush );
 
-  tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
+  style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
       TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) );
 
   p.end();
diff --git a/ksvg/data/SVGGlyphElementImpl.lut.h b/ksvg/data/SVGGlyphElementImpl.lut.h
index 8a4bb903..8300e1c8 100644
--- a/ksvg/data/SVGGlyphElementImpl.lut.h
+++ b/ksvg/data/SVGGlyphElementImpl.lut.h
@@ -13,7 +13,7 @@ static const char SVGGlyphElementImpl__s_hashTableStrings[] = {
     "orientation\0"
     "glyph-name\0"
     "vert-adv-y\0"
-    "tqunicode\0"
+    "unicode\0"
     "lang\0"
     "d\0"
 };
diff --git a/ksvg/data/SVGStylableImpl.lut.h b/ksvg/data/SVGStylableImpl.lut.h
index d652d4cb..838001a7 100644
--- a/ksvg/data/SVGStylableImpl.lut.h
+++ b/ksvg/data/SVGStylableImpl.lut.h
@@ -23,7 +23,7 @@ static const char SVGStylableImpl__s_hashTableStrings[] = {
     "fill-opacity\0"
     "marker-start\0"
     "stroke-width\0"
-    "tqunicode-bidi\0"
+    "unicode-bidi\0"
     "word-spacing\0"
     "writing-mode\0"
     "font-family\0"
diff --git a/ksvg/dom/SVGSVGElement.h b/ksvg/dom/SVGSVGElement.h
index cdb0ef74..59621e2e 100644
--- a/ksvg/dom/SVGSVGElement.h
+++ b/ksvg/dom/SVGSVGElement.h
@@ -190,7 +190,7 @@ public:
 	 * this SVG document is embedded as part of  another document (e.g., via the
 	 * HTML 'object' element), then the position and  size are unitless values in
 	 * the coordinate system of the parent document. (If  the parent uses CSS or
-	 * XSL tqlayout, then unitless values represent pixel units  for the current CSS
+	 * XSL layout, then unitless values represent pixel units  for the current CSS
 	 * or XSL viewport, as described in the CSS2 specification.)  If the parent
 	 * element does not have a coordinate system, then the user agent  should
 	 * provide reasonable default values for this attribute.
diff --git a/ksvg/ecma/ksvg_helper.cpp b/ksvg/ecma/ksvg_helper.cpp
index 1d41733e..24f05101 100644
--- a/ksvg/ecma/ksvg_helper.cpp
+++ b/ksvg/ecma/ksvg_helper.cpp
@@ -33,7 +33,7 @@ KJS::UString::UString(const DOM::DOMString &d)
 
 	unsigned int len = d.length();
 	KJS::UChar *dat = new UChar[len];
-	memcpy(dat, d.tqunicode(), len * sizeof(UChar));
+	memcpy(dat, d.unicode(), len * sizeof(UChar));
 	rep = KJS::UString::Rep::create(dat, len);
 }
 
@@ -41,7 +41,7 @@ KJS::UString::UString(const TQString &d)
 {
 	unsigned int len = d.length();
 	KJS::UChar *dat = new UChar[len];
-	memcpy(dat, d.tqunicode(), len * sizeof(UChar));
+	memcpy(dat, d.unicode(), len * sizeof(UChar));
 	rep = KJS::UString::Rep::create(dat, len);
 }
 
diff --git a/ksvg/impl/SVGEventImpl.cc b/ksvg/impl/SVGEventImpl.cc
index 38ab5e64..e1252af8 100644
--- a/ksvg/impl/SVGEventImpl.cc
+++ b/ksvg/impl/SVGEventImpl.cc
@@ -507,17 +507,17 @@ SVGKeyEventImpl::SVGKeyEventImpl(TQKeyEvent *key, DOM::AbstractView &view, SVGEv
 			break;
 	}
 
-	// m_keyVal should contain the tqunicode value
+	// m_keyVal should contain the unicode value
 	// of the pressed key if available.
 	if (!key->text().isNull())
-		m_keyVal = TQString(key->text()).tqunicode()[0];
+		m_keyVal = TQString(key->text()).unicode()[0];
 
 	//  m_numPad = ???
 
 	// key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together.
 	m_modifier = key->state();
 
-	// key->text() returns the tqunicode sequence as a TQString
+	// key->text() returns the unicode sequence as a TQString
 	m_outputString = DOM::DOMString(key->text());
 }
 
diff --git a/ksvg/impl/SVGGlyphElementImpl.cc b/ksvg/impl/SVGGlyphElementImpl.cc
index ef891912..4975b2c5 100644
--- a/ksvg/impl/SVGGlyphElementImpl.cc
+++ b/ksvg/impl/SVGGlyphElementImpl.cc
@@ -43,7 +43,7 @@ TQString SVGGlyphElementImpl::d() const
 /*
 @namespace KSVG
 @begin SVGGlyphElementImpl::s_hashTable 11
- tqunicode		SVGGlyphElementImpl::Unicode		DontDelete|ReadOnly
+ unicode		SVGGlyphElementImpl::Unicode		DontDelete|ReadOnly
  glyph-name		SVGGlyphElementImpl::GlyphName		DontDelete|ReadOnly
  d				SVGGlyphElementImpl::D				DontDelete|ReadOnly
  orientation	SVGGlyphElementImpl::Qt::Orientation	DontDelete|ReadOnly
diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc
index 2808bc7f..9471c562 100644
--- a/ksvg/impl/SVGStylableImpl.cc
+++ b/ksvg/impl/SVGStylableImpl.cc
@@ -711,7 +711,7 @@ float SVGStylableImpl::fontSizeForText(const TQString &value)
  text-anchor		SVGStylableImpl::TextAnchor			DontDelete|ReadOnly
  direction			SVGStylableImpl::Direction			DontDelete|ReadOnly
  writing-mode		SVGStylableImpl::WritingMode		DontDelete|ReadOnly
- tqunicode-bidi		SVGStylableImpl::UnicodeBidi		DontDelete|ReadOnly
+ unicode-bidi		SVGStylableImpl::UnicodeBidi		DontDelete|ReadOnly
  opacity			SVGStylableImpl::Opacity			DontDelete|ReadOnly
  fill-opacity		SVGStylableImpl::FillOpacity		DontDelete|ReadOnly
  stroke-opacity		SVGStylableImpl::StrokeOpacity		DontDelete|ReadOnly
@@ -1006,7 +1006,7 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value &
 			break;
 		case Direction:
 			m_flags |= SVG_STYLE_FLAG_TEXT_DIRECTION;
-			// Spec: direction is only processed when tqunicode-bidi
+			// Spec: direction is only processed when unicode-bidi
 			//       is set to bidi-override or embedded
 			if(m_textUnicodeBidi == OVERRIDE ||
 				m_textUnicodeBidi == EMBED ||
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp
index 11de3177..59ab8e5c 100644
--- a/ksvg/impl/libs/libtext2path/src/Converter.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp
@@ -125,7 +125,7 @@ GlyphAffinePair *Converter::requestGlyph(GlyphRenderParams *params, Rectangle &b
 	SharedGlyph cached = m_glyphCache.find(cacheGlyphKey(params));
 
 	// If not available in cache, render new one and cache it :)
-	// If we're mixing ie. japanese and latin characters (TTB tqlayout),
+	// If we're mixing ie. japanese and latin characters (TTB layout),
 	// then we also have to re-calculate the glyph again with the appropriate rotation matrix (Niko)
 	if(!cached || !onlyLatin)
 		cached = calcGlyph(params, affine, onlyLatin);
@@ -164,11 +164,11 @@ void Converter::selectGlyph(GlyphRenderParams *params)
 
 	// 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB layouts when rendering
 	// 	  a latin glyph because it needs to be rotated...
-	if(params->tqlayout()->tb())
+	if(params->layout()->tb())
 	{
 		Script script;
 		SCRIPT_FOR_CHAR(script, params->character())
-		if(script != Latin || params->tqlayout()->glyphOrientationVertical() == 0)
+		if(script != Latin || params->layout()->glyphOrientationVertical() == 0)
 			flags |= FT_LOAD_VERTICAL_LAYOUT;
 	}
 
@@ -193,7 +193,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine
 		affine.dx() += kx + affine.m21() * ky;
 
 		// Only apply y kerning in TB mode
-		if(params->tqlayout()->tb())
+		if(params->layout()->tb())
 			affine.dy() += kx + affine.m22() * ky;
 	}
 
@@ -206,7 +206,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine
 	traceAffine.scale(1000.0 / params->font()->fontFace()->units_per_EM);
 
 	// 3b. Enable character rotation, if needed
-	if(params->tqlayout()->tb())
+	if(params->layout()->tb())
 	{
 		Script script;
 		SCRIPT_FOR_CHAR(script, params->character())
@@ -214,7 +214,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine
 		{
 			FT_Matrix matrix;
 
-			double angle = deg2rad * params->tqlayout()->glyphOrientationVertical();
+			double angle = deg2rad * params->layout()->glyphOrientationVertical();
 			matrix.xx = (FT_Fixed)( cos(angle) * 0x10000L);
 			matrix.xy = (FT_Fixed)(-sin(angle) * 0x10000L);
 			matrix.yx = (FT_Fixed)( sin(angle) * 0x10000L);
@@ -257,21 +257,21 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned
 	if(params->useBidi())
 	{
 		FriBidiCharType baseDir = FRIBIDI_TYPE_N;
-		FriBidiChar *tqunicodeIn = new FriBidiChar[length + 1];
-		FriBidiChar *tqunicodeOut = new FriBidiChar[length + 1];
+		FriBidiChar *unicodeIn = new FriBidiChar[length + 1];
+		FriBidiChar *unicodeOut = new FriBidiChar[length + 1];
 		bidi = new unsigned short[length + 1];	
 
 		for(unsigned int i = 0; i < length; i++)
-			tqunicodeIn[i] = text[i];
+			unicodeIn[i] = text[i];
 	
-		fribidi_log2vis(tqunicodeIn, length, &baseDir, tqunicodeOut, 0, 0, 0); 
+		fribidi_log2vis(unicodeIn, length, &baseDir, unicodeOut, 0, 0, 0); 
 	
 		for(unsigned int i = 0; i < length; i++)
-			bidi[i] = tqunicodeOut[i];
+			bidi[i] = unicodeOut[i];
 
 		bidi[length] = 0;
-		delete []tqunicodeIn;
-		delete []tqunicodeOut;
+		delete []unicodeIn;
+		delete []unicodeOut;
 	}
 	else
 		bidi = const_cast<unsigned short *>(text);
@@ -302,7 +302,7 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned
 	int pixelUnderlineThickness = T2PMAX(1, (int) ((font->fontFace()->underline_thickness * fontSize / font->fontFace()->units_per_EM) * affine.m22()));
 
 	// 3. Prepare needed variables for the rendering loop
-	// 	  - rendering params (tqlayout, font...)
+	// 	  - rendering params (layout, font...)
 	// 	  - bounding box (per glyph, overall)
 	// 	  - glyph matrix (overall)
 	// 	  - resulting glyph sets
diff --git a/ksvg/impl/libs/libtext2path/src/Font.cpp b/ksvg/impl/libs/libtext2path/src/Font.cpp
index 2ced971d..1d6f7005 100644
--- a/ksvg/impl/libs/libtext2path/src/Font.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Font.cpp
@@ -141,7 +141,7 @@ std::string Font::buildRequest(const FontVisualParams *fontParams, int &id)
 			FcPatternAddString(pattern, FC_FAMILY, reinterpret_cast<const FcChar8 *>(string.c_str()));
 	}
 
-	// Always load vertical tqlayout
+	// Always load vertical layout
 	FcPatternAddBool(pattern, FC_VERTICAL_LAYOUT, true);
 
 	// Disable hinting
@@ -208,7 +208,7 @@ bool Font::load(const FontVisualParams *fontParams)
 		return false;
 	}
 
-	// Choose tqunicode charmap
+	// Choose unicode charmap
 	for(int charmap = 0; charmap < m_fontFace->num_charmaps; charmap++)
 	{
 		if(m_fontFace->charmaps[charmap]->encoding == ft_encoding_unicode)
@@ -217,7 +217,7 @@ bool Font::load(const FontVisualParams *fontParams)
 
 			if(error)
 			{
-				std::cout << "Font::load(), unable to select tqunicode charmap. Aborting!" << std::endl;
+				std::cout << "Font::load(), unable to select unicode charmap. Aborting!" << std::endl;
 
 				FT_Done_Face(m_fontFace);
 				m_fontFace = 0;
diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.cpp b/ksvg/impl/libs/libtext2path/src/Glyph.cpp
index 08ad55a8..d2e16189 100644
--- a/ksvg/impl/libs/libtext2path/src/Glyph.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Glyph.cpp
@@ -309,14 +309,14 @@ void GlyphRenderParams::setFont(Font *font)
 	m_font = font;
 }
 	
-const GlyphLayoutParams *GlyphRenderParams::tqlayout() const
+const GlyphLayoutParams *GlyphRenderParams::layout() const
 {
 	return m_layout;
 }
 
-void GlyphRenderParams::setLayout(const GlyphLayoutParams *tqlayout)
+void GlyphRenderParams::setLayout(const GlyphLayoutParams *layout)
 {
-	m_layout = tqlayout;
+	m_layout = layout;
 }
 
 unsigned int GlyphRenderParams::glyphIndex() const
diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.h b/ksvg/impl/libs/libtext2path/src/Glyph.h
index 8dcbe599..b3bd3fb5 100644
--- a/ksvg/impl/libs/libtext2path/src/Glyph.h
+++ b/ksvg/impl/libs/libtext2path/src/Glyph.h
@@ -171,8 +171,8 @@ namespace T2P
 		Font *font() const;
 		void setFont(Font *font);
 		
-		const GlyphLayoutParams *tqlayout() const;
-		void setLayout(const GlyphLayoutParams *tqlayout);
+		const GlyphLayoutParams *layout() const;
+		void setLayout(const GlyphLayoutParams *layout);
 		
 		unsigned int glyphIndex() const;
 		void setGlyphIndex(unsigned int glyphIndex);
diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
index e4446052..7e94b1b1 100644
--- a/kuickshow/src/defaultswidget.cpp
+++ b/kuickshow/src/defaultswidget.cpp
@@ -105,13 +105,13 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
   ////////////////
 
 
-  // tqlayout management
+  // layout management
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 0,
-            KDialog::spacingHint(), "main tqlayout" );
+            KDialog::spacingHint(), "main layout" );
 
-  TQVBoxLayout *gbScaleLayout = new TQVBoxLayout( gbScale->tqlayout(),
+  TQVBoxLayout *gbScaleLayout = new TQVBoxLayout( gbScale->layout(),
             KDialog::spacingHint());
-  TQVBoxLayout *gbGeometryLayout = new TQVBoxLayout(gbGeometry->tqlayout(),
+  TQVBoxLayout *gbGeometryLayout = new TQVBoxLayout(gbGeometry->layout(),
             KDialog::spacingHint());
   TQGridLayout *gbPreviewLayout = new TQGridLayout(gbPreview, 2, 3, 0,
             KDialog::spacingHint());
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
index 5f8df74d..2662df41 100644
--- a/kuickshow/src/filewidget.cpp
+++ b/kuickshow/src/filewidget.cpp
@@ -196,7 +196,7 @@ bool FileWidget::eventFilter( TQObject *o, TQEvent *e )
 	    }
 	
 	    const TQString& text = k->text();
-	    if ( !text.isEmpty() && text.tqunicode()->isPrint() ) {
+	    if ( !text.isEmpty() && text.unicode()->isPrint() ) {
                 k->accept();
 		
                 if ( !m_fileFinder ) {
diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp
index bde353d6..1308885a 100644
--- a/kuickshow/src/generalwidget.cpp
+++ b/kuickshow/src/generalwidget.cpp
@@ -36,8 +36,8 @@
 GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-  tqlayout->setSpacing( KDialog::spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  layout->setSpacing( KDialog::spacingHint() );
 
   TQPixmap pixmap = UserIcon( "logo" );
   KURLLabel *logo = new KURLLabel( this );
@@ -50,7 +50,7 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
   connect( logo, TQT_SIGNAL( leftClickedURL( const TQString & ) ),
             TQT_SLOT( slotURLClicked( const TQString & ) ) );
 
-  tqlayout->addWidget( logo, 0, AlignRight );
+  layout->addWidget( logo, 0, AlignRight );
 
   cbFullscreen = new TQCheckBox( i18n("Fullscreen mode"), this, "boscreen" );
 
@@ -70,17 +70,17 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
   gridLayout->addWidget( l1, 1, 0 );
   gridLayout->addWidget( editFilter, 1, 1 );
 
-  tqlayout->addWidget( cbFullscreen );
-  tqlayout->addWidget( cbPreload );
-  tqlayout->addWidget( cbLastdir );
-  tqlayout->addLayout( gridLayout );
+  layout->addWidget( cbFullscreen );
+  layout->addWidget( cbPreload );
+  layout->addWidget( cbLastdir );
+  layout->addLayout( gridLayout );
 
   ////////////////////////////////////////////////////////////////////////
 
   TQVGroupBox *gbox2 = new TQVGroupBox( i18n("Quality/Speed"),
 				     this, "qualitybox" );
-  tqlayout->addWidget( gbox2 );
-  tqlayout->addStretch();
+  layout->addWidget( gbox2 );
+  layout->addStretch();
 
   cbSmoothScale = new TQCheckBox( i18n("Smooth scaling"), gbox2, "smoothscale" );
   cbFastRender = new TQCheckBox( i18n("Fast rendering"), gbox2, "fastrender" );
diff --git a/kuickshow/src/mainwidget.cpp b/kuickshow/src/mainwidget.cpp
index d94d332e..47b3d837 100644
--- a/kuickshow/src/mainwidget.cpp
+++ b/kuickshow/src/mainwidget.cpp
@@ -35,7 +35,7 @@ MainWidget::~MainWidget()
 }
 
 
-// for now, no tqlayout managers
+// for now, no layout managers
 void MainWidget::resizeEvent( TQResizeEvent * )
 {
   box->resize( width(), height() );
diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp
index 7005bbe8..0d003a0a 100644
--- a/kuickshow/src/printing.cpp
+++ b/kuickshow/src/printing.cpp
@@ -199,21 +199,21 @@ KuickPrintDialogPage::KuickPrintDialogPage( TQWidget *parent, const char *name )
 {
     setTitle( i18n("Image Settings") );
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-    tqlayout->setMargin( KDialog::marginHint() );
-    tqlayout->setSpacing( KDialog::spacingHint() );
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    layout->setMargin( KDialog::marginHint() );
+    layout->setSpacing( KDialog::spacingHint() );
 
     m_addFileName = new TQCheckBox( i18n("Print fi&lename below image"), this);
     m_addFileName->setChecked( true );
-    tqlayout->addWidget( m_addFileName );
+    layout->addWidget( m_addFileName );
 
     m_blackwhite = new TQCheckBox ( i18n("Print image in &black and white"), this);
     m_blackwhite->setChecked( false );
-    tqlayout->addWidget (m_blackwhite );
+    layout->addWidget (m_blackwhite );
 
     TQVButtonGroup *group = new TQVButtonGroup( i18n("Scaling"), this );
     group->setRadioButtonExclusive( true );
-    tqlayout->addWidget( group );
+    layout->addWidget( group );
     // m_shrinkToFit = new TQRadioButton( i18n("Shrink image to &fit, if necessary"), group );
     m_shrinkToFit = new TQCheckBox( i18n("Shrink image to &fit, if necessary"), group );
     m_shrinkToFit->setChecked( true );
diff --git a/kuickshow/src/slideshowwidget.cpp b/kuickshow/src/slideshowwidget.cpp
index ed2bedc6..9727c203 100644
--- a/kuickshow/src/slideshowwidget.cpp
+++ b/kuickshow/src/slideshowwidget.cpp
@@ -31,8 +31,8 @@ SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name )
 {
 //     setTitle( i18n("Slideshow") );
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-    tqlayout->setSpacing( KDialog::spacingHint() );
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    layout->setSpacing( KDialog::spacingHint() );
 
     m_fullScreen = new TQCheckBox( i18n("Switch to &full-screen"), this );
     m_startWithCurrent = new TQCheckBox( i18n("S&tart with current image"), this);
@@ -48,11 +48,11 @@ SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name )
     m_cycles->setSpecialValueText( i18n("infinite") );
     m_cycles->setRange( 0, 500 );
     
-    tqlayout->addWidget( m_fullScreen );
-    tqlayout->addWidget( m_startWithCurrent );
-    tqlayout->addWidget( m_delayTime );
-    tqlayout->addWidget( m_cycles );
-    tqlayout->addStretch( 1 );
+    layout->addWidget( m_fullScreen );
+    layout->addWidget( m_startWithCurrent );
+    layout->addWidget( m_delayTime );
+    layout->addWidget( m_cycles );
+    layout->addStretch( 1 );
 
     loadSettings( *kdata );
 }
diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp
index 6645fb1e..e994d8ed 100644
--- a/kview/config/kviewconfmodules.cpp
+++ b/kview/config/kviewconfmodules.cpp
@@ -35,12 +35,12 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kviewgeneralconfig, KViewGeneralConfigFactory( "
 KViewGeneralConfig::KViewGeneralConfig( TQWidget * parent, const char * /*name*/, const TQStringList & args )
 	: KCModule( KViewGeneralConfigFactory::instance(), parent, args )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 
 	m_pResizeGroup = new TQVButtonGroup( i18n( "Resizing" ), this );
 	m_pResizeGroup->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
 	connect( m_pResizeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( resizeChanged( int ) ) );
-	tqlayout->addWidget( m_pResizeGroup );
+	layout->addWidget( m_pResizeGroup );
 
 	( void )new TQRadioButton( i18n( "Only resize window" ), m_pResizeGroup );
 	( void )new TQRadioButton( i18n( "Resize image to fit window" ), m_pResizeGroup );
diff --git a/kview/kview.cpp b/kview/kview.cpp
index 390649be..03951c4a 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -89,7 +89,7 @@ KView::KView()
 		connect( part->widget(), TQT_SIGNAL( contextPress( const TQPoint & ) ),
 				TQT_SLOT( contextPress( const TQPoint & ) ) );
 
-		connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
+		connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
 				TQT_SLOT( clipboardDataChanged() ) );
 
 		connect( m_pViewer, TQT_SIGNAL( started( KIO::Job * ) ),
@@ -208,7 +208,7 @@ TQSize KView::sizeForCentralWidgetSize( TQSize size )
 	if( ! mb->isHidden() )
 	{
 		size.rheight() += mb->heightForWidth( width() );
-		if( tqstyle().styleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) )
+		if( style().styleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) )
 			size.rheight() += dockWindowsMovable() ? 1 : 2;
 	}
 	kdDebug( 4600 ) << "added Menubar:           " << size << endl;
@@ -301,7 +301,7 @@ void KView::slotClose()
 
 void KView::slotCopy()
 {
-	TQClipboard *cb = TQApplication::tqclipboard();
+	TQClipboard *cb = TQApplication::clipboard();
 	cb->setSelectionMode( false );
 
 	TQRect selectarea = m_pCanvas->selection();
@@ -320,7 +320,7 @@ void KView::slotCopy()
 void KView::slotPaste()
 {
 	// Get TQImage from clipboard and create a new image.
-	TQClipboard *cb = TQApplication::tqclipboard();
+	TQClipboard *cb = TQApplication::clipboard();
     TQImage img = cb->image();
 	if( ! img.isNull() )
 		m_pViewer->newImage( img );
@@ -412,7 +412,7 @@ void KView::enableAction( const char * name, bool b )
 
 void KView::clipboardDataChanged()
 {
-	TQClipboard * cb = TQApplication::tqclipboard();
+	TQClipboard * cb = TQApplication::clipboard();
 	cb->setSelectionMode( false );
 	bool hasImage = TQImageDrag::canDecode( cb->data( TQClipboard::Clipboard ) );
 	m_paPaste->setEnabled( hasImage );
@@ -653,7 +653,7 @@ TQSize KView::barSize( int mainwinwidth, BarSizeFrom from )
 				width += toolBar()->width();
 				break;
 			case KToolBar::Flat:
-				height += kapp->tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent );
+				height += kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent );
 				break;
 			case KToolBar::Floating:
 				break;
diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp
index f9cf90cc..4ecf07b9 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -38,8 +38,8 @@ KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQS
 	: KCModule( KViewCanvasConfigFactory::instance(), parent, args )
 	, m_config( new KConfig( "kviewcanvasrc" ) )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this );
-	tqlayout->setAutoAdd( true );
+	TQBoxLayout * layout = new TQVBoxLayout( this );
+	layout->setAutoAdd( true );
 
 	m_pWidget = new GeneralConfigWidget( this );
 	m_pWidget->m_pMinWidth ->setRange( 1, 200 );
diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui
index 15476bcd..108ed82e 100644
--- a/kview/kviewcanvas/config/generalconfigwidget.ui
+++ b/kview/kviewcanvas/config/generalconfigwidget.ui
@@ -138,7 +138,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -181,7 +181,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp
index a4259b05..0ee58b78 100644
--- a/kview/kviewviewer/imagesettings.cpp
+++ b/kview/kviewviewer/imagesettings.cpp
@@ -30,14 +30,14 @@ ImageSettings::ImageSettings( TQWidget * parent, const char * name )
 {
 	setTitle( i18n( "Image Settings" ) );
 
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 	m_pFitImage = new TQCheckBox( i18n( "Fit image to page size" ), this );
 	m_pFitImage->setChecked( true );
-	tqlayout->addWidget( m_pFitImage );
+	layout->addWidget( m_pFitImage );
 	m_pCenter = new TQCheckBox( i18n( "Center image on page" ), this );
 	m_pCenter->setChecked( true );
-	tqlayout->addWidget( m_pCenter );
-	tqlayout->insertStretch( -1, 0 );
+	layout->addWidget( m_pCenter );
+	layout->insertStretch( -1, 0 );
 }
 
 ImageSettings::~ImageSettings()
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 9971dee8..65513b12 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -810,14 +810,14 @@ void KViewViewer::slotFileDirty( const TQString & )
 								  "If you don't and subsequently save the image, you will lose the\n"
 								  "changes that have already been saved." ).arg( url().fileName() ), vb );
 		TQWidget * hb = new TQWidget( vb );
-		TQHBoxLayout * tqlayout = new TQHBoxLayout( hb );
-		tqlayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+		TQHBoxLayout * layout = new TQHBoxLayout( hb );
+		layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 		KPushButton * yes = new KPushButton( i18n("Reload"), hb );
-		tqlayout->addWidget( yes );
-		tqlayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+		layout->addWidget( yes );
+		layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 		KPushButton * no = new KPushButton( i18n("Do Not Reload"), hb );
-		tqlayout->addWidget( no );
-		tqlayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+		layout->addWidget( no );
+		layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 		connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotReloadUnmodified() ) );
 		connect( yes, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) );
 		connect( no, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) );
diff --git a/kview/kviewviewer/printimagesettings.ui b/kview/kviewviewer/printimagesettings.ui
index b2cf260f..8c35a9b2 100644
--- a/kview/kviewviewer/printimagesettings.ui
+++ b/kview/kviewviewer/printimagesettings.ui
@@ -25,7 +25,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -39,7 +39,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -93,7 +93,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout1</cstring>
+                                        <cstring>layout1</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp
index 3f868694..e44889ed 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.cpp
+++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp
@@ -34,8 +34,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kviewpresenterconfig, KViewPresenterConfigFactor
 KViewPresenterConfig::KViewPresenterConfig( TQWidget * parent, const char *, const TQStringList & args )
 	: KCModule( KViewPresenterConfigFactory::instance(), parent, args )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
 
 	m_pCheckBox = new TQCheckBox( "This is only for testing...", this );
 	connect( m_pCheckBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( checkChanged() ) );
diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp
index b6818271..1c79ee15 100644
--- a/kview/modules/presenter/kviewpresenterconfmodule.cpp
+++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp
@@ -49,8 +49,8 @@ void KViewPresenterConfModule::reset()
 
 void KViewPresenterConfModule::createPage( TQFrame * page )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
+	TQBoxLayout * layout = new TQVBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
 
 	m_pCheckBox = new TQCheckBox( "This is only for testing...", page );
 }
diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp
index 4979e4dc..f5138f55 100644
--- a/kview/modules/scale/kview_scale.cpp
+++ b/kview/modules/scale/kview_scale.cpp
@@ -64,9 +64,9 @@ void KViewScale::slotScaleDlg()
 	KDialogBase dlg( m_pViewer->widget(), "KView scale dialog", true, i18n( "Scale Image" ), KDialogBase::Ok|KDialogBase::Cancel );
 	ScaleDlg widget( m_pCanvas->imageSize(), dlg.makeVBoxMainWidget() );
 #if 0
-	TQVBox * tqlayout = dlg.makeVBoxMainWidget();
+	TQVBox * layout = dlg.makeVBoxMainWidget();
 
-	TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), tqlayout );
+	TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), layout );
 	TQGridLayout * pixelgroupgrid = new TQGridLayout( pixelgroup, 1, 1, 0, KDialog::spacingHint() );
 	pixelgroupgrid->setSpacing( KDialog::spacingHint() );
 	pixelgroupgrid->setMargin( KDialog::marginHint() );
@@ -116,7 +116,7 @@ void KViewScale::slotScaleDlg()
 	pixelgroupgrid->addWidget( ratioy, 7, 1 );
 	pixelgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), pixelgroup ), 6, 7, 2, 2, TQt::AlignVCenter );
 
-	TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), tqlayout );
+	TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), layout );
 	TQGridLayout * printgroupgrid = new TQGridLayout( printgroup, 1, 1, 0, KDialog::spacingHint() );
 	printgroupgrid->setSpacing( KDialog::spacingHint() );
 	printgroupgrid->setMargin( KDialog::marginHint() );
diff --git a/kviewshell/documentPageCache.cpp b/kviewshell/documentPageCache.cpp
index addaa706..720285df 100644
--- a/kviewshell/documentPageCache.cpp
+++ b/kviewshell/documentPageCache.cpp
@@ -220,7 +220,7 @@ RenderedDocumentPagePixmap* DocumentPageCache::getPage(const PageNumber& pageNr)
 
       // We always set the cache capacity to be at least n times the cost of the page we want to insert.
       // Where n is the number of pages that can be visible at the same time at very high zoomlevels.
-      // n depends on the tqlayout mode.
+      // n depends on the layout mode.
       // If these pages are not all in the cache, scrolling the view becomes very slow, because for each
       // paint event the pages need to be rerendered.
       // We set n for each viewmode differently so that the user is able to reduce memory consuption by
diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp
index a2ba1b31..dad18d22 100644
--- a/kviewshell/kmultipage.cpp
+++ b/kviewshell/kmultipage.cpp
@@ -117,7 +117,7 @@ void KMultiPage::readSettings()
 
 void KMultiPage::writeSettings()
 {
-  // Save TOC tqlayout
+  // Save TOC layout
   tableOfContents->writeSettings();
 
   KVSPrefs::setGuiLayout(splitterWidget->sizes());
diff --git a/kviewshell/kprintDialogPage_pageoptions.cpp b/kviewshell/kprintDialogPage_pageoptions.cpp
index 62ce70be..c0c4b15e 100644
--- a/kviewshell/kprintDialogPage_pageoptions.cpp
+++ b/kviewshell/kprintDialogPage_pageoptions.cpp
@@ -33,7 +33,7 @@ KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions( TQWidget *parent, co
 
   kprintDialogPage_pageoptions_baseLayout = new TQVBoxLayout( this, 11, 6, "kprintDialogPage_pageoptions_baseLayout"); 
   if (kprintDialogPage_pageoptions_baseLayout == 0) {
-    kdError(1223) << "KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions() cannot create tqlayout" << endl;
+    kdError(1223) << "KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions() cannot create layout" << endl;
     return;
   }
     
diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp
index ae99982d..bedbb6ad 100644
--- a/kviewshell/marklist.cpp
+++ b/kviewshell/marklist.cpp
@@ -169,16 +169,16 @@ MarkListWidget::MarkListWidget(TQWidget* _parent, MarkList* _markList, const Pag
   : TQWidget(_parent), showThumbnail(_showThumbnail), pageNumber(_pageNumber),
     pageCache(_pageCache), markList(_markList)
 {
-  TQBoxLayout* tqlayout = new TQVBoxLayout(this, margin);
+  TQBoxLayout* layout = new TQVBoxLayout(this, margin);
 
   thumbnailWidget = 0;
   if (showThumbnail)
   {
     thumbnailWidget = new ThumbnailWidget(this, pageNumber, pageCache);
-    tqlayout->addWidget(thumbnailWidget, 1, TQt::AlignTop);
+    layout->addWidget(thumbnailWidget, 1, TQt::AlignTop);
   }
 
-  TQBoxLayout* bottomLayout = new TQHBoxLayout(tqlayout);
+  TQBoxLayout* bottomLayout = new TQHBoxLayout(layout);
 
   checkBox = new TQCheckBox(TQString(), this );
   checkBox->setFocusPolicy(TQ_NoFocus);
diff --git a/kviewshell/optionDialogAccessibilityWidget.ui b/kviewshell/optionDialogAccessibilityWidget.ui
index ea0cc6d2..2bf421a0 100644
--- a/kviewshell/optionDialogAccessibilityWidget.ui
+++ b/kviewshell/optionDialogAccessibilityWidget.ui
@@ -122,7 +122,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -199,7 +199,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -332,7 +332,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/kviewshell/pageView.h b/kviewshell/pageView.h
index 637a7e23..14b6fab2 100644
--- a/kviewshell/pageView.h
+++ b/kviewshell/pageView.h
@@ -106,8 +106,8 @@ public slots:
     /** Turn the scrollbars on/off. */
     void slotShowScrollbars(bool);
 
-    /** Set tqlayout of the page widgets according to the current viewmode and zoomlevel.
-        Set zoomChanged = true if the the tqlayout needs updateing because the zoomlevel has changed. */
+    /** Set layout of the page widgets according to the current viewmode and zoomlevel.
+        Set zoomChanged = true if the the layout needs updateing because the zoomlevel has changed. */
     void layoutPages(bool zoomChanged = false);
 
     void slotEnableMoveTool(bool enable);
diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
index 2fe05a8b..24b7dfbb 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
@@ -36,7 +36,7 @@ KPrintDialogPage_DJVUConversionOptions::KPrintDialogPage_DJVUConversionOptions(
 
   kprintDialogPage_pageoptions_baseLayout = new TQVBoxLayout( this, 11, 6, "kprintDialogPage_pageoptions_baseLayout"); 
   if (kprintDialogPage_pageoptions_baseLayout == 0) {
-    kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create tqlayout" << endl;
+    kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create layout" << endl;
     return;
   }
   
diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
index 4287fe54..e6872648 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
@@ -40,7 +40,7 @@ KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *pa
 
   kprintDialogPage_pageoptions_baseLayout = new TQVBoxLayout( this, 11, 6, "kprintDialogPage_pageoptions_baseLayout");
   if (kprintDialogPage_pageoptions_baseLayout == 0) {
-    kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create tqlayout" << endl;
+    kdError(1223) << "KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions() cannot create layout" << endl;
     return;
   }
 
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
index 802f0edf..f384ce97 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
@@ -428,7 +428,7 @@ DjVuImage::notify_chunk_done(const DjVuPort *, const GUTF8String & name)
        !name.cmp("PMxx", 2) ||
        !name.cmp("BMxx", 2)  ) )
    {
-      DjVuPort::get_portcaster()->notify_retqlayout(this);
+      DjVuPort::get_portcaster()->notify_relayout(this);
       relayout_sent=true;
    } 
    else if (!name.cmp("Sxxx", 1) ||
@@ -461,7 +461,7 @@ public:
   GP<DataPool> request_data(const DjVuPort *src, const GURL & url);
   void notify_chunk_done(const DjVuPort *, const GUTF8String &name);
   void notify_redisplay(const class DjVuImage * source);
-  void notify_retqlayout(const class DjVuImage * source);
+  void notify_relayout(const class DjVuImage * source);
 };
 
 DjVuImageNotifier::DjVuImageNotifier(DjVuInterface *notifier)
@@ -485,10 +485,10 @@ DjVuImageNotifier::notify_redisplay(const class DjVuImage * source)
 }
 
 void 
-DjVuImageNotifier::notify_retqlayout(const class DjVuImage * source)
+DjVuImageNotifier::notify_relayout(const class DjVuImage * source)
 {
   if (notifier)
-    notifier->notify_retqlayout();
+    notifier->notify_relayout();
 }
 
 void 
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
index aabf9ecf..57b40938 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
@@ -123,7 +123,7 @@ class DjVuInterface
 public:
   virtual ~DjVuInterface();
   virtual void notify_chunk(const char *chkid, const char *msg) = 0;
-  virtual void notify_retqlayout(void) = 0;
+  virtual void notify_relayout(void) = 0;
   virtual void notify_redisplay(void) = 0;
 };
 
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
index 8cf9b967..5e8a25c9 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
@@ -557,12 +557,12 @@ DjVuPortcaster::notify_redisplay(const DjVuImage * source)
 }
 
 void
-DjVuPortcaster::notify_retqlayout(const DjVuImage * source)
+DjVuPortcaster::notify_relayout(const DjVuImage * source)
 {
    GPList<DjVuPort> list;
    compute_closure(source, list);
    for(GPosition pos=list; pos; ++pos)
-     list[pos]->notify_retqlayout(source);
+     list[pos]->notify_relayout(source);
 }
 
 void
@@ -626,7 +626,7 @@ void
 DjVuPort::notify_redisplay(const DjVuImage *) {}
 
 void
-DjVuPort::notify_retqlayout(const DjVuImage *) {}
+DjVuPort::notify_relayout(const DjVuImage *) {}
 
 void
 DjVuPort::notify_chunk_done(const DjVuPort *, const GUTF8String &) {}
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h
index 3c742128..99c165fb 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h
@@ -216,7 +216,7 @@ public:
       /** This notification is sent by \ref{DjVuImage} when its geometry
 	  has been changed as a result of decoding. It may be used to
 	  implement progressive redisplay. */
-   virtual void		notify_retqlayout(const class DjVuImage * source);
+   virtual void		notify_relayout(const class DjVuImage * source);
 
       /** This notification is sent when a new chunk has been decoded. */
    virtual void		notify_chunk_done(const DjVuPort * source, const GUTF8String &name);
@@ -448,7 +448,7 @@ public:
       /** Computes destination list for #source# and calls the corresponding
 	  function in each of the ports from the destination list starting from
 	  the closest. */
-   virtual void		notify_retqlayout(const class DjVuImage * source);
+   virtual void		notify_relayout(const class DjVuImage * source);
 
       /** Computes destination list for #source# and calls the corresponding
 	  function in each of the ports from the destination list starting from
diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp
index b7001240..38c0644c 100644
--- a/kviewshell/searchWidget.cpp
+++ b/kviewshell/searchWidget.cpp
@@ -43,34 +43,34 @@ SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl)
 
   setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
 
-  tqlayout = new TQHBoxLayout(this, 4, 6, "SearchWidgetLayout");
+  layout = new TQHBoxLayout(this, 4, 6, "SearchWidgetLayout");
 
   stopButton = new TQPushButton(this, "stopButton");
   stopButton->setPixmap(KGlobal::iconLoader()->loadIcon("stop", KIcon::Small, KIcon::SizeSmall));
-  tqlayout->addWidget(stopButton);
+  layout->addWidget(stopButton);
 
   searchLabel = new TQLabel(this, "searchLabel");
   searchLabel->setText(i18n("Search:"));
-  tqlayout->addWidget(searchLabel);
+  layout->addWidget(searchLabel);
 
   searchText = new KLineEdit(this, "searchText");
-  tqlayout->addWidget(searchText);
+  layout->addWidget(searchText);
 
   searchLabel->setBuddy(searchText);
 
   findPrevButton = new TQPushButton(this, "findPrevButton");
   findPrevButton->setPixmap(KGlobal::iconLoader()->loadIcon("back", KIcon::NoGroup, KIcon::SizeSmall));
   TQToolTip::add(findPrevButton, i18n("Find previous"));
-  tqlayout->addWidget(findPrevButton);
+  layout->addWidget(findPrevButton);
 
   findNextButton = new TQPushButton(this, "findNextButton");
   findNextButton->setPixmap(KGlobal::iconLoader()->loadIcon("forward", KIcon::NoGroup, KIcon::SizeSmall));
   TQToolTip::add(findNextButton, i18n("Find next"));
-  tqlayout->addWidget(findNextButton);
+  layout->addWidget(findNextButton);
 
   caseSensitiveCheckBox = new TQCheckBox(this, "caseSensitiveCheckBox");
   caseSensitiveCheckBox->setText(i18n("Case sensitive"));
-  tqlayout->addWidget(caseSensitiveCheckBox);
+  layout->addWidget(caseSensitiveCheckBox);
 
   connect(stopButton, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(stopSearch()));
 
diff --git a/kviewshell/searchWidget.h b/kviewshell/searchWidget.h
index 1445c22d..72e737a9 100644
--- a/kviewshell/searchWidget.h
+++ b/kviewshell/searchWidget.h
@@ -68,7 +68,7 @@ private:
   TQPushButton* findPrevButton;
   TQCheckBox* caseSensitiveCheckBox;
 
-  TQHBoxLayout* tqlayout;
+  TQHBoxLayout* layout;
 };
 
 #endif
diff --git a/kviewshell/selection.cpp b/kviewshell/selection.cpp
index 50edb80f..4fb0092a 100644
--- a/kviewshell/selection.cpp
+++ b/kviewshell/selection.cpp
@@ -30,8 +30,8 @@ void TextSelection::set(const PageNumber& pageNr, TQ_INT32 start, TQ_INT32 end,
     selectedText = TQString();
 
   if (page != 0) {
-    TQApplication::tqclipboard()->setSelectionMode(true);
-    TQApplication::tqclipboard()->setText(selectedText);
+    TQApplication::clipboard()->setSelectionMode(true);
+    TQApplication::clipboard()->setText(selectedText);
   }
 }
 
@@ -53,8 +53,8 @@ bool TextSelection::operator!= (const TextSelection& s) const
 void TextSelection::copyText() const
 {
   if (!isEmpty()) {
-    TQApplication::tqclipboard()->setSelectionMode(false);
-    TQApplication::tqclipboard()->setText(selectedText);
+    TQApplication::clipboard()->setSelectionMode(false);
+    TQApplication::clipboard()->setText(selectedText);
   }
 }
 
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index b807af2f..edd21412 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -675,7 +675,7 @@ void ImageCanvas::update_scaled_pixmap( void )
     if( scaleKind() == DYNAMIC )
         kdDebug(28000) << "Scaling DYNAMIC" << endl;
     TQSize noSBSize( visibleWidth(), visibleHeight());
-    const int sbWidth = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent );
+    const int sbWidth = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent );
 
     // if( verticalScrollBar()->visible() ) noSBSize.width()+=sbWidth;
     // if( horizontalScrollBar()->visible() ) noSBSize.height()+=sbWidth;
diff --git a/libkscan/kscandoc.h b/libkscan/kscandoc.h
index ca57150a..14f1f2c8 100644
--- a/libkscan/kscandoc.h
+++ b/libkscan/kscandoc.h
@@ -95,7 +95,7 @@ Small dialog which enables scanning source selection, e.g. Flatbed, automatic do
 
 - ScanParams\n
 The ScanParams class is the actual core of the
- KScan Library in terms of interface tqlayout. The ScanParams class provides a ready-to-use interface for the selected scanner.\n
+ KScan Library in terms of interface layout. The ScanParams class provides a ready-to-use interface for the selected scanner.\n
 \n
  The scanner device is analyzed in this class and dynamically generates an interface, according to the device's properties, containing the most important operational elements. These are currently
 
diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp
index 720a5593..cc51e05b 100644
--- a/libkscan/kscanslider.cpp
+++ b/libkscan/kscanslider.cpp
@@ -82,7 +82,7 @@ KScanSlider::KScanSlider( TQWidget *parent, const TQString& text,
     /* set Value 0 to the widget */
     slider->setValue( (int) min -1 );
 
-    /* Add to tqlayout widget and activate */
+    /* Add to layout widget and activate */
     hb->addWidget( slider, 36 );
     hb->addSpacing( 4 );
     hb->addWidget( m_spin, 0 );
diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp
index 0da2140c..93538e34 100644
--- a/libkscan/previewer.cpp
+++ b/libkscan/previewer.cpp
@@ -119,10 +119,10 @@ Previewer::Previewer(TQWidget *parent, const char *name )
     htop->addWidget( frame );
 
     TQVBoxLayout *top = new TQVBoxLayout( frame, KDialog::marginHint(), KDialog::spacingHint() );
-    tqlayout = new TQHBoxLayout( KDialog::spacingHint() );
-    top->addLayout( tqlayout, 9 );
+    layout = new TQHBoxLayout( KDialog::spacingHint() );
+    top->addLayout( layout, 9 );
     TQVBoxLayout *left = new TQVBoxLayout( KDialog::spacingHint() );
-    tqlayout->addLayout( left, 2 );
+    layout->addLayout( left, 2 );
 
     /* Load autoselection values from Config file */
     KConfig *cfg = KGlobal::config();
@@ -142,7 +142,7 @@ Previewer::Previewer(TQWidget *parent, const char *name )
     img_canvas->setDefaultScaleKind( ImageCanvas::DYNAMIC );
     img_canvas->enableContextMenu(true);
     img_canvas->repaint();
-    tqlayout->addWidget( img_canvas, 6 );
+    layout->addWidget( img_canvas, 6 );
 
     /* Actions for the previewer zoom */
     KAction *act;
diff --git a/libkscan/previewer.h b/libkscan/previewer.h
index b1400e3a..7492604b 100644
--- a/libkscan/previewer.h
+++ b/libkscan/previewer.h
@@ -89,7 +89,7 @@ private:
 
     TQPoint calcPercent( int, int );
 
-    TQHBoxLayout *tqlayout;
+    TQHBoxLayout *layout;
     ImageCanvas *img_canvas;
     TQComboBox   *pre_format_combo;
     TQMemArray<TQCString> format_ids;
diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp
index 422eed4a..636b96df 100644
--- a/libkscan/scanparams.cpp
+++ b/libkscan/scanparams.cpp
@@ -111,7 +111,7 @@ bool ScanParams::connectDevice( KScanDevice *newScanDevice )
    /* initialise own widgets */
    cb_gray_preview = 0;
 
-   /* A top tqlayout box */
+   /* A top layout box */
    // TQVBoxLayout *top = new TQVBoxLayout(this, 6);
    TQHBox *hb = new TQHBox( this );
    hb->setSpacing( KDialog::spacingHint() );
@@ -160,7 +160,7 @@ bool ScanParams::connectDevice( KScanDevice *newScanDevice )
    connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slStartScan()) );
    pb = kbb->addButton( i18n( "&Preview Scan" ));
    connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slAcquirePreview()) );
-   kbb->tqlayout();
+   kbb->layout();
 
    /* Initialise the progress dialog */
    progressDialog = new TQProgressDialog( i18n("Scanning in progress"),