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

695 files changed, 3868 insertions, 3868 deletions

diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index fe4739de..d57a7ec3 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -21,7 +21,7 @@
 
 */
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kgenericfactory.h>
 #include <ksimpleconfig.h>
@@ -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);
 	
@@ -113,7 +113,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
 	connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)),
 		TQT_SLOT(slot_deviceSelected(TQIconViewItem *)));
 
-	m_deviceSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+	m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	
 	// create actions
 	KAction *act;
diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp
index 17a2c249..0cc21d44 100644
--- a/kamera/kcontrol/kameraconfigdialog.cpp
+++ b/kamera/kcontrol/kameraconfigdialog.cpp
@@ -20,7 +20,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 */
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgrid.h>
 #include <tqlabel.h>
 #include <tqvgroupbox.h>
@@ -221,14 +221,14 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
 		return;
 	}
 
-	// Append all this widgets tqchildren
+	// Append all this widgets children
 	for(int i = 0; i < gp_widget_count_children(widget); ++i) {
 		CameraWidget *widget_child;
 		gp_widget_get_child(widget, i, &widget_child);
 		appendWidget(newParent, widget_child);
 	}
 	
-	// Things that must be done after all tqchildren were added
+	// Things that must be done after all children were added
 /*
 	switch (widget_type) {
 	case GP_WIDGET_SECTION:
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 9ce6deae..6182eec4 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -20,7 +20,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 */
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidgetstack.h>
 #include <tqvbuttongroup.h>
 #include <tqvgroupbox.h>
@@ -86,7 +86,7 @@ bool KCamera::initInformation()
 	int index = gp_abilities_list_lookup_model(m_abilitylist, m_model.local8Bit().data());
 	if(index < 0) {
 		emit error(i18n("Description of abilities for camera %1 is not available."
-					" Configuration options may be incorrect.").tqarg(m_model));
+					" Configuration options may be incorrect.").arg(m_model));
 		return false;
 	}
         gp_abilities_list_get_abilities(m_abilitylist, index, &m_abilities);
@@ -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
@@ -293,7 +293,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
 	connect(m_modelSel, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
         TQT_SLOT(slot_setModel(TQListViewItem *)));
 	// make sure listview only as wide as it needs to be
-	m_modelSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
+	m_modelSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
 		TQSizePolicy::Preferred));
 
 	TQVBoxLayout *rightLayout = new TQVBoxLayout(0L, 0, KDialog::spacingHint());
@@ -347,7 +347,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
 	for (int i = 0; i < gphoto_ports; i++) {
 		if (gp_port_info_list_get_info(list, i, &info) >= 0) {
 			if (strncmp(info.path, "serial:", 7) == 0)
-				m_serialPortCombo->insertItem(TQString::tqfromLatin1(info.path).mid(7));
+				m_serialPortCombo->insertItem(TQString::fromLatin1(info.path).mid(7));
 		}
 	}
 	gp_port_info_list_free(list);
@@ -432,7 +432,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
 	int index = gp_abilities_list_lookup_model(m_device->m_abilitylist, model.local8Bit().data());
 	if(index < 0) {
 		slot_error(i18n("Description of abilities for camera %1 is not available."
-				" Configuration options may be incorrect.").tqarg(model));
+				" Configuration options may be incorrect.").arg(model));
 	}
 	int result = gp_abilities_list_get_abilities(m_device->m_abilitylist, index, &abilities);
 	if (result == GP_OK) {
@@ -452,7 +452,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
 			setPortType(INDEX_USB);
 	} else {
 		slot_error(i18n("Description of abilities for camera %1 is not available."
-			     " Configuration options may be incorrect.").tqarg(model));
+			     " Configuration options may be incorrect.").arg(model));
 	}
 }
 
diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp
index 7e8c9387..b70e9241 100644
--- a/kamera/kioslave/kamera.cpp
+++ b/kamera/kioslave/kamera.cpp
@@ -30,7 +30,7 @@
 #include <errno.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kdebug.h>
 #include <kinstance.h>
@@ -55,7 +55,7 @@ extern "C"
 {
 	KDE_EXPORT int kdemain(int argc, char **argv);
 
-	static void frontendCameratqStatus(GPContext *context, const char *format, va_list args, void *data);
+	static void frontendCameraStatus(GPContext *context, const char *format, va_list args, void *data);
 	static unsigned int frontendProgressStart(
 		GPContext *context, float totalsize, const char *format,
 		va_list args, void *data
@@ -242,7 +242,7 @@ void KameraProtocol::get(const KURL &url)
 
 #undef GPHOTO_TEXT_FILE
 	// emit info message
-	infoMessage( i18n("Retrieving data from camera <b>%1</b>").tqarg(url.user()) );
+	infoMessage( i18n("Retrieving data from camera <b>%1</b>").arg(url.user()) );
 
 	// Note: There's no need to re-read directory for each get() anymore
 	gp_file_new(&m_file);
@@ -795,7 +795,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use
 		}
 
 		// register gphoto2 callback functions
-		gp_context_set_status_func(m_context, frontendCameratqStatus, this);
+		gp_context_set_status_func(m_context, frontendCameraStatus, this);
 		gp_context_set_progress_funcs(m_context, frontendProgressStart, frontendProgressUpdate, NULL, this);
 		// gp_camera_set_message_func(m_camera, ..., this)
 
@@ -881,7 +881,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo
 
 	if (info.file.fields & GP_FILE_INFO_TYPE) {
 		atom.m_uds = UDS_MIME_TYPE;
-		atom.m_str = TQString::tqfromLatin1(info.file.type);
+		atom.m_str = TQString::fromLatin1(info.file.type);
 		udsEntry.append(atom);
 	}
 
@@ -1028,7 +1028,7 @@ unsigned int frontendProgressStart(
 }
 
 // this callback function is activated on every status message from gphoto2
-static void frontendCameratqStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
+static void frontendCameraStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
 {
 	KameraProtocol *object = (KameraProtocol*)data;
 	char *status;
diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp
index acf1fd06..117259ab 100644
--- a/kcoloredit/colorselector.cpp
+++ b/kcoloredit/colorselector.cpp
@@ -17,7 +17,7 @@
 
 #include <math.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 /* #include <tqtabwidget.h> */
 #include <tqradiobutton.h>
 #include <tqlabel.h>
@@ -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..749c5464 100644
--- a/kcoloredit/gradientselection.cpp
+++ b/kcoloredit/gradientselection.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqradiobutton.h>
 #include <tqcolor.h>
@@ -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/kcoloredit.h b/kcoloredit/kcoloredit.h
index e09fd415..675cddb0 100644
--- a/kcoloredit/kcoloredit.h
+++ b/kcoloredit/kcoloredit.h
@@ -74,7 +74,7 @@ class KColorEditApp : public KMainWindow
     KColorEditDoc *document() const;
 
   protected:
-    /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
+    /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
      * file
      */
     void saveOptions();
diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp
index 0669380b..f4c2f1e9 100644
--- a/kcoloredit/kcoloreditdoc.cpp
+++ b/kcoloredit/kcoloreditdoc.cpp
@@ -19,7 +19,7 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqwidget.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 // include files for KDE
 #include <klocale.h>
@@ -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..89b84e6f 100644
--- a/kcoloredit/kcoloreditview.cpp
+++ b/kcoloredit/kcoloreditview.cpp
@@ -17,7 +17,7 @@
 
 // include files for TQt
 #include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqvgroupbox.h>
 #include <tqlineedit.h>
@@ -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/kxycolorselector.cpp b/kcoloredit/kxycolorselector.cpp
index 68df676d..e6c0e6ef 100644
--- a/kcoloredit/kxycolorselector.cpp
+++ b/kcoloredit/kxycolorselector.cpp
@@ -42,7 +42,7 @@ void KXYColorSelector::setType(const int type) {
 
 void KXYColorSelector::updateContents() {
 	drawPalette(&pixmap);
-	tqrepaint();
+	repaint();
 }
 
 void KXYColorSelector::resizeEvent(TQResizeEvent*) {
diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp
index c705cad0..bb4a3c23 100644
--- a/kcoloredit/kzcolorselector.cpp
+++ b/kcoloredit/kzcolorselector.cpp
@@ -53,7 +53,7 @@ void KZColorSelector::setType(const int type) {
 
 void KZColorSelector::updateContents() {
 	drawPalette(&pixmap);
-	tqrepaint(false);
+	repaint(false);
 }
 
 void KZColorSelector::resizeEvent(TQResizeEvent*) {
diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp
index 23def4d5..d7ac54aa 100644
--- a/kcoloredit/loadpalettedlg.cpp
+++ b/kcoloredit/loadpalettedlg.cpp
@@ -17,7 +17,7 @@
 
 #include <string.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kcoloredit/palette.cpp b/kcoloredit/palette.cpp
index 42758b41..5745d824 100644
--- a/kcoloredit/palette.cpp
+++ b/kcoloredit/palette.cpp
@@ -17,7 +17,7 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kcoloredit/palette.h b/kcoloredit/palette.h
index a363ada4..ccba9a6f 100644
--- a/kcoloredit/palette.h
+++ b/kcoloredit/palette.h
@@ -19,7 +19,7 @@
 #define PALETTE_H
 
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 
 #include "color.h"
diff --git a/kcoloredit/paletteview.cpp b/kcoloredit/paletteview.cpp
index 52e8b4be..7d932c4f 100644
--- a/kcoloredit/paletteview.cpp
+++ b/kcoloredit/paletteview.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "kcoloreditview.h"
 #include "paletteview.h"
diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp
index 63cb3f9b..23bd280c 100644
--- a/kcoloredit/paletteviewscrolledarea.cpp
+++ b/kcoloredit/paletteviewscrolledarea.cpp
@@ -19,7 +19,7 @@
 #include <tqptrlist.h>
 #include <tqcolor.h>
 #include <tqcursor.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqpen.h>
@@ -77,7 +77,7 @@ void PaletteViewScrolledArea::redraw() {
 }
 
 void PaletteViewScrolledArea::repaintPalette() {
-	tqrepaint(false);
+	repaint(false);
 }
 
 void PaletteViewScrolledArea::checkSelectionAutoScroll(const int mousePosY) {
@@ -220,7 +220,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
 	setCellsSizes();
 	TQPixmap pixmap(size());
 	TQPainter painter;
-	painter.tqbegin(TQT_TQPAINTDEVICE(&pixmap), this);
+	painter.begin(TQT_TQPAINTDEVICE(&pixmap), this);
 	TQFontMetrics fontMetrics = painter.fontMetrics();
 	int maxLineWidth;
 	if(viewColorNames) {
@@ -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 selectedBackgroundBrush(TQFrame::tqpalette().active().highlight());
+        TQBrush( TQFrame::palette().active().base() ));
+	TQBrush normalBackgroundBrush(TQFrame::palette().active().background());
+	TQBrush selectedBackgroundBrush(TQFrame::palette().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..776b81f3 100644
--- a/kcoloredit/texteditselection.h
+++ b/kcoloredit/texteditselection.h
@@ -20,7 +20,7 @@
 
 #include <tqwidget.h>
 #include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "color.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.cpp b/kdvi/TeXFontDefinition.cpp
index c89aa59d..49ddcaa0 100644
--- a/kdvi/TeXFontDefinition.cpp
+++ b/kdvi/TeXFontDefinition.cpp
@@ -105,7 +105,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
     TQString filename_test(font_pool->getExtraSearchPath() + "/" + filename);
     file = fopen( TQFile::encodeName(filename_test), "r");
     if (file == 0) {
-      kdError(4300) << i18n("Cannot find font %1, file %2.").tqarg(fontname).tqarg(filename) << endl;
+      kdError(4300) << i18n("Cannot find font %1, file %2.").arg(fontname).arg(filename) << endl;
       return;
     } else
       filename = filename_test;
@@ -121,7 +121,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
       font = new TeXFont_PK(this);
       set_char_p = &dviRenderer::set_char;
       if ((checksum != 0) && (checksum != font->checksum)) 
-	kdWarning(4300) << i18n("Checksum mismatch for font file %1").tqarg(filename) << endl;
+	kdWarning(4300) << i18n("Checksum mismatch for font file %1").arg(filename) << endl;
       fontTypeName = "TeX PK";
       return;
     }
@@ -169,7 +169,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
 #else
   // If we don't have the FreeType library, we should never have
   // reached this point. Complain, and leave this font blank
-  kdError(4300) << i18n("Cannot recognize format for font file %1").tqarg(filename) << endl;
+  kdError(4300) << i18n("Cannot recognize format for font file %1").arg(filename) << endl;
 #endif
 }
 
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/kdvi/TeXFont_PFB.cpp b/kdvi/TeXFont_PFB.cpp
index 45c76512..d2c74e27 100644
--- a/kdvi/TeXFont_PFB.cpp
+++ b/kdvi/TeXFont_PFB.cpp
@@ -41,13 +41,13 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
   int error = FT_New_Face( parent->font_pool->FreeType_library, parent->filename.local8Bit(), 0, &face );
   
   if ( error == FT_Err_Unknown_File_Format ) {
-    errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").tqarg(parent->filename);
+    errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").arg(parent->filename);
     kdError(4300) << errorMessage << endl;
     fatalErrorInFontLoading = true;
     return;
   } else 
     if ( error ) {
-      errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").tqarg(parent->filename);
+      errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").arg(parent->filename);
       kdError(4300) << errorMessage << endl;
       fatalErrorInFontLoading = true;
       return;
@@ -74,8 +74,8 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
   // TeX is only able to address character codes 0-255 while
   // e.g. Type1 fonts may contain several thousands of characters)
   if (enc != 0) {
-    parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "Encoding" ));
-    parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" ));
+    parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "Encoding" ));
+    parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "encoding" ));
 
     // An encoding vector is given for this font, i.e. an array of
     // character names (such as: 'parenleft' or 'dotlessj'). We use
@@ -168,7 +168,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
     long int characterSize_in_printers_points_by_64 = (long int)((64.0*72.0*parent->scaled_size_in_DVI_units*parent->font_pool->getCMperDVIunit())/2.54 + 0.5 ); 
     error = FT_Set_Char_Size(face, 0, characterSize_in_printers_points_by_64, res, res );
     if (error) {
-      TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").tqarg(parent->filename);
+      TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").arg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;
@@ -184,7 +184,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
       error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_HINTING );
 
     if (error) {
-      TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
+      TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;
@@ -196,7 +196,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
     // convert to an anti-aliased bitmap
     error = FT_Render_Glyph( face->glyph, ft_render_mode_normal );
     if (error) {
-      TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
+      TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;
@@ -209,8 +209,8 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
 
     if ((slot->bitmap.width == 0) || (slot->bitmap.rows == 0)) {
       if (errorMessage.isEmpty())
-	errorMessage = i18n("Glyph #%1 is empty.").tqarg(ch);
-      kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").tqarg(ch).tqarg(parent->filename) << endl;
+	errorMessage = i18n("Glyph #%1 is empty.").arg(ch);
+      kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").arg(ch).arg(parent->filename) << endl;
       g->shrunkenCharacter.resize( 15, 15 );
       g->shrunkenCharacter.fill(TQColor(255, 0, 0));
       g->x2 = 0;
@@ -279,7 +279,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
   if (g->dvi_advance_in_units_of_design_size_by_2e20 == 0) {
     int error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_SCALE);
     if (error) {
-      TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
+      TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;
diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp
index f678df9b..e2597971 100644
--- a/kdvi/TeXFont_PK.cpp
+++ b/kdvi/TeXFont_PK.cpp
@@ -91,7 +91,7 @@ TeXFont_PK::TeXFont_PK(TeXFontDefinition *parent)
     characterBitmaps[i] = 0;
   file = fopen(TQFile::encodeName(parent->filename), "r");
   if (file == 0) 
-    kdError(4300) << i18n("Cannot open font file %1.").tqarg(parent->filename) << endl;
+    kdError(4300) << i18n("Cannot open font file %1.").arg(parent->filename) << endl;
 #ifdef DEBUG_PK
   else
     kdDebug(4300) << "TeXFont_PK::TeXFont_PK(): file opened successfully" << endl;
@@ -136,7 +136,7 @@ glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQ
     // If the character is not defined in the PK file, mark the
     // character as missing, and print an error message
     if (g->addr == 0) {
-      kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").tqarg(ch).tqarg(parent->filename) << endl;
+      kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").arg(ch).arg(parent->filename) << endl;
       g->addr = -1;
       return g;
     }
@@ -454,7 +454,7 @@ void TeXFont_PK::PK_skip_specials()
       case PK_NOOP :
 	break;
       default :
-	oops(i18n("Unexpected %1 in PK file %2").tqarg(PK_flag_byte).tqarg(parent->filename) );
+	oops(i18n("Unexpected %1 in PK file %2").arg(PK_flag_byte).arg(parent->filename) );
 	break;
       }
     }
@@ -521,7 +521,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
     w = num(fp, n);
     h = num(fp, n);
     if (w > 0x7fff || h > 0x7fff)
-      oops(i18n("The character %1 is too large in file %2").tqarg(ch).tqarg(parent->filename));
+      oops(i18n("The character %1 is too large in file %2").arg(ch).arg(parent->filename));
     characterBitmaps[ch]->w = w;
     characterBitmaps[ch]->h = h;
   }
@@ -626,9 +626,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	paint_switch = 1 - paint_switch;
       }
       if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
-	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(parent->filename));
+	oops(i18n("Wrong number of bits stored:  char. %1, font %2").arg(ch).arg(parent->filename));
       if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
-	oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
+	oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename));
     }
     
     // The data in the bitmap is now in the processor's bit order,
@@ -712,9 +712,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	paint_switch = 1 - paint_switch;
       }
       if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
-	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(parent->filename));
+	oops(i18n("Wrong number of bits stored:  char. %1, font %2").arg(ch).arg(parent->filename));
       if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
-	oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
+	oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename));
     }
   } // endif: big or small Endian?
 }
diff --git a/kdvi/dviFile.cpp b/kdvi/dviFile.cpp
index 33dc601d..b3937265 100644
--- a/kdvi/dviFile.cpp
+++ b/kdvi/dviFile.cpp
@@ -256,7 +256,7 @@ void dvifile::prepare_pages()
    while (i > 0) {
     command_pointer  = dvi_Data() + page_offset[i--];
     if (readUINT8() != BOP) {
-      errorMsg = i18n("The page %1 does not start with the BOP command.").tqarg(i+1);
+      errorMsg = i18n("The page %1 does not start with the BOP command.").arg(i+1);
       return;
     }
     command_pointer += 10 * 4;
diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp
index acb3dceb..b42135eb 100644
--- a/kdvi/dviRenderer.cpp
+++ b/kdvi/dviRenderer.cpp
@@ -15,11 +15,11 @@
 #include <string.h>
 
 #include <tqcheckbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcursor.h>
 #include <tqlabel.h>
 #include <tqfileinfo.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmessagebox.h>
 #include <tqpaintdevice.h>
 #include <tqpainter.h>
@@ -277,7 +277,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
     TQLabel *label2 = new TQLabel( i18n("<qt>This DVI file contains source file information. You may click into the text with the "
 				      "middle mouse button, and an editor will open the TeX-source file immediately.</qt>"),
 				 contents);
-    label2->setMinimumSize(label2->tqsizeHint());
+    label2->setMinimumSize(label2->sizeHint());
     lay->add( label2 );
     lay->addStretch(1);
     TQSize extraSize = TQSize(50,30);
@@ -437,7 +437,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
   if (!fi.exists() || fi.isDir()) {
     KMessageBox::error( parentWidget,
 			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist. "
-			     "KDVI already tried to add the ending '.dvi'.</qt>").tqarg(filename),
+			     "KDVI already tried to add the ending '.dvi'.</qt>").arg(filename),
 			i18n("File Error!"));
     return false;
   }
@@ -451,8 +451,8 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
     KMessageBox::sorry( parentWidget,
 			i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr> which has "
 			      "type <strong>%2</strong>. KDVI can only load DVI (.dvi) files.</qt>" )
-			.tqarg( fname )
-			.tqarg( mimetype ) );
+			.arg( fname )
+			.arg( mimetype ) );
     return false;
   }
   
@@ -462,7 +462,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
     KMessageBox::sorry( parentWidget,
                         i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
                              "likely this means that the DVI file is broken.</qt>")
-                        .tqarg( fname ) );
+                        .arg( fname ) );
     return false;
   }
 
@@ -641,7 +641,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
 				    "line %1 in the TeX-file <strong>%2</strong>. It seems, however, that the DVI file "
 				    "does not contain the necessary source file information. "
 				    "We refer to the manual of KDVI for a detailed explanation on how to include this "
-				    "information. Press the F1 key to open the manual.</qt>").tqarg(refLineNumber).tqarg(refFileName),
+				    "information. Press the F1 key to open the manual.</qt>").arg(refLineNumber).arg(refFileName),
 			 i18n("Could Not Find Reference"));
       mutex.unlock();
       return Anchor();
@@ -681,7 +681,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
     } else
       if (anchorForRefFileFound == false)
 	KMessageBox::sorry(parentWidget, i18n("<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
-					      "line %1 in the TeX-file <strong>%2</strong>.</qt>").tqarg(refLineNumber).tqarg(refFileName),
+					      "line %1 in the TeX-file <strong>%2</strong>.</qt>").arg(refLineNumber).arg(refFileName),
 			   i18n( "Could Not Find Reference" ));
       else {
 	mutex.unlock();
@@ -735,7 +735,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
   {
       KMessageBox::sorry(parentWidget, TQString("<qt>") +
 			 i18n("The DVI-file refers to the TeX-file "
-			      "<strong>%1</strong> which could not be found.").tqarg(KShellProcess::quote(TeXfile)) +
+			      "<strong>%1</strong> which could not be found.").arg(KShellProcess::quote(TeXfile)) +
 			 TQString("</qt>"),
 			 i18n( "Could Not Find File" ));
       return;
@@ -786,7 +786,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
 			    "for inverse search, reported an error. You might wish to look at the <strong>document info "
 			    "dialog</strong> which you will find in the File-Menu for a precise error report. The "
 			    "manual for KDVI contains a detailed explanation how to set up your editor for use with KDVI, "
-			    "and a list of common problems.</qt>").tqarg(command);
+			    "and a list of common problems.</qt>").arg(command);
   
   info->clear(i18n("Starting the editor..."));
   
diff --git a/kdvi/dviRenderer_draw.cpp b/kdvi/dviRenderer_draw.cpp
index 2031fcd7..050396e9 100644
--- a/kdvi/dviRenderer_draw.cpp
+++ b/kdvi/dviRenderer_draw.cpp
@@ -292,7 +292,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
       if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
 	currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
 	if (currinf.fontp == NULL) {
-	  errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
+	  errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0);
 	  return;
 	}
 	currinf.set_char_p = currinf.fontp->set_char_p;
@@ -567,7 +567,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
 	  break;
 	  
 	default:
-	  errorMsg = i18n("The unknown op-code %1 was encountered.").tqarg(ch);
+	  errorMsg = i18n("The unknown op-code %1 was encountered.").arg(ch);
 	  return;
 	} /* end switch*/
       } /* end else (ch not a SETCHAR or FNTNUM) */
diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp
index 110aaacb..2b4ffd65 100644
--- a/kdvi/dviRenderer_export.cpp
+++ b/kdvi/dviRenderer_export.cpp
@@ -101,7 +101,7 @@ void dviRenderer::exportPDF()
     return;
   TQFileInfo finfo(fileName);
   if (finfo.exists()) {
-    int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
+    int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
 				       i18n("Overwrite File"), i18n("Overwrite"));
     if (r == KMessageBox::Cancel)
       return;
@@ -137,12 +137,12 @@ void dviRenderer::exportPDF()
   export_errorString = i18n("<qt>The external program 'dvipdf', which was used to export the file, reported an error. "
 			    "You might wish to look at the <strong>document info dialog</strong> which you will "
 			    "find in the File-Menu for a precise error report.</qt>") ;
-  info->clear(i18n("Export: %1 to PDF").tqarg(KShellProcess::quote(dviFile->filename)));
+  info->clear(i18n("Export: %1 to PDF").arg(KShellProcess::quote(dviFile->filename)));
 
   proc->clearArguments();
   finfo.setFile(dviFile->filename);
-  *proc << TQString("cd %1; dvipdfm").tqarg(KShellProcess::quote(finfo.dirPath(true)));
-  *proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
+  *proc << TQString("cd %1; dvipdfm").arg(KShellProcess::quote(finfo.dirPath(true)));
+  *proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
   *proc << KShellProcess::quote(dviFile->filename);
   proc->closeStdin();
   if (proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) {
@@ -200,7 +200,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
       return;
     TQFileInfo finfo(fileName);
     if (finfo.exists()) {
-      int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
+      int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
 					 i18n("Overwrite File"));
       if (r == KMessageBox::No)
 	return;
@@ -300,17 +300,17 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
   export_errorString = i18n("<qt>The external program 'dvips', which was used to export the file, reported an error. "
 			    "You might wish to look at the <strong>document info dialog</strong> which you will "
 			    "find in the File-Menu for a precise error report.</qt>") ;
-  info->clear(i18n("Export: %1 to PostScript").tqarg(KShellProcess::quote(dviFile->filename)));
+  info->clear(i18n("Export: %1 to PostScript").arg(KShellProcess::quote(dviFile->filename)));
   
   proc->clearArguments();
   TQFileInfo finfo(dviFile->filename);
-  *proc << TQString("cd %1; dvips").tqarg(KShellProcess::quote(finfo.dirPath(true)));
+  *proc << TQString("cd %1; dvips").arg(KShellProcess::quote(finfo.dirPath(true)));
   if (printer == 0)
     *proc << "-z"; // export Hyperlinks
   if (options.isEmpty() == false)
     *proc << options;
-  *proc << TQString("%1").tqarg(KShellProcess::quote(sourceFileName));
-  *proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
+  *proc << TQString("%1").arg(KShellProcess::quote(sourceFileName));
+  *proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
   proc->closeStdin();
   if (proc->start(KProcess::NotifyOnExit, KProcess::Stderr) == false) {
     kdError(4300) << "dvips failed to start" << endl;
diff --git a/kdvi/dviRenderer_prescan.cpp b/kdvi/dviRenderer_prescan.cpp
index 7cfd2415..81a3b40f 100644
--- a/kdvi/dviRenderer_prescan.cpp
+++ b/kdvi/dviRenderer_prescan.cpp
@@ -84,7 +84,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
 
   TQString originalFName = EPSfilename;
 
-  embedPS_progress->setLabel(i18n("Embedding %1").tqarg(EPSfilename));  
+  embedPS_progress->setLabel(i18n("Embedding %1").arg(EPSfilename));  
   tqApp->processEvents();
 
   
@@ -102,7 +102,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
     for(page=0; page < dviFile->total_pages; page++) 
       if ((dviFile->page_offset[page] <= currentOffset) && (currentOffset <= dviFile->page_offset[page+1]))
 	break;
-    errorMsg += i18n("Page %1: The PostScript file <strong>%2</strong> could not be found.<br>").tqarg(page+1).tqarg(originalFName);
+    errorMsg += i18n("Page %1: The PostScript file <strong>%2</strong> could not be found.<br>").arg(page+1).arg(originalFName);
     embedPS_progress->progressBar()->advance(1);
     tqApp->processEvents();
     return;
@@ -131,13 +131,13 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
   int clip=include_command.find(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
 
   // Generate the PostScript commands to be included
-  TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury);
+  TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").arg(llx).arg(lly).arg(urx).arg(ury);
   if (rwi != 0)
-    PS.append( TQString(" %1 @rwi").tqarg(rwi) );
+    PS.append( TQString(" %1 @rwi").arg(rwi) );
   if (rhi != 0)
-    PS.append( TQString(" %1 @rhi").tqarg(rhi) );
+    PS.append( TQString(" %1 @rhi").arg(rhi) );
   if (angle != 0)
-    PS.append( TQString(" %1 @angle").tqarg(angle) );
+    PS.append( TQString(" %1 @angle").arg(angle) );
   if (clip != -1)
     PS.append(" @clip");
   PS.append( " @setspecial\n" );
@@ -252,7 +252,7 @@ void dviRenderer::prescan_ParsePapersizeSpecial(const TQString& _cp)
     dviFile->suggestedPageSize = new pageSize;
     dviFile->suggestedPageSize->setPageSize(cp);
   } else 
-    printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").tqarg(cp));
+    printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").arg(cp));
 
   return;
 }
@@ -297,7 +297,7 @@ void dviRenderer::prescan_ParsePSHeaderSpecial(const TQString& cp)
   }
   
   if (TQFile::exists(_file))
-    PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").tqarg(_file) );
+    PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").arg(_file) );
 }
 
 
@@ -321,7 +321,7 @@ void dviRenderer::prescan_ParsePSQuoteSpecial(const TQString& cp)
   
   double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
   double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
-  PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
+  PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
   PostScriptOutPutString->append( " @beginspecial @setspecial \n" );
   PostScriptOutPutString->append( cp );
   PostScriptOutPutString->append( " @endspecial \n" );
@@ -375,17 +375,17 @@ void dviRenderer::prescan_ParsePSSpecial(const TQString& cp)
   double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
   
   if (cp.find("ps::[begin]", 0, false) == 0) {
-    PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
-    PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(11)) );
+    PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
+    PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(11)) );
   } else {
     if (cp.find("ps::[end]", 0, false) == 0) {
-      PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(9)) );
+      PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(9)) );
     } else {
       if (cp.find("ps::", 0, false) == 0) {
-	PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(4)) );
+	PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(4)) );
       } else {
-	PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
-	PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(3)) );
+	PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
+	PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(3)) );
       }
     }
   }
@@ -459,22 +459,22 @@ void dviRenderer::prescan_ParsePSFileSpecial(const TQString& cp)
   if (TQFile::exists(EPSfilename)) {
     double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
     double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
-    PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
+    PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
     PostScriptOutPutString->append( "@beginspecial " );
-    PostScriptOutPutString->append( TQString(" %1 @llx").tqarg(llx) );
-    PostScriptOutPutString->append( TQString(" %1 @lly").tqarg(lly) );
-    PostScriptOutPutString->append( TQString(" %1 @urx").tqarg(urx) );
-    PostScriptOutPutString->append( TQString(" %1 @ury").tqarg(ury) );
+    PostScriptOutPutString->append( TQString(" %1 @llx").arg(llx) );
+    PostScriptOutPutString->append( TQString(" %1 @lly").arg(lly) );
+    PostScriptOutPutString->append( TQString(" %1 @urx").arg(urx) );
+    PostScriptOutPutString->append( TQString(" %1 @ury").arg(ury) );
     if (rwi != 0)
-      PostScriptOutPutString->append( TQString(" %1 @rwi").tqarg(rwi) );
+      PostScriptOutPutString->append( TQString(" %1 @rwi").arg(rwi) );
     if (rhi != 0)
-      PostScriptOutPutString->append( TQString(" %1 @rhi").tqarg(rhi) );
+      PostScriptOutPutString->append( TQString(" %1 @rhi").arg(rhi) );
     if (angle != 0)
-      PostScriptOutPutString->append( TQString(" %1 @angle").tqarg(angle) );
+      PostScriptOutPutString->append( TQString(" %1 @angle").arg(angle) );
     if (clip != -1)
       PostScriptOutPutString->append(" @clip");
     PostScriptOutPutString->append( " @setspecial \n" );
-    PostScriptOutPutString->append( TQString(" (%1) run\n").tqarg(EPSfilename) );
+    PostScriptOutPutString->append( TQString(" (%1) run\n").arg(EPSfilename) );
     PostScriptOutPutString->append( "@endspecial \n" );
   }
   
@@ -633,7 +633,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
     if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
       currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
       if (currinf.fontp == NULL) {
-	errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
+	errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0);
 	return;
       }
       currinf.set_char_p = currinf.fontp->set_char_p;
diff --git a/kdvi/dviWidget.cpp b/kdvi/dviWidget.cpp
index a0f43da3..ded6e6cb 100644
--- a/kdvi/dviWidget.cpp
+++ b/kdvi/dviWidget.cpp
@@ -112,7 +112,7 @@ void DVIWidget::mouseMoveEvent(TQMouseEvent* e)
 	  if (cp[i].isDigit() == false)
 	    break;
 	
-	emit setStatusBarText( i18n("line %1 of %2").tqarg(cp.left(i)).tqarg(cp.mid(i).simplifyWhiteSpace()) );
+	emit setStatusBarText( i18n("line %1 of %2").arg(cp.left(i)).arg(cp.mid(i).simplifyWhiteSpace()) );
 	return;
       }
     }
diff --git a/kdvi/fontEncoding.cpp b/kdvi/fontEncoding.cpp
index 62905030..9f2d4de2 100644
--- a/kdvi/fontEncoding.cpp
+++ b/kdvi/fontEncoding.cpp
@@ -36,7 +36,7 @@ fontEncoding::fontEncoding(const TQString &encName)
   encFileName = encFileName.stripWhiteSpace();
 
   if (encFileName.isEmpty()) {
-    kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").tqarg(encName) << endl;
+    kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").arg(encName) << endl;
     return;
   }
 
@@ -76,7 +76,7 @@ fontEncoding::fontEncoding(const TQString &encName)
     for(; i<256; i++)
       glyphNameVector[i] = ".notdef";
   } else {
-    kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").tqarg(encFileName) << endl;
+    kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").arg(encFileName) << endl;
     return;
   }
 
diff --git a/kdvi/fontEncoding.h b/kdvi/fontEncoding.h
index 95eb4dd0..8ce0d18b 100644
--- a/kdvi/fontEncoding.h
+++ b/kdvi/fontEncoding.h
@@ -20,7 +20,7 @@
  * MetaFont fonts. A DVI file referres to a MetaFont font by giving an
  * at-most-8-character name, such as 'cmr10'. The DVI previewer would
  * then locate the associated PK font file (e.g. cmr10.600pk), load
- * it, and retrieve the character tqshaped.
+ * it, and retrieve the character shaped.
  *
  * Today TeX is also used to access Type1 and TrueType fonts, which it
  * was never designed to do. As in the case of MetaFont font, the DVI
diff --git a/kdvi/fontMap.cpp b/kdvi/fontMap.cpp
index 7dec6f4f..8cbe4a0e 100644
--- a/kdvi/fontMap.cpp
+++ b/kdvi/fontMap.cpp
@@ -98,7 +98,7 @@ fontMap::fontMap()
     }
     file.close();
   } else
-    kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").tqarg(map_fileName) << endl;
+    kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").arg(map_fileName) << endl;
   
 #ifdef DEBUG_FONTMAP
   kdDebug(4300) << "FontMap file parsed. Results:" << endl;
diff --git a/kdvi/fontMap.h b/kdvi/fontMap.h
index da80b72a..4e02f742 100644
--- a/kdvi/fontMap.h
+++ b/kdvi/fontMap.h
@@ -55,7 +55,7 @@ class fontMapEntry {
  * Long time ago, when TeX was only used with MetaFont fonts, the DVI
  * file would specify a font by giving an 8-character name, such as
  * 'cmr10'. The DVI previewer would then locate the associated PK font
- * file, load it, and retrieve the character tqshaped. Happy times, they
+ * file, load it, and retrieve the character shaped. Happy times, they
  * were.
  *
  * Today TeX is also used to access Type1 and TrueType fonts, which do
diff --git a/kdvi/fontpool.cpp b/kdvi/fontpool.cpp
index 8cd35df7..463d123b 100644
--- a/kdvi/fontpool.cpp
+++ b/kdvi/fontpool.cpp
@@ -187,12 +187,12 @@ TQString fontPool::status()
 
   text.append("<table WIDTH=\"100%\" NOSAVE >");
   text.append( TQString("<tr><td><b>%1</b></td> <td><b>%2</b></td> <td><b>%3</b></td> <td><b>%4</b> <td><b>%5</b></td> <td><b>%6</b></td></tr>")
-	       .tqarg(i18n("TeX Name"))
-	       .tqarg(i18n("Family"))
-	       .tqarg(i18n("Zoom"))
-	       .tqarg(i18n("Type"))
-	       .tqarg(i18n("Encoding"))
-	       .tqarg(i18n("Comment")) );
+	       .arg(i18n("TeX Name"))
+	       .arg(i18n("Family"))
+	       .arg(i18n("Zoom"))
+	       .arg(i18n("Type"))
+	       .arg(i18n("Encoding"))
+	       .arg(i18n("Comment")) );
 
  TeXFontDefinition *fontp = fontList.first();
   while ( fontp != 0 ) {
@@ -210,12 +210,12 @@ TQString fontPool::status()
 
 #ifdef HAVE_FREETYPE
     tmp << TQString ("<tr><td>%1</td> <td>%2</td> <td>%3%</td> <td>%4</td> <td>%5</td> <td>%6</td></tr>")
-      .tqarg(fontp->fontname)
-      .tqarg(fontp->getFullFontName())
-      .tqarg((int)(fontp->enlargement*100 + 0.5))
-      .tqarg(fontp->getFontTypeName())
-      .tqarg(encoding)
-      .tqarg(errMsg);
+      .arg(fontp->fontname)
+      .arg(fontp->getFullFontName())
+      .arg((int)(fontp->enlargement*100 + 0.5))
+      .arg(fontp->getFontTypeName())
+      .arg(encoding)
+      .arg(errMsg);
 #endif
 
     fontp=fontList.next();
@@ -280,7 +280,7 @@ void fontPool::locateFonts()
   // present an error message to the user.
   if (!areFontsLocated()) {
     markFontsAsLocated();
-    TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(kpsewhichOutput);
+    TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").arg(getenv("PATH")).arg(kpsewhichOutput);
     KMessageBox::detailedError( 0, i18n("<qt><p>KDVI was not able to locate all the font files "
 					"which are necessary to display the current DVI file. "
 					"Your document might be unreadable.</p></qt>"),
@@ -330,17 +330,17 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
       numFontsInJob++;
       
       if (locateTFMonly == true)
-	shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").tqarg(fontp->fontname));
+	shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").arg(fontp->fontname));
       else {
 #ifdef HAVE_FREETYPE
 	if (FreeType_could_be_loaded == true) {
 	  const TQString &filename = fontsByTeXName.findFileName(fontp->fontname);
 	  if (!filename.isEmpty())
-	    shellProcessCmdLine += KShellProcess::quote(TQString("%1").tqarg(filename));
+	    shellProcessCmdLine += KShellProcess::quote(TQString("%1").arg(filename));
 	}
 #endif
-	shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").tqarg(fontp->fontname));
-	shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").tqarg(fontp->fontname));
+	shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").arg(fontp->fontname));
+	shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").arg(fontp->fontname));
       }
     }
     fontp=fontList.next();
@@ -363,7 +363,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
 			"and your document might by unreadable. If this error is reproducable "
 			"please report the issue to the KDVI developers using the 'Help' menu.<p>" );
     TQApplication::restoreOverrideCursor();
-    KMessageBox::error( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg),
+    KMessageBox::error( 0, TQString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(msg),
 			i18n("Problem locating fonts - KDVI") );
     markFontsAsLocated();
     return;
@@ -399,9 +399,9 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
 			  "typesetting system. If TeX is not installed on your system, you could install the TeTeX distribution (www.tetex.org). "
 			  "If you are sure that TeX is installed, please try to use the kpsewhich program from the command line to check if it "
 			  "really works.</p>");
-      TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(kpsewhichOutput);
+      TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").arg(getenv("PATH")).arg(kpsewhichOutput);
       
-      KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg), details,
+      KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(msg), details,
 				  i18n("Problem locating fonts - KDVI") );
       // This makes sure the we don't try to run kpsewhich again
       markFontsAsLocated();
@@ -587,7 +587,7 @@ void fontPool::mf_output_receiver(KProcess *, char *buffer, int buflen)
       TQString dpi       = startLine.mid(secondblank+1,lastblank-secondblank-1);
 
       progress.show();
-      progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").tqarg(fontName).tqarg(dpi) );
+      progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").arg(fontName).arg(dpi) );
     }
     MetafontOutput = MetafontOutput.remove(0,numleft+1);
   }
diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp
index 24810714..d67f8bc3 100644
--- a/kdvi/fontprogress.cpp
+++ b/kdvi/fontprogress.cpp
@@ -14,7 +14,7 @@
 #include <tqapplication.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvariant.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -42,7 +42,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
   TQVBox *page = makeVBoxMainWidget();
 
   TextLabel1   = new TQLabel( label, page, "TextLabel2" );
-  TextLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) );
+  TextLabel1->setAlignment( int( TQLabel::AlignCenter ) );
   TQWhatsThis::add( TextLabel1, whatsThis );
   TQToolTip::add( TextLabel1, ttip );
 
@@ -55,7 +55,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
     ProgressBar1 = NULL;
   
   TextLabel2   = new TQLabel( "", page, "TextLabel2" );
-  TextLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) );
+  TextLabel2->setAlignment( int( TQLabel::AlignCenter ) );
   TQWhatsThis::add( TextLabel2, whatsThis );
   TQToolTip::add( TextLabel2, ttip );
 
diff --git a/kdvi/infodialog.cpp b/kdvi/infodialog.cpp
index 97ffef6f..4ac46810 100644
--- a/kdvi/infodialog.cpp
+++ b/kdvi/infodialog.cpp
@@ -10,9 +10,9 @@
 #include <klocale.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqregexp.h>
-#include <tqtextview.h>
+#include <textview.h>
 #include <tqtooltip.h>
 #include <tqvariant.h>
 #include <tqwhatsthis.h>
@@ -64,17 +64,17 @@ void infoDialog::setDVIData(dvifile *dviFile)
     text = i18n("There is no DVI file loaded at the moment.");
   else {
     text.append("<table WIDTH=\"100%\" NOSAVE >");
-    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("Filename")).tqarg(dviFile->filename));
+    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("Filename")).arg(dviFile->filename));
 
     TQFile file(dviFile->filename);
     if (file.exists())
-      text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("File Size")).tqarg(KIO::convertSize(file.size())));
+      text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(KIO::convertSize(file.size())));
     else
-      text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").tqarg(i18n("The file does no longer exist.")));
+      text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").arg(i18n("The file does no longer exist.")));
 
     text.append(TQString("<tr><td><b>  </b></td> <td>  </td></tr>"));
-    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("#Pages")).tqarg(dviFile->total_pages));
-    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("Generator/Date")).tqarg(dviFile->generatorString));
+    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("#Pages")).arg(dviFile->total_pages));
+    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("Generator/Date")).arg(dviFile->generatorString));
   } // else (dviFile == NULL)
 
   TextLabel1->setText( text );
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index e318a160..18a3df78 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -161,7 +161,7 @@ void KDVIMultiPage::slotSave()
     fileName = fileName+ending;
 
   if (TQFile(fileName).exists()) {
-    int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
+    int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
                        i18n("Overwrite File"), i18n("Overwrite"));
     if (r == KMessageBox::Cancel)
       return;
@@ -239,7 +239,7 @@ void KDVIMultiPage::print()
 
   // Show the printer options dialog. Return immediately if the user
   // aborts.
-  if (!printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) ))
+  if (!printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1)) ))
     return;
 
   // This funny method call is necessary for the KPrinter to return
@@ -379,7 +379,7 @@ void KDVIMultiPage::print()
       dvips_options +=  TQString(",");
     else
       commaflag = 1;
-    dvips_options += TQString("%1").tqarg(*it);
+    dvips_options += TQString("%1").arg(*it);
   }
 
   // Now print. For that, export the DVI-File to PostScript. Note that
diff --git a/kdvi/main.cpp b/kdvi/main.cpp
index f10501bd..af7bc928 100644
--- a/kdvi/main.cpp
+++ b/kdvi/main.cpp
@@ -77,14 +77,14 @@ int main(int argc, char** argv)
 
       if (!url.isValid()) 
       {
-        kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl;
+        kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl;
         return -1;
       }
 
       if (!url.isLocalFile()) 
       {
         kdError(4300) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local "
-             "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
+             "files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
         return -1;
       }
 
diff --git a/kdvi/optionDialogFontsWidget_base.ui b/kdvi/optionDialogFontsWidget_base.ui
index 766f6b98..bb7e18f4 100644
--- a/kdvi/optionDialogFontsWidget_base.ui
+++ b/kdvi/optionDialogFontsWidget_base.ui
@@ -44,7 +44,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>121</height>
diff --git a/kdvi/optionDialogSpecialWidget_base.ui b/kdvi/optionDialogSpecialWidget_base.ui
index e821d761..4610984b 100644
--- a/kdvi/optionDialogSpecialWidget_base.ui
+++ b/kdvi/optionDialogSpecialWidget_base.ui
@@ -169,7 +169,7 @@
                     <property name="text">
                         <string>What is 'inverse search'? </string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="url" stdset="0">
@@ -186,7 +186,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>390</width>
                             <height>21</height>
diff --git a/kdvi/psgs.cpp b/kdvi/psgs.cpp
index 9f1f925f..d7f087e4 100644
--- a/kdvi/psgs.cpp
+++ b/kdvi/psgs.cpp
@@ -211,11 +211,11 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
   TQStringList argus;
   argus << "gs";
   argus << "-dSAFER" << "-dPARANOIDSAFER" << "-dDELAYSAFER" << "-dNOPAUSE" << "-dBATCH";
-  argus << TQString("-sDEVICE=%1").tqarg(*gsDevice);
-  argus << TQString("-sOutputFile=%1").tqarg(filename);
-  argus << TQString("-sExtraIncludePath=%1").tqarg(includePath);
-  argus << TQString("-g%1x%2").tqarg(pixel_page_w).tqarg(pixel_page_h); // page size in pixels
-  argus << TQString("-r%1").tqarg(resolution);                       // resolution in dpi
+  argus << TQString("-sDEVICE=%1").arg(*gsDevice);
+  argus << TQString("-sOutputFile=%1").arg(filename);
+  argus << TQString("-sExtraIncludePath=%1").arg(includePath);
+  argus << TQString("-g%1x%2").arg(pixel_page_w).arg(pixel_page_h); // page size in pixels
+  argus << TQString("-r%1").arg(resolution);                       // resolution in dpi
   argus << "-c" << "<< /PermitFileReading [ ExtraIncludePath ] /PermitFileWriting [] /PermitFileControl [] >> setuserparams .locksafe";
   argus << "-f" << PSfile.name();
   
@@ -241,7 +241,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
     while(proc.readln(GSoutput) != -1) {
       if (GSoutput.contains("Unknown device")) {
 	kdDebug(4300) << TQString("The version of ghostview installed on this computer does not support "
-				   "the '%1' ghostview device driver.").tqarg(*gsDevice) << endl;
+				   "the '%1' ghostview device driver.").arg(*gsDevice) << endl;
 	knownDevices.remove(gsDevice);
 	gsDevice = knownDevices.begin();
 	if (knownDevices.isEmpty())
@@ -267,7 +267,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
 					  "drivers. Note that KDVI needs to be restarted to re-enable PostScript support."
 					  "</p></qt>"));
 	else {
-	  kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").tqarg(*gsDevice) << endl;
+	  kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").arg(*gsDevice) << endl;
 	  gs_generate_graphics_file(page, filename, magnification);
 	}
 	return;
diff --git a/kdvi/special.cpp b/kdvi/special.cpp
index 918b7352..48c99ec8 100644
--- a/kdvi/special.cpp
+++ b/kdvi/special.cpp
@@ -222,7 +222,7 @@ void dviRenderer::color_special(const TQString& _cp)
     // Take color off the stack
     if (colorStack.isEmpty())
       printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Color pop command issued when the color stack is empty." ).
-				tqarg(dviFile->filename).tqarg(current_page));
+				arg(dviFile->filename).arg(current_page));
     else
       colorStack.pop();
     return;
@@ -308,7 +308,7 @@ void parse_special_argument(const TQString& strg, const char* argument_name, int
       // Maybe we should open a dialog here.
       kdError(4300) << i18n("Malformed parameter in the epsf special command.\n"
                             "Expected a float to follow %1 in %2")
-                       .tqarg(argument_name).tqarg(strg) << endl;
+                       .arg(argument_name).arg(strg) << endl;
   }
 }
 
@@ -432,7 +432,7 @@ void dviRenderer::epsf_special(const TQString& cp)
       foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter), EPSfilename_orig, -1);
     else
       foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter), 
-				i18n("File not found: \n %1").tqarg(EPSfilename_orig), -1);
+				i18n("File not found: \n %1").arg(EPSfilename_orig), -1);
     foreGroundPainter->restore();
   }
   
@@ -453,7 +453,7 @@ void dviRenderer::TPIC_flushPath_special()
 
   TQPen pen(TQt::black, (int)(penWidth_in_mInch*resolutionInDPI/1000.0 + 0.5));  // Sets the pen size in milli-inches
   foreGroundPainter->setPen(pen);
-  foreGroundPainter->tqdrawPolyline(TPIC_path, 0, number_of_elements_in_path);
+  foreGroundPainter->drawPolyline(TPIC_path, 0, number_of_elements_in_path);
   number_of_elements_in_path = 0;
 }
 
@@ -469,12 +469,12 @@ void dviRenderer::TPIC_addPath_special(const TQString& cp)
   bool ok;
   float xKoord = cp_noWhiteSpace.section(' ', 0, 0).toFloat(&ok);
   if (ok == false) {
-    printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").tqarg(cp) );
+    printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").arg(cp) );
     return;
   }
   float yKoord = cp_noWhiteSpace.section(' ', 1, 1).toFloat(&ok);
   if (ok == false) {
-    printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").tqarg(cp) );
+    printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").arg(cp) );
     return;
   }
   
@@ -502,7 +502,7 @@ void dviRenderer::TPIC_setPen_special(const TQString& cp)
   bool ok;
   penWidth_in_mInch = cp.stripWhiteSpace().toFloat(&ok);
   if (ok == false) {
-    printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").tqarg(cp) );
+    printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").arg(cp) );
     penWidth_in_mInch = 0.0;
     return;
   }
@@ -700,7 +700,7 @@ void dviRenderer::applicationDoSpecial(char *cp)
       foreGroundPainter->translate(-x,-y);
     } else
       printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Could not interpret angle in text rotation special." ).
-				tqarg(dviFile->filename).tqarg(current_page));
+				arg(dviFile->filename).arg(current_page));
   }
 
   // The graphicx package marks the end of rotated text with this
@@ -722,6 +722,6 @@ void dviRenderer::applicationDoSpecial(char *cp)
       (strncasecmp(cp, "background", 10) == 0) )
     return;
   
-  printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").tqarg(special_command));
+  printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").arg(special_command));
   return;
 }
diff --git a/kdvi/vf.cpp b/kdvi/vf.cpp
index b6da55c0..6e8f7a41 100644
--- a/kdvi/vf.cpp
+++ b/kdvi/vf.cpp
@@ -177,7 +177,7 @@ void TeXFontDefinition::read_VF_index()
     }
   }
   if (cmnd != POST)
-    oops(i18n("Wrong command byte found in VF macro list: %1").tqarg(cmnd));
+    oops(i18n("Wrong command byte found in VF macro list: %1").arg(cmnd));
   
   fclose (VF_file);
   file = NULL;
diff --git a/kfax/faxinput.cpp b/kfax/faxinput.cpp
index e37e9dd7..40ae2a41 100644
--- a/kfax/faxinput.cpp
+++ b/kfax/faxinput.cpp
@@ -110,7 +110,7 @@ notetiff(const char *name)
 
 
     if ((tf = fopen(name, "r")) == NULL) {
-        TQString mesg = i18n("Unable to open:\n%1\n").tqarg(TQFile::decodeName(name));
+        TQString mesg = i18n("Unable to open:\n%1\n").arg(TQFile::decodeName(name));
 	kfaxerror(i18n("Sorry"), mesg);
 	return 0;
     }
@@ -147,7 +147,7 @@ notetiff(const char *name)
 
 	if (fseek(tf, IFDoff, SEEK_SET) < 0) {
 	realbad:
-	  str = i18n("Invalid tiff file:\n%1\n").tqarg(TQFile::decodeName(name));
+	  str = i18n("Invalid tiff file:\n%1\n").arg(TQFile::decodeName(name));
 	  kfaxerror(i18n("Sorry"),str);
 	bad:
 	    if (strips)
@@ -249,7 +249,7 @@ notetiff(const char *name)
 	    case 279:		/* StripByteCounts */
 		if (count != nstrips) {
 		  str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n")
-			      .tqarg(TQFile::decodeName(name)).tqarg(nstrips).tqarg(count);
+			      .arg(TQFile::decodeName(name)).arg(nstrips).arg(count);
 		  kfaxerror(i18n("Message"),str);
 		  goto realbad;
 		}
@@ -419,7 +419,7 @@ getstrip(struct pagenode *pn, int strip)
 	pn->length = pn->strips[strip].size;
     }
     else {
-      str = i18n("Trying to expand too many strips\n%1%n").tqarg(TQFile::decodeName(pn->pathname));
+      str = i18n("Trying to expand too many strips\n%1%n").arg(TQFile::decodeName(pn->pathname));
       kfaxerror(i18n("Warning"),str);
       return NULL;
     }
@@ -448,7 +448,7 @@ getstrip(struct pagenode *pn, int strip)
 	/* handle ghostscript / PC Research fax file */
       if (Data[24] != 1 || Data[25] != 0){
 	str = i18n("Only the first page of the PC Research multipage file\n%1\nwill be shown\n")
-		.tqarg(TQFile::decodeName(pn->pathname));
+		.arg(TQFile::decodeName(pn->pathname));
 	kfaxerror(i18n("Message"),str);
       }
 	pn->length -= 64;
@@ -462,7 +462,7 @@ getstrip(struct pagenode *pn, int strip)
 	pn->height = G3count(pn, pn->expander == g32expand);
     if (pn->height == 0) {
 
-      str = i18n("No fax found in file:\n%1\n").tqarg(TQFile::decodeName(pn->pathname));
+      str = i18n("No fax found in file:\n%1\n").arg(TQFile::decodeName(pn->pathname));
       kfaxerror(i18n("Sorry"),str);
       errno = 0;
       badfile(pn);
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index 1a97400c..bbc9121a 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -701,7 +701,7 @@ void TopLevel::print(){
   printer.setFullPage( true );
   printer.setUsePrinterResolution( true );
   printer.setCreator( i18n("KFax") + " " KFAXVERSION );
-  printer.setDocName( TQString("%1 - %2").tqarg(firstpage->name).tqarg(i18n("KFax")));
+  printer.setDocName( TQString("%1 - %2").arg(firstpage->name).arg(i18n("KFax")));
   printer.setDocFileName( firstpage->name );
   printer.setPageSelection( KPrinter::ApplicationSide );
   printer.setMinMax( 1, pages ); 
@@ -792,11 +792,11 @@ void TopLevel::printIt( KPrinter &printer, TQPainter &painter )
     TQSize scaledImageSize = size;
     if (size.width() > maxSize.width() || size.height() > maxSize.height() ) {
 	// Image does not fit - scale it and print centered
-	scaledImageSize.tqscale( maxSize, TQSize::ScaleMin );
+	scaledImageSize.scale( maxSize, TQSize::ScaleMin );
 	kdDebug() << "Image does not fit - scaling to " << maxSize << endl;
     } else {
 	// Image does fit - print it in original size, but centered
-	scaledImageSize.tqscale( size, TQSize::ScaleMin );
+	scaledImageSize.scale( size, TQSize::ScaleMin );
 	kdDebug() << "Image does fit - scaling to " << size << endl;
     }
     kdDebug() << "Final image size " << scaledImageSize << endl;
@@ -846,7 +846,7 @@ void TopLevel::openNetFile( const KURL &u)
 
   if ( u.isLocalFile() )
   {
-    TQString string = i18n("Loading '%1'").tqarg(u.path());
+    TQString string = i18n("Loading '%1'").arg(u.path());
     statusbar->message(string);
     openadd( u.path());
     statusbar->clear();
@@ -1441,17 +1441,17 @@ void TopLevel::uiUpdate(){
 	currentpage = pages;
     }
 
-    TQString pagestr = i18n("Page: %1 of %2").tqarg(currentpage).tqarg(pages);
+    TQString pagestr = i18n("Page: %1 of %2").arg(currentpage).arg(pages);
 
     statusbar->changeItem(pagestr, ID_PAGE_NO);
 
     if(Image){
-      TQString wh = i18n("W: %1 H: %2").tqarg(Image->width).tqarg(Image->height);
+      TQString wh = i18n("W: %1 H: %2").arg(Image->width).arg(Image->height);
       statusbar->changeItem(wh, ID_INS_OVR);
     }
 
-    TQString resolution = i18n("Res: %1").tqarg(thispage->vres?i18n("Fine"):i18n("Normal"));
-    // TODO: resolution += TQString("%1x%2").tqarg(thispage->dpiX).tqarg(thispage->dpiY);
+    TQString resolution = i18n("Res: %1").arg(thispage->vres?i18n("Fine"):i18n("Normal"));
+    // TODO: resolution += TQString("%1x%2").arg(thispage->dpiX).arg(thispage->dpiY);
     statusbar->changeItem(resolution, ID_GENERAL);
 
     statusbar->changeItem(thispage->name, ID_FNAME);
diff --git a/kfax/kfax_printsettings.cpp b/kfax/kfax_printsettings.cpp
index 5382c2e5..53fc6537 100644
--- a/kfax/kfax_printsettings.cpp
+++ b/kfax/kfax_printsettings.cpp
@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 KFAXPrintSettings::KFAXPrintSettings(TQWidget *parent, const char *name)
diff --git a/kfax/options.cpp b/kfax/options.cpp
index 053bf162..dab7325b 100644
--- a/kfax/options.cpp
+++ b/kfax/options.cpp
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <knuminput.h>
 #include <tqdir.h>
@@ -60,28 +60,28 @@ 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();
 
   vbl->addLayout( hbl1 );
 
   displaylabel = new TQLabel(i18n("Display options:"), bg,"displaylabel");
-  displaylabel->setFixedSize( displaylabel->tqsizeHint() );
+  displaylabel->setFixedSize( displaylabel->sizeHint() );
   hbl1->addWidget( displaylabel );
 
   landscape = new TQCheckBox(i18n("Landscape"), bg,"Landscape");
-  landscape->setFixedSize( landscape->tqsizeHint() );
+  landscape->setFixedSize( landscape->sizeHint() );
   hbl1->addSpacing( 10 );
   hbl1->addWidget( landscape );
 
   flip = new TQCheckBox(i18n("Upside down"), bg,"upsidedown");
-  flip->setFixedSize( flip->tqsizeHint() );
+  flip->setFixedSize( flip->sizeHint() );
   hbl1->addSpacing( 10 );
   hbl1->addWidget( flip );
 
   invert = new TQCheckBox(i18n("Invert"), bg,"invert");
-  invert->setFixedSize( invert->tqsizeHint() );
+  invert->setFixedSize( invert->sizeHint() );
   hbl1->addSpacing( 10 );
   hbl1->addWidget( invert );
 
@@ -139,7 +139,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
   rawgroup->setFrameStyle(TQFrame::NoFrame);
 
   rawlabel = new TQLabel(i18n("Raw fax format:"),rawgroup,"rawlabel");
-  rawlabel->setFixedSize( rawlabel->tqsizeHint() );
+  rawlabel->setFixedSize( rawlabel->sizeHint() );
   hbl4->addWidget( rawlabel );
 
   g3 = new TQRadioButton("G3",rawgroup,"g3");
diff --git a/kfaxview/faxrenderer.cpp b/kfaxview/faxrenderer.cpp
index b109c1f5..0061d673 100644
--- a/kfaxview/faxrenderer.cpp
+++ b/kfaxview/faxrenderer.cpp
@@ -136,7 +136,7 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
   TQString   filename = fi.absFilePath();
   if (!fi.exists() || fi.isDir()) {
     KMessageBox::error( parentWidget,
-			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
+			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").arg(filename),
 			i18n("File Error"));
     // the return value 'false' indicates that this operation was not successful.
     mutex.unlock();
@@ -157,11 +157,11 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
     // this case gracefully.
     if (fax.errorString().isEmpty())
       KMessageBox::error( parentWidget,
-			  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
+			  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
 			  i18n("File Error"));
     else
       KMessageBox::detailedError( parentWidget,
-				  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
+				  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
 				  fax.errorString(),
 				  i18n("File Error"));
     clear();
diff --git a/kfaxview/libkfaximage/kfaximage.cpp b/kfaxview/libkfaximage/kfaximage.cpp
index 0d35f8d7..a3570209 100644
--- a/kfaxview/libkfaximage/kfaximage.cpp
+++ b/kfaxview/libkfaximage/kfaximage.cpp
@@ -41,7 +41,7 @@ static const char bigTIFF[]    = "\x4d\x4d\x00\x2a";
 KFaxImage::KFaxImage( const TQString &filename, TQObject *parent, const char *name )
    : TQObject(parent,name)
 {
-  KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkfaximage") );
+  KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkfaximage") );
   loadImage(filename);
 }
 
@@ -327,7 +327,7 @@ KFaxImage::notetiff()
 	    case 279:		/* StripByteCounts */
 		if (count != nstrips) {
 		  str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n")
-			      .tqarg(filename()).tqarg(nstrips).tqarg(count);
+			      .arg(filename()).arg(nstrips).arg(count);
 		  kfaxerror(str);
 		  goto realbad;
 		}
@@ -403,7 +403,7 @@ KFaxImage::notetiff()
 void
 KFaxImage::badfile(pagenode *pn)
 {
-  kfaxerror(i18n("%1: Bad Fax File").tqarg(filename()));
+  kfaxerror(i18n("%1: Bad Fax File").arg(filename()));
   FreeImage(pn);
 }
 
diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp
index 9227d0a0..05692315 100644
--- a/kfaxview/main.cpp
+++ b/kfaxview/main.cpp
@@ -97,14 +97,14 @@ int main(int argc, char** argv)
 
       if (!url.isValid()) 
       {
-        kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl;
+        kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl;
         return -1;
       }
 
       if (!url.isLocalFile()) 
       {
         kdError(4300) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local "
-             "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
+             "files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
         return -1;
       }
 
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-page-transition.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
index 9998f738..cde8818d 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
@@ -68,7 +68,7 @@ int PageTransition::duration() const
   return data->pt->getDuration();
 }
 
-PageTransition::Alignment PageTransition::tqalignment() const
+PageTransition::Alignment PageTransition::alignment() const
 {
   return (Poppler::PageTransition::Alignment)data->pt->getAlignment();
 }
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
index f33a014c..53002ff9 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
@@ -60,7 +60,7 @@ class PageTransition {
     Fade
   };
   
-  /** \brief tqalignment of the transition effect that shall be used
+  /** \brief alignment of the transition effect that shall be used
    */
   // if changed remember to keep in sync with PageTransition.h enum
   enum Alignment {
@@ -114,7 +114,7 @@ class PageTransition {
   /**
      \brief Get dimension in which the transition effect occurs.
   */
-  Alignment tqalignment() const;
+  Alignment alignment() const;
   
   /**
      \brief Get direction of motion of the transition effect.
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
index 445417a2..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.tqat(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;
 
@@ -136,11 +136,11 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G
                 }
             }
 
-        // 3. recursively descend over tqchildren
+        // 3. recursively descend over children
         outlineItem->open();
-        GooList * tqchildren = outlineItem->getKids();
-        if ( tqchildren )
-            addTocChildren( docSyn, &item, tqchildren );
+        GooList * children = outlineItem->getKids();
+        if ( children )
+            addTocChildren( docSyn, &item, children );
     }
 }
 
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/exr/kfile_exr.cpp b/kfile-plugins/exr/kfile_exr.cpp
index 0a85a728..639ac0df 100644
--- a/kfile-plugins/exr/kfile_exr.cpp
+++ b/kfile-plugins/exr/kfile_exr.cpp
@@ -237,10 +237,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
 #endif
 			TQString UTCOffset;
 			if (utcOffset(h)>0.0) {
-				UTCOffset.append(TQString("%1").tqarg(utcOffset(h)/3600, 0, 'f', 1));
+				UTCOffset.append(TQString("%1").arg(utcOffset(h)/3600, 0, 'f', 1));
 				UTCOffset.append(" hours behind UTC");
 			} else {
-				UTCOffset.append(TQString("%1").tqarg(-1.0*utcOffset(h)/3600, 0, 'f', 1));
+				UTCOffset.append(TQString("%1").arg(-1.0*utcOffset(h)/3600, 0, 'f', 1));
 				UTCOffset.append(" hours ahead of UTC");
 			}
 			appendItem( stdgroup, "UTC Offset", UTCOffset); 
@@ -264,10 +264,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
 		if ( hasLongitude(h) ) {
 			TQString Longitude;
 			if (longitude(h)<0.0) {
-				Longitude.append(TQString("%1").tqarg(-1.0*longitude(h),0,'f',3));
+				Longitude.append(TQString("%1").arg(-1.0*longitude(h),0,'f',3));
 				Longitude.append(" deg West");
 			} else {
-				Longitude.append(TQString("%1").tqarg(longitude(h),0,'f',3));
+				Longitude.append(TQString("%1").arg(longitude(h),0,'f',3));
 				Longitude.append(" deg East");
 			}
 			appendItem( stdgroup, "Longitude", Longitude);
@@ -275,17 +275,17 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
 		if ( hasLatitude(h) ) {
 			TQString Latitude;
 			if (latitude(h)<0.0) {
-				Latitude.append(TQString("%1").tqarg(-1.0*latitude(h),0,'f',3));
+				Latitude.append(TQString("%1").arg(-1.0*latitude(h),0,'f',3));
 				Latitude.append(" deg South");
 			} else {
-				Latitude.append(TQString("%1").tqarg(latitude(h),0,'f',3));
+				Latitude.append(TQString("%1").arg(latitude(h),0,'f',3));
 				Latitude.append(" deg North");
 			}
 			appendItem( stdgroup, "Latitude", Latitude );
 		}
 		if ( hasAltitude(h) ) {
 			double Altitude = altitude(h);
-			appendItem( stdgroup, "Altitude", TQString("%1").tqarg(Altitude,0,'f',1) );
+			appendItem( stdgroup, "Altitude", TQString("%1").arg(Altitude,0,'f',1) );
 		}
 		if ( hasIsoSpeed(h) ) {
 			double IsoSpeed = isoSpeed(h);
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/exif.cpp b/kfile-plugins/jpeg/exif.cpp
index 6c621477..f4803705 100644
--- a/kfile-plugins/jpeg/exif.cpp
+++ b/kfile-plugins/jpeg/exif.cpp
@@ -525,11 +525,11 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
         switch(Tag){
 
             case TAG_MAKE:
-                ExifData::CameraMake = TQString::tqfromLatin1((const char*)ValuePtr, 31);
+                ExifData::CameraMake = TQString::fromLatin1((const char*)ValuePtr, 31);
                 break;
 
             case TAG_MODEL:
-                ExifData::CameraModel = TQString::tqfromLatin1((const char*)ValuePtr, 39);
+                ExifData::CameraModel = TQString::fromLatin1((const char*)ValuePtr, 39);
 		break;
 
             case TAG_ORIENTATION:
@@ -537,7 +537,7 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
                 break;
 
             case TAG_DATETIME_ORIGINAL:
-		DateTime = TQString::tqfromLatin1((const char*)ValuePtr, 19);
+		DateTime = TQString::fromLatin1((const char*)ValuePtr, 19);
                 break;
 
             case TAG_USERCOMMENT:
@@ -558,12 +558,12 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
                         int c;
                         c = (ValuePtr)[a];
                         if (c != '\0' && c != ' '){
-                            UserComment = TQString::tqfromLatin1((const char*)(a+ValuePtr), 199);
+                            UserComment = TQString::fromLatin1((const char*)(a+ValuePtr), 199);
                             break;
                         }
                     }
                 }else{
-                    UserComment = TQString::tqfromLatin1((const char*)ValuePtr, 199);
+                    UserComment = TQString::fromLatin1((const char*)ValuePtr, 199);
                 }
                 break;
 
@@ -803,7 +803,7 @@ void ExifData::process_EXIF(unsigned char * CharBuf, unsigned int length)
             // printf("Exif section in Motorola order\n");
             MotorolaOrder = 1;
         }else{
-            throw FatalError("Invalid Exif tqalignment marker.");
+            throw FatalError("Invalid Exif alignment marker.");
         }
     }
 
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/kfile-plugins/pdf/kfile_pdf.cpp b/kfile-plugins/pdf/kfile_pdf.cpp
index 89e46297..a3dcbde7 100644
--- a/kfile-plugins/pdf/kfile_pdf.cpp
+++ b/kfile-plugins/pdf/kfile_pdf.cpp
@@ -83,16 +83,16 @@ bool KPdfPlugin::readInfo( KFileMetaInfo& info, uint /* what */)
     if (doc->isEncrypted())
     {
     	enc = i18n("Yes (Can Print:%1 Can Copy:%2 Can Change:%3 Can Add notes:%4)")
-    	.tqarg(doc->okToPrint() ? i18n("Yes") : i18n("No"))
-    	.tqarg(doc->okToCopy() ? i18n("Yes") : i18n("No"))
-    	.tqarg(doc->okToChange() ? i18n("Yes") : i18n("No"))
-    	.tqarg(doc->okToAddNotes() ? i18n("Yes") : i18n("No"));
+    	.arg(doc->okToPrint() ? i18n("Yes") : i18n("No"))
+    	.arg(doc->okToCopy() ? i18n("Yes") : i18n("No"))
+    	.arg(doc->okToChange() ? i18n("Yes") : i18n("No"))
+    	.arg(doc->okToAddNotes() ? i18n("Yes") : i18n("No"));
     }
     else enc = i18n("No");
     
     appendItem(generalGroup, "Protected", enc );
     appendItem(generalGroup, "Linearized", doc->isLinearized() ? i18n("Yes") : i18n("No") );
-    TQString versionString = TQString("%1").tqarg( doc->getPDFVersion(), 0, 'f', 1 );
+    TQString versionString = TQString("%1").arg( doc->getPDFVersion(), 0, 'f', 1 );
     appendItem(generalGroup, "Version", versionString );
 
     delete doc;
diff --git a/kfile-plugins/pnm/kfile_pnm.cpp b/kfile-plugins/pnm/kfile_pnm.cpp
index 6c965e65..6818626e 100644
--- a/kfile-plugins/pnm/kfile_pnm.cpp
+++ b/kfile-plugins/pnm/kfile_pnm.cpp
@@ -22,7 +22,7 @@
 #include <math.h>
 #include <kgenericfactory.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 static const char* formats[] = {
 	I18N_NOOP("plain"),
diff --git a/kfile-plugins/ps/gscreator.cpp b/kfile-plugins/ps/gscreator.cpp
index cc4edcfc..c664947b 100644
--- a/kfile-plugins/ps/gscreator.cpp
+++ b/kfile-plugins/ps/gscreator.cpp
@@ -521,7 +521,7 @@ bool GSCreator::getEPSIPreview(const TQString &path, long start, long
     return false;
   }
 
-  TQString previewstr = TQString::tqfromLatin1(buf);
+  TQString previewstr = TQString::fromLatin1(buf);
   free(buf);
 
   int offset = 0;
diff --git a/kfile-plugins/rgb/kfile_rgb.cpp b/kfile-plugins/rgb/kfile_rgb.cpp
index 41bd8c28..ffcad0b5 100644
--- a/kfile-plugins/rgb/kfile_rgb.cpp
+++ b/kfile-plugins/rgb/kfile_rgb.cpp
@@ -134,7 +134,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
 		long compressed = file.size() - 512;
 		long verbatim = xsize * ysize * zsize;
 		appendItem(group, "Compression", i18n("Runlength Encoded")
-				+ TQString(", %1%").tqarg(compressed * 100.0 / verbatim, 0, 'f', 1));
+				+ TQString(", %1%").arg(compressed * 100.0 / verbatim, 0, 'f', 1));
 
 		long k;
 		TQ_UINT32 offs;
@@ -152,7 +152,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
 			k += it.data();
 
 		if (k)
-			appendItem(group, "SharedRows", TQString("%1%").tqarg(k * 100.0
+			appendItem(group, "SharedRows", TQString("%1%").arg(k * 100.0
 					/ (ysize * zsize), 0, 'f', 1));
 		else
 			appendItem(group, "SharedRows", i18n("None"));
diff --git a/kgamma/kcmkgamma/displaynumber.cpp b/kgamma/kcmkgamma/displaynumber.cpp
index 8ca9beed..dd678716 100644
--- a/kgamma/kcmkgamma/displaynumber.cpp
+++ b/kgamma/kcmkgamma/displaynumber.cpp
@@ -28,7 +28,7 @@ DisplayNumber::DisplayNumber(TQWidget *parent, int digits, \
 
   setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
   setBackgroundMode(TQt::PaletteBase);
-  tqsetAlignment(TQt::AlignCenter);
+  setAlignment(TQt::AlignCenter);
   setFocusPolicy(TQ_NoFocus);
 }
 
diff --git a/kgamma/kcmkgamma/kgamma.cpp b/kgamma/kcmkgamma/kgamma.cpp
index 7f28dc63..99eddbaf 100644
--- a/kgamma/kcmkgamma/kgamma.cpp
+++ b/kgamma/kcmkgamma/kgamma.cpp
@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstringlist.h>
 #include <tqdir.h>
 #include <tqcheckbox.h>
@@ -157,37 +157,37 @@ void KGamma::setupUI() {
     pic1->setMinimumSize(530, 171);
     pic1->setBackgroundPixmap(background);
     pic1->setPixmap(TQPixmap(locate("data", "kgamma/pics/greyscale.png")));
-    pic1->tqsetAlignment(AlignCenter);
+    pic1->setAlignment(AlignCenter);
     stack->addWidget( pic1, 0 );
 
     TQLabel *pic2 = new TQLabel(stack);
     pic2->setBackgroundPixmap(background);
     pic2->setPixmap(TQPixmap(locate("data", "kgamma/pics/rgbscale.png")));
-    pic2->tqsetAlignment(AlignCenter);
+    pic2->setAlignment(AlignCenter);
     stack->addWidget( pic2, 1 );
 
     TQLabel *pic3 = new TQLabel(stack);
     pic3->setBackgroundPixmap(background);
     pic3->setPixmap(TQPixmap(locate("data", "kgamma/pics/cmyscale.png")));
-    pic3->tqsetAlignment(AlignCenter);
+    pic3->setAlignment(AlignCenter);
     stack->addWidget( pic3, 2 );
 
     TQLabel *pic4 = new TQLabel(stack);
     pic4->setBackgroundPixmap(background);
     pic4->setPixmap(TQPixmap(locate("data", "kgamma/pics/darkgrey.png")));
-    pic4->tqsetAlignment(AlignCenter);
+    pic4->setAlignment(AlignCenter);
     stack->addWidget( pic4, 3 );
 
     TQLabel *pic5 = new TQLabel(stack);
     pic5->setBackgroundPixmap(background);
     pic5->setPixmap(TQPixmap(locate("data", "kgamma/pics/midgrey.png")));
-    pic5->tqsetAlignment(AlignCenter);
+    pic5->setAlignment(AlignCenter);
     stack->addWidget( pic5, 4 );
 
     TQLabel *pic6 = new TQLabel(stack);
     pic6->setBackgroundPixmap(background);
     pic6->setPixmap(TQPixmap(locate("data", "kgamma/pics/lightgrey.png")));
-    pic6->tqsetAlignment(AlignCenter);
+    pic6->setAlignment(AlignCenter);
     stack->addWidget( pic6, 5 );
 
     topLayout->addWidget(stack, 10);
@@ -264,7 +264,7 @@ void KGamma::setupUI() {
 
     screenselect = new TQComboBox( options );
     for ( int i = 0; i < ScreenCount; i++ )
-      screenselect->insertItem( i18n("Screen %1").tqarg(i+1) );
+      screenselect->insertItem( i18n("Screen %1").arg(i+1) );
     screenselect->setCurrentItem(currentScreen);
     connect(screenselect, TQT_SIGNAL(activated(int)), TQT_SLOT(changeScreen(int)));
 
@@ -279,7 +279,7 @@ void KGamma::setupUI() {
     TQLabel *error = new TQLabel(this);
     error->setText(i18n("Gamma correction is not supported by your"
     " graphics hardware or driver."));
-    error->tqsetAlignment(AlignCenter);
+    error->setAlignment(AlignCenter);
     topLayout->addWidget(error);
   }
 }
@@ -351,7 +351,7 @@ void KGamma::save() {
 
     if ( !xf86cfgbox->isChecked() ) { //write gamma settings to the users config
       for (int i = 0; i < ScreenCount; i++) {
-        config->setGroup( TQString("Screen %1").tqarg(i) );
+        config->setGroup( TQString("Screen %1").arg(i) );
         config->writeEntry("rgamma", rgamma[i]);
         config->writeEntry("ggamma", ggamma[i]);
         config->writeEntry("bgamma", bgamma[i]);
@@ -405,7 +405,7 @@ bool KGamma::loadUserSettings() {
   KConfig *config = new KConfig("kgammarc");
 
   for (int i = 0; i < ScreenCount; i++) {
-    config->setGroup(TQString( "Screen %1" ).tqarg(i) );
+    config->setGroup(TQString( "Screen %1" ).arg(i) );
     rgamma[i] = config->readEntry("rgamma");
     ggamma[i] = config->readEntry("ggamma");
     bgamma[i] = config->readEntry("bgamma");
@@ -610,7 +610,7 @@ extern "C"
 
       for (int i = 0; i < xv._ScreenCount(); i++) {
         xv.setScreen(i);
-        config->setGroup( TQString("Screen %1").tqarg(i) );
+        config->setGroup( TQString("Screen %1").arg(i) );
 
         if ((rgamma = config->readEntry("rgamma").toFloat()))
           xv.setGamma(XVidExtWrap::Red, rgamma);
diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp
index 82ef1f3a..f2e0fa4b 100644
--- a/kghostview/displayoptions.cpp
+++ b/kghostview/displayoptions.cpp
@@ -68,15 +68,15 @@ namespace {
 TQString DisplayOptions::toString( const DisplayOptions& options )
 {
 	return TQString( qformat )
-		.tqarg( options.page() )
-		.tqarg( options.magnification() )
-		.tqarg( options.overrideOrientation() )
-		.tqarg( options.overridePageMedia().utf8().data() );
+		.arg( options.page() )
+		.arg( options.magnification() )
+		.arg( options.overrideOrientation() )
+		.arg( options.overridePageMedia().utf8().data() );
 }
 
 bool DisplayOptions::fromString( DisplayOptions& out, const TQString& in )
 {
-	TQRegExp regex( TQString::tqfromLatin1( rformat ) );
+	TQRegExp regex( TQString::fromLatin1( rformat ) );
 	if ( regex.search( in ) < 0 ) return false;
 
 	out.reset();
diff --git a/kghostview/gssettingswidget.ui b/kghostview/gssettingswidget.ui
index 756f8b50..7ba9f637 100644
--- a/kghostview/gssettingswidget.ui
+++ b/kghostview/gssettingswidget.ui
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>286</width>
                     <height>20</height>
diff --git a/kghostview/gssettingswidget.ui.h b/kghostview/gssettingswidget.ui.h
index 11f4bf63..371d6712 100644
--- a/kghostview/gssettingswidget.ui.h
+++ b/kghostview/gssettingswidget.ui.h
@@ -9,6 +9,6 @@
 
 void GSSettingsWidget::setDetectedVersion( TQString v)
 {
-    mDetectedVersion->setText(mDetectedVersion->text().tqarg( v ));
+    mDetectedVersion->setText(mDetectedVersion->text().arg( v ));
 }
 
diff --git a/kghostview/infodialog.cpp b/kghostview/infodialog.cpp
index 431a0ed7..5e480504 100644
--- a/kghostview/infodialog.cpp
+++ b/kghostview/infodialog.cpp
@@ -19,7 +19,7 @@
 
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdatetime.h>
 #include <tqregexp.h>
 
@@ -90,7 +90,7 @@ namespace {
 		    "(?:(\\+|\\-)(\\d\\d)\'?(\\d\\d)\'?)?"
 		    "\\)" );
 	if ( exp.exactMatch( dateStr ) ) {
-	    TQStringList list = exp.tqcapturedTexts();
+	    TQStringList list = exp.capturedTexts();
 	    TQStringList::iterator iter = list.begin();
 	    ++iter; // whole string!
 #undef GET
diff --git a/kghostview/kdscerrordialog.cpp b/kghostview/kdscerrordialog.cpp
index e831cbcd..a0bbb07e 100644
--- a/kghostview/kdscerrordialog.cpp
+++ b/kghostview/kdscerrordialog.cpp
@@ -17,8 +17,8 @@
  */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -97,7 +97,7 @@ KDSCErrorHandler::Response KDSCErrorDialog::error( const KDSCError& err )
 	break;
     }
 
-    _lineNumberLabel->setText( i18n( "On line %1:" ).tqarg( err.lineNumber() ) );
+    _lineNumberLabel->setText( i18n( "On line %1:" ).arg( err.lineNumber() ) );
     _lineLabel->setText( err.line() );
     _descriptionLabel->setText( description( err.type() ) );
     
diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp
index 1d38ba88..c5bbdedf 100644
--- a/kghostview/kgv_miniwidget.cpp
+++ b/kghostview/kgv_miniwidget.cpp
@@ -441,7 +441,7 @@ void KGVMiniWidget::showPage( int pagenumber )
 	    /*
 	    KNotifyClient::userEvent
 	      (i18n("KGhostview cannot load the document, \"%1\".\n"
-		    "It appears to be broken.").tqarg( _fileName ),
+		    "It appears to be broken.").arg( _fileName ),
 	       KNotifyClient::Messagebox);
 	    _psWidget->disableInterpreter();
 	    _psFile=0;
@@ -486,13 +486,13 @@ void KGVMiniWidget::updateStatusBarText( int pageNumber )
 	else
 	    if( !_usePageLabels || document()->format() == KGVDocument::PDF )
 		text = i18n( "Page %1 of %2" )
-		       .tqarg( pageNumber + 1 )
-		       .tqarg( dsc()->page_count() );
+		       .arg( pageNumber + 1 )
+		       .arg( dsc()->page_count() );
 	    else
 		text = i18n( "Page %1 (%2 of %3)" )
-		       .tqarg( dsc()->page()[ _options.page() ].label )
-		       .tqarg( pageNumber + 1 )
-		       .tqarg( dsc()->page_count() );
+		       .arg( dsc()->page()[ _options.page() ].label )
+		       .arg( pageNumber + 1 )
+		       .arg( dsc()->page_count() );
 
 	emit setStatusBarText( text );
     }
@@ -534,7 +534,7 @@ void KGVMiniWidget::buildTOC()
 	}
     }
     else {
-	marklist->insertItem( TQString::tqfromLatin1( "1" ), 0 );
+	marklist->insertItem( TQString::fromLatin1( "1" ), 0 );
     }
 }
 
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index e8edace1..0a7c1e06 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -20,7 +20,7 @@
 #include <tqfileinfo.h>
 #include <tqframe.h>
 #include <tqtable.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqregexp.h>
 
 #include <kaction.h>
@@ -264,7 +264,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     for ( TQValueList<double>::iterator first = mags.begin(), last = mags.end();
 	    first != last;
 	    ++first ) {
-        TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
+        TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
         str.remove( KGlobal::locale()->decimalSymbol() + "00" );
         zooms << str;
 	if ( *first == 1.0 ) idx = cur;
@@ -600,7 +600,7 @@ void KGVPart::updateZoomActions()
     }
 
     // Show percentage that isn't predefined
-    TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( zoom, 2 ));
+    TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( zoom, 2 ));
     str.remove( KGlobal::locale()->decimalSymbol() + "00" );
     items.insert( items.at(idx), 1, str );
     _zoomTo->setItems( items );
@@ -750,8 +750,8 @@ void KGVPart::slotGhostscriptError( const TQString& error )
 				"Below are any error messages which were received from Ghostscript "
 				"(<nobr><strong>%2</strong></nobr>) "
 				"which may help you.</qt>" )
-		    .tqarg( error )
-		    .tqarg( Configuration::interpreter() ),
+		    .arg( error )
+		    .arg( Configuration::interpreter() ),
 	   true );
     // The true above makes it show a "configure gs" option, but maybe we
     // should trigger an auto-redetection?
diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp
index 6159a6f2..aa821b27 100644
--- a/kghostview/kgvconfigdialog.cpp
+++ b/kghostview/kgvconfigdialog.cpp
@@ -19,7 +19,7 @@
 
 // Add header files alphabetically
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kconfig.h>
 #include <kdebug.h>
@@ -114,13 +114,13 @@ namespace {
 			"which are impossible to resolve. Please upgrade to a newer version.\n"
 			"KGhostView will try to work with it, but it may not display any files at all.\n"
 			"Version %2 seems to be appropriate on your system, although newer versions will work as well." )
-		    .tqarg( version )
-		    .tqarg( recommended ) );
+		    .arg( version )
+		    .arg( recommended ) );
 	}
 	if ( version < TQString::number( 7.00 ) ) 
 	{
 	    TQStringList arguments = TQStringList::split( ' ', Configuration::antialiasingArguments() );
-	    arguments.remove( TQString::tqfromLatin1( "-dMaxBitmap=10000000" ) );
+	    arguments.remove( TQString::fromLatin1( "-dMaxBitmap=10000000" ) );
 	    TQString antiAliasArgs = arguments.join( " " );
 
 	    Configuration::setAntialiasingArguments( antiAliasArgs );
@@ -140,9 +140,9 @@ void  ConfigDialog::showSettings( KGVPart* main ) {
     KConfigDialog* dialog = new KConfigDialog( 0, name,
 	    Configuration::self(), KDialogBase::IconList );
     dialog->addPage( new GeneralSettingsWidget( 0, "general-settings" ),
-	    i18n( "General" ), TQString::tqfromLatin1( "kghostview" ) );
+	    i18n( "General" ), TQString::fromLatin1( "kghostview" ) );
     GSSettingsWidget *gssw = new GSSettingsWidget( 0, "gs-settings" );
-    dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::tqfromLatin1( "pdf" ) );
+    dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::fromLatin1( "pdf" ) );
 
     gssw->setDetectedVersion(Configuration::version());
 
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index 89cd7948..bcfc4d2e 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -98,7 +98,7 @@ void KGVDocument::doOpenFile()
 	KMessageBox::sorry( _part->widget(),
 		i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: "
 		      "File does not exist.</qt>" )
-		.tqarg( _fileName ) );
+		.arg( _fileName ) );
 	emit canceled( TQString() );
 	return;
     }
@@ -107,7 +107,7 @@ void KGVDocument::doOpenFile()
     	KMessageBox::sorry( _part->widget(),
 		i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: "
 		      "Permission denied.</qt>" )
-		.tqarg( _fileName ) );
+		.arg( _fileName ) );
 	emit canceled( TQString() );
 	return;
     }
@@ -132,7 +132,7 @@ void KGVDocument::doOpenFile()
 	if( _tmpDSC->status() != 0 ) {
 	    KMessageBox::error( _part->widget(),
 		    i18n( "Could not create temporary file: %1" )
-		    .tqarg( strerror( _tmpDSC->status() ) ) );
+		    .arg( strerror( _tmpDSC->status() ) ) );
 	    emit canceled( TQString() );
 	    return;
 	}
@@ -159,8 +159,8 @@ void KGVDocument::doOpenFile()
 	              "which has type <strong>%2</strong>. KGhostview can "
 	              "only load PostScript (.ps, .eps) and Portable "
 	              "Document Format (.pdf) files.</qt>" )
-		      .tqarg( _fileName )
-		      .tqarg( _mimetype ) );
+		      .arg( _fileName )
+		      .arg( _mimetype ) );
 	emit canceled( TQString() );
 	return;
     }
@@ -190,7 +190,7 @@ bool KGVDocument::uncompressFile()
     {
 	KMessageBox::error( _part->widget(),
 		i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" )
-		.tqarg( _fileName ) );
+		.arg( _fileName ) );
 	emit canceled( TQString() );
 	return false;
     }
@@ -201,7 +201,7 @@ bool KGVDocument::uncompressFile()
     {
 	KMessageBox::error( _part->widget(),
 		i18n( "Could not create temporary file: %2" )
-		.tqarg( strerror( _tmpUnzipped->status() ) ) );
+		.arg( strerror( _tmpUnzipped->status() ) ) );
 	emit canceled( TQString() );
 	return false;
     }
@@ -221,7 +221,7 @@ bool KGVDocument::uncompressFile()
     {
 	KMessageBox::error( _part->widget(),
 	    i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" )
-	    .tqarg( _fileName ) );
+	    .arg( _fileName ) );
 	emit canceled( TQString() );
 	return false;
     }
@@ -239,7 +239,7 @@ void KGVDocument::openPDFFileContinue( bool pdf2dscResult )
     {
 	KMessageBox::error( _part->widget(),
 		i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr>.</qt>" ) 
-		.tqarg( _part->url().url() ) );
+		.arg( _part->url().url() ) );
 	emit canceled( TQString() );
 	return;
     }
@@ -260,8 +260,8 @@ void KGVDocument::openPSFile(const TQString &file)
     {
 	KMessageBox::error( _part->widget(),
 		i18n( "<qt>Error opening file <nobr><strong>%1</strong></nobr>: %2</qt>" )
-		.tqarg( _part->url().url() )
-		.tqarg( strerror( errno ) ) );
+		.arg( _part->url().url() )
+		.arg( strerror( errno ) ) );
 	emit canceled( "" );
 	return;
     }
@@ -497,7 +497,7 @@ TQString KGVDocument::pageListToRange( const PageList& pageList )
 	    if( bss == ess )
 		range += TQString::number( *ess );
 	    else
-		range += TQString( "%1-%2" ).tqarg( *bss ).tqarg( *ess );
+		range += TQString( "%1-%2" ).arg( *bss ).arg( *ess );
 
 	    bss = it;
 	}
@@ -521,7 +521,7 @@ void KGVDocument::print()
 	printer.setOption( "kde-range", 
 	                    pageListToRange( _part->markList()->markList() ) );
 
-	if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) ) 
+	if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) ) 
 	{
 	    KTempFile tf( TQString(), ".ps" );
 	    if( tf.status() == 0 ) 
@@ -548,7 +548,7 @@ void KGVDocument::print()
     {
 	printer.setPageSelection( KPrinter::SystemSide );
 	
-	if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) )
+	if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) )
 	    printer.printFiles( _fileName );
     }
 }
@@ -775,13 +775,13 @@ void KGVDocument::runPdf2ps( const TQString& pdfName,
     process << _interpreterPath
 	    << "-dNODISPLAY"
 	    << "-dTQUIET"
-	    << TQString( "-sPDFname=%1" ).tqarg( pdfName )
+	    << TQString( "-sPDFname=%1" ).arg( pdfName )
 	    << TQString( "-sDSCnamale locale( "kghostview" );
     _fallBackPageMedia = pageSizeToString( 
               static_cast< TQPrinter::PageSize >( locale.pageSize() ) );
     
     _usePageLabels = false;
-e=%1" ).tqarg( dscName )
+e=%1" ).arg( dscName )
 	    << "pdf2dsc.ps"
 	    << "-c"
 	    << "quit";
@@ -823,8 +823,8 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName )
               << "-dDELAYSAFER"
               << "-dNODISPLAY"
               << "-dTQUIET"
-              << TQString( "-sPDFname=%1" ).tqarg( pdfName )
-              << TQString( "-sDSCname=%1" ).tqarg( dscName )
+              << TQString( "-sPDFname=%1" ).arg( pdfName )
+              << TQString( "-sDSCname=%1" ).arg( dscName )
               << "-c"
               << "<< /PermitFileReading [ PDFname ] /PermitFileWriting [ DSCname ] /PermitFileControl [] >> setuserparams .locksafe"
               << "-f"
diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp
index 0f11e563..c7024c59 100644
--- a/kghostview/kgvfactory.cpp
+++ b/kghostview/kgvfactory.cpp
@@ -64,7 +64,7 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *
      *
      * as we did before.
      */
-    args << TQString::tqfromLatin1( className );
+    args << TQString::fromLatin1( className );
     if ( !strcmp( className, "Browser/View" ) ) {
 	    className = "KParts::ReadOnlyPart";
     }
diff --git a/kghostview/kgvpagedecorator.cpp b/kghostview/kgvpagedecorator.cpp
index a549d95d..b6304c1d 100644
--- a/kghostview/kgvpagedecorator.cpp
+++ b/kghostview/kgvpagedecorator.cpp
@@ -63,7 +63,7 @@ void KGVPageDecorator::drawFrame( TQPainter* p )
     if( !r.isValid() ) 
 	return;
     
-    const TQColorGroup& cg = tqcolorGroup();
+    const TQColorGroup& cg = colorGroup();
 
     r.moveCenter( r.center() + _shadowOffset );
     qDrawPlainRect( p, r, cg.shadow(), _shadowOffset.manhattanLength() );
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 568b209b..7f099032 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -252,7 +252,7 @@ KGVShell::openStdin()
     if( _tmpFile->status() != 0 ) {
 	KMessageBox::error( this,
 		i18n( "Could not create temporary file: %1" )
-		.tqarg( strerror( _tmpFile->status() ) ) );
+		.arg( strerror( _tmpFile->status() ) ) );
 	return;
     }
 
@@ -269,7 +269,7 @@ KGVShell::openStdin()
     if( read != 0 ) {
 	KMessageBox::error( this,
 		i18n( "Could not open standard input stream: %1" )
-		.tqarg( strerror( errno ) ) );
+		.arg( strerror( errno ) ) );
 	return;
     }
 
@@ -309,7 +309,7 @@ void KGVShell::slotMaximize()
 
 void KGVShell::slotResize()
 {
-    resize( m_gvpart->pageView()->tqsizeHint().width(), height() );
+    resize( m_gvpart->pageView()->sizeHint().width(), height() );
 }
 
 void KGVShell::setFullScreen( bool useFullScreen )
diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp
index c6d5d972..b5234ac6 100644
--- a/kghostview/kpswidget.cpp
+++ b/kghostview/kpswidget.cpp
@@ -333,7 +333,7 @@ void KPSWidget::setupWidget()
     // Make sure the properties are updated immediately.
     XSync( x11Display(), false );
 
-    tqrepaint();
+    repaint();
 
     _widgetDirty = false;
 }
@@ -343,7 +343,7 @@ bool KPSWidget::startInterpreter()
     setupWidget();
 
     _process = new KProcess;
-    if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString(  "%1 %2" ).tqarg( winId() ).tqarg( _backgroundPixmap.handle() ) );
+    if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString(  "%1 %2" ).arg( winId() ).arg( _backgroundPixmap.handle() ) );
     else _process->setEnvironment( "GHOSTVIEW", TQString::number( winId() ) );
 
     *_process << _ghostscriptPath.local8Bit();
@@ -420,7 +420,7 @@ void KPSWidget::slotProcessExited( KProcess* process )
     {
 	kdDebug( 4500 ) << "KPSWidget::slotProcessExited(): looks like it was not a clean exit." << endl;
 	if ( process->normalExit() ) {
-	    emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).tqarg( process->exitStatus() ) ) );
+	    emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).arg( process->exitStatus() ) ) );
 	} else {
 	    emit ghostscriptError( TQString( i18n( "Process killed or crashed." ) ) );
 	}
diff --git a/kghostview/logwindow.cpp b/kghostview/logwindow.cpp
index 207e88f1..bac46ce7 100644
--- a/kghostview/logwindow.cpp
+++ b/kghostview/logwindow.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
 
diff --git a/kghostview/marklist.cpp b/kghostview/marklist.cpp
index ee91af25..259d13a1 100644
--- a/kghostview/marklist.cpp
+++ b/kghostview/marklist.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
@@ -81,7 +81,7 @@ void MarkListItem::setPixmap( TQPixmap thumbnail )
 void MarkListItem::setSelected( bool selected )
 {
     if (selected)
-	setPaletteBackgroundColor( TQApplication::tqpalette().active().highlight() );
+	setPaletteBackgroundColor( TQApplication::palette().active().highlight() );
     else
 	setPaletteBackgroundColor( _backgroundColor );
 }
diff --git a/kghostview/scrollbox.cpp b/kghostview/scrollbox.cpp
index 0246e893..87d68418 100644
--- a/kghostview/scrollbox.cpp
+++ b/kghostview/scrollbox.cpp
@@ -99,19 +99,19 @@ void ScrollBox::setPageSize( const TQSize& s )
 {
     pagesize = s;
     setFixedHeight( s.height() * width() / s.width() );
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setViewSize( const TQSize& s )
 {
     viewsize = s;
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setViewPos( const TQPoint& pos )
 {
     viewpos = pos;
-    tqrepaint();
+    repaint();
 }
 
 void ScrollBox::setThumbnail( TQPixmap img )
diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp
index 8f1c8f0c..a0ec7fba 100644
--- a/kghostview/viewcontrol.cpp
+++ b/kghostview/viewcontrol.cpp
@@ -14,7 +14,7 @@
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 #include "viewcontrol.h"
@@ -36,7 +36,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 	vcGroupBox = new TQGroupBox(  this );
 	vcGroupBox->setFrameStyle( TQFrame::NoFrame );
 	//vcGroupBox->setTitle( i18n("Force Changes To") );
-	//vcGroupBox->tqsetAlignment( 1 );
+	//vcGroupBox->setAlignment( 1 );
 
 	topLayout->addWidget( vcGroupBox, 10 );
 
@@ -51,7 +51,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 
 
 	magComboBox = new TQComboBox( FALSE, vcGroupBox );
-	magComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
+	magComboBox->setFixedHeight( magComboBox->sizeHint().height() );
 
 
 	//magComboBox->hide();
@@ -63,7 +63,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 
 
 	mediaComboBox = new TQComboBox( FALSE, vcGroupBox );
-	mediaComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
+	mediaComboBox->setFixedHeight( magComboBox->sizeHint().height() );
 
 	connect ( mediaComboBox, TQT_SIGNAL (activated (int)),
 		  this, TQT_SLOT (slotMediaSelection (int)) );
@@ -75,7 +75,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 	orientComboBox->insertItem(i18n("Landscape"));
 	orientComboBox->insertItem(i18n("Seascape"));
 	orientComboBox->insertItem(i18n("Upside Down"));
-	orientComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
+	orientComboBox->setFixedHeight( magComboBox->sizeHint().height() );
 
 	connect ( orientComboBox, TQT_SIGNAL (activated (int)),
 		  this, TQT_SLOT (slotOrientSelection (int)) );
@@ -85,9 +85,9 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 
 	TQLabel* vcLabel;
 	vcLabel = new TQLabel( magComboBox, i18n("&Magnification"), vcGroupBox );
-	vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
-	if ( vcLabel->tqsizeHint().width() > labelWidth )
-		labelWidth = vcLabel->tqsizeHint().width();
+	vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
+	if ( vcLabel->sizeHint().width() > labelWidth )
+		labelWidth = vcLabel->sizeHint().width();
 	vcLabel->setMinimumWidth( labelWidth );
 
 	vcLabel->hide();
@@ -96,24 +96,24 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 
 
 	vcLabel = new TQLabel( mediaComboBox, i18n("M&edia"), vcGroupBox );
-	vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
-	if ( vcLabel->tqsizeHint().width() > labelWidth )
-		labelWidth = vcLabel->tqsizeHint().width();
+	vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
+	if ( vcLabel->sizeHint().width() > labelWidth )
+		labelWidth = vcLabel->sizeHint().width();
 	vcLabel->setMinimumWidth( labelWidth );
 
 	grid->addWidget( vcLabel, 1, 0 );
 
 	vcLabel = new TQLabel( orientComboBox, i18n("&Orientation"), vcGroupBox );
-	vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
-	if ( vcLabel->tqsizeHint().width() > labelWidth )
-		labelWidth = vcLabel->tqsizeHint().width();
+	vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
+	if ( vcLabel->sizeHint().width() > labelWidth )
+		labelWidth = vcLabel->sizeHint().width();
 	vcLabel->setMinimumWidth( labelWidth );
 
 	grid->addWidget( vcLabel, 2, 0 );
 
-	vcGroupBox->setMinimumHeight( 2*orientComboBox->tqsizeHint().height()+20 );
+	vcGroupBox->setMinimumHeight( 2*orientComboBox->sizeHint().height()+20 );
 	vcGroupBox->setMinimumWidth(
-		40 + labelWidth + orientComboBox->tqsizeHint().width() );
+		40 + labelWidth + orientComboBox->sizeHint().width() );
 
         KSeparator* sep = new KSeparator( KSeparator::HLine, this);
 	topLayout->addWidget( sep );
@@ -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/kcolorgrid.cpp b/kiconedit/kcolorgrid.cpp
index 35fd9f3e..65d766c9 100644
--- a/kiconedit/kcolorgrid.cpp
+++ b/kiconedit/kcolorgrid.cpp
@@ -163,7 +163,7 @@ void KColorGrid::resizeEvent(TQResizeEvent *)
 }
 */
 
-TQSize KColorGrid::tqsizeHint() const
+TQSize KColorGrid::sizeHint() const
 {
   return TQSize(totalwidth, totalheight);
 }
@@ -293,14 +293,14 @@ void KColorGrid::setColor( int colNum, uint col, bool update )
   }
 
   //kdDebug(4640) << "KColorGrid::setColor - before updateCell" << endl;
-  tqrepaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize,  cellsize, cellsize);
+  repaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize,  cellsize, cellsize);
   //updateCell( colNum/numCols(), colNum%numCols(), false );
   //kdDebug(4640) << "KColorGrid::setColor - after updateCell" << endl;
 }
 
 void KColorGrid::updateCell( int row, int col, bool  )
 {
-    //kdDebug(4640) << "updateCell - before tqrepaint" << endl;
+    //kdDebug(4640) << "updateCell - before repaint" << endl;
   TQWMatrix matrix;
   TQPainter p;
   p.begin( this );
@@ -330,6 +330,6 @@ void KColorGrid::setCellSize( int s )
   totalheight = (numRows() * s) + 1;
   resize(totalwidth, totalheight);
   if ( isVisible() )
-    tqrepaint(viewRect(), false);
+    repaint(viewRect(), false);
 }
 #include "kcolorgrid.moc"
diff --git a/kiconedit/kcolorgrid.h b/kiconedit/kcolorgrid.h
index a5e21fc7..5e466348 100644
--- a/kiconedit/kcolorgrid.h
+++ b/kiconedit/kcolorgrid.h
@@ -65,7 +65,7 @@ public:
 
   virtual void setCellSize( int s );
   virtual int cellSize() { return cellsize; }
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 
   void setSize(const TQSize s) { setNumRows(s.height()); setNumCols(s.width()); }
 
diff --git a/kiconedit/kicon.cpp b/kiconedit/kicon.cpp
index f36fde00..9a4da93c 100644
--- a/kiconedit/kicon.cpp
+++ b/kiconedit/kicon.cpp
@@ -70,7 +70,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
 
         if(!url.isValid()) // Giving up
         {
-            TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").tqarg(url.url());
+            TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").arg(url.url());
             KMessageBox::sorry((TQWidget*)parent(), msg);
             return false;
         }
@@ -86,7 +86,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
     {
         if(!KIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
         {
-            TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
+            TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
             KMessageBox::error((TQWidget*)parent(), msg);
             return false;
         }
@@ -101,7 +101,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
 
     if(!loadedOk) 
     {
-          TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
+          TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
           KMessageBox::error((TQWidget*)parent(), msg);
     }
     else
@@ -208,7 +208,7 @@ bool KIconEditIcon::saveAs(const TQImage *image)
     {
         int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
             i18n( "A file named \"%1\" already exists. "
-                  "Overwrite it?" ).tqarg(file),
+                  "Overwrite it?" ).arg(file),
             i18n( "Overwrite File?" ),
             i18n( "&Overwrite" ) );
   
@@ -265,7 +265,7 @@ bool KIconEditIcon::save(const TQImage *image, const TQString &_filename)
     }
     else 
     {
-        TQString msg = i18n("There was an error saving:\n%1\n").tqarg(str);
+        TQString msg = i18n("There was an error saving:\n%1\n").arg(str);
         KMessageBox::error((TQWidget*)parent(), msg);
         kdDebug(4640) << "KIconEditIcon::save - " << msg << endl;
     }
diff --git a/kiconedit/kiconcolors.cpp b/kiconedit/kiconcolors.cpp
index 4393379b..8e5daf84 100644
--- a/kiconedit/kiconcolors.cpp
+++ b/kiconedit/kiconcolors.cpp
@@ -43,7 +43,7 @@ void KDrawColors::paintCell( TQPainter *painter, int row, int col )
   int d = spacing();
 
   qDrawShadePanel( painter, d, d, cellSize()-d, cellSize()-d,
-                tqcolorGroup(), true, 1, &brush);
+                colorGroup(), true, 1, &brush);
   if ( row * numCols() + col == selected)
      painter->drawWinFocusRect( d+1, d+1, cellSize()-(2*d)+1, cellSize()-(2*d)+1 );
 }
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index d5db3bde..91ad06c3 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqvbox.h>
 #include <tqbuttongroup.h>
@@ -49,7 +49,7 @@
 static inline TQPixmap loadIcon( const char * name )
 {
   return KGlobal::instance()->iconLoader()
-    ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
+    ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
 }
 
 KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent) 
@@ -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 );
@@ -548,8 +548,8 @@ KIconConfig::KIconConfig(TQWidget *parent)
 
   TQSize min(300, 400);
 
-  if (300 < tqsizeHint().width()) { min.setWidth(tqsizeHint().width()); }
-  if (400 < tqsizeHint().height()) { min.setHeight(tqsizeHint().height()); }
+  if (300 < sizeHint().width()) { min.setWidth(sizeHint().width()); }
+  if (400 < sizeHint().height()) { min.setHeight(sizeHint().height()); }
 
   resize(min);
 }
diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp
index 8a4a6af1..38461262 100644
--- a/kiconedit/kiconedit.cpp
+++ b/kiconedit/kiconedit.cpp
@@ -222,10 +222,10 @@ void KIconEdit::writeConfig()
     saveMainWindowSettings( config, "MainWindowSettings" );
 }
 
-TQSize KIconEdit::tqsizeHint() const
+TQSize KIconEdit::sizeHint() const
 {
     if(gridview)
-        return gridview->tqsizeHint();
+        return gridview->sizeHint();
     else
         return TQSize(-1, -1);
 }
@@ -477,7 +477,7 @@ bool KIconEdit::setupStatusBar()
     statusbar->insertFixedItem("99999,99999", 0, true);
     statusbar->insertFixedItem("99999 x 99999", 1, true);
     statusbar->insertFixedItem(" 1:999", 2, true);
-    str = i18n("Colors: %1").tqarg(9999999);
+    str = i18n("Colors: %1").arg(9999999);
     statusbar->insertFixedItem(str, 3, true);
     statusbar->insertItem("", 4);
 
diff --git a/kiconedit/kiconedit.h b/kiconedit/kiconedit.h
index e912e0f7..7af10e74 100644
--- a/kiconedit/kiconedit.h
+++ b/kiconedit/kiconedit.h
@@ -65,7 +65,7 @@ public:
   KIconEdit( const TQImage image, const char *name = "kiconedit");
   ~KIconEdit();
 
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
   static WindowList windowList;
 
 signals:
diff --git a/kiconedit/kiconeditslots.cpp b/kiconedit/kiconeditslots.cpp
index f229b325..7d8fffd7 100644
--- a/kiconedit/kiconeditslots.cpp
+++ b/kiconedit/kiconeditslots.cpp
@@ -195,7 +195,7 @@ void KIconEdit::slotPrint()
 {
     KPrinter printer;
 
-    if ( printer.setup(this, i18n("Print %1").tqarg(icon->url().section('/', -1))) )
+    if ( printer.setup(this, i18n("Print %1").arg(icon->url().section('/', -1))) )
     {
         int margin = 10, yPos = 0;
         printer.setCreator("KDE Icon Editor");
@@ -422,13 +422,13 @@ void KIconEdit::slotUpdateZoom( int s )
 
 void KIconEdit::slotUpdateStatusPos(int x, int y)
 {
-    TQString str = i18n("Status Position", "%1, %2").tqarg(x).tqarg(y);
+    TQString str = i18n("Status Position", "%1, %2").arg(x).arg(y);
     statusbar->changeItem( str, 0);
 }
 
 void KIconEdit::slotUpdateStatusSize(int x, int y)
 {
-    TQString str = i18n("Status Size", "%1 x %2").tqarg(x).tqarg(y);
+    TQString str = i18n("Status Size", "%1 x %2").arg(x).arg(y);
     statusbar->changeItem( str, 1);
 }
 
@@ -443,13 +443,13 @@ void KIconEdit::slotUpdateStatusScaling(int s)
 
 void KIconEdit::slotUpdateStatusColors(uint)
 {
-    TQString str = i18n("Colors: %1").tqarg(grid->numColors());
+    TQString str = i18n("Colors: %1").arg(grid->numColors());
     statusbar->changeItem( str, 3);
 }
 
 void KIconEdit::slotUpdateStatusColors(uint n, uint *)
 {
-    TQString str = i18n("Colors: %1").tqarg(n);
+    TQString str = i18n("Colors: %1").arg(n);
     statusbar->changeItem( str, 3);
 }
 
diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp
index b24db091..672dbdac 100644
--- a/kiconedit/kicongrid.cpp
+++ b/kiconedit/kicongrid.cpp
@@ -27,7 +27,7 @@
 #include <tqwhatsthis.h>
 #include <tqscrollview.h>
 #include <tqbitmap.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdatetime.h>
 
 #include <kiconloader.h>
@@ -1035,7 +1035,7 @@ void KIconEditGrid::load( TQImage *image)
             setColor((y*numCols())+x, *l, false);
         }
         //kdDebug(4640) << "Row: " << y << endl;
-        kapp->tqprocessEvents(200);
+        kapp->processEvents(200);
     }
 
     updateColors();
@@ -1044,7 +1044,7 @@ void KIconEditGrid::load( TQImage *image)
     emit changed(pixmap());
     setUpdatesEnabled(true);
     emit needPainting();
-    //tqrepaint(viewRect(), false);
+    //repaint(viewRect(), false);
     history->clear();
 }
 
@@ -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;
     }
@@ -1379,7 +1379,7 @@ void KIconEditGrid::editPasteAsNew()
             *img = tmp;
             load(img);
             setModified(true);
-            //tqrepaint(viewRect(), false);
+            //repaint(viewRect(), false);
   
             p = *img;
             emit changed(TQPixmap(p));
diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp
index e38d58bb..4a29fe05 100644
--- a/kiconedit/knew.cpp
+++ b/kiconedit/knew.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */  
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
@@ -173,7 +173,7 @@ NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent )
   l->addWidget( rbtempl, 1 );
   //l->addWidget(rbtempl, 5, AlignLeft);
   
-  //grp->setMinimumSize(grp->tqchildrenRect().size());
+  //grp->setMinimumSize(grp->childrenRect().size());
   
   grp->setButton( 0 );
 }
diff --git a/kiconedit/kresize.cpp b/kiconedit/kresize.cpp
index ac98e214..4e73dad9 100644
--- a/kiconedit/kresize.cpp
+++ b/kiconedit/kresize.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 
 #include <klocale.h>
@@ -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 225e2439..907b447a 100644
--- a/kiconedit/palettetoolbar.cpp
+++ b/kiconedit/palettetoolbar.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqpainter.h>
 
@@ -42,7 +42,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
   m_lblPreview = new TQLabel( base );
   m_lblPreview->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
   m_lblPreview->setFixedHeight( 64 );
-  m_lblPreview->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
+  m_lblPreview->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
   TQWhatsThis::add(m_lblPreview, i18n( "Preview\n\nThis is a 1:1 preview"
       " of the current icon" ) );
   m_layout->addWidget( m_lblPreview );
@@ -50,31 +50,31 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
   m_currentColorView = new TQLabel( base );
   m_currentColorView->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
   m_currentColorView->setFixedHeight( 24 );
-  m_currentColorView->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
+  m_currentColorView->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
   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 68060bb3..74eaf050 100644
--- a/kmrml/kmrml/algorithmdialog.cpp
+++ b/kmrml/kmrml/algorithmdialog.cpp
@@ -22,7 +22,7 @@
 
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqscrollview.h>
 #include <tqvbox.h>
 #include <tqvgroupbox.h>
@@ -49,8 +49,8 @@ protected:
     virtual void viewportResizeEvent(TQResizeEvent* ev)
     {
       TQScrollView::viewportResizeEvent(ev);
-      m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()),
-                       kMax(m_frame->tqsizeHint().height(), ev->size().height()));
+      m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()),
+                       kMax(m_frame->sizeHint().height(), ev->size().height()));
     };
 
 private:
@@ -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" );
@@ -106,7 +106,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
     mainLayout->activate();
     algoHLayout->move( groupBox->x() + 10, groupBox->y() - 12 );
     
-    box->setMinimumWidth( algoHLayout->tqsizeHint().width() + 
+    box->setMinimumWidth( algoHLayout->sizeHint().width() + 
                           4 * KDialog::spacingHint() );
 }
 
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp
index 2183cc5b..c184c10c 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.cpp
+++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp
@@ -78,7 +78,7 @@ void IndexCleaner::startNext()
     if ( index != -1 )
         cmd.replace( index, 2, TQUOTE( dir ) );
     else // no %d? What else can we do?
-        cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) );
+        cmd.append( TQString::fromLatin1(" ") + TQUOTE( dir ) );
 
     *m_process << cmd;
 
diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp
index 09a83c33..3f479ee6 100644
--- a/kmrml/kmrml/kcontrol/indexer.cpp
+++ b/kmrml/kmrml/kcontrol/indexer.cpp
@@ -112,7 +112,7 @@ void Indexer::processNext()
          *m_process << *it;
 #endif
 
-    emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").tqarg( m_currentDir ));
+    emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").arg( m_currentDir ));
     m_process->start();
 }
 
@@ -160,7 +160,7 @@ void Indexer::slotCanRead( KProcIO *proc )
                     if ( ok )
                     {
                         uint dirsLeft = m_dirs.count();
-                        TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").tqarg( m_dirCount - dirsLeft ).tqarg( m_dirCount).tqarg( m_currentDir ).tqarg( currentFile ).tqarg( numFiles );
+                        TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").arg( m_dirCount - dirsLeft ).arg( m_dirCount).arg( m_currentDir ).arg( currentFile ).arg( numFiles );
                         emit progress( perc, message );
                     }
                 }
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
index 42aaf534..3e7e91c1 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kaboutdata.h>
 #include <kapplication.h>
@@ -58,11 +58,11 @@ KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
     ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" );
     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 )));
 
@@ -86,11 +86,11 @@ void KCMKMrml::checkGiftInstallation()
         KMessageBox::error( this, errorMessage );
         m_mainPage->hide();
         TQLabel *errorLabel = new TQLabel( errorMessage, this );
-        errorLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+        errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
         KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this ); 
-        urlLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+        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/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index 84ba61a2..ca491ead 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -186,7 +186,7 @@ TQStringList MainPage::difference( const TQStringList& oldIndexDirs,
 {
     TQStringList result;
 
-    TQString slash = TQString::tqfromLatin1("/");
+    TQString slash = TQString::fromLatin1("/");
     TQStringList::ConstIterator oldIt = oldIndexDirs.begin();
     TQString oldDir, newDir;
 
@@ -465,7 +465,7 @@ void MainPage::slotIndexingFinished( int returnCode )
             if ( err )
                 syserr = TQString::fromLocal8Bit( err );
             else
-                syserr = i18n("Unknown error: %1").tqarg( returnCode );
+                syserr = i18n("Unknown error: %1").arg( returnCode );
         }
 
         KMessageBox::detailedError( this, i18n("An error occurred during indexing. The index might be invalid."),
diff --git a/kmrml/kmrml/kcontrol/serverconfigwidget.ui b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
index e577b221..5f3a34cd 100644
--- a/kmrml/kmrml/kcontrol/serverconfigwidget.ui
+++ b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
@@ -135,7 +135,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
@@ -200,7 +200,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>16</height>
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 219a36a6..ef9c4b06 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -18,7 +18,7 @@
 
 #include <tqdir.h>
 #include <tqfile.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kconfig.h>
 #include <kdebug.h>
@@ -104,7 +104,7 @@ bool Config::sync()
 void Config::setDefaultHost( const TQString& host )
 {
     m_defaultHost = host.isEmpty() ?
-                    TQString::tqfromLatin1(DEFAULT_HOST) : host;
+                    TQString::fromLatin1(DEFAULT_HOST) : host;
 
     m_config->setGroup( CONFIG_GROUP );
     m_config->writeEntry( "Default Host", m_defaultHost );
diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h
index 4e39d3bf..2208030a 100644
--- a/kmrml/kmrml/lib/kmrml_config.h
+++ b/kmrml/kmrml/lib/kmrml_config.h
@@ -108,7 +108,7 @@ namespace KMrml
 
         TQString settingsGroup( const TQString& host ) const
         {
-            return TQString::tqfromLatin1( "SettingsFor: " ).append( host );
+            return TQString::fromLatin1( "SettingsFor: " ).append( host );
         }
 
         bool m_serverStartedIndividually;
diff --git a/kmrml/kmrml/lib/mrml_shared.cpp b/kmrml/kmrml/lib/mrml_shared.cpp
index 932010f6..3e7d6d95 100644
--- a/kmrml/kmrml/lib/mrml_shared.cpp
+++ b/kmrml/kmrml/lib/mrml_shared.cpp
@@ -53,7 +53,7 @@ const TQString * MrmlShared::m_element = 0L;
 const TQString * MrmlShared::m_attribute = 0L;
 const TQString * MrmlShared::m_attributeName = 0L;
 const TQString * MrmlShared::m_attributeValue = 0L;
-const TQString * MrmlShared::m_tqchildren = 0L;
+const TQString * MrmlShared::m_children = 0L;
 const TQString * MrmlShared::m_none = 0L;
 
 const TQString * MrmlShared::m_multiSet = 0L;
@@ -141,7 +141,7 @@ void MrmlShared::init()
     m_attribute = new TQString ( "attribute" ) ;
     m_attributeName = new TQString ( "attribute-name" ) ;
     m_attributeValue = new TQString ( "attribute-value" ) ;
-    m_tqchildren = new TQString ( "tqchildren" ) ;
+    m_children = new TQString ( "children" ) ;
     m_none = new TQString ( "none" ) ;
 
     m_multiSet = new TQString ( "multi-set" ) ;
@@ -215,7 +215,7 @@ void MrmlShared::cleanup()
     delete m_attribute;
     delete m_attributeName;
     delete m_attributeValue;
-    delete m_tqchildren;
+    delete m_children;
     delete m_none;
 
     delete m_visibility;
diff --git a/kmrml/kmrml/lib/mrml_shared.h b/kmrml/kmrml/lib/mrml_shared.h
index 175d5c3c..6ed2177a 100644
--- a/kmrml/kmrml/lib/mrml_shared.h
+++ b/kmrml/kmrml/lib/mrml_shared.h
@@ -76,7 +76,7 @@ public:
     static const TQString& attribute()           { return *m_attribute; }
     static const TQString& attributeName()       { return *m_attributeName; }
     static const TQString& attributeValue()      { return *m_attributeValue; }
-    static const TQString& tqchildren()            { return *m_tqchildren; }
+    static const TQString& children()            { return *m_children; }
     static const TQString& none()                { return *m_none; }
 
     static const TQString& visibility()          { return *m_visibility; }
@@ -139,7 +139,7 @@ private:
     static const TQString * m_attribute;
     static const TQString * m_attributeName;
     static const TQString * m_attributeValue;
-    static const TQString * m_tqchildren;
+    static const TQString * m_children;
     static const TQString * m_none;
 
     static const TQString * m_visibility;
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index 137c2062..a61de8f1 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -216,11 +216,11 @@ bool Mrml::startSession( const KURL& url )
     // Wolfgang says, we shouldn't create an own session-id here, as gcc 2.95
     // apparently makes problems in exception handling somehow. So we simply
     // accept the server's session-id.
-    TQString msg = mrmlString( TQString() ).tqarg(
+    TQString msg = mrmlString( TQString() ).arg(
         "<open-session user-name=\"%1\" session-name=\"kio_mrml session\" /> \
          <get-algorithms />                                                  \
          <get-collections />                                                 \
-         </mrml>" ).tqarg( user( url ));
+         </mrml>" ).arg( user( url ));
 
     TQCString utf8 = msg.utf8();
 //     qDebug(":::Writing: %s", utf8.data());
@@ -240,13 +240,13 @@ TQString Mrml::mrmlString( const TQString& sessionId, const TQString& transactio
          </mrml>";
 
     if ( sessionId.isEmpty() ) // when we don't have one yet
-        return msg.tqarg( "<mrml>%1" );
+        return msg.arg( "<mrml>%1" );
 
     if ( transactionId.isNull() )
-        return msg.tqarg( "<mrml session-id=\"%1\">%1" ).tqarg( sessionId );
+        return msg.arg( "<mrml session-id=\"%1\">%1" ).arg( sessionId );
     else
-        return msg.tqarg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
-                  .tqarg( sessionId ).tqarg( transactionId );
+        return msg.arg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
+                  .arg( sessionId ).arg( transactionId );
 }
 
 void Mrml::emitData( const TQCString& msg )
diff --git a/kmrml/kmrml/mrml_elements.cpp b/kmrml/kmrml/mrml_elements.cpp
index 8700ed43..3fadcaba 100644
--- a/kmrml/kmrml/mrml_elements.cpp
+++ b/kmrml/kmrml/mrml_elements.cpp
@@ -28,7 +28,7 @@ using namespace KMrml;
 //
 // MrmlElement is currently the baseclass for Algorithm and Collection. Both
 // may have a single child-element <query-paradigm-list>, with a number of
-// <query-paradigm> elements as tqchildren.
+// <query-paradigm> elements as children.
 //
 
 MrmlElement::MrmlElement( const TQDomElement& elem )
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index 542d3b9c..7a8967c8 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -153,13 +153,13 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
 
     m_algoButton = new TQPushButton( TQString(), m_panel );
     m_algoButton->setPixmap( SmallIcon("configure") );
-    m_algoButton->setFixedSize( m_algoButton->tqsizeHint() );
+    m_algoButton->setFixedSize( m_algoButton->sizeHint() );
     connect( m_algoButton, TQT_SIGNAL( clicked() ),
              TQT_SLOT( slotConfigureAlgorithm() ));
     TQToolTip::add( m_algoButton, i18n("Configure algorithm") );
 
     TQWidget *spacer = new TQWidget( m_panel );
-    spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+    spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
                                         TQSizePolicy::Minimum ) );
 
     int resultSize = config->readNumEntry( "Result-size", 20 );
@@ -172,7 +172,7 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
 
     m_startButton = new TQPushButton( TQString(), tmp );
     connect( m_startButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStartClicked() ));
-    settqStatus( NeedCollection );
+    setStatus( NeedCollection );
 
     setWidget( box );
 
@@ -206,7 +206,7 @@ void MrmlPart::initCollections( const TQDomElement& elem )
         KMessageBox::information( widget(),
                                i18n("There is no image collection available\n"
                                     "at %1.\n"), i18n("No Image Collection"));
-        settqStatus( NeedCollection );
+        setStatus( NeedCollection );
     }
     else
         m_collectionCombo->updateGeometry(); // adjust the entire grid
@@ -229,7 +229,7 @@ bool MrmlPart::openURL( const KURL& url )
 
     m_url = url;
     TQString host = url.host().isEmpty() ?
-                   TQString::tqfromLatin1("localhost") : url.host();
+                   TQString::fromLatin1("localhost") : url.host();
 
     m_hostCombo->setCurrentItem( host );
 
@@ -285,8 +285,8 @@ bool MrmlPart::openURL( const KURL& url )
                  == KMessageBox::Yes )
             {
                 KApplication::tdeinitExec( "kcmshell",
-                                           TQString::tqfromLatin1("kcmkmrml"));
-                settqStatus( NeedCollection );
+                                           TQString::fromLatin1("kcmkmrml"));
+                setStatus( NeedCollection );
                 return false;
             }
         }
@@ -308,9 +308,9 @@ void MrmlPart::contactServer( const KURL& url )
     m_job->addMetaData( MrmlShared::kio_task(), MrmlShared::kio_initialize() );
 
     TQString host = url.host().isEmpty() ?
-                   TQString::tqfromLatin1("localhost") : url.host();
+                   TQString::fromLatin1("localhost") : url.host();
 
-    slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host ));
+    slotSetStatusBar( i18n("Connecting to indexing server at %1...").arg( host ));
 }
 
 //
@@ -376,7 +376,7 @@ bool MrmlPart::closeURL()
         m_job = 0L;
     }
 
-    settqStatus( NeedCollection );
+    setStatus( NeedCollection );
 
     return true;
 }
@@ -400,7 +400,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
 
     emit started( job );
     emit setWindowCaption( url.prettyURL() );
-    settqStatus( InProgress );
+    setStatus( InProgress );
 
     return job;
 }
@@ -423,7 +423,7 @@ void MrmlPart::slotResult( KIO::Job *job )
     bool auto_random = m_view->isEmpty() && m_queryList.isEmpty();
     m_random->setChecked( auto_random );
     m_random->setEnabled( !auto_random );
-    settqStatus( job->error() ? NeedCollection : CanSearch );
+    setStatus( job->error() ? NeedCollection : CanSearch );
 
     if ( !job->error() && !m_queryList.isEmpty() ) {
         // we have a connection and we got a list of relevant URLs to query for
@@ -495,7 +495,7 @@ void MrmlPart::parseMrml( TQDomDocument& doc )
                 else if ( tagName == "error" ) {
                     KMessageBox::information( widget(),
                                        i18n("Server returned error:\n%1\n")
-                                       .tqarg( elem.attribute( "message" )),
+                                       .arg( elem.attribute( "message" )),
                                               i18n("Server Error") );
                 }
 
@@ -776,7 +776,7 @@ void MrmlPart::slotHostComboActivated( const TQString& host )
     openURL( settings.getUrl() );
 }
 
-void MrmlPart::settqStatus( tqStatus status )
+void MrmlPart::setStatus( Status status )
 {
     switch ( status )
     {
diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h
index 1451b833..0bfec704 100644
--- a/kmrml/kmrml/mrml_part.h
+++ b/kmrml/kmrml/mrml_part.h
@@ -57,7 +57,7 @@ class MrmlPart : public KParts::ReadOnlyPart
   TQ_OBJECT
 
 public:
-    enum tqStatus { NeedCollection, CanSearch, InProgress };
+    enum Status { NeedCollection, CanSearch, InProgress };
 
     MrmlPart( TQWidget *parentWidget, const char *widgetName,
               TQObject *parent, const char *name, const TQStringList& args );
@@ -116,7 +116,7 @@ private:
     void initHostCombo();
     void enableServerDependentWidgets( bool enable );
 
-    void settqStatus( tqStatus status );
+    void setStatus( Status status );
 
     void contactServer( const KURL& url );
     void downloadReferenceFiles( const KURL::List& downloadList );
@@ -143,7 +143,7 @@ private:
     CollectionList m_collections;
     AlgorithmList m_algorithms;
 
-    tqStatus m_status;
+    Status m_status;
     static uint s_sessionId;
 
 };
diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp
index d5b26117..2fed1bcb 100644
--- a/kmrml/kmrml/mrml_view.cpp
+++ b/kmrml/kmrml/mrml_view.cpp
@@ -57,7 +57,7 @@ MrmlView::MrmlView( TQWidget *parent, const char *name )
     // query result image
     TQLabel l( i18n( "No thumbnail available" ), 0L );
     l.setFixedSize( 80, 80 );
-    l.tqsetAlignment( WordBreak | AlignCenter );
+    l.setAlignment( WordBreak | AlignCenter );
 //     l.setFrameStyle( TQLabel::Box | TQLabel::Plain );
 //     l.setLineWidth( 1 );
     l.setPaletteBackgroundColor( TQt::white );
@@ -176,7 +176,7 @@ void MrmlView::slotLayout()
     TQPtrListIterator<MrmlViewItem> it( m_items );
 
     for ( ; it.current(); ++it ) {
-        itemWidth = TQMAX( itemWidth, it.current()->tqsizeHint().width() );
+        itemWidth = TQMAX( itemWidth, it.current()->sizeHint().width() );
     }
 
     if ( itemWidth == 0 )
@@ -202,7 +202,7 @@ void MrmlView::slotLayout()
         if ( item == 0 )
             rowIt = it;
 
-        rowHeight = TQMAX( rowHeight, it.current()->tqsizeHint().height() );
+        rowHeight = TQMAX( rowHeight, it.current()->sizeHint().height() );
         addChild( it.current(), margin + item * itemWidth, y );
         it.current()->show();
 
@@ -306,11 +306,11 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL,
 
     /*
     if ( similarity > -1 )
-        TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1<br>%1</qt>")
-                       .tqarg( url )
-                       .tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity))));
+        TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>")
+                       .arg( url )
+                       .arg(i18n("Similarity: %1").arg( TQString::number(similarity))));
     else
-        TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1</qt>").tqarg( url ) );
+        TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").arg( url ) );
     */
 
     setMinimumSize( 130, 130 ); // ###
@@ -342,14 +342,14 @@ void MrmlViewItem::paintEvent( TQPaintEvent *e )
 
     if ( m_similarity >= 0 ) {
         TQPainter p( this );
-        TQPen pen( tqcolorGroup().highlight(), 1, TQPen::SolidLine );
+        TQPen pen( colorGroup().highlight(), 1, TQPen::SolidLine );
         p.setPen( pen );
         int x = margin;
         int y = m_combo->y() - similarityHeight - 2;
         int w = (int) (similarityFullWidth * m_similarity);
         int h = similarityHeight;
         p.drawRect( x, y, similarityFullWidth, h );
-        p.fillRect( x, y, w, h, tqcolorGroup().highlight() );
+        p.fillRect( x, y, w, h, colorGroup().highlight() );
     }
 }
 
@@ -361,7 +361,7 @@ void MrmlViewItem::resizeEvent( TQResizeEvent *e )
     m_combo->move( width()/2 - m_combo->width()/2, y );
 }
 
-TQSize MrmlViewItem::tqsizeHint() const
+TQSize MrmlViewItem::sizeHint() const
 {
     int w = TQMAX( TQMAX(minimumHeight(), m_combo->width()), m_pixmap.width() );
     w += 2 * margin;
diff --git a/kmrml/kmrml/mrml_view.h b/kmrml/kmrml/mrml_view.h
index a9f1aad1..f73634a8 100644
--- a/kmrml/kmrml/mrml_view.h
+++ b/kmrml/kmrml/mrml_view.h
@@ -126,7 +126,7 @@ public:
 
     void setSimilarity( double value );
 
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
     const KURL& url() const { return m_url; }
     const KURL& thumbURL() const { return m_thumbURL; }
diff --git a/kmrml/kmrml/propertysheet.cpp b/kmrml/kmrml/propertysheet.cpp
index dba9d531..af913558 100644
--- a/kmrml/kmrml/propertysheet.cpp
+++ b/kmrml/kmrml/propertysheet.cpp
@@ -98,10 +98,10 @@ void PropertySheet::initFromDOM( const TQDomElement& elem )
     m_minSubsetSize = toInt( elem.attribute( MrmlShared::minSubsetSize() ));
     m_maxSubsetSize = toInt( elem.attribute( MrmlShared::maxSubsetSize() ));
 
-    TQValueList<TQDomElement> tqchildren =
+    TQValueList<TQDomElement> children =
         KMrml::directChildElements( elem, MrmlShared::propertySheet() );
-    TQValueListConstIterator<TQDomElement> it = tqchildren.begin();
-    for ( ; it != tqchildren.end(); ++it )
+    TQValueListConstIterator<TQDomElement> it = children.begin();
+    for ( ; it != children.end(); ++it )
         m_subSheets.append( new PropertySheet( *it ) );
 }
 
@@ -190,7 +190,7 @@ PropertySheet::SendType PropertySheet::getSendType( const TQString& value )
         type = AttributeName;
     else if ( value == MrmlShared::attributeValue() )
         type = AttributeValue;
-    else if ( value == MrmlShared::tqchildren() )
+    else if ( value == MrmlShared::children() )
         type = Children;
     else if ( value == MrmlShared::none() )
         type = None;
diff --git a/kmrml/kmrml/propertysheet.h b/kmrml/kmrml/propertysheet.h
index 2e20cb85..e4759282 100644
--- a/kmrml/kmrml/propertysheet.h
+++ b/kmrml/kmrml/propertysheet.h
@@ -34,7 +34,7 @@ namespace KMrml
         {
             MultiSet = 1,       // ??
             Subset,             // radio-button/combobox or listbox
-            SetElement,         // CheckBox -> disables/enables tqchildren?
+            SetElement,         // CheckBox -> disables/enables children?
             Boolean,            // CheckBox
             Numeric,            // Slider/Spinbox
             Textual,            // lineedit
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index 70d34c14..ce569bab 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -146,7 +146,7 @@ void Watcher::slotProcExited( KProcess *proc )
                              i18n("<qt>The server with the command line"
                                   "<br>%1<br>"
                                   "is not available anymore. Do you want to "
-                                  "restart it?" ).tqarg( daemon->commandline ),
+                                  "restart it?" ).arg( daemon->commandline ),
                                             i18n("Service Failure"), i18n("Restart Server"), i18n("Do Not Restart") )
                  == KMessageBox::Yes )
             {
@@ -175,7 +175,7 @@ bool Watcher::startDaemon( DaemonData *daemon )
                       i18n("Unable to start the server with the "
                            "command line"
                            "<br>%1<br>"
-                          "Try again?").tqarg( daemon->commandline ),
+                          "Try again?").arg( daemon->commandline ),
                                          i18n("Service Failure"), i18n("Try Again"), i18n("Do Not Try") )
              == KMessageBox::Yes )
         {
diff --git a/kolourpaint/BUGS b/kolourpaint/BUGS
index 25814d61..84f3391f 100644
--- a/kolourpaint/BUGS
+++ b/kolourpaint/BUGS
@@ -27,8 +27,8 @@ This file lists known bugs in this version that are not considered
    manifestations of the current QSpinBox behaviour.
 
 6. a) The undo history and document modified state are not updated during
-      the drawing of multi-segment tqshapes (Polygon, Connected Lines,
-      Curve).  They are however updated after tqshapes' completion.
+      the drawing of multi-segment shapes (Polygon, Connected Lines,
+      Curve).  They are however updated after shapes' completion.
 
    b) The text and brush-like tools set the document modified flag even if
       user cancels the draw operation.
@@ -37,7 +37,7 @@ This file lists known bugs in this version that are not considered
       still marked as modified (because 2 commands - the create selection
       and the move - were added but only one was undone).
 
-7. Certain tqshapes may have the wrong size (usually only a pixel off and
+7. Certain shapes may have the wrong size (usually only a pixel off and
    only in extreme cases) e.g. an ellipse of height 1 always has a width 1
    pixel less than it should be.  This is a Qt bug.
 
diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp
index 06948815..6849ebf4 100644
--- a/kolourpaint/kpcommandhistory.cpp
+++ b/kolourpaint/kpcommandhistory.cpp
@@ -257,13 +257,13 @@ kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig,
     : d (new kpCommandHistoryBasePrivate ())
 {
     m_actionUndo = new KToolBarPopupAction (undoActionText (),
-        TQString::tqfromLatin1 ("undo"),
+        TQString::fromLatin1 ("undo"),
         KStdAccel::shortcut (KStdAccel::Undo),
         this, TQT_SLOT (undo ()),
         ac, KStdAction::name (KStdAction::Undo));
 
     m_actionRedo = new KToolBarPopupAction (redoActionText (),
-        TQString::tqfromLatin1 ("redo"),
+        TQString::fromLatin1 ("redo"),
         KStdAccel::shortcut (KStdAccel::Redo),
         this, TQT_SLOT (redo ()),
         ac, KStdAction::name (KStdAction::Redo));
@@ -763,7 +763,7 @@ void kpCommandHistoryBase::trimCommandLists ()
             -m_documentRestoredPosition > (int) m_undoCommandList.size ())
         {
         #if DEBUG_KP_COMMAND_HISTORY
-            kdDebug () << "\t\t\ttqinvalidate documentRestoredPosition" << endl;
+            kdDebug () << "\t\t\tinvalidate documentRestoredPosition" << endl;
         #endif
             m_documentRestoredPosition = INT_MAX;
         }
@@ -911,7 +911,7 @@ void kpCommandHistory::undo ()
     if (m_mainWindow && m_mainWindow->toolHasBegunShape ())
     {
     #if DEBUG_KP_COMMAND_HISTORY
-        kdDebug () << "\thas begun tqshape - cancel draw" << endl;
+        kdDebug () << "\thas begun shape - cancel draw" << endl;
     #endif
         m_mainWindow->tool ()->cancelShapeInternal ();
     }
@@ -928,7 +928,7 @@ void kpCommandHistory::redo ()
         //
         // Ignoring the request would not be intuitive for tools like
         // Polygon & Polyline (where it's not always apparent to the user
-        // that s/he's still drawing a tqshape even though the mouse isn't
+        // that s/he's still drawing a shape even though the mouse isn't
         // down).
         m_mainWindow->tool ()->cancelShapeInternal ();
     }
diff --git a/kolourpaint/kpcommandhistory.h b/kolourpaint/kpcommandhistory.h
index da415663..0cc18229 100644
--- a/kolourpaint/kpcommandhistory.h
+++ b/kolourpaint/kpcommandhistory.h
@@ -222,16 +222,16 @@ private:
 
 // Intercepts Undo/Redo requests:
 //
-// If the user is currently drawing a tqshape, it cancels it.
+// If the user is currently drawing a shape, it cancels it.
 // Else it passes on the Undo/Redo request to kpCommandHistoryBase.
 //
 // TODO: This is wrong.  It won't work if the Undo action is disabled,
 //       for instance.
 //
 //       Maybe the real solution is to call kpCommandHistoryBase::addCommand()
-//       as _soon_ as the tqshape starts - not after it ends.  But the
+//       as _soon_ as the shape starts - not after it ends.  But the
 //       trouble with this solution is that if the user Undoes/cancels
-//       the tqshape s/he's currently drawing, it would replace a Redo
+//       the shape s/he's currently drawing, it would replace a Redo
 //       slot in the history.  Arguably you shouldn't be able to Redo
 //       something you never finished drawing.
 //
diff --git a/kolourpaint/kpdefs.h b/kolourpaint/kpdefs.h
index d0343f9e..c509ae0f 100644
--- a/kolourpaint/kpdefs.h
+++ b/kolourpaint/kpdefs.h
@@ -65,71 +65,71 @@
 // Settings
 //
 
-#define kpSettingsGroupGeneral TQString::tqfromLatin1 ("General Settings")
-#define kpSettingFirstTime TQString::tqfromLatin1 ("First Time")
-#define kpSettingShowGrid TQString::tqfromLatin1 ("Show Grid")
-#define kpSettingShowPath TQString::tqfromLatin1 ("Show Path")
-#define kpSettingColorSimilarity TQString::tqfromLatin1 ("Color Similarity")
-#define kpSettingDitherOnOpen TQString::tqfromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than")
-#define kpSettingPrintImageCenteredOnPage TQString::tqfromLatin1 ("Print Image Centered On Page")
+#define kpSettingsGroupGeneral TQString::fromLatin1 ("General Settings")
+#define kpSettingFirstTime TQString::fromLatin1 ("First Time")
+#define kpSettingShowGrid TQString::fromLatin1 ("Show Grid")
+#define kpSettingShowPath TQString::fromLatin1 ("Show Path")
+#define kpSettingColorSimilarity TQString::fromLatin1 ("Color Similarity")
+#define kpSettingDitherOnOpen TQString::fromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than")
+#define kpSettingPrintImageCenteredOnPage TQString::fromLatin1 ("Print Image Centered On Page")
 
-#define kpSettingsGroupFileSaveAs TQString::tqfromLatin1 ("File/Save As")
-#define kpSettingsGroupFileExport TQString::tqfromLatin1 ("File/Export")
-#define kpSettingsGroupEditCopyTo TQString::tqfromLatin1 ("Edit/Copy To")
+#define kpSettingsGroupFileSaveAs TQString::fromLatin1 ("File/Save As")
+#define kpSettingsGroupFileExport TQString::fromLatin1 ("File/Export")
+#define kpSettingsGroupEditCopyTo TQString::fromLatin1 ("Edit/Copy To")
 
-#define kpSettingForcedMimeType TQString::tqfromLatin1 ("Forced MimeType")
-#define kpSettingForcedColorDepth TQString::tqfromLatin1 ("Forced Color Depth")
-#define kpSettingForcedDither TQString::tqfromLatin1 ("Forced Dither")
-#define kpSettingForcedQuality TQString::tqfromLatin1 ("Forced Quality")
+#define kpSettingForcedMimeType TQString::fromLatin1 ("Forced MimeType")
+#define kpSettingForcedColorDepth TQString::fromLatin1 ("Forced Color Depth")
+#define kpSettingForcedDither TQString::fromLatin1 ("Forced Dither")
+#define kpSettingForcedQuality TQString::fromLatin1 ("Forced Quality")
 
-#define kpSettingLastDocSize TQString::tqfromLatin1 ("Last Document Size")
+#define kpSettingLastDocSize TQString::fromLatin1 ("Last Document Size")
 
-#define kpSettingMoreEffectsLastEffect TQString::tqfromLatin1 ("More Effects - Last Effect")
+#define kpSettingMoreEffectsLastEffect TQString::fromLatin1 ("More Effects - Last Effect")
 
-#define kpSettingResizeScaleLastKeepAspect TQString::tqfromLatin1 ("Resize Scale - Last Keep Aspect")
+#define kpSettingResizeScaleLastKeepAspect TQString::fromLatin1 ("Resize Scale - Last Keep Aspect")
 
 
-#define kpSettingsGroupMimeTypeProperties TQString::tqfromLatin1 ("MimeType Properties Version 1.2-2")
-#define kpSettingMimeTypeMaximumColorDepth TQString::tqfromLatin1 ("Maximum Color Depth")
-#define kpSettingMimeTypeHasConfigurableColorDepth TQString::tqfromLatin1 ("Configurable Color Depth")
-#define kpSettingMimeTypeHasConfigurableQuality TQString::tqfromLatin1 ("Configurable Quality Setting")
+#define kpSettingsGroupMimeTypeProperties TQString::fromLatin1 ("MimeType Properties Version 1.2-2")
+#define kpSettingMimeTypeMaximumColorDepth TQString::fromLatin1 ("Maximum Color Depth")
+#define kpSettingMimeTypeHasConfigurableColorDepth TQString::fromLatin1 ("Configurable Color Depth")
+#define kpSettingMimeTypeHasConfigurableQuality TQString::fromLatin1 ("Configurable Quality Setting")
 
 
-#define kpSettingsGroupUndoRedo TQString::tqfromLatin1 ("Undo/Redo Settings")
-#define kpSettingUndoMinLimit TQString::tqfromLatin1 ("Min Limit")
-#define kpSettingUndoMaxLimit TQString::tqfromLatin1 ("Max Limit")
-#define kpSettingUndoMaxLimitSizeLimit TQString::tqfromLatin1 ("Max Limit Size Limit")
+#define kpSettingsGroupUndoRedo TQString::fromLatin1 ("Undo/Redo Settings")
+#define kpSettingUndoMinLimit TQString::fromLatin1 ("Min Limit")
+#define kpSettingUndoMaxLimit TQString::fromLatin1 ("Max Limit")
+#define kpSettingUndoMaxLimitSizeLimit TQString::fromLatin1 ("Max Limit Size Limit")
 
 
-#define kpSettingsGroupThumbnail TQString::tqfromLatin1 ("Thumbnail Settings")
-#define kpSettingThumbnailShown TQString::tqfromLatin1 ("Shown")
-#define kpSettingThumbnailGeometry TQString::tqfromLatin1 ("Geometry")
-#define kpSettingThumbnailZoomed TQString::tqfromLatin1 ("Zoomed")
-#define kpSettingThumbnailShowRectangle TQString::tqfromLatin1 ("ShowRectangle")
+#define kpSettingsGroupThumbnail TQString::fromLatin1 ("Thumbnail Settings")
+#define kpSettingThumbnailShown TQString::fromLatin1 ("Shown")
+#define kpSettingThumbnailGeometry TQString::fromLatin1 ("Geometry")
+#define kpSettingThumbnailZoomed TQString::fromLatin1 ("Zoomed")
+#define kpSettingThumbnailShowRectangle TQString::fromLatin1 ("ShowRectangle")
 
 
-#define kpSettingsGroupPreviewSave TQString::tqfromLatin1 ("Save Preview Settings")
-#define kpSettingPreviewSaveGeometry TQString::tqfromLatin1 ("Geometry")
-#define kpSettingPreviewSaveUpdateDelay TQString::tqfromLatin1 ("Update Delay")
+#define kpSettingsGroupPreviewSave TQString::fromLatin1 ("Save Preview Settings")
+#define kpSettingPreviewSaveGeometry TQString::fromLatin1 ("Geometry")
+#define kpSettingPreviewSaveUpdateDelay TQString::fromLatin1 ("Update Delay")
 
 
-#define kpSettingsGroupTools TQString::tqfromLatin1 ("Tool Settings")
-#define kpSettingLastTool TQString::tqfromLatin1 ("Last Used Tool")
-#define kpSettingToolBoxIconSize TQString::tqfromLatin1 ("Tool Box Icon Size")
+#define kpSettingsGroupTools TQString::fromLatin1 ("Tool Settings")
+#define kpSettingLastTool TQString::fromLatin1 ("Last Used Tool")
+#define kpSettingToolBoxIconSize TQString::fromLatin1 ("Tool Box Icon Size")
 
 
-#define kpSettingsGroupText TQString::tqfromLatin1 ("Text Settings")
-#define kpSettingFontFamily TQString::tqfromLatin1 ("Font Family")
-#define kpSettingFontSize TQString::tqfromLatin1 ("Font Size")
-#define kpSettingBold TQString::tqfromLatin1 ("Bold")
-#define kpSettingItalic TQString::tqfromLatin1 ("Italic")
-#define kpSettingUnderline TQString::tqfromLatin1 ("Underline")
-#define kpSettingStrikeThru TQString::tqfromLatin1 ("Strike Thru")
+#define kpSettingsGroupText TQString::fromLatin1 ("Text Settings")
+#define kpSettingFontFamily TQString::fromLatin1 ("Font Family")
+#define kpSettingFontSize TQString::fromLatin1 ("Font Size")
+#define kpSettingBold TQString::fromLatin1 ("Bold")
+#define kpSettingItalic TQString::fromLatin1 ("Italic")
+#define kpSettingUnderline TQString::fromLatin1 ("Underline")
+#define kpSettingStrikeThru TQString::fromLatin1 ("Strike Thru")
 
 
-#define kpSettingsGroupFlattenEffect TQString::tqfromLatin1 ("Flatten Effect Settings")
-#define kpSettingFlattenEffectColor1 TQString::tqfromLatin1 ("Color1")
-#define kpSettingFlattenEffectColor2 TQString::tqfromLatin1 ("Color2")
+#define kpSettingsGroupFlattenEffect TQString::fromLatin1 ("Flatten Effect Settings")
+#define kpSettingFlattenEffectColor1 TQString::fromLatin1 ("Color1")
+#define kpSettingFlattenEffectColor2 TQString::fromLatin1 ("Color2")
 
 
 //
@@ -140,11 +140,11 @@
 //
 // This key only exists if the document does.  If it exists, it can be empty.
 // The URL need not point to a file that exists e.g. "kolourpaint doesnotexist.png".
-#define kpSessionSettingDocumentUrl TQString::tqfromLatin1 ("Session Document Url")
+#define kpSessionSettingDocumentUrl TQString::fromLatin1 ("Session Document Url")
 
 // The size of a document which is not from a URL e.g. "kolourpaint doesnotexist.png".
 // This key does not exist for documents from URLs.
-#define kpSessionSettingNotFromUrlDocumentSize TQString::tqfromLatin1 ("Session Not-From-Url Document Size")
+#define kpSessionSettingNotFromUrlDocumentSize TQString::fromLatin1 ("Session Not-From-Url Document Size")
 
 
 #endif  // __kp_defs_h__
diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp
index fe91bfee..f9934bb4 100644
--- a/kolourpaint/kpdocument.cpp
+++ b/kolourpaint/kpdocument.cpp
@@ -35,7 +35,7 @@
 
 #include <tqcolor.h>
 #include <tqbitmap.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
@@ -156,7 +156,7 @@ TQPixmap kpDocument::convertToPixmapAsLosslessAsPossible (
         metaInfo->setDotsPerMeterY (image.dotsPerMeterY ());
         metaInfo->setOffset (image.offset ());
 
-        TQValueList <TQImageTextKeyLang> keyList = image.tqtextList ();
+        TQValueList <TQImageTextKeyLang> keyList = image.textList ();
         for (TQValueList <TQImageTextKeyLang>::const_iterator it = keyList.begin ();
              it != keyList.end ();
              it++)
@@ -475,7 +475,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
                 //       low maximum colour depth
                 i18n ("Lossy File Format"),
                 KStdGuiItem::save (),
-                TQString::tqfromLatin1 ("SaveInLossyMimeTypeDontAskAgain")));
+                TQString::fromLatin1 ("SaveInLossyMimeTypeDontAskAgain")));
     }
     else if (lossyType & kpDocumentSaveOptions::ColorDepthLow)
     {
@@ -490,7 +490,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
                     .arg (saveOptions.colorDepth ()),
                 i18n ("Low Color Depth"),
                 KStdGuiItem::save (),
-                TQString::tqfromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
+                TQString::fromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
     }
 #undef TQUIT_IF_CANCEL
 
@@ -628,8 +628,8 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
                << ",overwritePrompt=" << overwritePrompt
                << ",lossyPrompt=" << lossyPrompt
                << ")" << endl;
-    saveOptions.printDebug (TQString::tqfromLatin1 ("\tsaveOptions"));
-    metaInfo.printDebug (TQString::tqfromLatin1 ("\tmetaInfo"));
+    saveOptions.printDebug (TQString::fromLatin1 ("\tsaveOptions"));
+    metaInfo.printDebug (TQString::fromLatin1 ("\tmetaInfo"));
 #endif
 
     if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, parent))
@@ -1109,22 +1109,22 @@ void kpDocument::setSelection (const kpSelection &selection)
                                 (selection.type () == kpSelection::Text));
 
     // We don't change the Selection Tool if the new selection's
-    // tqshape is merely different to the current tool's (e.g. rectangular
+    // shape is merely different to the current tool's (e.g. rectangular
     // vs elliptical) because:
     //
     // 1. All image selection tools support editing selections of all the
-    //    different tqshapes anyway.
+    //    different shapes anyway.
     // 2. Suppose the user is trying out different drags of selection borders
-    //    and then decides to paste a differently tqshaped selection before continuing
+    //    and then decides to paste a differently shaped selection before continuing
     //    to try out different borders.  If the pasting were to switch to
-    //    a differently tqshaped tool, the borders drawn after the paste would
-    //    be using a new tqshape rather than the tqshape before the paste.  This
+    //    a differently shaped tool, the borders drawn after the paste would
+    //    be using a new shape rather than the shape before the paste.  This
     //    could get irritating so we don't do the switch.
     //
     if (m_mainWindow &&
         (!m_mainWindow->toolIsASelectionTool () || isTextChanged))
     {
-        // Switch to the appropriately tqshaped selection tool
+        // Switch to the appropriately shaped selection tool
         // _before_ we change the selection
         // (all selection tool's ::end() functions nuke the current selection)
         switch (selection.type ())
diff --git a/kolourpaint/kpdocumentmetainfo.cpp b/kolourpaint/kpdocumentmetainfo.cpp
index f0b9f0f0..01728efa 100644
--- a/kolourpaint/kpdocumentmetainfo.cpp
+++ b/kolourpaint/kpdocumentmetainfo.cpp
@@ -82,7 +82,7 @@ kpDocumentMetaInfo &kpDocumentMetaInfo::operator= (const kpDocumentMetaInfo &rhs
 void kpDocumentMetaInfo::printDebug (const TQString &prefix) const
 {
     const TQString usedPrefix = !prefix.isEmpty () ?
-                                   prefix + TQString::tqfromLatin1 (":") :
+                                   prefix + TQString::fromLatin1 (":") :
                                    TQString();
 
     kdDebug () << usedPrefix << endl;
diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp
index 3c312e42..6bbb81d4 100644
--- a/kolourpaint/kpdocumentsaveoptions.cpp
+++ b/kolourpaint/kpdocumentsaveoptions.cpp
@@ -114,7 +114,7 @@ kpDocumentSaveOptions &kpDocumentSaveOptions::operator= (const kpDocumentSaveOpt
 void kpDocumentSaveOptions::printDebug (const TQString &prefix) const
 {
     const TQString usedPrefix = !prefix.isEmpty () ?
-                                   prefix + TQString::tqfromLatin1 (": ") :
+                                   prefix + TQString::fromLatin1 (": ") :
                                    TQString();
 
     kdDebug () << usedPrefix
@@ -246,7 +246,7 @@ bool kpDocumentSaveOptions::qualityIsInvalid () const
 TQString kpDocumentSaveOptions::defaultMimeType (KConfigBase *config)
 {
     return config->readEntry (kpSettingForcedMimeType,
-                              TQString::tqfromLatin1 ("image/png"));
+                              TQString::fromLatin1 ("image/png"));
 }
 
 // public static
@@ -445,19 +445,19 @@ int kpDocumentSaveOptions::mimeTypeMaximumColorDepth (const TQString &mimeType)
     // SYNC: update mime info here
     
     // Greyscale actually (unenforced since depth not set to configurable)
-    defaultList << TQString::tqfromLatin1 ("image/x-eps:32");
+    defaultList << TQString::fromLatin1 ("image/x-eps:32");
     
-    defaultList << TQString::tqfromLatin1 ("image/x-portable-bitmap:1");
+    defaultList << TQString::fromLatin1 ("image/x-portable-bitmap:1");
     
     // Greyscale actually (unenforced since depth not set to configurable)
-    defaultList << TQString::tqfromLatin1 ("image/x-portable-greymap:8");
+    defaultList << TQString::fromLatin1 ("image/x-portable-greymap:8");
     
-    defaultList << TQString::tqfromLatin1 ("image/x-xbm:1");
+    defaultList << TQString::fromLatin1 ("image/x-xbm:1");
 
     const TQStringList mimeTypeList = mimeTypesSupportingProperty (
         kpSettingMimeTypeMaximumColorDepth, defaultList);
 
-    const TQString mimeTypeColon = mimeType + TQString::tqfromLatin1 (":");
+    const TQString mimeTypeColon = mimeType + TQString::fromLatin1 (":");
     for (TQStringList::const_iterator it = mimeTypeList.begin ();
          it != mimeTypeList.end ();
          it++)
@@ -488,16 +488,16 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableColorDepth (const TQString &m
     TQStringList defaultMimeTypes;
 
     // SYNC: update mime info here
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/png");
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-bmp");
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-pcx");
+    defaultMimeTypes << TQString::fromLatin1 ("image/png");
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-bmp");
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-pcx");
     
     // TODO: Only 1, 24 not 8; TQt only sees 32 but "file" cmd realises
     //       it's either 1 or 24.
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-rgb");
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-rgb");
   
     // TODO: Only 8 and 24 - no 1.
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-xpm");
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-xpm");
 
     return mimeTypeSupportsProperty (mimeType,
         kpSettingMimeTypeHasConfigurableColorDepth,
@@ -517,8 +517,8 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableQuality (const TQString &mime
     TQStringList defaultMimeTypes;
 
     // SYNC: update mime info here
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/jp2");
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/jpeg");
+    defaultMimeTypes << TQString::fromLatin1 ("image/jp2");
+    defaultMimeTypes << TQString::fromLatin1 ("image/jpeg");
 
     return mimeTypeSupportsProperty (mimeType,
         kpSettingMimeTypeHasConfigurableQuality,
diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp
index 372743af..f08823b9 100644
--- a/kolourpaint/kpdocumentsaveoptionswidget.cpp
+++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp
@@ -34,7 +34,7 @@
 #include <tqbuffer.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 #include <kcombobox.h>
@@ -712,9 +712,9 @@ void kpDocumentSaveOptionsWidget::setMode (Mode mode)
 void kpDocumentSaveOptionsWidget::repaintLabels ()
 {
     if (mode () != Quality)
-        m_colorDepthLabel->tqrepaint ();
+        m_colorDepthLabel->repaint ();
     if (mode () == Quality)
-        m_qualityLabel->tqrepaint ();
+        m_qualityLabel->repaint ();
 }
 
 
@@ -767,7 +767,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
         if (m_previewDialogLastRelativeGeometry.isEmpty ())
         {
         #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
-            kdDebug () << "\tread cfg preview dialog last rel tqgeometry" << endl;
+            kdDebug () << "\tread cfg preview dialog last rel geometry" << endl;
         #endif
             KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave);
             KConfigBase *cfg = cfgGroupSaver.config ();
@@ -826,7 +826,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
 
 
     #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
-        kdDebug () << "\ttqgeometry after show="
+        kdDebug () << "\tgeometry after show="
                    << TQRect (m_previewDialog->x (), m_previewDialog->y (),
                               m_previewDialog->width (), m_previewDialog->height ())
                    << endl;
@@ -852,7 +852,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
         cfg->sync ();
 
     #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
-        kdDebug () << "\tsaving preview tqgeometry "
+        kdDebug () << "\tsaving preview geometry "
                    << m_previewDialogLastRelativeGeometry
                    << " (TQt would have us believe "
                    << kpWidgetMapper::fromGlobal (m_visualParent,
@@ -942,7 +942,7 @@ void kpDocumentSaveOptionsWidget::updatePreviewDialogLastRelativeGeometry ()
     else
     {
     #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
-        kdDebug () << "\tnot visible - ignoring tqgeometry" << endl;
+        kdDebug () << "\tnot visible - ignoring geometry" << endl;
     #endif
     }
 }
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index 3b117803..439f99c4 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -157,7 +157,7 @@ void kpMainWindow::readThumbnailSettings ()
 
 #if DEBUG_KP_MAIN_WINDOW
     kdDebug () << "\t\tThumbnail Settings: shown=" << m_configThumbnailShown
-               << " tqgeometry=" << m_configThumbnailGeometry
+               << " geometry=" << m_configThumbnailGeometry
                << " zoomed=" << m_configZoomedThumbnail
                << " showRectangle=" << d->m_configThumbnailShowRectangle
                << endl;
@@ -731,7 +731,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
         connect (m_document, TQT_SIGNAL (selectionIsTextChanged (bool)),
                  this, TQT_SLOT (slotImageMenuUpdateDueToSelection ()));
 
-        // tqStatus bar
+        // Status bar
         connect (m_document, TQT_SIGNAL (documentOpened ()),
                  this, TQT_SLOT (recalculateStatusBar ()));
 
@@ -808,7 +808,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
             #endif
                 slotCreateThumbnail ();
             }
-            // this' tqgeometry is weird ATM
+            // this' geometry is weird ATM
             else
             {
             #if DEBUG_KP_MAIN_WINDOW
diff --git a/kolourpaint/kpmainwindow.h b/kolourpaint/kpmainwindow.h
index bd0df32b..3da1e570 100644
--- a/kolourpaint/kpmainwindow.h
+++ b/kolourpaint/kpmainwindow.h
@@ -640,7 +640,7 @@ private slots:
 
 
     /*
-     * tqStatus Bar
+     * Status Bar
      */
 
 private:
diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp
index e5156148..8d3cdd61 100644
--- a/kolourpaint/kpmainwindow_edit.cpp
+++ b/kolourpaint/kpmainwindow_edit.cpp
@@ -28,7 +28,7 @@
 #include <kpmainwindow.h>
 
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdatetime.h>
 #include <tqfontmetrics.h>
 #include <tqimage.h>
@@ -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/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp
index 9fc82440..c4f339db 100644
--- a/kolourpaint/kpmainwindow_settings.cpp
+++ b/kolourpaint/kpmainwindow_settings.cpp
@@ -195,7 +195,7 @@ void kpMainWindow::slotNewToolBarConfig ()
     KMessageBox::information (this,
         i18n ("You have to restart KolourPaint for these changes to take effect."),
         i18n ("Toolbar Settings Changed"),
-        TQString::tqfromLatin1 ("ToolBarSettingsChanged"));
+        TQString::fromLatin1 ("ToolBarSettingsChanged"));
 
     //createGUI();
     //applyMainWindowSettings (kapp->config (), autoSaveGroup ());
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index 859e33f0..44bea619 100644
--- a/kolourpaint/kpmainwindow_text.cpp
+++ b/kolourpaint/kpmainwindow_text.cpp
@@ -80,7 +80,7 @@ void kpMainWindow::readAndApplyTextSettings ()
     KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
     KConfigBase *cfg = cfgGroupSaver.config ();
 
-    m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::tqfromLatin1 ("Times")));
+    m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::fromLatin1 ("Times")));
     m_actionTextFontSize->setFontSize (cfg->readNumEntry (kpSettingFontSize, 14));
     m_actionTextBold->setChecked (cfg->readBoolEntry (kpSettingBold, false));
     m_actionTextItalic->setChecked (cfg->readBoolEntry (kpSettingItalic, false));
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index 8be4beb8..c90479b0 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -289,7 +289,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor)
             // Ordinary flicker is better than the whole view moving
             TQPainter p (m_mainView);
             p.fillRect (m_mainView->rect (),
-                        m_scrollView->viewport ()->tqcolorGroup ().background ());
+                        m_scrollView->viewport ()->colorGroup ().background ());
         }
     }
 
@@ -842,13 +842,13 @@ void kpMainWindow::slotSaveThumbnailGeometry ()
     TQRect rect (m_thumbnail->x (), m_thumbnail->y (),
                 m_thumbnail->width (), m_thumbnail->height ());
 #if DEBUG_KP_MAIN_WINDOW
-    kdDebug () << "\tthumbnail relative tqgeometry=" << rect << endl;
+    kdDebug () << "\tthumbnail relative geometry=" << rect << endl;
 #endif
 
     m_configThumbnailGeometry = mapFromGlobal (rect);
 
 #if DEBUG_KP_MAIN_WINDOW
-    kdDebug () << "\tCONFIG: saving thumbnail tqgeometry "
+    kdDebug () << "\tCONFIG: saving thumbnail geometry "
                 << m_configThumbnailGeometry
                 << endl;
 #endif
@@ -1067,11 +1067,11 @@ void kpMainWindow::updateThumbnail ()
         kdDebug () << "\tcreating thumbnail" << endl;
     #endif
 
-        // Read last saved tqgeometry before creating thumbnail & friends
+        // Read last saved geometry before creating thumbnail & friends
         // in case they call notifyThumbnailGeometryChanged()
         TQRect thumbnailGeometry = m_configThumbnailGeometry;
     #if DEBUG_KP_MAIN_WINDOW
-        kdDebug () << "\t\tlast used tqgeometry=" << thumbnailGeometry << endl;
+        kdDebug () << "\t\tlast used geometry=" << thumbnailGeometry << endl;
     #endif
 
         m_thumbnail = new kpThumbnail (this, "thumbnail");
@@ -1084,9 +1084,9 @@ void kpMainWindow::updateThumbnail ()
         if (!thumbnailGeometry.isEmpty () &&
             TQRect (0, 0, width (), height ()).intersects (thumbnailGeometry))
         {
-            const TQRect tqgeometry = mapToGlobal (thumbnailGeometry);
-            m_thumbnail->resize (tqgeometry.size ());
-            m_thumbnail->move (tqgeometry.topLeft ());
+            const TQRect geometry = mapToGlobal (thumbnailGeometry);
+            m_thumbnail->resize (geometry.size ());
+            m_thumbnail->move (geometry.topLeft ());
         }
         else
         {
@@ -1101,7 +1101,7 @@ void kpMainWindow::updateThumbnail ()
                                     initialHeight);
 
             #if DEBUG_KP_MAIN_WINDOW
-                kdDebug () << "\t\tcreating tqgeometry=" << geometryRect << endl;
+                kdDebug () << "\t\tcreating geometry=" << geometryRect << endl;
             #endif
 
                 geometryRect = mapToGlobal (geometryRect);
diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp
index 43f81984..c5381d7d 100644
--- a/kolourpaint/kpselection.cpp
+++ b/kolourpaint/kpselection.cpp
@@ -373,7 +373,7 @@ TQBitmap kpSelection::maskForOwnType (bool nullForRectangular) const
         points.detach ();
         points.translate (-m_rect.x (), -m_rect.y ());
 
-        painter.tqdrawPolygon (points, false/*even-odd algo*/);
+        painter.drawPolygon (points, false/*even-odd algo*/);
     }
 
     painter.end ();
@@ -921,7 +921,7 @@ TQString kpSelection::textForTextLines (const TQValueVector <TQString> &textLine
          it != textLines_.end ();
          it++)
     {
-        bigString += TQString::tqfromLatin1 ("\n");
+        bigString += TQString::fromLatin1 ("\n");
         bigString += (*it);
     }
 
@@ -1049,7 +1049,7 @@ int kpSelection::minimumHeightForTextStyle (const kpTextStyle &)
 }
 
 // public static
-TQSize kpSelection::tqminimumSizeForTextStyle (const kpTextStyle &textStyle)
+TQSize kpSelection::minimumSizeForTextStyle (const kpTextStyle &textStyle)
 {
     return TQSize (minimumWidthForTextStyle (textStyle),
                   minimumHeightForTextStyle (textStyle));
@@ -1061,7 +1061,7 @@ int kpSelection::preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle
 {
     const int about15CharsWidth =
         textStyle.fontMetrics ().width (
-            TQString::tqfromLatin1 ("1234567890abcde"));
+            TQString::fromLatin1 ("1234567890abcde"));
 
     const int preferredMinWidth =
         TQMAX (150,
@@ -1108,7 +1108,7 @@ int kpSelection::minimumHeight () const
 }
 
 // public
-TQSize kpSelection::tqminimumSize () const
+TQSize kpSelection::minimumSize () const
 {
     return TQSize (minimumWidth (), minimumHeight ());
 }
diff --git a/kolourpaint/kpselection.h b/kolourpaint/kpselection.h
index 24b1ba39..a227fef2 100644
--- a/kolourpaint/kpselection.h
+++ b/kolourpaint/kpselection.h
@@ -169,7 +169,7 @@ public:
     //       Be more robust when external enforcement fails.
     static int minimumWidthForTextStyle (const kpTextStyle &);
     static int minimumHeightForTextStyle (const kpTextStyle &);
-    static TQSize tqminimumSizeForTextStyle (const kpTextStyle &);
+    static TQSize minimumSizeForTextStyle (const kpTextStyle &);
 
     static int preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle);
     static int preferredMinimumHeightForTextStyle (const kpTextStyle &textStyle);
@@ -177,7 +177,7 @@ public:
 
     int minimumWidth () const;
     int minimumHeight () const;
-    TQSize tqminimumSize () const;
+    TQSize minimumSize () const;
 
     int textRowForPoint (const TQPoint &globalPoint) const;
     int textColForPoint (const TQPoint &globalPoint) const;
diff --git a/kolourpaint/kpselectiondrag.cpp b/kolourpaint/kpselectiondrag.cpp
index 22cdeb4a..9c680abb 100644
--- a/kolourpaint/kpselectiondrag.cpp
+++ b/kolourpaint/kpselectiondrag.cpp
@@ -143,10 +143,10 @@ bool kpSelectionDrag::provides (const char *mimeType) const
 }
 
 // public virtual [base TQMimeSource]
-TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
+TQByteArray kpSelectionDrag::encodedData (const char *mimeType) const
 {
 #if DEBUG_KP_SELECTION_DRAG
-    kdDebug () << "kpSelectionDrag::tqencodedData(" << mimeType << ")" << endl;
+    kdDebug () << "kpSelectionDrag::encodedData(" << mimeType << ")" << endl;
 #endif
 
     if (!mimeType)
@@ -192,7 +192,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
             }
             else
             {
-                kdError () << "kpSelectionDrag::tqencodedData(" << mimeType << ")"
+                kdError () << "kpSelectionDrag::encodedData(" << mimeType << ")"
                            << " kpSelectionDrag(TQImage) could not decode data into TQImage"
                            << endl;
                 stream << kpSelection ();
@@ -207,7 +207,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
         kdDebug () << "\twant it as TQImage in TQByteArray" << endl;
     #endif
 
-        return TQImageDrag::tqencodedData (mimeType);
+        return TQImageDrag::encodedData (mimeType);
     }
 }
 
@@ -255,7 +255,7 @@ bool kpSelectionDrag::decode (const TQMimeSource *e, kpSelection &sel,
     #if DEBUG_KP_SELECTION_DRAG
         kdDebug () << "\tmimeSource provides selection - just return it in TQByteArray" << endl;
     #endif
-        TQByteArray data = e->tqencodedData (kpSelectionDrag::selectionMimeType);
+        TQByteArray data = e->encodedData (kpSelectionDrag::selectionMimeType);
         TQDataStream stream (data, IO_ReadOnly);
 
         // (no need for wali as kpSelection's by definition only support TQPixmap's)
diff --git a/kolourpaint/kpselectiondrag.h b/kolourpaint/kpselectiondrag.h
index 93473509..4ed90d7f 100644
--- a/kolourpaint/kpselectiondrag.h
+++ b/kolourpaint/kpselectiondrag.h
@@ -56,7 +56,7 @@ protected:
 public:
     virtual const char *format (int which = 0) const;
     virtual bool provides (const char *mimeType) const;
-    virtual TQByteArray tqencodedData (const char *mimeType) const;
+    virtual TQByteArray encodedData (const char *mimeType) const;
 
     static bool canDecode (const TQMimeSource *e);
     static bool decode (const TQMimeSource *e, TQImage &img);
diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp
index 84923c1d..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 ()->tqminimumSize () : TQSize ();
+    TQSize layoutMinimumSize = layout () ? layout ()->minimumSize () : TQSize ();
 #if DEBUG_KP_THUMBNAIL
-    kdDebug () << "\ttqlayout=" << tqlayout ()
-               << " minSize=" << (tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ()) << endl;
+    kdDebug () << "\tlayout=" << layout ()
+               << " minSize=" << (layout () ? layout ()->minimumSize () : TQSize ()) << endl;
     kdDebug () << "\tboxLayout=" << boxLayout ()
-               << " minSize=" << (boxLayout () ? boxLayout ()->tqminimumSize () : TQSize ())
+               << " 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 da240492..1cdb1323 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -34,10 +34,10 @@
 #include <limits.h>
 
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcursor.h>
 #include <tqevent.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 
@@ -153,7 +153,7 @@ void kpTool::createAction ()
     m_action = new kpToolAction (text (), iconName (), shortcutForKey (m_key),
                                  this, TQT_SLOT (slotActionActivated ()),
                                  m_mainWindow->actionCollection (), name ());
-    m_action->setExclusiveGroup (TQString::tqfromLatin1 ("Tool Box Actions"));
+    m_action->setExclusiveGroup (TQString::fromLatin1 ("Tool Box Actions"));
     m_action->setWhatsThis (description ());
 
     connect (m_action, TQT_SIGNAL (toolTipChanged (const TQString &)),
@@ -744,7 +744,7 @@ void kpTool::endDrawInternal (const TQPoint &thisPoint, const TQRect &normalized
 // private
 void kpTool::endShapeInternal (const TQPoint &thisPoint, const TQRect &normalizedRect)
 {
-    endDrawInternal (thisPoint, normalizedRect, true/*end tqshape*/);
+    endDrawInternal (thisPoint, normalizedRect, true/*end shape*/);
 }
 
 // virtual
@@ -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
@@ -1046,7 +1046,7 @@ void kpTool::mouseMoveEvent (TQMouseEvent *e)
                << " viewUnderCursorTQt=" << (v1 ? v1->name () : "(none)")
                << " viewUnderStartPoint=" << (v2 ? v2->name () : "(none)")
                << endl;
-    kdDebug () << "\ttqfocusWidget=" << kapp->tqfocusWidget () << endl;
+    kdDebug () << "\tfocusWidget=" << kapp->focusWidget () << endl;
 #endif
 
     TQt::ButtonState buttonState = e->stateAfter ();
@@ -1154,7 +1154,7 @@ void kpTool::wheelEvent (TQWheelEvent *e)
     if ((e->state () & TQt::ControlButton) == 0)
         return;
     
-    // If drawing, bye; don't care if a tqshape in progress though.
+    // If drawing, bye; don't care if a shape in progress though.
     if (hasBegunDraw ())
         return;
         
@@ -1652,7 +1652,7 @@ bool kpTool::warnIfBigImageSize (int oldWidth, int oldHeight,
             text,
             caption,
             continueButtonText,
-            TQString::tqfromLatin1 ("BigImageDontAskAgain"));
+            TQString::fromLatin1 ("BigImageDontAskAgain"));
 
         return (accept == KMessageBox::Continue);
     }
diff --git a/kolourpaint/kptool.h b/kolourpaint/kptool.h
index 03bedb0a..b5555d64 100644
--- a/kolourpaint/kptool.h
+++ b/kolourpaint/kptool.h
@@ -341,7 +341,7 @@ protected:
 
 
     /*
-     * User Notifications (tqStatus Bar)
+     * User Notifications (Status Bar)
      */
 
 public:
diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp
index 5b68a7b2..c130c0d9 100644
--- a/kolourpaint/kpview.cpp
+++ b/kolourpaint/kpview.cpp
@@ -1568,7 +1568,7 @@ void kpView::paintEventDrawSelectionResizeHandles (TQPainter *painter, const TQR
         painter->setRasterOp (TQt::XorROP);
     }
 
-    TQMemArray <TQRect> rects = selResizeHandlesRegion.tqrects ();
+    TQMemArray <TQRect> rects = selResizeHandlesRegion.rects ();
     for (TQMemArray <TQRect>::ConstIterator it = rects.begin ();
          it != rects.end ();
          it++)
@@ -1888,7 +1888,7 @@ void kpView::paintEvent (TQPaintEvent *e)
 
 
     TQRegion viewRegion = clipRegion ().intersect (e->region ());
-    TQMemArray <TQRect> rects = viewRegion.tqrects ();
+    TQMemArray <TQRect> rects = viewRegion.rects ();
 #if DEBUG_KP_VIEW_RENDERER && 1
     kdDebug () << "\t#rects = " << rects.count () << endl;
 #endif
diff --git a/kolourpaint/kpviewmanager.cpp b/kolourpaint/kpviewmanager.cpp
index 3586a173..71b58a2c 100644
--- a/kolourpaint/kpviewmanager.cpp
+++ b/kolourpaint/kpviewmanager.cpp
@@ -628,7 +628,7 @@ void kpViewManager::updateView (kpView *v, const TQRect &viewRect)
     if (!queueUpdates ())
     {
         if (fastUpdates ())
-            v->tqrepaint (viewRect, false/*no erase*/);
+            v->repaint (viewRect, false/*no erase*/);
         else
             v->update (viewRect);
     }
@@ -646,7 +646,7 @@ void kpViewManager::updateView (kpView *v, const TQRegion &viewRegion)
     if (!queueUpdates ())
     {
         if (fastUpdates ())
-            v->tqrepaint (viewRegion, false/*no erase*/);
+            v->repaint (viewRegion, false/*no erase*/);
         else
             v->update (viewRegion.boundingRect ());
     }
diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp
index e8ea5a5d..80e9d9e7 100644
--- a/kolourpaint/kpviewscrollablecontainer.cpp
+++ b/kolourpaint/kpviewscrollablecontainer.cpp
@@ -184,7 +184,7 @@ void kpGrip::updatePixmap ()
         return;
 
     TQPixmap pixmap (width (), height ());
-    pixmap.fill (tqcolorGroup ().highlight ());
+    pixmap.fill (colorGroup ().highlight ());
     kpPixmapFX::ensureTransparentAt (&pixmap, pixmap.rect ());
     const TQRect hr = hotRect ();
 #if DEBUG_KP_VIEW_SCROLLABLE_CONTAINER
@@ -663,7 +663,7 @@ void kpViewScrollableContainer::repaintWidgetAtResizeLineViewRect (
         // TODO: should be "!widget->testWFlags (TQt::WRepaintNoErase)"
         //       but for some reason, doesn't work for viewport().
         const bool erase = !dynamic_cast <kpView *> (widget);
-        widget->tqrepaint (redrawWidgetRect, erase);
+        widget->repaint (redrawWidgetRect, erase);
     }
 }
 
@@ -1269,7 +1269,7 @@ bool kpViewScrollableContainer::slotDragScroll (bool *didSomething)
 
             // Repaint newly exposed region immediately to reduce tearing
             // of scrollView.
-            m_view->tqrepaint (region, false/*no erase*/);
+            m_view->repaint (region, false/*no erase*/);
         }
     }
 
diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff
index 20f4828c..3832fbff 100644
--- a/kolourpaint/patches/doc_resize_no_flicker.diff
+++ b/kolourpaint/patches/doc_resize_no_flicker.diff
@@ -147,8 +147,8 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
          // TODO: should be "!widget->testWFlags (Qt::WRepaintNoErase)"
          //       but for some reason, doesn't work for viewport().
          const bool erase = !dynamic_cast <kpView *> (widget);
--        widget->tqrepaint (redrawWidgetRect, erase);
-+        widget->tqrepaint (redrawWidgetRegion, erase);
+-        widget->repaint (redrawWidgetRect, erase);
++        widget->repaint (redrawWidgetRegion, erase);
      }
  }
  
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp
index 946814d5..d66f6c91 100644
--- a/kolourpaint/pixmapfx/kpeffectbalance.cpp
+++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp
@@ -35,7 +35,7 @@
 #include <tqfontmetrics.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 
@@ -275,9 +275,9 @@ 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->tqsetAlignment (m_gammaLabel->tqalignment () | TQt::AlignRight);
+    m_gammaLabel->setAlignment (m_gammaLabel->alignment () | TQt::AlignRight);
     TQPushButton *gammaResetPushButton = new TQPushButton (i18n ("Rese&t"), this);
 
 
@@ -438,7 +438,7 @@ void kpEffectBalanceWidget::recalculateGammaLabel ()
                          'f'/*[-]9.9*/,
                          2/*precision*/) +
         " ");
-    m_gammaLabel->tqrepaint ();
+    m_gammaLabel->repaint ();
 }
 
 
diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
index e1feaaa3..5d1ba4b1 100644
--- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
+++ b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
@@ -32,7 +32,7 @@
 
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 
diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp
index 0783021d..7de6a6ac 100644
--- a/kolourpaint/pixmapfx/kpeffectemboss.cpp
+++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp
@@ -33,7 +33,7 @@
 #include <tqcheckbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 
diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp
index 1768aa96..a0fd8506 100644
--- a/kolourpaint/pixmapfx/kpeffectflatten.cpp
+++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp
@@ -32,7 +32,7 @@
 
 #include <tqcheckbox.h>
 #include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqvbox.h>
 
diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp
index ad05d013..6ad04905 100644
--- a/kolourpaint/pixmapfx/kpeffectinvert.cpp
+++ b/kolourpaint/pixmapfx/kpeffectinvert.cpp
@@ -32,7 +32,7 @@
 
 #include <tqcheckbox.h>
 #include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 
 #include <kdebug.h>
diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
index 83dd997d..0b764683 100644
--- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
+++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
@@ -33,7 +33,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqradiobutton.h>
 
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
index 098e0396..d7624775 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
@@ -33,7 +33,7 @@
 #include <tqgroupbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 #include <kapplication.h>
@@ -255,23 +255,23 @@ void kpEffectsDialog::selectEffect (int which)
         // Don't resize the preview when showing the widget:
         // TODO: actually work
 
-        TQSize previewGroupBoxMinSize = m_previewGroupBox->tqminimumSize ();
-        TQSize previewGroupBoxMaxSize = m_previewGroupBox->tqmaximumSize ();
+        TQSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize ();
+        TQSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize ();
         TQLayout::ResizeMode previewGroupBoxResizeMode = 
-            m_previewGroupBox->tqlayout () ?
-                m_previewGroupBox->tqlayout ()->tqresizeMode () :
+            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/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp
index 5b281606..2543f962 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.cpp
+++ b/kolourpaint/pixmapfx/kppixmapfx.cpp
@@ -1403,12 +1403,12 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_,
     painter.setWorldMatrix (transformMatrix);
 #if DEBUG_KP_PIXMAP_FX && 0
     kdDebug () << "\ttranslate top=" << painter.xForm (TQPoint (0, 0)) << endl;
-    kdDebug () << "\tmatrix: m11=" << painter.tqworldMatrix ().m11 ()
-               << " m12=" << painter.tqworldMatrix ().m12 ()
-               << " m21=" << painter.tqworldMatrix ().m21 ()
-               << " m22=" << painter.tqworldMatrix ().m22 ()
-               << " dx=" << painter.tqworldMatrix ().dx ()
-               << " dy=" << painter.tqworldMatrix ().dy ()
+    kdDebug () << "\tmatrix: m11=" << painter.worldMatrix ().m11 ()
+               << " m12=" << painter.worldMatrix ().m12 ()
+               << " m21=" << painter.worldMatrix ().m21 ()
+               << " m22=" << painter.worldMatrix ().m22 ()
+               << " dx=" << painter.worldMatrix ().dx ()
+               << " dy=" << painter.worldMatrix ().dy ()
                << endl;
 #endif
     painter.drawPixmap (TQPoint (0, 0), pm);
diff --git a/kolourpaint/tools/kptoolautocrop.cpp b/kolourpaint/tools/kptoolautocrop.cpp
index 41aeb398..c294b1d0 100644
--- a/kolourpaint/tools/kptoolautocrop.cpp
+++ b/kolourpaint/tools/kptoolautocrop.cpp
@@ -70,7 +70,7 @@ kpToolAutoCropBorder::kpToolAutoCropBorder (const TQPixmap *pixmapPtr,
     : m_pixmapPtr (pixmapPtr),
       m_processedColorSimilarity (processedColorSimilarity)
 {
-    tqinvalidate ();
+    invalidate ();
 }
 
 
@@ -280,7 +280,7 @@ bool kpToolAutoCropBorder::exists () const
 }
 
 // public
-void kpToolAutoCropBorder::tqinvalidate ()
+void kpToolAutoCropBorder::invalidate ()
 {
     m_rect = TQRect ();
     m_referenceColor = kpColor::invalid;
@@ -374,7 +374,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
     //       and regression testing.
     //
     // TODO: e.g. When the top fills entire rect but bot doesn't we could
-    //       tqinvalidate top and continue autocrop.
+    //       invalidate top and continue autocrop.
     int numRegions = 0;
     if (!leftBorder.calculate (true/*x*/, +1/*going right*/) ||
         leftBorder.fillsEntirePixmap () ||
@@ -439,7 +439,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
         #if DEBUG_KP_TOOL_AUTO_CROP
             kdDebug () << "\tignoring left border" << endl;
         #endif
-            leftBorder.tqinvalidate ();
+            leftBorder.invalidate ();
         }
     }
 
@@ -454,7 +454,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
         #if DEBUG_KP_TOOL_AUTO_CROP
             kdDebug () << "\tignoring top border" << endl;
         #endif
-            topBorder.tqinvalidate ();
+            topBorder.invalidate ();
         }
     }
 
diff --git a/kolourpaint/tools/kptoolautocrop.h b/kolourpaint/tools/kptoolautocrop.h
index 886b4223..bb1a5d4a 100644
--- a/kolourpaint/tools/kptoolautocrop.h
+++ b/kolourpaint/tools/kptoolautocrop.h
@@ -69,7 +69,7 @@ public:
 
     bool fillsEntirePixmap () const;
     bool exists () const;
-    void tqinvalidate ();
+    void invalidate ();
 
 private:
     const TQPixmap *m_pixmapPtr;
diff --git a/kolourpaint/tools/kptoolbrush.cpp b/kolourpaint/tools/kptoolbrush.cpp
index 30c68aee..a5122805 100644
--- a/kolourpaint/tools/kptoolbrush.cpp
+++ b/kolourpaint/tools/kptoolbrush.cpp
@@ -32,7 +32,7 @@
 kpToolBrush::kpToolBrush (kpMainWindow *mainWindow)
     : kpToolPen (kpToolPen::Brush,
                  i18n ("Brush"),
-                 i18n ("Draw using brushes of different tqshapes and sizes"),
+                 i18n ("Draw using brushes of different shapes and sizes"),
                  TQt::Key_B,
                  mainWindow, "tool_brush")
 {
diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp
index eade158b..158bd339 100644
--- a/kolourpaint/tools/kptoolpolygon.cpp
+++ b/kolourpaint/tools/kptoolpolygon.cpp
@@ -35,7 +35,7 @@
 
 #include <tqbitmap.h>
 #include <tqcursor.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpoint.h>
 #include <tqpushbutton.h>
@@ -479,7 +479,7 @@ void kpToolPolygon::beginDraw ()
             break;
 
         default:
-            kdError () << "kpToolPolygon::beginDraw() tqshape" << endl;
+            kdError () << "kpToolPolygon::beginDraw() shape" << endl;
             break;
         }
     }
diff --git a/kolourpaint/tools/kptoolpolygon.h b/kolourpaint/tools/kptoolpolygon.h
index 50129be3..4478157e 100644
--- a/kolourpaint/tools/kptoolpolygon.h
+++ b/kolourpaint/tools/kptoolpolygon.h
@@ -29,7 +29,7 @@
 #ifndef __kptoolpolygon_h__
 #define __kptoolpolygon_h__
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpen.h>
 #include <tqobject.h>
 #include <tqpixmap.h>
diff --git a/kolourpaint/tools/kptoolpreviewdialog.cpp b/kolourpaint/tools/kptoolpreviewdialog.cpp
index 2136e02d..6212d7af 100644
--- a/kolourpaint/tools/kptoolpreviewdialog.cpp
+++ b/kolourpaint/tools/kptoolpreviewdialog.cpp
@@ -30,7 +30,7 @@
 #include <kptoolpreviewdialog.h>
 
 #include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -389,7 +389,7 @@ void kpToolPreviewDialog::updatePreview ()
         m_previewPixmapLabel->setPixmap (previewPixmap);
 
         // immediate update esp. for expensive previews
-        m_previewPixmapLabel->tqrepaint (false/*no erase*/);
+        m_previewPixmapLabel->repaint (false/*no erase*/);
 
 #if DEBUG_KP_TOOL_PREVIEW_DIALOG
     kdDebug () << "\tafter TQLabel::setPixmap() previewPixmapLabel: w="
diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp
index df560ea2..a0699d7b 100644
--- a/kolourpaint/tools/kptoolrectangle.cpp
+++ b/kolourpaint/tools/kptoolrectangle.cpp
@@ -108,7 +108,7 @@ static TQPixmap pixmap (const kpToolRectangle::Mode mode,
     if (startPoint != endPoint)
     {
     #if DEBUG_KP_TOOL_RECTANGLE && 1
-        kdDebug () << "\tdraw tqshape" << endl;
+        kdDebug () << "\tdraw shape" << endl;
     #endif
 
         // TODO: Rectangle of pen width 1, height 1 and width X is rendered
diff --git a/kolourpaint/tools/kptoolrectangle.h b/kolourpaint/tools/kptoolrectangle.h
index e41b5d47..dc147fc9 100644
--- a/kolourpaint/tools/kptoolrectangle.h
+++ b/kolourpaint/tools/kptoolrectangle.h
@@ -29,7 +29,7 @@
 #ifndef __kptoolrectangle_h__
 #define __kptoolrectangle_h__
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpen.h>
 #include <tqpixmap.h>
 #include <tqpoint.h>
@@ -53,7 +53,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    // it turns out that these tqshapes are all really the same thing
+    // it turns out that these shapes are all really the same thing
     // (same options, same feel) - the only real difference is the
     // drawing functions (a one line change)
     enum Mode {Rectangle, RoundedRectangle, Ellipse};
diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp
index 40270e1f..3a59ed75 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -40,7 +40,7 @@
 #include <tqgroupbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpoint.h>
 #include <tqpointarray.h>
 #include <tqpushbutton.h>
@@ -665,17 +665,17 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
     // TODO: ALT+R doesn't select the button.
     m_resizeButton = new TQToolButton (m_operationGroupBox);
     toolButtonSetLook (m_resizeButton,
-                       TQString::tqfromLatin1 ("resize"),
+                       TQString::fromLatin1 ("resize"),
                        i18n ("&Resize"));
 
     m_scaleButton = new TQToolButton (m_operationGroupBox);
     toolButtonSetLook (m_scaleButton,
-                       TQString::tqfromLatin1 ("scale"),
+                       TQString::fromLatin1 ("scale"),
                        i18n ("&Scale"));
 
     m_smoothScaleButton = new TQToolButton (m_operationGroupBox);
     toolButtonSetLook (m_smoothScaleButton,
-                       TQString::tqfromLatin1 ("smooth_scale"),
+                       TQString::fromLatin1 ("smooth_scale"),
                        i18n ("S&mooth Scale"));
 
 
@@ -684,9 +684,9 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
     //m_smoothScaleLabel = new TQLabel (i18n ("S&mooth scale"), m_operationGroupBox);
 
 
-    //m_resizeLabel->tqsetAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix);
-    //m_scaleLabel->tqsetAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix);
-    //m_smoothScaleLabel->tqsetAlignment (m_smoothScaleLabel->tqalignment () | TQt::ShowPrefix);
+    //m_resizeLabel->setAlignment (m_resizeLabel->alignment () | TQt::ShowPrefix);
+    //m_scaleLabel->setAlignment (m_scaleLabel->alignment () | TQt::ShowPrefix);
+    //m_smoothScaleLabel->setAlignment (m_smoothScaleLabel->alignment () | TQt::ShowPrefix);
 
 
     TQButtonGroup *resizeScaleButtonGroup = new TQButtonGroup (baseWidget);
@@ -727,9 +727,9 @@ void kpToolResizeScaleDialog::createDimensionsGroupBox (TQWidget *baseWidget)
     m_dimensionsGroupBox = new TQGroupBox (i18n ("Dimensions"), baseWidget);
 
     TQLabel *widthLabel = new TQLabel (i18n ("Width:"), m_dimensionsGroupBox);
-    widthLabel->tqsetAlignment (widthLabel->tqalignment () | TQt::AlignHCenter);
+    widthLabel->setAlignment (widthLabel->alignment () | TQt::AlignHCenter);
     TQLabel *heightLabel = new TQLabel (i18n ("Height:"), m_dimensionsGroupBox);
-    heightLabel->tqsetAlignment (heightLabel->tqalignment () | TQt::AlignHCenter);
+    heightLabel->setAlignment (heightLabel->alignment () | TQt::AlignHCenter);
 
     TQLabel *originalLabel = new TQLabel (i18n ("Original:"), m_dimensionsGroupBox);
     m_originalWidthInput = new KIntNumInput (
diff --git a/kolourpaint/tools/kptoolrotate.cpp b/kolourpaint/tools/kptoolrotate.cpp
index 5def33ca..4b015916 100644
--- a/kolourpaint/tools/kptoolrotate.cpp
+++ b/kolourpaint/tools/kptoolrotate.cpp
@@ -34,7 +34,7 @@
 #include <tqbuttongroup.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqwmatrix.h>
diff --git a/kolourpaint/tools/kptoolskew.cpp b/kolourpaint/tools/kptoolskew.cpp
index eec804d7..e2c0deae 100644
--- a/kolourpaint/tools/kptoolskew.cpp
+++ b/kolourpaint/tools/kptoolskew.cpp
@@ -34,7 +34,7 @@
 #include <tqapplication.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqwmatrix.h>
 
diff --git a/kolourpaint/views/kpthumbnailview.cpp b/kolourpaint/views/kpthumbnailview.cpp
index 54281ba4..970663b5 100644
--- a/kolourpaint/views/kpthumbnailview.cpp
+++ b/kolourpaint/views/kpthumbnailview.cpp
@@ -77,7 +77,7 @@ void kpThumbnailView::resizeEvent (TQResizeEvent *e)
                << endl;
 #endif
 
-    // For TQResizeEvent's, TQt already throws an entire widget tqrepaint into
+    // For TQResizeEvent's, TQt already throws an entire widget repaint into
     // the event loop.  So eat useless update() calls that can only slow
     // things down.
     // TODO: this doesn't seem to work.
diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
index b2f3441a..4d06d46e 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
@@ -133,12 +133,12 @@ void kpColorSimilarityCube::setColorSimilarity (double similarity)
 
     m_colorSimilarity = similarity;
 
-    tqrepaint (false/*no erase*/);
+    repaint (false/*no erase*/);
 }
 
 
 // protected virtual [base TQWidget]
-TQSize kpColorSimilarityCube::tqsizeHint () const
+TQSize kpColorSimilarityCube::sizeHint () const
 {
     return TQSize (52, 52);
 }
@@ -247,8 +247,8 @@ void kpColorSimilarityCube::drawFace (TQPainter *p,
     #if DEBUG_KP_COLOR_SIMILARITY_CUBE
         kdDebug () << "\tnot enabled - making us grey" << endl;
     #endif
-        colors [0] = tqcolorGroup ().background ();
-        colors [1] = tqcolorGroup ().background ();
+        colors [0] = colorGroup ().background ();
+        colors [1] = colorGroup ().background ();
     }
 
 #if DEBUG_KP_COLOR_SIMILARITY_CUBE
@@ -274,7 +274,7 @@ void kpColorSimilarityCube::drawContents (TQPainter *p)
     TQRect cr (contentsRect ());
 
     TQPixmap backBuffer (cr.width (), cr.height ());
-    backBuffer.fill (tqcolorGroup ().background ());
+    backBuffer.fill (colorGroup ().background ());
 
     TQPainter backBufferPainter (&backBuffer);
 
diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.h b/kolourpaint/widgets/kpcolorsimilaritycube.h
index 0cf9f92a..a5f1db9f 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.h
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.h
@@ -55,7 +55,7 @@ public:
     double colorSimilarity () const;
     void setColorSimilarity (double similarity);
 
-    virtual TQSize tqsizeHint () const;
+    virtual TQSize sizeHint () const;
 
 protected:
     TQColor color (int redOrGreenOrBlue, int baseBrightness, int similarityDirection) const;
diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
index d71ac501..7f0f621d 100644
--- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
@@ -30,7 +30,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 #include <klocale.h>
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index cfdb6820..7510d87c 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -34,7 +34,7 @@
 #include <tqbitmap.h>
 #include <tqdrawutil.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqsize.h>
 #include <tqtooltip.h>
@@ -150,7 +150,7 @@ kpColor kpDualColorButton::oldBackgroundColor () const
 
 
 // public virtual [base TQWidget]
-TQSize kpDualColorButton::tqsizeHint () const
+TQSize kpDualColorButton::sizeHint () const
 {
     return TQSize (52, 52);
 }
@@ -318,14 +318,14 @@ void kpDualColorButton::drawContents (TQPainter *p)
     else
     {
         backBufferPainter.fillRect (m_backBuffer->rect (),
-                                    tqcolorGroup ().color (TQColorGroup::Background));
+                                    colorGroup ().color (TQColorGroup::Background));
     }
 
     TQPixmap swapPixmap = UserIcon ("colorbutton_swap_16x16");
     if (!isEnabled ())
     {
         // swapPixmap has a mask after all
-        swapPixmap.fill (tqcolorGroup ().color (TQColorGroup::Dark));
+        swapPixmap.fill (colorGroup ().color (TQColorGroup::Dark));
     }
     backBufferPainter.drawPixmap (swapPixmapRect ().topLeft (), swapPixmap);
 
@@ -346,8 +346,8 @@ void kpDualColorButton::drawContents (TQPainter *p)
             backBufferPainter.drawPixmap (bgRectInside, UserIcon ("color_transparent_26x26"));
     }
     else
-        backBufferPainter.fillRect (bgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
-    qDrawShadePanel (&backBufferPainter, bgRect, tqcolorGroup (),
+        backBufferPainter.fillRect (bgRectInside, colorGroup ().color (TQColorGroup::Button));
+    qDrawShadePanel (&backBufferPainter, bgRect, colorGroup (),
                      false/*not sunken*/, 2/*lineWidth*/,
                      0/*never fill*/);
 
@@ -366,8 +366,8 @@ void kpDualColorButton::drawContents (TQPainter *p)
             backBufferPainter.drawPixmap (fgRectInside, UserIcon ("color_transparent_26x26"));
     }
     else
-        backBufferPainter.fillRect (fgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
-    qDrawShadePanel (&backBufferPainter, fgRect, tqcolorGroup (),
+        backBufferPainter.fillRect (fgRectInside, colorGroup ().color (TQColorGroup::Button));
+    qDrawShadePanel (&backBufferPainter, fgRect, colorGroup (),
                      false/*not sunken*/, 2/*lineWidth*/,
                      0/*never fill*/);
 
@@ -768,7 +768,7 @@ kpTransparentColorCell::~kpTransparentColorCell ()
 
 
 // public virtual [base TQWidget]
-TQSize kpTransparentColorCell::tqsizeHint () const
+TQSize kpTransparentColorCell::sizeHint () const
 {
     return TQSize (m_pixmap.width () + frameWidth () * 2,
                   m_pixmap.height () + frameWidth () * 2);
@@ -829,7 +829,7 @@ kpColorPalette::kpColorPalette (TQWidget *parent,
 #endif
 
     m_transparentColorCell = new kpTransparentColorCell (this);
-    m_transparentColorCell->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_transparentColorCell->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     connect (m_transparentColorCell, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
              this, TQT_SIGNAL (foregroundColorChanged (const kpColor &)));
     connect (m_transparentColorCell, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
@@ -964,7 +964,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
                                   5/*margin*/, (10 * 4)/*spacing*/);
 
     m_dualColorButton = new kpDualColorButton (mainWindow, base);
-    m_dualColorButton->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_dualColorButton->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     connect (m_dualColorButton, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
              this, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)));
     connect (m_dualColorButton, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
@@ -981,7 +981,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
     m_boxLayout->addWidget (m_colorPalette, 0/*stretch*/);
 
     m_colorSimilarityToolBarItem = new kpColorSimilarityToolBarItem (mainWindow, base);
-    m_colorSimilarityToolBarItem->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_colorSimilarityToolBarItem->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     connect (m_colorSimilarityToolBarItem, TQT_SIGNAL (colorSimilarityChanged (double, int)),
              this, TQT_SIGNAL (colorSimilarityChanged (double, int)));
     m_boxLayout->addWidget (m_colorSimilarityToolBarItem, 0/*stretch*/);
diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h
index 59f13fb7..7c005441 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -91,7 +91,7 @@ public:
     kpColor oldBackgroundColor () const;
 
 public:
-    virtual TQSize tqsizeHint () const;
+    virtual TQSize sizeHint () const;
 
 protected:
     TQRect swapPixmapRect () const;
@@ -163,7 +163,7 @@ public:
     kpTransparentColorCell (TQWidget *parent, const char *name = 0);
     virtual ~kpTransparentColorCell ();
 
-    virtual TQSize tqsizeHint () const;
+    virtual TQSize sizeHint () const;
 
 signals:
     void transparentColorSelected (int mouseButton);
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
index 6e7386ec..dc500b12 100644
--- a/kolourpaint/widgets/kpsqueezedtextlabel.cpp
+++ b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
@@ -53,11 +53,11 @@ kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent
 
 
 // public virtual
-TQSize kpSqueezedTextLabel::tqminimumSizeHint () const
+TQSize kpSqueezedTextLabel::minimumSizeHint () const
 {
 #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
-    kdDebug () << "kpSqueezedTextLabel::tqminimumSizeHint() qLabel prefers"
-               << TQLabel::tqminimumSizeHint () << endl;
+    kdDebug () << "kpSqueezedTextLabel::minimumSizeHint() qLabel prefers"
+               << TQLabel::minimumSizeHint () << endl;
 #endif
     return TQSize (-1/*no minimum width*/, TQLabel::minimumHeight ());
 }
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.h b/kolourpaint/widgets/kpsqueezedtextlabel.h
index 4697af8a..e4828b54 100644
--- a/kolourpaint/widgets/kpsqueezedtextlabel.h
+++ b/kolourpaint/widgets/kpsqueezedtextlabel.h
@@ -43,7 +43,7 @@ public:
     kpSqueezedTextLabel (TQWidget *parent, const char *name = 0);
     kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name = 0);
 
-    virtual TQSize tqminimumSizeHint () const;
+    virtual TQSize minimumSizeHint () const;
 
     // TODO: maybe text() should return the full text?
     TQString fullText () const;
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index ba048d5c..c1f73ea5 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -32,7 +32,7 @@
 #include <kptooltoolbar.h>
 
 #include <tqbuttongroup.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdatetime.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
@@ -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
 
@@ -199,7 +199,7 @@ int kpToolToolBar::defaultIconSize ()
 
     if (m_defaultIconSize <= 0)
     {
-        // Adapt according to screen tqgeometry
+        // Adapt according to screen geometry
         const TQRect desktopSize = KGlobalSettings::desktopGeometry (this);
     #if DEBUG_KP_TOOL_TOOL_BAR
         kdDebug () << "\tadapting to screen size=" << desktopSize << endl;
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index 3d1d3cff..18177804 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -175,10 +175,10 @@ TQPair <int, int> kpToolWidgetBase::defaultSelectedRowAndCol () const
         KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
         KConfigBase *cfg = cfgGroupSaver.config ();
 
-        TQString nameString = TQString::tqfromLatin1 (name ());
+        TQString nameString = TQString::fromLatin1 (name ());
 
-        row = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Row"), -1);
-        col = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Col"), -1);
+        row = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Row"), -1);
+        col = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Col"), -1);
     }
 
 #if DEBUG_KP_TOOL_WIDGET_BASE
@@ -218,9 +218,9 @@ void kpToolWidgetBase::saveSelectedAsDefault () const
     KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
     KConfigBase *cfg = cfgGroupSaver.config ();
 
-    TQString nameString = TQString::tqfromLatin1 (name ());
-    cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Row"), m_selectedRow);
-    cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Col"), m_selectedCol);
+    TQString nameString = TQString::fromLatin1 (name ());
+    cfg->writeEntry (nameString + TQString::fromLatin1 (" Row"), m_selectedRow);
+    cfg->writeEntry (nameString + TQString::fromLatin1 (" Col"), m_selectedCol);
     cfg->sync ();
 }
 
diff --git a/kolourpaint/widgets/kptoolwidgetbrush.cpp b/kolourpaint/widgets/kptoolwidgetbrush.cpp
index 0c583126..57986b63 100644
--- a/kolourpaint/widgets/kptoolwidgetbrush.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbrush.cpp
@@ -59,7 +59,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
 
     TQPixmap *pm = m_brushBitmaps;
     
-    for (int tqshape = 0; tqshape < BRUSH_SIZE_NUM_ROWS; tqshape++)
+    for (int shape = 0; shape < BRUSH_SIZE_NUM_ROWS; shape++)
     {
         for (int i = 0; i < BRUSH_SIZE_NUM_COLS; i++)
         {
@@ -68,7 +68,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
             pm->resize ((w <= 0 ? width () : w),
                         (h <= 0 ? height () : h));
 
-            const int s = brushSize [tqshape][i];
+            const int s = brushSize [shape][i];
             TQRect rect;
             
             if (s >= pm->width () || s >= pm->height ())
@@ -92,7 +92,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
             painter.setBrush (TQt::black);
 
             // sync: <brushes>
-            switch (tqshape)
+            switch (shape)
             {
             case 0:
                 painter.drawEllipse (rect);
@@ -110,7 +110,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
             painter.end ();
 
             pm->setMask (pm->createHeuristicMask ());
-            addOption (*pm, brushName (tqshape, i)/*tooltip*/);
+            addOption (*pm, brushName (shape, i)/*tooltip*/);
 
             pm++;
         }
@@ -127,38 +127,38 @@ kpToolWidgetBrush::~kpToolWidgetBrush ()
 
 
 // private
-TQString kpToolWidgetBrush::brushName (int tqshape, int whichSize)
+TQString kpToolWidgetBrush::brushName (int shape, int whichSize)
 {
-    int s = brushSize [tqshape][whichSize];
+    int s = brushSize [shape][whichSize];
     
     if (s == 1)
         return i18n ("1x1");
     
-    TQString tqshapeName;
+    TQString shapeName;
 
     // sync: <brushes>
-    switch (tqshape)
+    switch (shape)
     {
     case 0:
-        tqshapeName = i18n ("Circle");
+        shapeName = i18n ("Circle");
         break;
     case 1:
-        tqshapeName = i18n ("Square");
+        shapeName = i18n ("Square");
         break;
     case 2:
-        // TODO: is this really the name of a tqshape? :)
-        tqshapeName = i18n ("Slash");
+        // TODO: is this really the name of a shape? :)
+        shapeName = i18n ("Slash");
         break;
     case 3:
-        // TODO: is this really the name of a tqshape? :)
-        tqshapeName = i18n ("Backslash");
+        // TODO: is this really the name of a shape? :)
+        shapeName = i18n ("Backslash");
         break;
     }
     
-    if (tqshapeName.isEmpty ())
+    if (shapeName.isEmpty ())
         return TQString();
     
-    return i18n ("%1x%2 %3").arg (s).arg (s).arg (tqshapeName);
+    return i18n ("%1x%2 %3").arg (s).arg (s).arg (shapeName);
 }
 
 TQPixmap kpToolWidgetBrush::brush () const
diff --git a/kolourpaint/widgets/kptoolwidgetbrush.h b/kolourpaint/widgets/kptoolwidgetbrush.h
index 0fd2f46a..c67db05e 100644
--- a/kolourpaint/widgets/kptoolwidgetbrush.h
+++ b/kolourpaint/widgets/kptoolwidgetbrush.h
@@ -43,7 +43,7 @@ public:
     virtual ~kpToolWidgetBrush ();
 
 private:
-    TQString brushName (int tqshape, int whichSize);
+    TQString brushName (int shape, int whichSize);
     
 public:
     TQPixmap brush () const;
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/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
index a87714c5..f3d2cd2e 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
@@ -31,7 +31,7 @@
 #include <kptoolwidgetfillstyle.h>
 
 #include <tqbitmap.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpainter.h>
 
 #include <kdebug.h>
diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
index 503cecd2..24569a21 100644
--- a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
+++ b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
@@ -54,7 +54,7 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *parent, const char
     for (int i = 0; i < int (sizeof (spraycanSizes) / sizeof (spraycanSizes [0])); i++)
     {
         int s = spraycanSizes [i];
-        TQString iconName = TQString ("tool_spraycan_%1x%1").tqarg (s).tqarg(s);
+        TQString iconName = TQString ("tool_spraycan_%1x%1").arg (s).arg(s);
         
     #if DEBUG_KP_TOOL_WIDGET_SPRAYCAN_SIZE
         kdDebug () << "\ticonName=" << iconName << endl;
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/img_saver.cpp b/kooka/img_saver.cpp
index 847023d1..02fb957f 100644
--- a/kooka/img_saver.cpp
+++ b/kooka/img_saver.cpp
@@ -46,7 +46,7 @@
 #include <kinputdialog.h>
 
 #include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfileinfo.h>
 #include <tqimage.h>
 #include <tqmessagebox.h>
@@ -116,7 +116,7 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name
    Q_CHECK_PTR(l_help);
    l_help->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
    l_help->setText( i18n("-No format selected-" ));
-   l_help->tqsetAlignment( AlignVCenter | AlignHCenter );
+   l_help->setAlignment( AlignVCenter | AlignHCenter );
    l_help->setMinimumWidth(230);
 
    // Insert Selbox for subformat
@@ -208,11 +208,11 @@ TQCString FormatDialog::getSubFormat( ) const
 #include "formathelp.h"
 void FormatDialog::buildHelp( void )
 {
-   format_help.insert( TQString::tqfromLatin1("BMP"), HELP_BMP );
-   format_help.insert( TQString::tqfromLatin1("PNM"), HELP_PNM );
-   format_help.insert( TQString::tqfromLatin1("JPEG"), HELP_JPG );
-   format_help.insert( TQString::tqfromLatin1("JPG"), HELP_JPG );
-   format_help.insert( TQString::tqfromLatin1("EPS"), HELP_EPS );
+   format_help.insert( TQString::fromLatin1("BMP"), HELP_BMP );
+   format_help.insert( TQString::fromLatin1("PNM"), HELP_PNM );
+   format_help.insert( TQString::fromLatin1("JPEG"), HELP_JPG );
+   format_help.insert( TQString::fromLatin1("JPG"), HELP_JPG );
+   format_help.insert( TQString::fromLatin1("EPS"), HELP_EPS );
 }
 
 
@@ -276,14 +276,14 @@ void ImgSaver::createDir( const TQString& dir )
       if( KIO::mkdir( KURL(dir)))
       {
         KMessageBox::sorry(0, i18n("The folder\n%1\n does not exist and could not be created;\n"
-                        "please check the permissions.").tqarg(dir));
+                        "please check the permissions.").arg(dir));
       }
    }
 #if 0
    if( ! fi.isWritable() )
    {
         KMessageBox::sorry(0, i18n("The directory\n%1\n is not writeable;\nplease check the permissions.")
-                .tqarg(dir));
+                .arg(dir));
    }
 #endif
 }
@@ -766,7 +766,7 @@ bool ImgSaver::renameImage( const KURL& fromUrl, KURL& toUrl, bool askExt,  TQWi
 
 	 TQString s;
 	 s = i18n("The filename you supplied has no file extension.\nShould the correct one be added automatically? ");
-	 s += i18n( "That would result in the new filename: %1" ).tqarg( fName);
+	 s += i18n( "That would result in the new filename: %1" ).arg( fName);
 
 	 result = KMessageBox::questionYesNo(overWidget, s, i18n( "Extension Missing"),
 					     i18n("Add Extension"), i18n("Do Not Add"),
@@ -863,7 +863,7 @@ bool ImgSaver::copyImage( const KURL& fromUrl, const KURL& toUrl, TQWidget *over
 
       TQString s;
       s = i18n("The filename you supplied has no file extension.\nShould the correct one be added automatically? ");
-      s += i18n( "That would result in the new filename: %1" ).tqarg( fName);
+      s += i18n( "That would result in the new filename: %1" ).arg( fName);
 
       result = KMessageBox::questionYesNo(overWidget, s, i18n( "Extension Missing"),
 					  i18n("Add Extension"), i18n("Do Not Add"),
diff --git a/kooka/imgnamecombo.cpp b/kooka/imgnamecombo.cpp
index 8190d5bc..833bf422 100644
--- a/kooka/imgnamecombo.cpp
+++ b/kooka/imgnamecombo.cpp
@@ -25,7 +25,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlistview.h>
 
@@ -51,7 +51,7 @@ ImageNameCombo::~ImageNameCombo()
 
 void ImageNameCombo::slotPathRemove( KFileTreeBranch *branch, const TQString& relPath )
 {
-   TQString path = branch->name() + TQString::tqfromLatin1(" - ") + relPath;
+   TQString path = branch->name() + TQString::fromLatin1(" - ") + relPath;
 
    kdDebug(28000) << "ImageNameCombo: Removing " << path << endl;
    TQString select = currentText();
@@ -82,7 +82,7 @@ void ImageNameCombo::slotGalleryPathChanged( KFileTreeBranch* branch, const TQSt
 {
    TQString newPath;
 
-   newPath = branch->name() + TQString::tqfromLatin1(" - ") + relativPath;
+   newPath = branch->name() + TQString::fromLatin1(" - ") + relativPath;
 
    kdDebug( 28000) << "Inserting " << newPath << " to combobox" << endl;
 
diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp
index e79c92df..b65df15c 100644
--- a/kooka/imgprintdialog.cpp
+++ b/kooka/imgprintdialog.cpp
@@ -31,7 +31,7 @@
 
 #include <tqstring.h>
 #include <tqmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
@@ -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 );
@@ -127,8 +127,8 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
 
 
     TQWidget *spaceEater = new TQWidget( this );
-    spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
-    tqlayout->addWidget( spaceEater );
+    spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
+    layout->addWidget( spaceEater );
 
     /* Set start values */
     m_rbScreen->setChecked(true);
@@ -167,7 +167,7 @@ void ImgPrintDialog::setOptions(const TQMap<TQString,TQString>& opts)
     m_sizeH->setValue( help );
 
     help = opts[OPT_SCREEN_RES].toInt();
-    m_screenRes->setText(i18n( "Screen resolution: %1 dpi").tqarg(help));
+    m_screenRes->setText(i18n( "Screen resolution: %1 dpi").arg(help));
 
     help = opts[OPT_PSGEN_DRAFT].toInt();
     m_psDraft->setChecked( help == 1 );
diff --git a/kooka/kadmosocr.cpp b/kooka/kadmosocr.cpp
index 3110451f..a0ad590b 100644
--- a/kooka/kadmosocr.cpp
+++ b/kooka/kadmosocr.cpp
@@ -356,7 +356,7 @@ KADMOS_ERROR CRep::SetImage(TQImage *Image)
     m_RepData.image.width   = Image->width();
     m_RepData.image.height  = Image->height();
     m_RepData.image.bitsperpixel = Image->depth();
-    m_RepData.image.tqalignment = 1;
+    m_RepData.image.alignment = 1;
     m_RepData.image.fillorder = FILLORDER_MSB2LSB;
     // color
     if( Image->depth() == 1 || (Image->numColors()==2 && Image->depth() == 8) )
diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp
index 2cd5d20b..424a6fdf 100644
--- a/kooka/kocrbase.cpp
+++ b/kooka/kocrbase.cpp
@@ -24,7 +24,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqfileinfo.h>
 #include <tqtooltip.h>
@@ -129,7 +129,7 @@ void KOCRBase::imgIntro()
     m_previewPix = new TQLabel( m_imgHBox );
     m_previewPix->setPixmap(TQPixmap());
     m_previewPix->setFixedSize(m_previewSize);
-    m_previewPix->tqsetAlignment( TQt::AlignCenter );
+    m_previewPix->setAlignment( TQt::AlignCenter );
     m_previewPix->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
     // m_previewPix->resize(m_previewSize);
 
@@ -164,7 +164,7 @@ void KOCRBase::ocrIntro( )
         hb_cap->setSpacing( KDialog::spacingHint());
 
         TQLabel *imgLab = new TQLabel( hb_cap );
-        imgLab->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop  );
+        imgLab->setAlignment( TQt::AlignHCenter | TQt::AlignTop  );
         imgLab->setPixmap( pix );
         pa = hb_cap;
     }
@@ -188,7 +188,7 @@ void KOCRBase::spellCheckIntro()
     KSpellConfig *sCfg = new KSpellConfig( m_gbSpellOpts, "SPELLCHK", m_spellConfig, false );
     /* A space eater */
     TQWidget *spaceEater = new TQWidget(m_spellchkPage);
-    spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
+    spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
 
     /* connect toggle button */
     connect( m_cbWantCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slWantSpellcheck(bool)));
@@ -285,7 +285,7 @@ void KOCRBase::introduceImage( KookaImage* img)
         }
     }
     TQWidget *spaceEater = new TQWidget( m_metaBox );
-    spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
+    spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
     m_metaBox->show();
 }
 
diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp
index ca913f1d..14134edd 100644
--- a/kooka/kocrgocr.cpp
+++ b/kooka/kocrgocr.cpp
@@ -26,7 +26,7 @@
 
 /* $Id$ */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqfileinfo.h>
 #include <tqtooltip.h>
diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp
index 59afa1a4..1c652651 100644
--- a/kooka/kocrkadmos.cpp
+++ b/kooka/kocrkadmos.cpp
@@ -24,7 +24,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqfileinfo.h>
 #include <tqtooltip.h>
@@ -422,14 +422,14 @@ bool KadmosDialog::getSelClassifier( TQString& path ) const
         if( res && ! fi.exists() )
         {
             kdDebug(28000) << "Classifier file does not exist" << endl;
-            path = i18n("Classifier file %1 does not exist").tqarg(classifier);
+            path = i18n("Classifier file %1 does not exist").arg(classifier);
             res = false;
         }
 
         if( res && ! fi.isReadable() )
         {
             kdDebug(28000) << "Classifier file could not be read" << endl;
-            path = i18n("Classifier file %1 is not readable").tqarg(classifier);
+            path = i18n("Classifier file %1 is not readable").arg(classifier);
             res = false;
         }
 
diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp
index b9365767..384dbe69 100644
--- a/kooka/kocrocrad.cpp
+++ b/kooka/kocrocrad.cpp
@@ -26,7 +26,7 @@
 
 /* $Id$ */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqfileinfo.h>
 #include <tqtooltip.h>
@@ -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/kooka/kooka.cpp b/kooka/kooka.cpp
index dc05a622..4750bf07 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -96,7 +96,7 @@ Kooka::Kooka( const TQCString& deviceToUse)
 
     changeCaption( i18n( "KDE Scanning" ));
 
-    setAutoSaveSettings(  TQString::tqfromLatin1("General Options"),
+    setAutoSaveSettings(  TQString::fromLatin1("General Options"),
                           true );
 }
 
diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp
index bebd60fa..bc467bfd 100644
--- a/kooka/kookapref.cpp
+++ b/kooka/kookapref.cpp
@@ -36,7 +36,7 @@
 #include <kcolorbutton.h>
 #include <kstandarddirs.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqvgroupbox.h>
 #include <tqgrid.h>
@@ -149,7 +149,7 @@ void KookaPreferences::setupOCRPage()
 #endif
     top->addWidget( kgp );
     TQWidget *spaceEater = new TQWidget( page );
-    spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
+    spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
     top->addWidget( spaceEater );
 
     /*
@@ -180,13 +180,13 @@ KURLRequester* KookaPreferences::binaryCheckBox( TQWidget *parent, const TQStrin
 {
     TQHBox *hbox = new TQHBox( parent );
 
-    (void) new TQLabel( i18n("Select the %1 binary to use:").tqarg( program ), hbox );
+    (void) new TQLabel( i18n("Select the %1 binary to use:").arg( program ), hbox );
     KURLRequester* urlRequester = new KURLRequester( parent );
     urlRequester->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
 
     TQToolTip::add( urlRequester,
                    i18n( "Enter the path to %1, the optical-character-recognition "
-			 "command line tool.").tqarg(program));
+			 "command line tool.").arg(program));
     return urlRequester;
 }
 
@@ -418,8 +418,8 @@ void KookaPreferences::setupThumbnailPage()
 
    /* Frame Stuff */
    int frameWidth = konf->readNumEntry( THUMB_MARGIN, 3 );
-   TQColor col1    = konf->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base()));
-   TQColor col2    = konf->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground()));
+   TQColor col1    = konf->readColorEntry( MARGIN_COLOR1, &(colorGroup().base()));
+   TQColor col2    = konf->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground()));
 
    TQGrid *fGrid = new TQGrid( 2, hgb3 );
    fGrid->setSpacing( 2 );
@@ -457,7 +457,7 @@ void KookaPreferences::slotApply( void )
     /* ** startup options ** */
 
    /** write the global one, to read from libkscan also */
-   konf->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
+   konf->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    bool cbVal = !(cbShowScannerSelection->isChecked());
    kdDebug(28000) << "Writing for " << STARTUP_SKIP_ASK << ": " << cbVal << endl;
    konf->writeEntry( STARTUP_SKIP_ASK, cbVal, true, true ); /* global flag goes to kdeglobals */
@@ -532,8 +532,8 @@ void KookaPreferences::slotDefault( void )
     m_tileSelector->setURL( KURL(bgImg) );
     m_thumbWidth->setValue( 100 );
     m_thumbHeight->setValue( 120 );
-    TQColor col1    = TQColor( tqcolorGroup().base());
-    TQColor col2    = TQColor( tqcolorGroup().foreground());
+    TQColor col1    = TQColor( colorGroup().base());
+    TQColor col2    = TQColor( colorGroup().foreground());
 
     m_frameWidth->setValue( 3 );
     m_colButt1->setColor( col1 );
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp
index 5586ee43..7d6c7f67 100644
--- a/kooka/kookaview.cpp
+++ b/kooka/kookaview.cpp
@@ -47,7 +47,7 @@
 #endif
 #include <tqlabel.h>
 #include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsplitter.h>
 #include <tqstrlist.h>
 #include <tqpaintdevice.h>
@@ -164,7 +164,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
    TQHBox *recentBox = new TQHBox( m_dockRecent );
    recentBox->setMargin(KDialog::marginHint());
    TQLabel *lab = new TQLabel( i18n("Gallery:"), recentBox );
-   lab->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
+   lab->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
    recentFolder = new ImageNameCombo( recentBox );
 
    m_dockRecent->setWidget( recentBox );
@@ -277,7 +277,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
 
    packager->openRoots();
 
-   /* tqStatus Bar */
+   /* Status Bar */
    KStatusBar *statBar = m_mainWindow->statusBar();
 
    // statBar->insertItem(TQString("1"), SBAR_ZOOM,  0, true );
@@ -472,7 +472,7 @@ void KookaView::print()
     printer.setUsePrinterResolution(true);
     printer.addDialogPage( new ImgPrintDialog( img ));
 
-    if( printer.setup( m_mainWindow, i18n("Print %1").tqarg(img->localFileName().section('/', -1)) ))
+    if( printer.setup( m_mainWindow, i18n("Print %1").arg(img->localFileName().section('/', -1)) ))
     {
 	KookaPrint kookaprint( &printer );
 	kookaprint.printImage(img);
@@ -565,7 +565,7 @@ void KookaView::startOCR( KookaImage *img )
 		   m_dockOCRText, TQT_SLOT( show() ));
 	  
           connect( ocrFabric, TQT_SIGNAL( repaintOCRResImage( )),
-                   img_canvas, TQT_SLOT(tqrepaint()));
+                   img_canvas, TQT_SLOT(repaint()));
 
 	  connect( ocrFabric, TQT_SIGNAL( clearOCRResultText()),
 		   m_ocrResEdit, TQT_SLOT(clear()));
@@ -842,7 +842,7 @@ void KookaView::slShowAImage( KookaImage *img )
        ocrFabric->slSetImage( img );
    }
 
-   /* tqStatus Bar */
+   /* Status Bar */
    KStatusBar *statBar = m_mainWindow->statusBar();
    if( img_canvas )
        statBar->changeItem( img_canvas->imageInfoString(), StatusImage );
@@ -913,7 +913,7 @@ void KookaView::slShowThumbnails(KFileTreeViewItem *dirKfi, bool forceRedraw )
  */
 void KookaView::slStartLoading( const KURL& url )
 {
-   emit( signalChangeStatusbar( i18n("Loading %1" ).tqarg( url.prettyURL() ) ));
+   emit( signalChangeStatusbar( i18n("Loading %1" ).arg( url.prettyURL() ) ));
 
    // if( m_stack->visibleWidget() != img_canvas )
    // {
diff --git a/kooka/kookaview.h b/kooka/kookaview.h
index 76910cdc..a4fe3383 100644
--- a/kooka/kookaview.h
+++ b/kooka/kookaview.h
@@ -31,7 +31,7 @@
 #include "kookaiface.h"
 #include <kdockwidget.h>
 #include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqimage.h>
 #include <tqsplitter.h>
 
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index 67d0aaca..a73402b6 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -60,7 +60,7 @@
 #include <tqpaintdevice.h>
 #include <tqpainter.h>
 #include <tqpen.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqfileinfo.h>
 
 /*
@@ -814,11 +814,11 @@ bool KSANEOCR::readORF( const TQString& fileName, TQString& errStr )
     TQFileInfo fi( fileName );
     if( ! fi.exists() ) {
         error = true;
-        errStr = i18n("The orf %1 does not exist.").tqarg(fileName);
+        errStr = i18n("The orf %1 does not exist.").arg(fileName);
     }
     if( ! error && ! fi.isReadable() ) {
         error = true;
-        errStr = i18n("Permission denied on file %1.").tqarg(fileName);
+        errStr = i18n("Permission denied on file %1.").arg(fileName);
     }
 
 
diff --git a/kooka/ocrresedit.cpp b/kooka/ocrresedit.cpp
index f8e8f2c2..75ec21c8 100644
--- a/kooka/ocrresedit.cpp
+++ b/kooka/ocrresedit.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 /* -------------------- ocrResEdit -------------------- */
 
diff --git a/kooka/ocrresedit.h b/kooka/ocrresedit.h
index 72517f4b..b9e7a7e0 100644
--- a/kooka/ocrresedit.h
+++ b/kooka/ocrresedit.h
@@ -27,7 +27,7 @@
 #ifndef _OCR_RESEDIT_
 #define _OCR_RESEDIT_
 
-#include <tqtextedit.h>
+#include <textedit.h>
 
 class TQString;
 class TQColor;
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index 9a8c9d3a..2f5da3ca 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -245,7 +245,7 @@ void ScanPackager::slotDecorate( KFileTreeViewItem* item )
 	 }
 
 	 /* set image size in pixels */
-	 TQString t = i18n( "%1 x %2" ).tqarg( img->width()).tqarg(img->height());
+	 TQString t = i18n( "%1 x %2" ).arg( img->width()).arg(img->height());
 	 item->setText( 1, t );
 	 kdDebug( 28000) << "Image loaded and decorated!" << endl;
       }
@@ -463,7 +463,7 @@ void ScanPackager::slotSelectDirectory( const TQString & dirString )
 {
    kdDebug(28000) << "Trying to decode directory string " << dirString << endl;
 
-   TQString searchFor = TQString::tqfromLatin1(" - ");
+   TQString searchFor = TQString::fromLatin1(" - ");
    int pos = dirString.find( searchFor );
 
    if( pos > -1 )
@@ -600,7 +600,7 @@ void ScanPackager::loadImageForItem( KFileTreeViewItem *item )
                   prevItem = subImgItem;
 
                   subImgItem->setPixmap( 0, loader->loadIcon( "editcopy", KIcon::Small ));
-                  subImgItem->setText( 0, i18n("Sub-image %1").tqarg( i ) );
+                  subImgItem->setText( 0, i18n("Sub-image %1").arg( i ) );
                   KookaImage  *subImgImg = new KookaImage( i, img );
                   subImgImg->setFileItem( newKfi );
                   newKfi->setExtraData( (void*) this, (void*) subImgImg );
@@ -853,7 +853,7 @@ void ScanPackager::slAddImage( TQImage *img, KookaImageMeta* )
    m_nextUrlToShow = lurl;
 
    TQString s;
-   /* Count amount of tqchildren of the father */
+   /* Count amount of children of the father */
    TQListViewItem *paps = curr->parent();
    if( curr->isDir() ) /* take only father if the is no directory */
       paps = curr;
@@ -861,7 +861,7 @@ void ScanPackager::slAddImage( TQImage *img, KookaImageMeta* )
    if( paps )
    {
       int childcount = paps->childCount();
-      s = i18n("%1 images").tqarg(childcount);
+      s = i18n("%1 images").arg(childcount);
       paps->setText( 1, s);
       setOpen( paps, true );
    }
@@ -1136,7 +1136,7 @@ void ScanPackager::slotDeleteItems( )
       s = i18n("Do you really want to delete this image?\nIt cannot be restored!" );
       if( item->isDir() )
       {
-	 s = i18n("Do you really want to delete the folder %1\nand all the images inside?").tqarg("");
+	 s = i18n("Do you really want to delete the folder %1\nand all the images inside?").arg("");
       }
       result = KMessageBox::warningContinueCancel(this, s, i18n( "Delete Collection Item"),
 					  KStdGuiItem::del(), "AskForDeleteFiles" );
@@ -1214,7 +1214,7 @@ TQString ScanPackager::getImgName( TQString name_on_disk )
    TQString s;
    (void) name_on_disk;
 
-   s = i18n("image %1").tqarg(img_counter++);
+   s = i18n("image %1").arg(img_counter++);
    return( s );
 }
 
diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp
index a431f1ea..570459f4 100644
--- a/kooka/thumbview.cpp
+++ b/kooka/thumbview.cpp
@@ -91,14 +91,14 @@ bool ThumbView::readSettings()
    bool dirty = false;
 
    TQColor color;
-   color = cfg->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base()));
+   color = cfg->readColorEntry( MARGIN_COLOR1, &(colorGroup().base()));
    if( color != m_marginColor1 )
    {
       dirty = true;
       m_marginColor1 = color;
    }
 
-   color = cfg->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground()));
+   color = cfg->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground()));
    if( color != m_marginColor2 )
    {
       dirty = true;
diff --git a/kpdf/conf/dlgaccessibility.ui b/kpdf/conf/dlgaccessibility.ui
index 9d7b9da2..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">
@@ -154,7 +154,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>20</height>
@@ -196,7 +196,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>20</height>
@@ -215,7 +215,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -234,7 +234,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>48</width>
                                             <height>21</height>
@@ -262,7 +262,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>20</height>
@@ -290,7 +290,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>48</width>
                                             <height>21</height>
@@ -318,7 +318,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>20</height>
@@ -348,7 +348,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -375,7 +375,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>48</width>
                                             <height>21</height>
@@ -392,7 +392,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>20</height>
@@ -409,7 +409,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>20</height>
@@ -426,7 +426,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>48</width>
                                             <height>21</height>
diff --git a/kpdf/conf/dlggeneral.ui b/kpdf/conf/dlggeneral.ui
index b042d261..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">
@@ -128,7 +128,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>1</height>
@@ -149,7 +149,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kpdf/conf/dlgperformance.ui b/kpdf/conf/dlgperformance.ui
index dab4ffcc..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">
@@ -98,7 +98,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>1</height>
@@ -138,13 +138,13 @@
                     <property name="textFormat">
                         <enum>PlainText</enum>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </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">
@@ -210,7 +210,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>1</height>
@@ -231,7 +231,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>16</height>
diff --git a/kpdf/conf/dlgpresentation.ui b/kpdf/conf/dlgpresentation.ui
index 8d3a6c8c..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">
@@ -258,7 +258,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>1</height>
diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp
index 2074789d..c85dcea9 100644
--- a/kpdf/core/document.cpp
+++ b/kpdf/core/document.cpp
@@ -13,7 +13,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqimage.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqvaluevector.h>
 #include <tqtimer.h>
 #include <tqmap.h>
@@ -118,7 +118,7 @@ KPDFDocument::KPDFDocument(TQWidget *widget)
     TQStringList::Iterator it = list.begin();
     while( it != list.end() )
     {
-        d->kimgioMimes << KMimeType::findByPath(TQString("foo.%1").tqarg(*it), 0, true)->name();
+        d->kimgioMimes << KMimeType::findByPath(TQString("foo.%1").arg(*it), 0, true)->name();
         ++it;
     }
 }
@@ -331,7 +331,7 @@ void KPDFDocument::reparseConfig()
     // reparse generator config and if something changed clear KPDFPages
     if ( generator && generator->reparseConfig() )
     {
-        // tqinvalidate pixmaps
+        // invalidate pixmaps
         TQValueVector<KPDFPage*>::iterator it = pages_vector.begin(), end = pages_vector.end();
         for ( ; it != end; ++it )
             (*it)->deletePixmapsAndRects();
@@ -712,7 +712,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
             }
         }
 
-        // reset cursor to previous tqshape
+        // reset cursor to previous shape
         TQApplication::restoreOverrideCursor();
 
         // send page lists if found anything new
@@ -764,7 +764,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
             }
         }
 
-        // reset cursor to previous tqshape
+        // reset cursor to previous shape
         TQApplication::restoreOverrideCursor();
 
         // if a match has been found..
@@ -793,7 +793,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
             }
         }
         else if ( !noDialogs )
-            KMessageBox::information( widget(), i18n("No matches found for '%1'.").tqarg( text ) );
+            KMessageBox::information( widget(), i18n("No matches found for '%1'.").arg( text ) );
     }
     // 3. PREVMATCH //TODO
     else if ( type == PrevMatch )
@@ -865,7 +865,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
             }
         }
 
-        // reset cursor to previous tqshape
+        // reset cursor to previous shape
         TQApplication::restoreOverrideCursor();
 
         // send page lists to update observers (since some filter on bookmarks)
@@ -1016,7 +1016,7 @@ void KPDFDocument::processLink( const KPDFLink * link )
                 KRun::run( *ptr, lst );
             }
             else
-                KMessageBox::information( widget(), i18n( "No application found for opening file of mimetype %1." ).tqarg( mime->name() ) );
+                KMessageBox::information( widget(), i18n( "No application found for opening file of mimetype %1." ).arg( mime->name() ) );
             } break;
 
         case KPDFLink::Action: {
@@ -1067,7 +1067,7 @@ void KPDFDocument::processLink( const KPDFLink * link )
         case KPDFLink::Browse: {
             const KPDFLinkBrowse * browse = static_cast< const KPDFLinkBrowse * >( link );
             // if the url is a mailto one, invoke mailer
-            if ( browse->url().tqstartsWith( "mailto:", false ) )
+            if ( browse->url().startsWith( "mailto:", false ) )
                 kapp->invokeMailer( browse->url() );
             else
             {
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 6550a543..65e3a55a 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -209,7 +209,7 @@ const DocumentInfo * PDFGenerator::generateDocumentInfo()
         if ( pdfdoc )
         {
             docInfo.set( "format", i18n( "PDF v. <version>", "PDF v. %1" )
-                         .tqarg( TQString::number( pdfdoc->getPDFVersion() ) ), i18n( "Format" ) );
+                         .arg( TQString::number( pdfdoc->getPDFVersion() ) ), i18n( "Format" ) );
             docInfo.set( "encryption", pdfdoc->isEncrypted() ? i18n( "Encrypted" ) : i18n( "Unencrypted" ),
                          i18n("Security") );
             docInfo.set( "optimization", pdfdoc->isLinearized() ? i18n( "Yes" ) : i18n( "No" ),
@@ -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.tqat(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 );
@@ -909,11 +909,11 @@ void PDFGenerator::addSynopsisChildren( TQDomNode * parent, GList * items )
 
         item.setAttribute( "Open", TQVariant( (bool)outlineItem->isOpen() ).toString() );
 
-        // 3. recursively descend over tqchildren
+        // 3. recursively descend over children
         outlineItem->open();
-        GList * tqchildren = outlineItem->getKids();
-        if ( tqchildren )
-            addSynopsisChildren( &item, tqchildren );
+        GList * children = outlineItem->getKids();
+        if ( children )
+            addSynopsisChildren( &item, children );
     }
 }
 
@@ -1017,10 +1017,10 @@ void PDFGenerator::addTransition( int pageNumber, KPDFPage * page )
 
     switch ( pdfTransition->getAlignment() ) {
         case PageTransition::Horizontal:
-            transition->tqsetAlignment( KPDFPageTransition::Horizontal );
+            transition->setAlignment( KPDFPageTransition::Horizontal );
             break;
         case PageTransition::Vertical:
-            transition->tqsetAlignment( KPDFPageTransition::Vertical );
+            transition->setAlignment( KPDFPageTransition::Vertical );
             break;
     }
 
diff --git a/kpdf/core/link.cpp b/kpdf/core/link.cpp
index a872ba60..fd4aa141 100644
--- a/kpdf/core/link.cpp
+++ b/kpdf/core/link.cpp
@@ -18,12 +18,12 @@ KPDFLink::~KPDFLink()
 
 TQString KPDFLinkGoto::linkTip() const
 {
-    return m_extFileName.isEmpty() ? ( m_vp.pageNumber != -1 ? i18n( "Go to page %1" ).tqarg( m_vp.pageNumber + 1 ) : TQString() ) : i18n("Open external file");
+    return m_extFileName.isEmpty() ? ( m_vp.pageNumber != -1 ? i18n( "Go to page %1" ).arg( m_vp.pageNumber + 1 ) : TQString() ) : i18n("Open external file");
 }
 
 TQString KPDFLinkExecute::linkTip() const
 {
-    return i18n( "Execute '%1'..." ).tqarg( m_fileName );
+    return i18n( "Execute '%1'..." ).arg( m_fileName );
 }
 
 TQString KPDFLinkBrowse::linkTip() const
diff --git a/kpdf/core/page.cpp b/kpdf/core/page.cpp
index 269cab2e..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;
@@ -319,7 +319,7 @@ bool NormalizedRect::intersects( double l, double t, double r, double b ) const
     return (l < right) && (r > left) && (t < bottom) && (b > top);
 }
 
-TQRect NormalizedRect::tqgeometry( int xScale, int yScale ) const
+TQRect NormalizedRect::geometry( int xScale, int yScale ) const
 {
     int l = (int)( left * xScale ),
         t = (int)( top * yScale ),
diff --git a/kpdf/core/page.h b/kpdf/core/page.h
index 1ec5add0..2de7aceb 100644
--- a/kpdf/core/page.h
+++ b/kpdf/core/page.h
@@ -36,7 +36,7 @@ class NormalizedRect
         bool intersects( const NormalizedRect & normRect ) const;
         bool intersects( double l, double t, double r, double b ) const;
 
-        TQRect tqgeometry( int xScale, int yScale ) const;
+        TQRect geometry( int xScale, int yScale ) const;
 };
 
 /**
diff --git a/kpdf/core/pagetransition.cpp b/kpdf/core/pagetransition.cpp
index 41d743c6..c43da45a 100644
--- a/kpdf/core/pagetransition.cpp
+++ b/kpdf/core/pagetransition.cpp
@@ -15,7 +15,7 @@
 KPDFPageTransition::KPDFPageTransition( Type type )
   : m_type( type ),
     m_duration( 1 ),
-    m_tqalignment(Horizontal ),
+    m_alignment(Horizontal ),
     m_direction( Inward ),
     m_angle( 0 ),
     m_scale( 1.0 ),
diff --git a/kpdf/core/pagetransition.h b/kpdf/core/pagetransition.h
index 25280437..70792355 100644
--- a/kpdf/core/pagetransition.h
+++ b/kpdf/core/pagetransition.h
@@ -51,7 +51,7 @@ class KPDFPageTransition
         inline int duration() const { return m_duration; }
 
         // Get dimension in which the transition effect occurs.
-        inline Alignment tqalignment() const { return m_tqalignment; }
+        inline Alignment alignment() const { return m_alignment; }
 
         // Get direction of motion of the transition effect.
         inline Direction direction() const { return m_direction; }
@@ -67,7 +67,7 @@ class KPDFPageTransition
 
         inline void setType( Type type ) { m_type = type; }
         inline void setDuration( int duration ) { m_duration = duration; }
-        inline void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; }
+        inline void setAlignment( Alignment alignment ) { m_alignment = alignment; }
         inline void setDirection( Direction direction ) { m_direction = direction; }
         inline void setAngle( int angle ) { m_angle = angle; }
         inline void setScale( double scale ) { m_scale = scale; }
@@ -76,7 +76,7 @@ class KPDFPageTransition
     private:
         Type m_type;
         int m_duration;
-        Alignment m_tqalignment;
+        Alignment m_alignment;
         Direction m_direction;
         int m_angle;
         double m_scale;
diff --git a/kpdf/error.cpp b/kpdf/error.cpp
index ca62437f..00d3581e 100644
--- a/kpdf/error.cpp
+++ b/kpdf/error.cpp
@@ -32,7 +32,7 @@ void CDECL error(int pos, char *msg, ...) {
     return;
   }
   if (pos >= 0) {
-    emsg = TQString("Error (%1): ").tqarg(pos);
+    emsg = TQString("Error (%1): ").arg(pos);
   } else {
     emsg = "Error: ";
   }
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index eec5e95b..2afd73b5 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -25,7 +25,7 @@
 #include <tqcheckbox.h>
 #include <tqsplitter.h>
 #include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include <tqtoolbox.h>
@@ -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 )
@@ -151,7 +151,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	connect( m_document, TQT_SIGNAL( openURL(const KURL &) ), this, TQT_SLOT( openURLFromDocument(const KURL &) ) );
 	connect( m_document, TQT_SIGNAL( close() ), this, TQT_SLOT( close() ) );
 	
-	if (parent && parent->tqmetaObject()->slotNames(true).contains("slotQuit()"))
+	if (parent && parent->metaObject()->slotNames(true).contains("slotQuit()"))
 		connect( m_document, TQT_SIGNAL( quit() ), parent, TQT_SLOT( slotQuit() ) );
 	else
 		connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) );
@@ -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 );
@@ -297,7 +297,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	m_showPresentation = new KAction( i18n("P&resentation"), "kpresenter_kpr", "Ctrl+Shift+P", this, TQT_SLOT(slotShowPresentation()), ac, "presentation");
 	m_showPresentation->setEnabled( false );
 
-	// attach the actions of the tqchildren widgets too
+	// attach the actions of the children widgets too
 	m_pageView->setupActions( ac );
 
 	// apply configuration (both internal settings and GUI configured items)
@@ -510,7 +510,7 @@ bool Part::openURL(const KURL &url)
     // these setWindowCaption calls only work for local files
     if ( !b )
     {
-        KMessageBox::error( widget(), i18n("Could not open %1").tqarg( url.prettyURL() ) );
+        KMessageBox::error( widget(), i18n("Could not open %1").arg( url.prettyURL() ) );
         emit setWindowCaption("");
     }
     else
@@ -806,17 +806,17 @@ void Part::slotSaveFileAs()
     {
         if (saveURL == url())
         {
-            KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").tqarg(saveURL.filename()) );
+            KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
             return;
         }
         if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
         {
-            if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").tqarg(saveURL.filename()), TQString(), i18n("Overwrite")) != KMessageBox::Continue)
+            if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), TQString(), i18n("Overwrite")) != KMessageBox::Continue)
                 return;
         }
 
         if ( !KIO::NetAccess::file_copy( m_file, saveURL, -1, true ) )
-            KMessageBox::information( 0, i18n("File could not be saved in '%1'. Try to save it to another location.").tqarg( saveURL.prettyURL() ) );
+            KMessageBox::information( 0, i18n("File could not be saved in '%1'. Try to save it to another location.").arg( saveURL.prettyURL() ) );
     }
 }
 
@@ -939,7 +939,7 @@ void Part::slotShowMenu(const KPDFPage *page, const TQPoint &point)
 	KPopupMenu *popup = new KPopupMenu( widget(), "rmb popup" );
 	if (page)
 	{
-		popup->insertTitle( i18n( "Page %1" ).tqarg( page->number() + 1 ) );
+		popup->insertTitle( i18n( "Page %1" ).arg( page->number() + 1 ) );
         if ( page->hasBookmark() )
 			popup->insertItem( SmallIcon("bookmark"), i18n("Remove Bookmark"), 1 );
 		else
diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index fed4602e..65a213d8 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -13,7 +13,7 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvalidator.h>
 #include <tqpainter.h>
 #include <kiconloader.h>
@@ -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 );
@@ -198,7 +198,7 @@ void MiniBar::notifyViewportChanged( bool /*smoothMove*/ )
 void MiniBar::resizeEvent( TQResizeEvent * e )
 {
     // auto-hide 'prev' and 'next' buttons if not enough space
-    const TQSize & myHint = tqminimumSizeHint();
+    const TQSize & myHint = minimumSizeHint();
     bool shown = m_prevButton->isVisible() && m_nextButton->isVisible();
     if ( shown && e->size().width() < myHint.width() )
     {
@@ -208,7 +208,7 @@ void MiniBar::resizeEvent( TQResizeEvent * e )
     }
     else if ( !shown )
     {
-        int histeresis = m_prevButton->tqsizeHint().width() * 2 + 2;
+        int histeresis = m_prevButton->sizeHint().width() * 2 + 2;
         if ( e->size().width() > (myHint.width() + histeresis) )
         {
             m_prevButton->show();
@@ -308,17 +308,17 @@ void ProgressWidget::paintEvent( TQPaintEvent * e )
     // paint rects and a separator line
     TQPainter p( this );
     if ( cRect.isValid() )
-        p.fillRect( cRect, tqpalette().active().highlightedText() );
+        p.fillRect( cRect, palette().active().highlightedText() );
     if ( fRect.isValid() )
-        p.fillRect( fRect, tqpalette().active().highlight() );
+        p.fillRect( fRect, palette().active().highlight() );
     if ( l && l != w  )
     {
-        p.setPen( tqpalette().active().highlight().dark( 120 ) );
+        p.setPen( palette().active().highlight().dark( 120 ) );
         int delta = TQApplication::reverseLayout() ? w - l : l;
         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 );
 }
 
@@ -337,7 +337,7 @@ PagesEdit::PagesEdit( MiniBar * parent )
     setValidator( m_validator );
 
     // customize text properties
-    tqsetAlignment( TQt::AlignCenter );
+    setAlignment( TQt::AlignCenter );
     setMaxLength( 4 );
 }
 
@@ -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/pagepainter.cpp b/kpdf/ui/pagepainter.cpp
index 21e9c37f..a4644c16 100644
--- a/kpdf/ui/pagepainter.cpp
+++ b/kpdf/ui/pagepainter.cpp
@@ -139,7 +139,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags,
             {
                 case KpdfSettings::EnumRenderMode::Inverted:
                     // Invert image pixels using TQImage internal function
-                    backImage.tqinvertPixels(false);
+                    backImage.invertPixels(false);
                     break;
                 case KpdfSettings::EnumRenderMode::Recolor:
                     // Recolor image using KImageEffect::flatten with dither:0
@@ -178,7 +178,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags,
             for ( ; hIt != hEnd; ++hIt )
             {
                 HighlightRect * r = *hIt;
-                TQRect highlightRect = r->tqgeometry( width, height );
+                TQRect highlightRect = r->geometry( width, height );
                 if ( highlightRect.isValid() && highlightRect.intersects( limits ) )
                 {
                     // find out the rect to highlight on pixmap
@@ -213,7 +213,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags,
     // 3. visually enchance links and images if requested
     if ( enhanceLinks || enhanceImages )
     {
-        TQColor normalColor = TQApplication::tqpalette().active().highlight();
+        TQColor normalColor = TQApplication::palette().active().highlight();
         TQColor lightColor = normalColor.light( 140 );
         // enlarging limits for intersection is like growing the 'rectGeometry' below
         TQRect limitsEnlarged = limits;
@@ -226,7 +226,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags,
             if ( (enhanceLinks && rect->objectType() == ObjectRect::Link) ||
                  (enhanceImages && rect->objectType() == ObjectRect::Image) )
             {
-                TQRect rectGeometry = rect->tqgeometry( width, height );
+                TQRect rectGeometry = rect->geometry( width, height );
                 if ( rectGeometry.intersects( limitsEnlarged ) )
                 {
                     // expand rect and draw inner border
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index de5fad0c..157a3655 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -24,7 +24,7 @@
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <dcopclient.h>
 #include <kcursor.h>
 #include <kiconloader.h>
@@ -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;
@@ -146,8 +146,8 @@ void PageViewTip::maybeTip( const TQPoint &_p )
     PageViewItem * pageItem = m_view->pickItemOnPoint( p.x(), p.y() );
     if ( pageItem && m_view->d->mouseMode == PageView::MouseNormal )
     {
-        double nX = (double)(p.x() - pageItem->tqgeometry().left()) / (double)pageItem->width(),
-               nY = (double)(p.y() - pageItem->tqgeometry().top()) / (double)pageItem->height();
+        double nX = (double)(p.x() - pageItem->geometry().left()) / (double)pageItem->width(),
+               nY = (double)(p.y() - pageItem->geometry().top()) / (double)pageItem->height();
 
         // if over a ObjectRect (of type Link) change cursor to hand
         const ObjectRect * object = pageItem->page()->hasObject( ObjectRect::Link, nX, nY );
@@ -158,8 +158,8 @@ void PageViewTip::maybeTip( const TQPoint &_p )
             TQString strtip = link->linkTip();
             if ( !strtip.isEmpty() )
             {
-                TQRect linkRect = object->tqgeometry( pageItem->width(), pageItem->height() );
-                linkRect.moveBy( - m_view->contentsX() + pageItem->tqgeometry().left(), - m_view->contentsY() + pageItem->tqgeometry().top() );
+                TQRect linkRect = object->geometry( pageItem->width(), pageItem->height() );
+                linkRect.moveBy( - m_view->contentsX() + pageItem->geometry().left(), - m_view->contentsY() + pageItem->geometry().top() );
                 tip( linkRect, strtip );
             }
         }
@@ -337,7 +337,7 @@ void PageView::notifySetup( const TQValueVector< KPDFPage * > & pageSet, bool do
     d->items.clear();
     d->visibleItems.clear();
 
-    // create tqchildren widgets
+    // create children widgets
     TQValueVector< KPDFPage * >::const_iterator setIt = pageSet.begin(), setEnd = pageSet.end();
     for ( ; setIt != setEnd; ++setIt )
         d->items.push_back( new PageViewItem( *setIt ) );
@@ -392,13 +392,13 @@ 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();
 
-    // restore viewport center or use default {x-center,v-top} tqalignment
-    const TQRect & r = item->tqgeometry();
+    // restore viewport center or use default {x-center,v-top} alignment
+    const TQRect & r = item->geometry();
     int newCenterX = r.left(),
         newCenterY = r.top();
     if ( vp.rePos.enabled )
@@ -462,13 +462,13 @@ void PageView::notifyPageChanged( int pageNumber, int changedFlags )
     if ( changedFlags & DocumentObserver::Bookmark )
         return;
 
-    // iterate over visible items: if page(pageNumber) is one of them, tqrepaint it
+    // iterate over visible items: if page(pageNumber) is one of them, repaint it
     TQValueList< PageViewItem * >::iterator iIt = d->visibleItems.begin(), iEnd = d->visibleItems.end();
     for ( ; iIt != iEnd; ++iIt )
         if ( (*iIt)->pageNumber() == pageNumber )
         {
             // update item's rectangle plus the little outline
-            TQRect expandedRect = (*iIt)->tqgeometry();
+            TQRect expandedRect = (*iIt)->geometry();
             expandedRect.addCoords( -1, -1, 3, 3 );
             updateContents( expandedRect );
 
@@ -535,7 +535,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe )
                            d->selectionRectColor : TQt::red;
 
     // subdivide region into rects
-    TQMemArray<TQRect> allRects = TQRegion(pe->region()).tqrects();
+    TQMemArray<TQRect> allRects = TQRegion(pe->region()).rects();
     uint numRects = allRects.count();
 
     // preprocess rects area to see if it worths or not using subdivision
@@ -592,7 +592,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe )
                     TQImage blendedImage = blendedPixmap.convertToImage();
                     KImageEffect::blend( selBlendColor.dark(140), blendedImage, 0.2 );
                     // copy the blended pixmap back to its place
-                    pixmapPainter.tqdrawPixmap( blendRect.left(), blendRect.top(), blendedImage );
+                    pixmapPainter.drawPixmap( blendRect.left(), blendRect.top(), blendedImage );
                 }
                 // draw border (red if the selection is too small)
                 pixmapPainter.setPen( selBlendColor );
@@ -618,7 +618,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe )
             if ( !selectionRect.isNull() && selectionRect.intersects( contentsRect ) &&
                  !selectionRectInternal.contains( contentsRect ) )
             {
-                screenPainter.setPen( tqpalette().active().highlight().dark(110) );
+                screenPainter.setPen( palette().active().highlight().dark(110) );
                 screenPainter.drawRect( selectionRect );
             }
             // 4) Layer 3: overlays
@@ -662,7 +662,7 @@ void PageView::keyPressEvent( TQKeyEvent * e )
                 bool found = d->document->searchText( PAGEVIEW_SEARCH_ID, d->typeAheadString, true, false,
                         KPDFDocument::NextMatch, true, tqRgb( 128, 255, 128 ), true );
                 TQString status = found ? i18n("Text found: \"%1\".") : i18n("Text not found: \"%1\".");
-                d->messageWindow->display( status.tqarg(d->typeAheadString.lower()),
+                d->messageWindow->display( status.arg(d->typeAheadString.lower()),
                                            found ? PageViewMessage::Find : PageViewMessage::Warning, 4000 );
                 d->findTimeoutTimer->start( 3000, true );
             }
@@ -682,7 +682,7 @@ void PageView::keyPressEvent( TQKeyEvent * e )
             // because it activates the accel
             releaseKeyboard();
             if ( d->document->continueSearch( PAGEVIEW_SEARCH_ID ) )
-                d->messageWindow->display( i18n("Text found: \"%1\".").tqarg(d->typeAheadString.lower()),
+                d->messageWindow->display( i18n("Text found: \"%1\".").arg(d->typeAheadString.lower()),
                                            PageViewMessage::Find, 3000 );
             d->findTimeoutTimer->start( 3000, true );
             // it is needed to grab the keyboard becase people may have Space assigned to a 
@@ -847,7 +847,7 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent * e )
         d->zoomFactor *= ( 1.0 + ( (double)deltaY / 500.0 ) );
         updateZoom( ZoomRefreshCurrent );
         // uncomment following line to force a complete redraw
-        viewport()->tqrepaint( false );
+        viewport()->repaint( false );
         return;
     }
 
@@ -876,7 +876,7 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent * e )
                 {
                     d->aPrevAction = d->aMouseNormal;
                     d->aMouseSelect->activate();
-                    TQColor selColor = tqpalette().active().highlight().light( 120 );
+                    TQColor selColor = palette().active().highlight().light( 120 );
                     selectionStart( e->x() + deltaX, e->y() + deltaY, selColor, false );
                     selectionEndPoint( e->x(), e->y() );
                     break;
@@ -946,7 +946,7 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e )
 
         case MouseZoom:     // set first corner of the zoom rect
             if ( leftButton )
-                selectionStart( e->x(), e->y(), tqpalette().active().highlight(), false );
+                selectionStart( e->x(), e->y(), palette().active().highlight(), false );
             else if ( rightButton )
                 updateZoom( ZoomOut );
             break;
@@ -954,7 +954,7 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e )
         case MouseSelect:   // set first corner of the selection rect
             if ( leftButton )
             {
-                TQColor selColor = tqpalette().active().highlight().light( 120 );
+                TQColor selColor = palette().active().highlight().light( 120 );
                 selectionStart( e->x(), e->y(), selColor, false );
             }
             break;
@@ -1006,8 +1006,8 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
             // if the mouse has not moved since the press, that's a -click-
             if ( leftButton && pageItem && d->mousePressPos == e->globalPos())
             {
-                double nX = (double)(e->x() - pageItem->tqgeometry().left()) / (double)pageItem->width(),
-                       nY = (double)(e->y() - pageItem->tqgeometry().top()) / (double)pageItem->height();
+                double nX = (double)(e->x() - pageItem->geometry().left()) / (double)pageItem->width(),
+                       nY = (double)(e->y() - pageItem->geometry().top()) / (double)pageItem->height();
                 const ObjectRect * linkRect, * imageRect;
                 linkRect = pageItem->page()->hasObject( ObjectRect::Link, nX, nY );
                 if ( linkRect )
@@ -1105,16 +1105,16 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
             for ( ; iIt != iEnd; ++iIt )
             {
                 PageViewItem * item = *iIt;
-                const TQRect & tqitemRect = item->tqgeometry();
-                if ( selectionRect.intersects( tqitemRect ) )
+                const TQRect & itemRect = item->geometry();
+                if ( selectionRect.intersects( itemRect ) )
                 {
                     // request the textpage if there isn't one
                     const KPDFPage * kpdfPage = item->page();
                     if ( !kpdfPage->hasSearchPage() )
                         d->document->requestTextPage( kpdfPage->number() );
-                    // grab text in the rect that intersects tqitemRect
-                    TQRect relativeRect = selectionRect.intersect( tqitemRect );
-                    relativeRect.moveBy( -tqitemRect.left(), -tqitemRect.top() );
+                    // grab text in the rect that intersects itemRect
+                    TQRect relativeRect = selectionRect.intersect( itemRect );
+                    relativeRect.moveBy( -itemRect.left(), -itemRect.top() );
                     NormalizedRect normRect( relativeRect, item->width(), item->height() );
                     selectedText += kpdfPage->getText( normRect );
                 }
@@ -1131,7 +1131,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
                 if ( KpdfSettings::useKTTSD() )
                     menu.insertItem( SmallIcon("kttsd"), i18n( "Speak Text" ), 2 );
             }
-            menu.insertTitle( i18n( "Image (%1 by %2 pixels)" ).tqarg( selectionRect.width() ).tqarg( selectionRect.height() ) );
+            menu.insertTitle( i18n( "Image (%1 by %2 pixels)" ).arg( selectionRect.width() ).arg( selectionRect.height() ) );
             menu.insertItem( SmallIcon("image"), i18n( "Copy to Clipboard" ), 3 );
             menu.insertItem( SmallIcon("filesave"), i18n( "Save to File..." ), 4 );
             int choice = menu.exec( e->globalPos() );
@@ -1147,11 +1147,11 @@ 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 );
-                    d->messageWindow->display( i18n( "Image [%1x%2] copied to clipboard." ).tqarg( copyPix.width() ).tqarg( copyPix.height() ) );
+                    d->messageWindow->display( i18n( "Image [%1x%2] copied to clipboard." ).arg( copyPix.width() ).arg( copyPix.height() ) );
                 }
                 else if ( choice == 4 )
                 {
@@ -1165,7 +1165,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
                         if ( type.isNull() )
                             type = "PNG";
                         copyPix.save( fileName, type.latin1() );
-                        d->messageWindow->display( i18n( "Image [%1x%2] saved to %3 file." ).tqarg( copyPix.width() ).tqarg( copyPix.height() ).tqarg( type ) );
+                        d->messageWindow->display( i18n( "Image [%1x%2] saved to %3 file." ).arg( copyPix.width() ).arg( copyPix.height() ).arg( type ) );
                     }
                 }
             }
@@ -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 );
@@ -1194,7 +1194,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
                         TQString error;
                         if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
                         {
-                            d->messageWindow->display( i18n("Starting KTTSD Failed: %1").tqarg(error) );
+                            d->messageWindow->display( i18n("Starting KTTSD Failed: %1").arg(error) );
                             KpdfSettings::setUseKTTSD(false);
                             KpdfSettings::writeConfig();
                         }
@@ -1221,7 +1221,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
                 }
             }
 
-            // clear widget selection and tqinvalidate rect
+            // clear widget selection and invalidate rect
             selectionClear();
 
             // restore previous action if came from it using right button
@@ -1323,17 +1323,17 @@ void PageView::paintItems( TQPainter * p, const TQRect & contentsRect )
     for ( ; iIt != iEnd; ++iIt )
     {
         // check if a piece of the page intersects the contents rect
-        if ( !(*iIt)->tqgeometry().intersects( checkRect ) )
+        if ( !(*iIt)->geometry().intersects( checkRect ) )
             continue;
 
         PageViewItem * item = *iIt;
-        TQRect pixmapGeometry = item->tqgeometry();
+        TQRect pixmapGeometry = item->geometry();
 
         // translate the painter so we draw top-left pixmap corner in 0,0
         p->save();
         p->translate( pixmapGeometry.left(), pixmapGeometry.top() );
 
-        // item pixmap and outline tqgeometry
+        // item pixmap and outline geometry
         TQRect outlineGeometry = pixmapGeometry;
         outlineGeometry.addCoords( -1, -1, 3, 3 );
 
@@ -1378,7 +1378,7 @@ void PageView::paintItems( TQPainter * p, const TQRect & contentsRect )
     }
 
     // paint with background color the unpainted area
-    TQMemArray<TQRect> backRects = remainingArea.tqrects();
+    TQMemArray<TQRect> backRects = remainingArea.rects();
     uint backRectsNumber = backRects.count();
     for ( uint jr = 0; jr < backRectsNumber; jr++ )
         p->fillRect( backRects[ jr ], TQt::gray );
@@ -1424,7 +1424,7 @@ PageViewItem * PageView::pickItemOnPoint( int x, int y )
     for ( ; iIt != iEnd; ++iIt )
     {
         PageViewItem * i = *iIt;
-        const TQRect & r = i->tqgeometry();
+        const TQRect & r = i->geometry();
         if ( x < r.right() && x > r.left() && y < r.bottom() )
         {
             if ( y > r.top() )
@@ -1485,7 +1485,7 @@ void PageView::selectionEndPoint( int x, int y )
                 compoundRegion -= intersection;
         }
         // tassellate region with rects and enqueue paint events
-        TQMemArray<TQRect> rects = compoundRegion.tqrects();
+        TQMemArray<TQRect> rects = compoundRegion.rects();
         for ( uint i = 0; i < rects.count(); i++ )
             updateContents( rects[i] );
     }
@@ -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
@@ -1599,7 +1599,7 @@ void PageView::updateZoomText()
             selIdx++;
         TQString localValue( KGlobal::locale()->formatNumber( value * 100.0, 2 ) );
         localValue.remove( KGlobal::locale()->decimalSymbol() + double_oh );
-        translated << TQString( "%1%" ).tqarg( localValue );
+        translated << TQString( "%1%" ).arg( localValue );
     }
     d->aZoom->setItems( translated );
 
@@ -1619,8 +1619,8 @@ void PageView::updateCursor( const TQPoint &p )
     PageViewItem * pageItem = pickItemOnPoint( p.x(), p.y() );
     if ( pageItem && d->mouseMode == MouseNormal )
     {
-        double nX = (double)(p.x() - pageItem->tqgeometry().left()) / (double)pageItem->width(),
-               nY = (double)(p.y() - pageItem->tqgeometry().top()) / (double)pageItem->height();
+        double nX = (double)(p.x() - pageItem->geometry().left()) / (double)pageItem->width(),
+               nY = (double)(p.y() - pageItem->geometry().top()) / (double)pageItem->height();
 
         // if over a ObjectRect (of type Link) change cursor to hand
         d->mouseOnRect = pageItem->page()->hasObject( ObjectRect::Link, nX, nY );
@@ -1643,7 +1643,7 @@ void PageView::doTypeAheadSearch()
     bool found = d->document->searchText( PAGEVIEW_SEARCH_ID, d->typeAheadString, false, false,
                                           KPDFDocument::NextMatch, true, tqRgb( 128, 255, 128 ), true );
     TQString status = found ? i18n("Text found: \"%1\".") : i18n("Text not found: \"%1\".");
-    d->messageWindow->display( status.tqarg(d->typeAheadString.lower()),
+    d->messageWindow->display( status.arg(d->typeAheadString.lower()),
                                found ? PageViewMessage::Find : PageViewMessage::Warning, 4000 );
     d->findTimeoutTimer->start( 3000, true );
 }
@@ -1677,7 +1677,7 @@ void PageView::slotRelayoutPages()
         fullHeight = 0;
     TQRect viewportRect( contentsX(), contentsY(), viewportWidth, viewportHeight );
 
-    // set all items tqgeometry and resize contents. handle 'continuous' and 'single' modes separately
+    // set all items geometry and resize contents. handle 'continuous' and 'single' modes separately
     if ( KpdfSettings::viewContinuous() )
     {
         // Here we find out column's width and row's height to compute a table
@@ -1816,11 +1816,11 @@ void PageView::slotRelayoutPages()
             {
                 int prevX = contentsX(),
                     prevY = contentsY();
-                const TQRect & tqgeometry = d->items[ vp.pageNumber ]->tqgeometry();
+                const TQRect & geometry = d->items[ vp.pageNumber ]->geometry();
                 double nX = vp.rePos.enabled ? vp.rePos.normalizedX : 0.5,
                        nY = vp.rePos.enabled ? vp.rePos.normalizedY : 0.0;
-                center( tqgeometry.left() + ROUND( nX * (double)tqgeometry.width() ),
-                        tqgeometry.top() + ROUND( nY * (double)tqgeometry.height() ) );
+                center( geometry.left() + ROUND( nX * (double)geometry.width() ),
+                        geometry.top() + ROUND( nY * (double)geometry.height() ) );
                 // center() usually moves the viewport, that requests pixmaps too.
                 // if that doesn't happen we have to request them by hand
                 if ( prevX == contentsX() && prevY == contentsY() )
@@ -1867,7 +1867,7 @@ void PageView::slotRequestVisiblePixmaps( int newLeft, int newTop )
         PageViewItem * i = *iIt;
 
         // if the item doesn't intersect the viewport, skip it
-        if ( !viewportRect.intersects( i->tqgeometry() ) )
+        if ( !viewportRect.intersects( i->geometry() ) )
             continue;
 
         // add the item to the 'visible list'
@@ -1885,18 +1885,18 @@ void PageView::slotRequestVisiblePixmaps( int newLeft, int newTop )
         // position between the item and the viewport center
         if ( isEvent )
         {
-            const TQRect & tqgeometry = i->tqgeometry();
+            const TQRect & geometry = i->geometry();
             // compute distance between item center and viewport center
-            double distance = hypot( (tqgeometry.left() + tqgeometry.right()) / 2 - viewportCenterX,
-                                     (tqgeometry.top() + tqgeometry.bottom()) / 2 - viewportCenterY );
+            double distance = hypot( (geometry.left() + geometry.right()) / 2 - viewportCenterX,
+                                     (geometry.top() + geometry.bottom()) / 2 - viewportCenterY );
             if ( distance >= minDistance && nearPageNumber != -1 )
                 continue;
             nearPageNumber = i->pageNumber();
             minDistance = distance;
-            if ( tqgeometry.height() > 0 && tqgeometry.width() > 0 )
+            if ( geometry.height() > 0 && geometry.width() > 0 )
             {
-                focusedX = ( viewportCenterX - (double)tqgeometry.left() ) / (double)tqgeometry.width();
-                focusedY = ( viewportCenterY - (double)tqgeometry.top() ) / (double)tqgeometry.height();
+                focusedX = ( viewportCenterX - (double)geometry.left() ) / (double)geometry.width();
+                focusedY = ( viewportCenterY - (double)geometry.top() ) / (double)geometry.height();
             }
         }
     }
diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp
index a948d49c..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 );
@@ -54,7 +54,7 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration
         iconXOffset = 0,
         shadowOffset = 1;
 
-    // load icon (if set) and update tqgeometry
+    // load icon (if set) and update geometry
     TQPixmap symbol;
     if ( icon != None )
     {
@@ -84,44 +84,44 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration
         width += 2 + symbol.width();
         height = TQMAX( height, symbol.height() );
     }
-    TQRect tqgeometry( 0, 0, width + 10, height + 8 );
+    TQRect geometry( 0, 0, width + 10, height + 8 );
 
     // resize pixmap, mask and widget
     static TQBitmap mask;
-    mask.resize( tqgeometry.size() );
-    m_pixmap.resize( tqgeometry.size() );
-    resize( tqgeometry.size() );
+    mask.resize( geometry.size() );
+    m_pixmap.resize( geometry.size() );
+    resize( geometry.size() );
 
     // create and set transparency mask
     TQPainter maskPainter( &mask);
     mask.fill( TQt::black );
     maskPainter.setBrush( TQt::white );
-    maskPainter.drawRoundRect( tqgeometry, 1600 / tqgeometry.width(), 1600 / tqgeometry.height() );
+    maskPainter.drawRoundRect( geometry, 1600 / geometry.width(), 1600 / geometry.height() );
     setMask( mask );
 
     // draw background
     TQPainter bufferPainter( &m_pixmap );
     bufferPainter.setPen( TQt::black );
     bufferPainter.setBrush( paletteBackgroundColor() );
-    bufferPainter.drawRoundRect( tqgeometry, 1600 / tqgeometry.width(), 1600 / tqgeometry.height() );
+    bufferPainter.drawRoundRect( geometry, 1600 / geometry.width(), 1600 / geometry.height() );
 
     // draw icon if present
     if ( !symbol.isNull() )
         bufferPainter.drawPixmap( 5 + iconXOffset, 4, symbol, 0, 0, symbol.width(), symbol.height() );
 
     // draw shadow and text
-    int yText = tqgeometry.height() - height / 2;
+    int yText = geometry.height() - height / 2;
     bufferPainter.setPen( paletteBackgroundColor().dark( 115 ) );
     bufferPainter.drawText( 5 + textXOffset + shadowOffset, yText + 1, message );
     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() - tqgeometry.width() - 10, 10 );
+        move( parentWidget()->width() - geometry.width() - 10, 10 );
 
-    // show widget and schedule a tqrepaint
+    // show widget and schedule a repaint
     show();
     update();
 
@@ -168,19 +168,19 @@ int PageViewItem::pageNumber() const
     return m_page->number();
 }
 
-const TQRect& PageViewItem::tqgeometry() const
+const TQRect& PageViewItem::geometry() const
 {
-    return m_tqgeometry;
+    return m_geometry;
 }
 
 int PageViewItem::width() const
 {
-    return m_tqgeometry.width();
+    return m_geometry.width();
 }
 
 int PageViewItem::height() const
 {
-    return m_tqgeometry.height();
+    return m_geometry.height();
 }
 
 double PageViewItem::zoomFactor() const
@@ -190,18 +190,18 @@ double PageViewItem::zoomFactor() const
 
 void PageViewItem::setGeometry( int x, int y, int width, int height )
 {
-    m_tqgeometry.setRect( x, y, width, height );
+    m_geometry.setRect( x, y, width, height );
 }
 
 void PageViewItem::setWHZ( int w, int h, double z )
 {
-    m_tqgeometry.setWidth( w );
-    m_tqgeometry.setHeight( h );
+    m_geometry.setWidth( w );
+    m_geometry.setHeight( h );
     m_zoomFactor = z;
 }
 
 void PageViewItem::moveTo( int x, int y )
 {
-    m_tqgeometry.moveLeft( x );
-    m_tqgeometry.moveTop( y );
+    m_geometry.moveLeft( x );
+    m_geometry.moveTop( y );
 }
diff --git a/kpdf/ui/pageviewutils.h b/kpdf/ui/pageviewutils.h
index ceac9fe2..68c2f08b 100644
--- a/kpdf/ui/pageviewutils.h
+++ b/kpdf/ui/pageviewutils.h
@@ -23,7 +23,7 @@ class KPDFPage;
 /**
  * @short PageViewItem represents graphically a kpdfpage into the PageView.
  *
- * It has methods for settings Item's tqgeometry and other visual properties such
+ * It has methods for settings Item's geometry and other visual properties such
  * as the individual zoom factor.
  */
 class PageViewItem
@@ -33,7 +33,7 @@ class PageViewItem
 
         const KPDFPage * page() const;
         int pageNumber() const;
-        const TQRect& tqgeometry() const;
+        const TQRect& geometry() const;
         int width() const;
         int height() const;
         double zoomFactor() const;
@@ -45,7 +45,7 @@ class PageViewItem
     private:
         const KPDFPage * m_page;
         double m_zoomFactor;
-        TQRect m_tqgeometry;
+        TQRect m_geometry;
 };
 
 
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 6e8f52c2..74800e88 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -43,12 +43,12 @@
 #define ENABLE_PROGRESS_OVERLAY
 
 
-// a frame contains a pointer to the page object, its tqgeometry and the
+// a frame contains a pointer to the page object, its geometry and the
 // transition effect to the next frame
 struct PresentationFrame
 {
     const KPDFPage * page;
-    TQRect tqgeometry;
+    TQRect geometry;
 };
 
 
@@ -56,7 +56,7 @@ PresentationWidget::PresentationWidget( TQWidget * parent, KPDFDocument * doc )
     : TQDialog( parent, "presentationWidget", true, WDestructiveClose | WStyle_NoBorder),
     m_pressedLink( 0 ), m_handCursor( false ), m_document( doc ), m_frameIndex( -1 )
 {
-    // set look and tqgeometry
+    // set look and geometry
     setBackgroundMode( TQt::NoBackground );
 
     m_width = -1;
@@ -124,7 +124,7 @@ void PresentationWidget::notifySetup( const TQValueVector< KPDFPage * > & pageSe
     {
         PresentationFrame * frame = new PresentationFrame();
         frame->page = *setIt;
-        // calculate frame tqgeometry keeping constant aspect ratio
+        // calculate frame geometry keeping constant aspect ratio
         float pageRatio = frame->page->ratio();
         int pageWidth = m_width,
             pageHeight = m_height;
@@ -132,7 +132,7 @@ void PresentationWidget::notifySetup( const TQValueVector< KPDFPage * > & pageSe
             pageWidth = (int)( (float)pageHeight / pageRatio );
         else
             pageHeight = (int)( (float)pageWidth * pageRatio );
-        frame->tqgeometry.setRect( (m_width - pageWidth) / 2,
+        frame->geometry.setRect( (m_width - pageWidth) / 2,
                                  (m_height - pageHeight) / 2,
                                  pageWidth, pageHeight );
         // add the frame to the vector
@@ -145,11 +145,11 @@ void PresentationWidget::notifySetup( const TQValueVector< KPDFPage * > & pageSe
     if ( info )
     {
         if ( !info->get( "title" ).isNull() )
-            m_metaStrings += i18n( "Title: %1" ).tqarg( info->get( "title" ) );
+            m_metaStrings += i18n( "Title: %1" ).arg( info->get( "title" ) );
         if ( !info->get( "author" ).isNull() )
-            m_metaStrings += i18n( "Author: %1" ).tqarg( info->get( "author" ) );
+            m_metaStrings += i18n( "Author: %1" ).arg( info->get( "author" ) );
     }
-    m_metaStrings += i18n( "Pages: %1" ).tqarg( m_document->pages() );
+    m_metaStrings += i18n( "Pages: %1" ).arg( m_document->pages() );
     m_metaStrings += i18n( "Click to begin" );
 }
 
@@ -287,9 +287,9 @@ void PresentationWidget::mouseMoveEvent( TQMouseEvent * e )
     else
     {
         // show the bar if reaching top 2 pixels
-        if ( e->y() <= (tqgeometry().top() + 1) )
+        if ( e->y() <= (geometry().top() + 1) )
             m_topBar->show();
-        // handle "dragging the wheel" if clicking on its tqgeometry
+        // handle "dragging the wheel" if clicking on its geometry
         else if ( e->state() == Qt::LeftButton && m_overlayGeometry.contains( e->pos() ) )
             overlayClick( e->pos() );
     }
@@ -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 );
@@ -330,12 +330,12 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
     }
 
     // check painting rect consistancy
-    TQRect r = pe->rect().intersect( tqgeometry() );
+    TQRect r = pe->rect().intersect( geometry() );
     if ( r.isNull() || m_lastRenderedPixmap.isNull() )
         return;
 
     // blit the pixmap to the screen
-    TQMemArray<TQRect> allRects = TQRegion(pe->region()).tqrects();
+    TQMemArray<TQRect> allRects = TQRegion(pe->region()).rects();
     uint numRects = allRects.count();
     for ( uint i = 0; i < numRects; i++ )
     {
@@ -370,18 +370,18 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
 // </widget events>
 
 
-const KPDFLink * PresentationWidget::getLink( int x, int y, TQRect * tqgeometry ) const
+const KPDFLink * PresentationWidget::getLink( int x, int y, TQRect * geometry ) const
 {
     // no links on invalid pages
-    if ( tqgeometry && !tqgeometry->isNull() )
-        tqgeometry->setRect( 0, 0, -1, -1 );
+    if ( geometry && !geometry->isNull() )
+        geometry->setRect( 0, 0, -1, -1 );
     if ( m_frameIndex < 0 || m_frameIndex >= (int)m_frames.size() )
         return 0;
 
-    // get frame, page and tqgeometry
+    // get frame, page and geometry
     const PresentationFrame * frame = m_frames[ m_frameIndex ];
     const KPDFPage * page = frame->page;
-    const TQRect & frameGeometry = frame->tqgeometry;
+    const TQRect & frameGeometry = frame->geometry;
 
     // compute normalized x and y
     double nx = (double)(x - frameGeometry.left()) / (double)frameGeometry.width();
@@ -396,11 +396,11 @@ const KPDFLink * PresentationWidget::getLink( int x, int y, TQRect * tqgeometry
     if ( !object )
         return 0;
 
-    // compute link tqgeometry if destination rect present
-    if ( tqgeometry )
+    // compute link geometry if destination rect present
+    if ( geometry )
     {
-        *tqgeometry = object->tqgeometry( frameGeometry.width(), frameGeometry.height() );
-        tqgeometry->moveBy( frameGeometry.left(), frameGeometry.top() );
+        *geometry = object->geometry( frameGeometry.width(), frameGeometry.height() );
+        geometry->moveBy( frameGeometry.left(), frameGeometry.top() );
     }
 
     // return the link pointer
@@ -416,7 +416,7 @@ void PresentationWidget::testCursorOnLink( int x, int y )
     // only react on changes (in/out from a link)
     if ( (link && !m_handCursor) || (!link && m_handCursor) )
     {
-        // change cursor tqshape
+        // change cursor shape
         m_handCursor = link != 0;
         setCursor( m_handCursor ? KCursor::handCursor() : KCursor::arrowCursor());
 
@@ -451,8 +451,8 @@ void PresentationWidget::changePage( int newPage )
     // check if pixmap exists or else request it
     m_frameIndex = newPage;
     PresentationFrame * frame = m_frames[ m_frameIndex ];
-    int pixW = frame->tqgeometry.width();
-    int pixH = frame->tqgeometry.height();
+    int pixW = frame->geometry.width();
+    int pixH = frame->geometry.height();
 
     // if pixmap not inside the KPDFPage we request it and wait for
     // notifyPixmapChanged call or else we can proceed to pixmap generation
@@ -470,16 +470,16 @@ void PresentationWidget::changePage( int newPage )
             if (newPage + 1 < (int)m_document->pages())
             {
                 PresentationFrame *nextFrame = m_frames[ newPage + 1 ];
-                pixW = nextFrame->tqgeometry.width();
-                pixH = nextFrame->tqgeometry.height();
+                pixW = nextFrame->geometry.width();
+                pixH = nextFrame->geometry.height();
                 if ( !nextFrame->page->hasPixmap( PRESENTATION_ID, pixW, pixH ) )
                     requests.push_back( new PixmapRequest( PRESENTATION_ID, newPage + 1, pixW, pixH, PRESENTATION_PRELOAD_PRIO, true ) );
             }
             if (newPage - 1 >= 0)
             {
                 PresentationFrame *prevFrame = m_frames[ newPage - 1 ];
-                pixW = prevFrame->tqgeometry.width();
-                pixH = prevFrame->tqgeometry.height();
+                pixW = prevFrame->geometry.width();
+                pixH = prevFrame->geometry.height();
                 if ( !prevFrame->page->hasPixmap( PRESENTATION_ID, pixW, pixH ) )
                     requests.push_back( new PixmapRequest( PRESENTATION_ID, newPage - 1, pixW, pixH, PRESENTATION_PRELOAD_PRIO, true ) );
             }
@@ -595,7 +595,7 @@ void PresentationWidget::generateContentsPage( int pageNum, TQPainter & p )
     PresentationFrame * frame = m_frames[ pageNum ];
 
     // translate painter and contents rect
-    TQRect geom( frame->tqgeometry );
+    TQRect geom( frame->geometry );
     p.translate( geom.left(), geom.top() );
     geom.moveBy( -geom.left(), -geom.top() );
 
@@ -605,11 +605,11 @@ void PresentationWidget::generateContentsPage( int pageNum, TQPainter & p )
                                      &p, geom, geom.width(), geom.height() );
 
     // restore painter
-    p.translate( -frame->tqgeometry.left(), -frame->tqgeometry.top() );
+    p.translate( -frame->geometry.left(), -frame->geometry.top() );
 
     // fill unpainted areas with background color
     TQRegion unpainted( TQRect( 0, 0, m_width, m_height ) );
-    TQMemArray<TQRect> rects = TQRegion(unpainted.subtract( frame->tqgeometry )).tqrects();
+    TQMemArray<TQRect> rects = TQRegion(unpainted.subtract( frame->geometry )).rects();
     for ( uint i = 0; i < rects.count(); i++ )
     {
         const TQRect & r = rects[i];
@@ -622,7 +622,7 @@ inline int qt_div255(int x) { return (x + (x>>8) + 0x80) >> 8; }
 void PresentationWidget::generateOverlay()
 {
 #ifdef ENABLE_PROGRESS_OVERLAY
-    // calculate overlay tqgeometry and resize pixmap if needed
+    // calculate overlay geometry and resize pixmap if needed
     int side = m_width / 16;
     m_overlayGeometry.setRect( m_width - side - 4, 4, side, side );
     if ( m_lastRenderedOverlay.width() != side )
@@ -690,9 +690,9 @@ void PresentationWidget::generateOverlay()
 
     // generate a 2 colors pixmap using mixing shadow (made with highlight color)
     // and image (made with highlightedText color)
-    TQColor color = tqpalette().active().highlightedText();
+    TQColor color = palette().active().highlightedText();
     int red = color.red(), green = color.green(), blue = color.blue();
-    color = tqpalette().active().highlight();
+    color = palette().active().highlight();
     int sRed = color.red(), sGreen = color.green(), sBlue = color.blue();
     // pointers
     unsigned int * data = (unsigned int *)image.bits(),
@@ -725,7 +725,7 @@ void PresentationWidget::generateOverlay()
     m_lastRenderedOverlay.convertFromImage( image );
 
     // start the autohide timer
-    tqrepaint( m_overlayGeometry, false /*clear*/ ); // toggle with next line
+    repaint( m_overlayGeometry, false /*clear*/ ); // toggle with next line
     //update( m_overlayGeometry );
     m_overlayHideTimer->start( 2500, true );
 #endif
@@ -837,14 +837,14 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
         case KpdfSettings::EnumSlidesTransition::BlindsHorizontal:
         {
             KPDFPageTransition transition( KPDFPageTransition::Blinds );
-            transition.tqsetAlignment( KPDFPageTransition::Horizontal );
+            transition.setAlignment( KPDFPageTransition::Horizontal );
             return transition;
             break;
         }
         case KpdfSettings::EnumSlidesTransition::BlindsVertical:
         {
             KPDFPageTransition transition( KPDFPageTransition::Blinds );
-            transition.tqsetAlignment( KPDFPageTransition::Vertical );
+            transition.setAlignment( KPDFPageTransition::Vertical );
             return transition;
             break;
         }
@@ -896,7 +896,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
         case KpdfSettings::EnumSlidesTransition::SplitHorizontalIn:
         {
             KPDFPageTransition transition( KPDFPageTransition::Split );
-            transition.tqsetAlignment( KPDFPageTransition::Horizontal );
+            transition.setAlignment( KPDFPageTransition::Horizontal );
             transition.setDirection( KPDFPageTransition::Inward );
             return transition;
             break;
@@ -904,7 +904,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
         case KpdfSettings::EnumSlidesTransition::SplitHorizontalOut:
         {
             KPDFPageTransition transition( KPDFPageTransition::Split );
-            transition.tqsetAlignment( KPDFPageTransition::Horizontal );
+            transition.setAlignment( KPDFPageTransition::Horizontal );
             transition.setDirection( KPDFPageTransition::Outward );
             return transition;
             break;
@@ -912,7 +912,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
         case KpdfSettings::EnumSlidesTransition::SplitVerticalIn:
         {
             KPDFPageTransition transition( KPDFPageTransition::Split );
-            transition.tqsetAlignment( KPDFPageTransition::Vertical );
+            transition.setAlignment( KPDFPageTransition::Vertical );
             transition.setDirection( KPDFPageTransition::Inward );
             return transition;
             break;
@@ -920,7 +920,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
         case KpdfSettings::EnumSlidesTransition::SplitVerticalOut:
         {
             KPDFPageTransition transition( KPDFPageTransition::Split );
-            transition.tqsetAlignment( KPDFPageTransition::Vertical );
+            transition.setAlignment( KPDFPageTransition::Vertical );
             transition.setDirection( KPDFPageTransition::Outward );
             return transition;
             break;
@@ -963,7 +963,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
 /** ONLY the TRANSITIONS GENERATION function from here on **/
 void PresentationWidget::initTransition( const KPDFPageTransition *transition )
 {
-    // if it's just a 'replace' transition, tqrepaint the screen
+    // if it's just a 'replace' transition, repaint the screen
     if ( transition->type() == KPDFPageTransition::Replace )
     {
         update();
@@ -971,7 +971,7 @@ void PresentationWidget::initTransition( const KPDFPageTransition *transition )
     }
 
     const bool isInward = transition->direction() == KPDFPageTransition::Inward;
-    const bool isHorizontal = transition->tqalignment() == KPDFPageTransition::Horizontal;
+    const bool isHorizontal = transition->alignment() == KPDFPageTransition::Horizontal;
     const float totalTime = transition->duration();
 
     m_transitionRects.clear();
diff --git a/kpdf/ui/presentationwidget.h b/kpdf/ui/presentationwidget.h
index 26db0836..000bfeaa 100644
--- a/kpdf/ui/presentationwidget.h
+++ b/kpdf/ui/presentationwidget.h
@@ -60,7 +60,7 @@ class PresentationWidget : public TQDialog, public DocumentObserver
         void paintEvent( TQPaintEvent * e );
 
     private:
-        const KPDFLink * getLink( int x, int y, TQRect * tqgeometry = 0 ) const;
+        const KPDFLink * getLink( int x, int y, TQRect * geometry = 0 ) const;
         void testCursorOnLink( int x, int y );
         void overlayClick( const TQPoint & position );
         void changePage( int newPage );
diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp
index d9cee932..d3d0af60 100644
--- a/kpdf/ui/propertiesdialog.cpp
+++ b/kpdf/ui/propertiesdialog.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 
 // qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klistview.h>
 #include <klocale.h>
@@ -24,18 +24,18 @@ 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;
   }
 
   // mime name based on mimetype id
   TQString mimeName = info->get( "mimeType" ).section( '/', -1 ).upper();
-  setCaption( i18n("%1 Properties").tqarg( mimeName ) );
+  setCaption( i18n("%1 Properties").arg( mimeName ) );
 
   TQDomElement docElement = info->documentElement();
 
@@ -49,11 +49,11 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
     if ( titleString.isEmpty() || valueString.isEmpty() )
         continue;
 
-    // create labels and tqlayout them
-    TQLabel *key = new TQLabel( i18n( "%1:" ).tqarg( titleString ), page );
+    // 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,10 +82,10 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
   }
 
   // current width: left column + right column + dialog borders
-  int width = tqlayout->tqminimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30;
+  int width = layout->minimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30;
   if (page2Layout)
   {
-    width = TQMAX( width, page2Layout->tqsizeHint().width() + marginHint() + spacingHint() + 31 );
+    width = TQMAX( width, page2Layout->sizeHint().width() + marginHint() + spacingHint() + 31 );
   }
   // stay inside the 2/3 of the screen width
   TQRect screenContainer = KGlobalSettings::desktopGeometry( this );
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 a41869d6..6c5e2b5f 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)) );
@@ -199,7 +199,7 @@ void ThumbnailList::notifyPageChanged( int pageNumber, int /*changedFlags*/ )
     //if ( !(changedFlags & DocumentObserver::Pixmap) )
     //    return;
 
-    // iterate over visible items: if page(pageNumber) is one of them, tqrepaint it
+    // iterate over visible items: if page(pageNumber) is one of them, repaint it
     TQValueList<ThumbnailWidget *>::iterator vIt = m_visibleThumbnails.begin(), vEnd = m_visibleThumbnails.end();
     for ( ; vIt != vEnd; ++vIt )
         if ( (*vIt)->pageNumber() == pageNumber )
@@ -362,7 +362,7 @@ void ThumbnailList::viewportResizeEvent( TQResizeEvent * e )
 	else if ( e->size().height() <= e->oldSize().height() )
 		return;
 
-	// tqinvalidate the bookmark overlay
+	// invalidate the bookmark overlay
 	if ( m_bookmarkOverlay )
 	{
 		delete m_bookmarkOverlay;
@@ -495,9 +495,9 @@ void ThumbnailWidget::paintEvent( TQPaintEvent * e )
     TQPainter p( this );
 
     // draw the bottom label + highlight mark
-    TQColor fillColor = m_selected ? tqpalette().active().highlight() : tqpalette().active().base();
+    TQColor fillColor = m_selected ? palette().active().highlight() : palette().active().base();
     p.fillRect( 0, 0, width, height, fillColor );
-    p.setPen( m_selected ? tqpalette().active().highlightedText() : tqpalette().active().text() );
+    p.setPen( m_selected ? palette().active().highlightedText() : palette().active().text() );
     p.drawText( 0, m_pixmapHeight + m_margin, width, m_labelHeight, TQt::AlignCenter, TQString::number( m_labelNumber ) );
 
     // draw page outline and pixmap
@@ -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/kpdf/ui/thumbnaillist.h b/kpdf/ui/thumbnaillist.h
index 549ea20c..fb128045 100644
--- a/kpdf/ui/thumbnaillist.h
+++ b/kpdf/ui/thumbnaillist.h
@@ -102,7 +102,7 @@ class ThumbnailsBox : public TQVBox
 {
 	public:
 		ThumbnailsBox( TQWidget * parent ) : TQVBox( parent ) {};
-		TQSize tqsizeHint() const { return TQSize(); }
+		TQSize sizeHint() const { return TQSize(); }
 };
 
 /**
diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp
index 18af4c37..0229c518 100644
--- a/kpovmodeler/pmactions.cpp
+++ b/kpovmodeler/pmactions.cpp
@@ -29,7 +29,7 @@
 #include "pmdebug.h"
 
 // Fixed widths are calculated wrong in a toolbar.
-// Fixed tqsizeHint for the combo box to return
+// Fixed sizeHint for the combo box to return
 // at least the minimum size
 class PMComboBox : public TQComboBox
 {
@@ -39,15 +39,15 @@ public:
    {
    }
 
-   virtual TQSize tqminimumSizeHint( ) const
+   virtual TQSize minimumSizeHint( ) const
    {
-      TQSize s = TQComboBox::tqminimumSizeHint( );
-      return s.expandedTo( tqminimumSize( ) );
+      TQSize s = TQComboBox::minimumSizeHint( );
+      return s.expandedTo( minimumSize( ) );
    }
-   virtual TQSize tqsizeHint( ) const
+   virtual TQSize sizeHint( ) const
    {
-      TQSize s = TQComboBox::tqsizeHint( );
-      return s.expandedTo( tqminimumSize( ) );
+      TQSize s = TQComboBox::sizeHint( );
+      return s.expandedTo( minimumSize( ) );
    }
 };
 
@@ -126,7 +126,7 @@ public:
       setText( text );
    }
 protected:
-   TQSize tqsizeHint( ) const
+   TQSize sizeHint( ) const
    {
       int w = fontMetrics( ).width( text( ) );
       int h = fontMetrics( ).height( );
@@ -135,10 +135,10 @@ protected:
    void drawButton( TQPainter* p )
    {
       // Draw the background
-      tqstyle( ).tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), tqcolorGroup( ),
+      tqstyle( ).drawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), colorGroup( ),
                                    TQStyle::Style_Enabled, TQStyle::SC_ToolButton );
       // Draw the label
-      tqstyle( ).tqdrawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), tqcolorGroup( ),
+      tqstyle( ).drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), colorGroup( ),
                             TQStyle::Style_Enabled );
    }
 };
diff --git a/kpovmodeler/pmaddcommand.cpp b/kpovmodeler/pmaddcommand.cpp
index 2eb78126..b8d4ea49 100644
--- a/kpovmodeler/pmaddcommand.cpp
+++ b/kpovmodeler/pmaddcommand.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 
 PMAddCommand::PMAddCommand( PMObject* obj, PMObject* parent, PMObject* after )
-      : PMCommand( i18n( "Add New %1" ).tqarg( obj->description( ) ) )
+      : PMCommand( i18n( "Add New %1" ).arg( obj->description( ) ) )
 {
    m_objects.append( obj );
    m_pParent = parent;
diff --git a/kpovmodeler/pmaddcommand.h b/kpovmodeler/pmaddcommand.h
index 51beec31..97793d03 100644
--- a/kpovmodeler/pmaddcommand.h
+++ b/kpovmodeler/pmaddcommand.h
@@ -48,10 +48,10 @@ public:
    /**
     * Command that adds a list of new PMObjects.
     *
-    * The object in the list will be inserted as tqchildren of parent after
+    * The object in the list will be inserted as children of parent after
     * the object after.
     *
-    * If after is 0, the objects will be inserted as first tqchildren.
+    * If after is 0, the objects will be inserted as first children.
     */
    PMAddCommand( const PMObjectList& list, PMObject* parent, PMObject* after );
    /**
diff --git a/kpovmodeler/pmbicubicpatch.cpp b/kpovmodeler/pmbicubicpatch.cpp
index dd281ceb..2c1c99dd 100644
--- a/kpovmodeler/pmbicubicpatch.cpp
+++ b/kpovmodeler/pmbicubicpatch.cpp
@@ -177,10 +177,10 @@ void PMBicubicPatch::serialize( TQDomElement& e, TQDomDocument& doc ) const
    e.setAttribute( "uvEnabled", m_uvEnabled );
 
    for( i = 0; i < 16; i++ )
-      e.setAttribute( TQString( "cp%1" ).tqarg( i ), m_point[i].serializeXML( ) );
+      e.setAttribute( TQString( "cp%1" ).arg( i ), m_point[i].serializeXML( ) );
 
    for( i = 0; i < 4; ++i )
-      e.setAttribute( TQString( "uv%1" ).tqarg( i ), m_uvVectors[i].serializeXML( ) );
+      e.setAttribute( TQString( "uv%1" ).arg( i ), m_uvVectors[i].serializeXML( ) );
 
    Base::serialize( e, doc );
 }
@@ -198,7 +198,7 @@ void PMBicubicPatch::readAttributes( const PMXMLHelper& h )
 
    for( v = 0; v < 4; v++ )
       for( u = 0; u < 4; u++ )
-         m_point[u+v*4] = h.vectorAttribute( TQString( "cp%1" ).tqarg( u+v*4 ),
+         m_point[u+v*4] = h.vectorAttribute( TQString( "cp%1" ).arg( u+v*4 ),
                                       PMVector( o + s * u, 0, o + s * v ) );
 
    m_uvVectors[0] = h.vectorAttribute( "uv0", c_defaultUVVector0 );
@@ -209,11 +209,11 @@ void PMBicubicPatch::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMBicubicPatch::tqmetaObject( ) const
+PMMetaObject* PMBicubicPatch::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BicubicPatch", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BicubicPatch", Base::metaObject( ),
                                         createNewBicubicPatch );
       s_pMetaObject->addProperty(
          new PMBicubicPatchProperty( "patchType", &PMBicubicPatch::setPatchType,
@@ -527,7 +527,7 @@ void PMBicubicPatch::controlPoints( PMControlPointList& list )
    for( v = 0; v < 4; v++ )
       for( u = 0; u < 4; u++ )
          list.append( new PM3DControlPoint( m_point[u+v*4], u+v*4,
-                                            i18n( "Point (%1, %2)" ).tqarg( u ).tqarg( v ) ) );
+                                            i18n( "Point (%1, %2)" ).arg( u ).arg( v ) ) );
 }
 
 void PMBicubicPatch::controlPointsChanged( PMControlPointList& list )
diff --git a/kpovmodeler/pmbicubicpatch.h b/kpovmodeler/pmbicubicpatch.h
index 54baae43..d14f7821 100644
--- a/kpovmodeler/pmbicubicpatch.h
+++ b/kpovmodeler/pmbicubicpatch.h
@@ -55,7 +55,7 @@ public:
    /** */
    virtual TQString description( ) const;
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmbicubicpatchedit.cpp b/kpovmodeler/pmbicubicpatchedit.cpp
index fe91f1e0..b31bbf44 100644
--- a/kpovmodeler/pmbicubicpatchedit.cpp
+++ b/kpovmodeler/pmbicubicpatchedit.cpp
@@ -23,7 +23,7 @@
 #include "pmvectorlistedit.h"
 #include "pmpart.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
@@ -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/pmblendmapmodifiers.cpp b/kpovmodeler/pmblendmapmodifiers.cpp
index e28fa7fb..9d26419e 100644
--- a/kpovmodeler/pmblendmapmodifiers.cpp
+++ b/kpovmodeler/pmblendmapmodifiers.cpp
@@ -57,11 +57,11 @@ PMBlendMapModifiers::~PMBlendMapModifiers( )
 {
 }
 
-PMMetaObject* PMBlendMapModifiers::tqmetaObject( ) const
+PMMetaObject* PMBlendMapModifiers::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BlendMapModifiers", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BlendMapModifiers", Base::metaObject( ),
                                         createBlendMapModifiers );
       s_pMetaObject->addProperty(
          new PMBlendMapModifiersProperty( "frequencyEnabled", &PMBlendMapModifiers::enableFrequency,
diff --git a/kpovmodeler/pmblendmapmodifiers.h b/kpovmodeler/pmblendmapmodifiers.h
index be5a863e..ecf0bfed 100644
--- a/kpovmodeler/pmblendmapmodifiers.h
+++ b/kpovmodeler/pmblendmapmodifiers.h
@@ -57,7 +57,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmblendmapmodifiersedit.cpp b/kpovmodeler/pmblendmapmodifiersedit.cpp
index fd443623..1c07bd0e 100644
--- a/kpovmodeler/pmblendmapmodifiersedit.cpp
+++ b/kpovmodeler/pmblendmapmodifiersedit.cpp
@@ -25,7 +25,7 @@
 #include "pmvector.h"
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
diff --git a/kpovmodeler/pmblob.cpp b/kpovmodeler/pmblob.cpp
index 317c18d7..6621cadf 100644
--- a/kpovmodeler/pmblob.cpp
+++ b/kpovmodeler/pmblob.cpp
@@ -77,11 +77,11 @@ void PMBlob::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMBlob::tqmetaObject( ) const
+PMMetaObject* PMBlob::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Blob", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Blob", Base::metaObject( ),
                                         createNewBlob );
       s_pMetaObject->addProperty(
          new PMBlobProperty( "threshold", &PMBlob::setThreshold, &PMBlob::threshold ) );
diff --git a/kpovmodeler/pmblob.h b/kpovmodeler/pmblob.h
index 6bdbef31..2c764590 100644
--- a/kpovmodeler/pmblob.h
+++ b/kpovmodeler/pmblob.h
@@ -52,7 +52,7 @@ public:
    /** */
    virtual TQString description( ) const;
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmblobcylinder.cpp b/kpovmodeler/pmblobcylinder.cpp
index 114f4fa0..d166a6a3 100644
--- a/kpovmodeler/pmblobcylinder.cpp
+++ b/kpovmodeler/pmblobcylinder.cpp
@@ -93,11 +93,11 @@ void PMBlobCylinder::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMBlobCylinder::tqmetaObject( ) const
+PMMetaObject* PMBlobCylinder::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BlobCylinder", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BlobCylinder", Base::metaObject( ),
                                         createNewBlobCylinder );
       s_pMetaObject->addProperty(
          new PMBlobCylinderProperty( "end1", &PMBlobCylinder::setEnd1,
diff --git a/kpovmodeler/pmblobcylinder.h b/kpovmodeler/pmblobcylinder.h
index a07df1f6..1e9a10f1 100644
--- a/kpovmodeler/pmblobcylinder.h
+++ b/kpovmodeler/pmblobcylinder.h
@@ -57,7 +57,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmblobcylinderedit.cpp b/kpovmodeler/pmblobcylinderedit.cpp
index 836d7d72..ab6fe32f 100644
--- a/kpovmodeler/pmblobcylinderedit.cpp
+++ b/kpovmodeler/pmblobcylinderedit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <tqcheckbox.h>
@@ -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/pmblobedit.cpp b/kpovmodeler/pmblobedit.cpp
index a38d9639..2b682291 100644
--- a/kpovmodeler/pmblobedit.cpp
+++ b/kpovmodeler/pmblobedit.cpp
@@ -20,7 +20,7 @@
 #include "pmblob.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
diff --git a/kpovmodeler/pmblobsphere.cpp b/kpovmodeler/pmblobsphere.cpp
index 70dcf06c..cbcd33a4 100644
--- a/kpovmodeler/pmblobsphere.cpp
+++ b/kpovmodeler/pmblobsphere.cpp
@@ -72,11 +72,11 @@ TQString PMBlobSphere::description( ) const
    return i18n( "blob sphere" );
 }
 
-PMMetaObject* PMBlobSphere::tqmetaObject( ) const
+PMMetaObject* PMBlobSphere::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BlobSphere", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BlobSphere", Base::metaObject( ),
                                         createNewBlobSphere );
       s_pMetaObject->addProperty(
          new PMBlobSphereProperty( "center", &PMBlobSphere::setCentre,
diff --git a/kpovmodeler/pmblobsphere.h b/kpovmodeler/pmblobsphere.h
index e734e399..0abe983e 100644
--- a/kpovmodeler/pmblobsphere.h
+++ b/kpovmodeler/pmblobsphere.h
@@ -55,7 +55,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmblobsphereedit.cpp b/kpovmodeler/pmblobsphereedit.cpp
index 6bf37b26..3e209769 100644
--- a/kpovmodeler/pmblobsphereedit.cpp
+++ b/kpovmodeler/pmblobsphereedit.cpp
@@ -20,7 +20,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
@@ -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/pmboundedby.cpp b/kpovmodeler/pmboundedby.cpp
index 467129e8..5cc66e55 100644
--- a/kpovmodeler/pmboundedby.cpp
+++ b/kpovmodeler/pmboundedby.cpp
@@ -40,11 +40,11 @@ PMBoundedBy::~PMBoundedBy( )
 {
 }
 
-PMMetaObject* PMBoundedBy::tqmetaObject( ) const
+PMMetaObject* PMBoundedBy::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BoundedBy", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BoundedBy", Base::metaObject( ),
                                         createNewBoundedBy );
       s_pMetaObject->addProperty(
          new PMBoundedByProperty( "clippedBy", 0, &PMBoundedBy::clippedBy ) );
diff --git a/kpovmodeler/pmboundedby.h b/kpovmodeler/pmboundedby.h
index 256dc5f5..7c88a6aa 100644
--- a/kpovmodeler/pmboundedby.h
+++ b/kpovmodeler/pmboundedby.h
@@ -49,7 +49,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmboundedbyedit.cpp b/kpovmodeler/pmboundedbyedit.cpp
index 8a41fa52..aa503006 100644
--- a/kpovmodeler/pmboundedbyedit.cpp
+++ b/kpovmodeler/pmboundedbyedit.cpp
@@ -19,7 +19,7 @@
 #include "pmboundedbyedit.h"
 #include "pmboundedby.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmbox.cpp b/kpovmodeler/pmbox.cpp
index 6ecc2c3c..155ebc68 100644
--- a/kpovmodeler/pmbox.cpp
+++ b/kpovmodeler/pmbox.cpp
@@ -76,11 +76,11 @@ void PMBox::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMBox::tqmetaObject( ) const
+PMMetaObject* PMBox::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Box", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Box", Base::metaObject( ),
                                         createNewBox );
       s_pMetaObject->addProperty(
          new PMBoxProperty( "corner1", &PMBox::setCorner1, &PMBox::corner1 ) );
diff --git a/kpovmodeler/pmbox.h b/kpovmodeler/pmbox.h
index 7896b779..e6abcf75 100644
--- a/kpovmodeler/pmbox.h
+++ b/kpovmodeler/pmbox.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmboxedit.cpp b/kpovmodeler/pmboxedit.cpp
index 6b6a2f2a..a4cad88d 100644
--- a/kpovmodeler/pmboxedit.cpp
+++ b/kpovmodeler/pmboxedit.cpp
@@ -20,7 +20,7 @@
 #include "pmbox.h"
 #include "pmvectoredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmbumpmap.cpp b/kpovmodeler/pmbumpmap.cpp
index 5c08040f..21fb29a3 100644
--- a/kpovmodeler/pmbumpmap.cpp
+++ b/kpovmodeler/pmbumpmap.cpp
@@ -200,11 +200,11 @@ void PMBumpMap::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMBumpMap::tqmetaObject( ) const
+PMMetaObject* PMBumpMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BumpMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BumpMap", Base::metaObject( ),
                                         createNewBumpMap );
 
       PMBitmapTypeProperty* bp = new PMBitmapTypeProperty(
diff --git a/kpovmodeler/pmbumpmap.h b/kpovmodeler/pmbumpmap.h
index ade1c1cd..ccdf5b98 100644
--- a/kpovmodeler/pmbumpmap.h
+++ b/kpovmodeler/pmbumpmap.h
@@ -72,7 +72,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp
index 5a4bf298..30c1afb9 100644
--- a/kpovmodeler/pmbumpmapedit.cpp
+++ b/kpovmodeler/pmbumpmapedit.cpp
@@ -24,7 +24,7 @@
 #include "pmvector.h"
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
diff --git a/kpovmodeler/pmcamera.cpp b/kpovmodeler/pmcamera.cpp
index e65b8341..ca37f751 100644
--- a/kpovmodeler/pmcamera.cpp
+++ b/kpovmodeler/pmcamera.cpp
@@ -165,11 +165,11 @@ void PMCamera::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMCamera::tqmetaObject( ) const
+PMMetaObject* PMCamera::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Camera", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Camera", Base::metaObject( ),
                                         createNewCamera );
       s_pMetaObject->addProperty(
          new PMCameraProperty( "location", &PMCamera::setLocation,
diff --git a/kpovmodeler/pmcamera.h b/kpovmodeler/pmcamera.h
index e0d1206e..7d385909 100644
--- a/kpovmodeler/pmcamera.h
+++ b/kpovmodeler/pmcamera.h
@@ -60,7 +60,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmcameraedit.cpp b/kpovmodeler/pmcameraedit.cpp
index 23db4104..3e501cf9 100644
--- a/kpovmodeler/pmcameraedit.cpp
+++ b/kpovmodeler/pmcameraedit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
@@ -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/pmclippedby.cpp b/kpovmodeler/pmclippedby.cpp
index b1499d0c..24ea4e46 100644
--- a/kpovmodeler/pmclippedby.cpp
+++ b/kpovmodeler/pmclippedby.cpp
@@ -40,11 +40,11 @@ PMClippedBy::~PMClippedBy( )
 {
 }
 
-PMMetaObject* PMClippedBy::tqmetaObject( ) const
+PMMetaObject* PMClippedBy::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ClippedBy", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ClippedBy", Base::metaObject( ),
                                         createNewClippedBy );
       s_pMetaObject->addProperty(
          new PMClippedByProperty( "boundedBy", 0, &PMClippedBy::boundedBy ) );
diff --git a/kpovmodeler/pmclippedby.h b/kpovmodeler/pmclippedby.h
index 252a7db2..0e76e2cf 100644
--- a/kpovmodeler/pmclippedby.h
+++ b/kpovmodeler/pmclippedby.h
@@ -48,7 +48,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmclippedbyedit.cpp b/kpovmodeler/pmclippedbyedit.cpp
index 8afa0285..b207a5c9 100644
--- a/kpovmodeler/pmclippedbyedit.cpp
+++ b/kpovmodeler/pmclippedbyedit.cpp
@@ -19,7 +19,7 @@
 #include "pmclippedbyedit.h"
 #include "pmclippedby.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmcolor.cpp b/kpovmodeler/pmcolor.cpp
index 1f895861..5b279d30 100644
--- a/kpovmodeler/pmcolor.cpp
+++ b/kpovmodeler/pmcolor.cpp
@@ -22,7 +22,7 @@
 
 #include "pmdebug.h"
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 
 PMColor::PMColor( )
diff --git a/kpovmodeler/pmcoloredit.cpp b/kpovmodeler/pmcoloredit.cpp
index f34ee47d..5abf8a40 100644
--- a/kpovmodeler/pmcoloredit.cpp
+++ b/kpovmodeler/pmcoloredit.cpp
@@ -20,7 +20,7 @@
 #include <kcolorbutton.h>
 #include <klocale.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcolor.h>
 #include <kdialog.h>
 
diff --git a/kpovmodeler/pmcolorsettings.cpp b/kpovmodeler/pmcolorsettings.cpp
index e8518312..d64ced5e 100644
--- a/kpovmodeler/pmcolorsettings.cpp
+++ b/kpovmodeler/pmcolorsettings.cpp
@@ -20,7 +20,7 @@
 #include "pmrendermanager.h"
 #include "pmdefaults.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <kcolorbutton.h>
 #include <klocale.h>
@@ -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( )
@@ -118,21 +118,21 @@ bool PMColorSettings::validateData( )
 
 void PMColorSettings::applySettings( )
 {
-   bool tqrepaint = false;
+   bool repaint = false;
    int i;
    
    PMRenderManager* rm = PMRenderManager::theManager( );
    if( rm->backgroundColor( ) != m_pBackgroundColor->color( ) )
    {
       rm->setBackgroundColor( m_pBackgroundColor->color( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    for( i = 0; i < 2; i++ )
    {
       if( rm->graphicalObjectColor( i ) != m_pGraphicalObjectsColor[i]->color( ) )
       {
          rm->setGraphicalObjectColor( i, m_pGraphicalObjectsColor[i]->color( ) );
-         tqrepaint = true;
+         repaint = true;
       }
    }
    for( i = 0; i < 2; i++ )
@@ -140,7 +140,7 @@ void PMColorSettings::applySettings( )
       if( rm->controlPointColor( i ) != m_pControlPointsColor[i]->color( ) )
       {
          rm->setControlPointColor( i, m_pControlPointsColor[i]->color( ) );
-         tqrepaint = true;
+         repaint = true;
       }
    }
    for( i = 0; i < 3; i++ )
@@ -148,15 +148,15 @@ void PMColorSettings::applySettings( )
       if( rm->axesColor( i ) != m_pAxesColor[i]->color( ) )
       {
          rm->setAxesColor( i, m_pAxesColor[i]->color( ) );
-         tqrepaint = true;
+         repaint = true;
       }
    }
    if( rm->fieldOfViewColor( ) != m_pFieldOfViewColor->color( ) )
    {
       rm->setFieldOfViewColor( m_pFieldOfViewColor->color( ) );
-      tqrepaint = true;
+      repaint = true;
    }
-   if( tqrepaint )
+   if( repaint )
       emit repaintViews( );
 }
 
diff --git a/kpovmodeler/pmcommand.h b/kpovmodeler/pmcommand.h
index d1e53c99..5d32b9d4 100644
--- a/kpovmodeler/pmcommand.h
+++ b/kpovmodeler/pmcommand.h
@@ -42,8 +42,8 @@ class PMPart;
  * PMCRemove: An object was removed. A signal with this constant has
  * to be emitted _before_ the object is removed.
  *
- * PMCChildren: Some tqchildren are added or removed. Do not use. Use PMCAdd and
- * PMCRemove for all tqchildrens.
+ * PMCChildren: Some children are added or removed. Do not use. Use PMCAdd and
+ * PMCRemove for all childrens.
  *
  * PMCData: Data (for dialog views) is changed
  *
diff --git a/kpovmodeler/pmcomment.cpp b/kpovmodeler/pmcomment.cpp
index 3f659682..b2256365 100644
--- a/kpovmodeler/pmcomment.cpp
+++ b/kpovmodeler/pmcomment.cpp
@@ -22,7 +22,7 @@
 #include "pmcommentedit.h"
 #include "pmmemento.h"
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <klocale.h>
 
 PMDefinePropertyClass( PMComment, PMCommentProperty );
@@ -108,11 +108,11 @@ void PMComment::setText( const TQString& text )
    }
 }
 
-PMMetaObject* PMComment::tqmetaObject( ) const
+PMMetaObject* PMComment::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Comment", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Comment", Base::metaObject( ),
                                         createNewComment );
       s_pMetaObject->addProperty(
          new PMCommentProperty( "text", &PMComment::setText, &PMComment::text ) );
diff --git a/kpovmodeler/pmcomment.h b/kpovmodeler/pmcomment.h
index 832863bc..d435423d 100644
--- a/kpovmodeler/pmcomment.h
+++ b/kpovmodeler/pmcomment.h
@@ -62,7 +62,7 @@ public:
    virtual PMObject* copy( ) const { return new PMComment( *this ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmcommentedit.cpp b/kpovmodeler/pmcommentedit.cpp
index 92cdbfa3..ff4247fe 100644
--- a/kpovmodeler/pmcommentedit.cpp
+++ b/kpovmodeler/pmcommentedit.cpp
@@ -19,7 +19,7 @@
 #include "pmcommentedit.h"
 #include "pmcomment.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmultilineedit.h>
 #include <kglobalsettings.h>
 
diff --git a/kpovmodeler/pmcompositeobject.cpp b/kpovmodeler/pmcompositeobject.cpp
index 3699e716..d8b61e8c 100644
--- a/kpovmodeler/pmcompositeobject.cpp
+++ b/kpovmodeler/pmcompositeobject.cpp
@@ -67,10 +67,10 @@ PMCompositeObject::~PMCompositeObject( )
       delete m_pViewStructure;
 }
 
-PMMetaObject* PMCompositeObject::tqmetaObject( ) const
+PMMetaObject* PMCompositeObject::metaObject( ) const
 {
    if( !s_pMetaObject )
-      s_pMetaObject = new PMMetaObject( "CompositeObject", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "CompositeObject", Base::metaObject( ) );
    return s_pMetaObject;
 }
 
@@ -84,7 +84,7 @@ void PMCompositeObject::cleanUp( ) const
    Base::cleanUp( );
 }
 
-PMObject* PMCompositeObject::tqchildAt( uint index ) const
+PMObject* PMCompositeObject::childAt( uint index ) const
 {
    PMObject* tmp;
    uint i = 0;
@@ -136,7 +136,7 @@ bool PMCompositeObject::insertChild( PMObject* o, int i )
       }
       else
       {
-         PMObject* tmp = tqchildAt( ( uint ) ( i - 1 ) );
+         PMObject* tmp = childAt( ( uint ) ( i - 1 ) );
          if( !tmp )
          {
             kdError( PMArea ) << "Index too big" << "\n";
@@ -272,7 +272,7 @@ bool PMCompositeObject::takeChild( PMObject* o )
 
 bool PMCompositeObject::takeChild( uint i )
 {
-   PMObject* tmp = tqchildAt( i );
+   PMObject* tmp = childAt( i );
    if( tmp )
       return takeChild( tmp );
    kdError( PMArea ) << "Index too big";
diff --git a/kpovmodeler/pmcompositeobject.h b/kpovmodeler/pmcompositeobject.h
index 50298236..350180db 100644
--- a/kpovmodeler/pmcompositeobject.h
+++ b/kpovmodeler/pmcompositeobject.h
@@ -44,12 +44,12 @@ public:
     */
    PMCompositeObject( const PMCompositeObject& o );
    /**
-    * Deletes the object and all tqchildren.
+    * Deletes the object and all children.
     */
    virtual ~PMCompositeObject( );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -65,7 +65,7 @@ public:
     * Returns a pointer to the child object at position index,
     * or null if the index is out of range.
     */
-   virtual PMObject* tqchildAt( uint index ) const;
+   virtual PMObject* childAt( uint index ) const;
 
    /**
     * Returns true if the object contains the child object o
@@ -96,7 +96,7 @@ public:
     */
    virtual bool appendChild( PMObject* );
    /**
-    * Returns the number of tqchildren.
+    * Returns the number of children.
     */
    virtual int countChildren( ) const;
    /**
diff --git a/kpovmodeler/pmcone.cpp b/kpovmodeler/pmcone.cpp
index 014fbc0f..c6fd719e 100644
--- a/kpovmodeler/pmcone.cpp
+++ b/kpovmodeler/pmcone.cpp
@@ -100,11 +100,11 @@ void PMCone::readAttributes( const PMXMLHelper & h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMCone::tqmetaObject( ) const
+PMMetaObject* PMCone::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Cone", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Cone", Base::metaObject( ),
                                         createNewCone );
       s_pMetaObject->addProperty(
          new PMConeProperty( "end1", &PMCone::setEnd1, &PMCone::end1 ) );
diff --git a/kpovmodeler/pmcone.h b/kpovmodeler/pmcone.h
index 25dacfd5..c41f9325 100644
--- a/kpovmodeler/pmcone.h
+++ b/kpovmodeler/pmcone.h
@@ -62,7 +62,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmconeedit.cpp b/kpovmodeler/pmconeedit.cpp
index 75a07855..401c7a4f 100644
--- a/kpovmodeler/pmconeedit.cpp
+++ b/kpovmodeler/pmconeedit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <tqcheckbox.h>
@@ -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/pmcsg.cpp b/kpovmodeler/pmcsg.cpp
index 66532ac6..0ac7e58a 100644
--- a/kpovmodeler/pmcsg.cpp
+++ b/kpovmodeler/pmcsg.cpp
@@ -130,11 +130,11 @@ void PMCSG::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMCSG::tqmetaObject( ) const
+PMMetaObject* PMCSG::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "CSG", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "CSG", Base::metaObject( ),
                                         createNewCSG );
       PMCSGTypeProperty* p = new PMCSGTypeProperty( "csgType", &PMCSG::setCSGType, &PMCSG::csgType );
       p->addEnumValue( "union", CSGUnion );
diff --git a/kpovmodeler/pmcsg.h b/kpovmodeler/pmcsg.h
index 36184883..380bf0ef 100644
--- a/kpovmodeler/pmcsg.h
+++ b/kpovmodeler/pmcsg.h
@@ -62,7 +62,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmcsgedit.cpp b/kpovmodeler/pmcsgedit.cpp
index 014eb09b..3ec36a84 100644
--- a/kpovmodeler/pmcsgedit.cpp
+++ b/kpovmodeler/pmcsgedit.cpp
@@ -19,7 +19,7 @@
 #include "pmcsgedit.h"
 #include "pmcsg.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <klocale.h>
@@ -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/pmcylinder.cpp b/kpovmodeler/pmcylinder.cpp
index c449189d..358cb542 100644
--- a/kpovmodeler/pmcylinder.cpp
+++ b/kpovmodeler/pmcylinder.cpp
@@ -97,11 +97,11 @@ void PMCylinder::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMCylinder::tqmetaObject( ) const
+PMMetaObject* PMCylinder::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Cylinder", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Cylinder", Base::metaObject( ),
                                         createNewCylinder );
       s_pMetaObject->addProperty(
          new PMCylinderProperty( "end1", &PMCylinder::setEnd1, &PMCylinder::end1 ) );
diff --git a/kpovmodeler/pmcylinder.h b/kpovmodeler/pmcylinder.h
index cae308fe..1bd10901 100644
--- a/kpovmodeler/pmcylinder.h
+++ b/kpovmodeler/pmcylinder.h
@@ -58,7 +58,7 @@ public:
    /** */
    virtual TQString description( ) const;
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmcylinderedit.cpp b/kpovmodeler/pmcylinderedit.cpp
index b8741ae7..33da88fa 100644
--- a/kpovmodeler/pmcylinderedit.cpp
+++ b/kpovmodeler/pmcylinderedit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <tqcheckbox.h>
@@ -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/pmdatachangecommand.cpp b/kpovmodeler/pmdatachangecommand.cpp
index 4188d253..99ac75d3 100644
--- a/kpovmodeler/pmdatachangecommand.cpp
+++ b/kpovmodeler/pmdatachangecommand.cpp
@@ -28,7 +28,7 @@ PMDataChangeCommand::PMDataChangeCommand( PMMemento* memento )
    TQString text = memento->originator( )->name( );
    if( text.isEmpty( ) )
       text = memento->originator( )->description( );
-   setText( i18n( "Change %1" ).tqarg( text ) );
+   setText( i18n( "Change %1" ).arg( text ) );
 
    // the data is already changed when the command is created
    m_executed = true;
diff --git a/kpovmodeler/pmdeclare.cpp b/kpovmodeler/pmdeclare.cpp
index 089447bc..3f290e2f 100644
--- a/kpovmodeler/pmdeclare.cpp
+++ b/kpovmodeler/pmdeclare.cpp
@@ -44,14 +44,14 @@ PMDeclare::PMDeclare( const PMDeclare& d )
 {
    m_id = d.m_id; // CAUTION! Duplication of the id which has to be unique
    m_pDeclareType = 0; // will be set automatically in the
-   // base constuctor when the tqchildren are copied
+   // base constuctor when the children are copied
 }
 
-PMMetaObject* PMDeclare::tqmetaObject( ) const
+PMMetaObject* PMDeclare::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Declare", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Declare", Base::metaObject( ),
                                         createNewDeclare );
       s_pMetaObject->addProperty(
          new PMDeclareProperty( "id", &PMDeclare::setID, &PMDeclare::id ) );
@@ -180,9 +180,9 @@ void PMDeclare::updateDeclareType( )
    if( o )
    {
       if( o->isA( "GraphicalObject" ) )
-         type = m->tqmetaObject( "GraphicalObject" );
+         type = m->metaObject( "GraphicalObject" );
       else
-         type = o->tqmetaObject( );
+         type = o->metaObject( );
    }
    setDeclareType( type );
 }
diff --git a/kpovmodeler/pmdeclare.h b/kpovmodeler/pmdeclare.h
index 69915218..89468bf4 100644
--- a/kpovmodeler/pmdeclare.h
+++ b/kpovmodeler/pmdeclare.h
@@ -55,7 +55,7 @@ public:
    virtual TQString pixmap( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp
index 60446a53..7cf96d12 100644
--- a/kpovmodeler/pmdeclareedit.cpp
+++ b/kpovmodeler/pmdeclareedit.cpp
@@ -23,10 +23,10 @@
 #include "pmscanner.h"
 #include "pmobjectselect.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 
@@ -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/pmdeletecommand.cpp b/kpovmodeler/pmdeletecommand.cpp
index 1afb81fa..2a8650f1 100644
--- a/kpovmodeler/pmdeletecommand.cpp
+++ b/kpovmodeler/pmdeletecommand.cpp
@@ -27,7 +27,7 @@
 #include <tqptrdict.h>
 
 PMDeleteCommand::PMDeleteCommand( PMObject* obj )
-      : PMCommand( i18n( "Delete %1" ).tqarg( obj->name( ) ) )
+      : PMCommand( i18n( "Delete %1" ).arg( obj->name( ) ) )
 {
    // the scene can not be deleted!
    if( obj->parent( ) )
@@ -256,7 +256,7 @@ int PMDeleteCommand::errorFlags( PMPart* )
       {
          m_errors.prepend( i18n( "The declare \"%1\" can't be removed "
                                  "because of some remaining links." )
-                           .tqarg( decl->id( ) ) );
+                           .arg( decl->id( ) ) );
          
          PMDeleteInfo* tmp = info;
          info = m_infoList.prev( );
diff --git a/kpovmodeler/pmdensity.cpp b/kpovmodeler/pmdensity.cpp
index a742d514..3935b6be 100644
--- a/kpovmodeler/pmdensity.cpp
+++ b/kpovmodeler/pmdensity.cpp
@@ -43,11 +43,11 @@ PMDensity::~PMDensity( )
 {
 }
 
-PMMetaObject* PMDensity::tqmetaObject( ) const
+PMMetaObject* PMDensity::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Density", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Density", Base::metaObject( ),
                                         createNewDensity );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pmdensity.h b/kpovmodeler/pmdensity.h
index c194f846..b1502fe2 100644
--- a/kpovmodeler/pmdensity.h
+++ b/kpovmodeler/pmdensity.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmdensityedit.cpp b/kpovmodeler/pmdensityedit.cpp
index 407a4f80..cb36fd67 100644
--- a/kpovmodeler/pmdensityedit.cpp
+++ b/kpovmodeler/pmdensityedit.cpp
@@ -20,7 +20,7 @@
 #include "pmdensity.h"
 #include "pmlinkedit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmdetailobject.cpp b/kpovmodeler/pmdetailobject.cpp
index 050729a4..5abc7e22 100644
--- a/kpovmodeler/pmdetailobject.cpp
+++ b/kpovmodeler/pmdetailobject.cpp
@@ -47,11 +47,11 @@ PMDetailObject::~PMDetailObject()
 {
 }
 
-PMMetaObject* PMDetailObject::tqmetaObject( ) const
+PMMetaObject* PMDetailObject::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "DetailObject", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "DetailObject", Base::metaObject( ) );
       s_pMetaObject->addProperty(
             new PMDetailObjectProperty( "globalDetail", &PMDetailObject::setGlobalDetail, &PMDetailObject::globalDetail ) );
       s_pMetaObject->addProperty(
diff --git a/kpovmodeler/pmdetailobject.h b/kpovmodeler/pmdetailobject.h
index 10efae07..846ef8c0 100644
--- a/kpovmodeler/pmdetailobject.h
+++ b/kpovmodeler/pmdetailobject.h
@@ -43,7 +43,7 @@ public:
    virtual ~PMDetailObject();
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmdetailobjectedit.cpp b/kpovmodeler/pmdetailobjectedit.cpp
index 09b53cbd..6baacac2 100644
--- a/kpovmodeler/pmdetailobjectedit.cpp
+++ b/kpovmodeler/pmdetailobjectedit.cpp
@@ -17,7 +17,7 @@
 #include "pmdetailobjectedit.h"
 #include "pmdetailobject.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
@@ -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 9b575fd8..c84982bf 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -18,7 +18,7 @@
 
 #include "pmdialogeditbase.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
@@ -451,17 +451,17 @@ void PMDialogEditBase::slotTexturePreview( )
       str << "union {\n";
       if( s_showBox )
       {
-         str << c_boxCode.tqarg( numObjects );
+         str << c_boxCode.arg( numObjects );
          numObjects++;
       }
       if( s_showCylinder )
       {
-         str << c_cylinderCode.tqarg( numObjects );
+         str << c_cylinderCode.arg( numObjects );
          numObjects++;
       }
       if( s_showSphere )
       {
-         str << c_sphereCode.tqarg( numObjects );
+         str << c_sphereCode.arg( numObjects );
          numObjects++;
       }
 
@@ -495,18 +495,18 @@ void PMDialogEditBase::slotTexturePreview( )
       {
          c1 = PMColor( s_wallColor1 );
          c2 = PMColor( s_wallColor2 );
-         str << c_wallCode.tqarg( c1.serialize( true ) ).tqarg( c2.serialize( true ) );
+         str << c_wallCode.arg( c1.serialize( true ) ).arg( c2.serialize( true ) );
       }
       if( s_showFloor )
       {
          c1 = PMColor( s_floorColor1 );
          c2 = PMColor( s_floorColor2 );
-         str << c_floorCode.tqarg( c1.serialize( true ) ).tqarg( c2.serialize( true ) );
+         str << c_floorCode.arg( c1.serialize( true ) ).arg( c2.serialize( true ) );
       }
 
       str << c_lightCode;
       str << c_cameraCode[numObjects-1];
-      str << c_globalSettingsCode.tqarg( s_previewGamma );
+      str << c_globalSettingsCode.arg( s_previewGamma );
 
       // Set the render mode
       mode.setHeight( s_previewSize );
@@ -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( ) );
@@ -540,7 +540,7 @@ void PMDialogEditBase::slotPreviewFinished( int exitStatus )
       KMessageBox::error( this, i18n( "Povray exited abnormally with "
                                       "exit code %1.\n"
                                       "See the povray output for details." )
-                          .tqarg( exitStatus ) );
+                          .arg( exitStatus ) );
    }
    else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) )
    {
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 0a7f372e..caab8731 100644
--- a/kpovmodeler/pmdialogview.cpp
+++ b/kpovmodeler/pmdialogview.cpp
@@ -33,7 +33,7 @@
 #include <krun.h>
 #include <kstdguiitem.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqgroupbox.h>
 #include <tqscrollview.h>
@@ -69,7 +69,7 @@ void PMDialogEditContent::calculateSize( )
    int fw = lineWidth( ) * 2;
    if( m_pContents )
    {
-      TQSize newSize = m_pContents->tqminimumSizeHint( );
+      TQSize newSize = m_pContents->minimumSizeHint( );
 
       setVScrollBarMode( AlwaysOff );
       setHScrollBarMode( AlwaysOff );
@@ -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/pmdisc.cpp b/kpovmodeler/pmdisc.cpp
index 6f7bac55..bda89579 100644
--- a/kpovmodeler/pmdisc.cpp
+++ b/kpovmodeler/pmdisc.cpp
@@ -96,11 +96,11 @@ void PMDisc::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMDisc::tqmetaObject( ) const
+PMMetaObject* PMDisc::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Disc", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Disc", Base::metaObject( ),
                                         createNewDisc );
       s_pMetaObject->addProperty(
          new PMDiscProperty( "center", &PMDisc::setCenter, &PMDisc::center ) );
diff --git a/kpovmodeler/pmdisc.h b/kpovmodeler/pmdisc.h
index b56e2175..62201bcf 100644
--- a/kpovmodeler/pmdisc.h
+++ b/kpovmodeler/pmdisc.h
@@ -58,7 +58,7 @@ public:
    /** */
    virtual TQString description( ) const;
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmdiscedit.cpp b/kpovmodeler/pmdiscedit.cpp
index e960f869..b7e0028a 100644
--- a/kpovmodeler/pmdiscedit.cpp
+++ b/kpovmodeler/pmdiscedit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <klocale.h>
@@ -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 87fc37ef..8a691d1f 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -20,7 +20,7 @@
 #include "pmdockwidget_private.h"
 
 #include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqobjectlist.h>
 #include <tqstrlist.h>
@@ -154,7 +154,7 @@ PMDockMainWindow::~PMDockMainWindow()
 // kparts/dockmainwindow stuff
 void PMDockMainWindow::createGUI( Part * part )
 {
-  kdDebug(1000) << TQString("DockMainWindow::createGUI for %1").tqarg(part?part->name():"0L") << endl;
+  kdDebug(1000) << TQString("DockMainWindow::createGUI for %1").arg(part?part->name():"0L") << endl;
 
   KXMLGUIFactory *factory = guiFactory();
 
@@ -164,7 +164,7 @@ void PMDockMainWindow::createGUI( Part * part )
 
   if ( d->m_activePart )
   {
-    kdDebug(1000) << TQString("deactivating GUI for %1").tqarg(d->m_activePart->name()) << endl;
+    kdDebug(1000) << TQString("deactivating GUI for %1").arg(d->m_activePart->name()) << endl;
 
     GUIActivateEvent ev( false );
     TQApplication::sendEvent( d->m_activePart, &ev );
@@ -337,7 +337,7 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
 
   paint.begin( this );
 
-  tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+  tqstyle().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,13 +386,13 @@ 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();
-  drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+  layout->addWidget( drag );
+  layout->addWidget( dockbackButton );
+  layout->addWidget( toDesktopButton );
+  layout->addWidget( stayButton );
+  layout->addWidget( closeButton );
+  layout->activate();
+  drag->setFixedHeight( layout->minimumSize().height() );
 }
 
 void PMDockWidgetHeader::setTopLevel( bool isTopLevel )
@@ -415,7 +415,7 @@ void PMDockWidgetHeader::setTopLevel( bool isTopLevel )
     closeButton->show();
     toDesktopButton->show();
   }
-  tqlayout->activate();
+  layout->activate();
   updateGeometry();
 }
 
@@ -423,20 +423,20 @@ 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();
-  drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+  layout->addWidget( drag );
+  layout->addWidget( dockbackButton );
+  layout->addWidget( toDesktopButton );
+  layout->addWidget( stayButton );
+  layout->addWidget( closeButton );
+  layout->activate();
+  drag->setFixedHeight( layout->minimumSize().height() );
 }
 
 void PMDockWidgetHeader::slotStayClicked()
@@ -459,12 +459,12 @@ void PMDockWidgetHeader::setDragEnabled(bool b)
 #ifndef NO_KDE2
 void PMDockWidgetHeader::saveConfig( KConfig* c )
 {
-  c->writeEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), stayButton->isOn() );
+  c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() );
 }
 
 void PMDockWidgetHeader::loadConfig( KConfig* c )
 {
-  setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), false ) );
+  setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) );
 }
 #endif
 
@@ -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 );
   }
 }
 
@@ -584,7 +584,7 @@ void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
   }
 
   if ( s == manager->main ){
-      setGeometry( TQRect(TQPoint(0,0), manager->main->tqgeometry().size()) );
+      setGeometry( TQRect(TQPoint(0,0), manager->main->geometry().size()) );
   }
 
   if ( !s )
@@ -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 ) ||
@@ -829,7 +829,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   if ( !parentDock ){
     // dock to a toplevel dockwidget means newDock is toplevel now
     newDock->move( target->frameGeometry().topLeft() );
-    newDock->resize( target->tqgeometry().size() );
+    newDock->resize( target->geometry().size() );
     if ( target->isVisibleToTLW() ) newDock->show();
   }
 
@@ -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 )
@@ -1110,7 +1110,7 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
   tab->parentWidget()->setName( listOfName.utf8() );
   tab->parentWidget()->setCaption( listOfCaption );
 
-  tab->parentWidget()->tqrepaint( false ); // PMDockWidget->tqrepaint
+  tab->parentWidget()->repaint( false ); // PMDockWidget->repaint
   if ( tab->parentWidget()->parent() )
     if ( tab->parentWidget()->parent()->inherits("PMDockSplitter") )
       ((PMDockSplitter*)(tab->parentWidget()->parent()))->updateName();
@@ -1168,13 +1168,13 @@ void PMDockWidget::loseFormerBrotherDockWidget()
     TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
                          this, TQT_SLOT(loseFormerBrotherDockWidget()) );
   formerBrotherDockWidget = 0L;
-  tqrepaint();
+  repaint();
 }
 
 void PMDockWidget::dockBack()
 {
   if( formerBrotherDockWidget) {
-    // search all tqchildren if it tries to dock back to a child
+    // search all children if it tries to dock back to a child
     bool found = false;
     TQObjectList* cl = queryList("PMDockWidget");
     TQObjectListIt it( *cl );
@@ -1316,21 +1316,21 @@ 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 tqchildren, 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)
 
-  if ( obj == main && event->type() == TQEvent::Resize && dynamic_cast<PMDockArea*>(main) && main->tqchildren() ){
+  if ( obj == main && event->type() == TQEvent::Resize && dynamic_cast<PMDockArea*>(main) && main->children() ){
 #ifndef NO_KDE2
-    kdDebug()<<"PMDockManager::eventFilter(): main is a PMDockArea and there are tqchildren"<<endl;
+    kdDebug()<<"PMDockManager::eventFilter(): main is a PMDockArea and there are children"<<endl;
 #endif
-    TQWidget* fc = (TQWidget*)main->tqchildren()->getFirst();
+    TQWidget* fc = (TQWidget*)main->children()->getFirst();
     if ( fc )
-      fc->setGeometry( TQRect(TQPoint(0,0), main->tqgeometry().size()) );
+      fc->setGeometry( TQRect(TQPoint(0,0), main->geometry().size()) );
   }
 */
 
@@ -1356,7 +1356,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
             findChildDockWidget( curdw, *childDockWidgetList );
 
             d->oldDragRect = TQRect();
-            d->dragRect = TQRect(curdw->tqgeometry());
+            d->dragRect = TQRect(curdw->geometry());
             TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
             d->dragRect.moveTopLeft(p);
             drawDragRectangle();
@@ -1377,7 +1377,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
           if (d->readyToDrag) {
               d->readyToDrag = false;
               d->oldDragRect = TQRect();
-              d->dragRect = TQRect(curdw->tqgeometry());
+              d->dragRect = TQRect(curdw->geometry());
               TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
               d->dragRect.moveTopLeft(p);
               drawDragRectangle();
@@ -1398,7 +1398,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
             break;
           } else {
             if (dropCancel && curdw) {
-              d->dragRect = TQRect(curdw->tqgeometry());
+              d->dragRect = TQRect(curdw->geometry());
               TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
               d->dragRect.moveTopLeft(p);
             }else
@@ -1454,7 +1454,7 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
     return 0L;
   }
 #if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
-  p = p->tqtopLevelWidget();
+  p = p->topLevelWidget();
 #endif
   TQWidget* w = 0L;
   findChildDockWidget( w, p, p->mapFromGlobal(pos) );
@@ -1511,7 +1511,7 @@ void PMDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const
     while ( it.current() ) {
       if ( it.current()->isWidgetType() ) {
         w = (TQWidget*)it.current();
-        if ( w->isVisible() && w->tqgeometry().contains(pos) ) {
+        if ( w->isVisible() && w->geometry().contains(pos) ) {
           if ( w->inherits("PMDockWidget") ) ww = w;
           findChildDockWidget( ww, w, w->mapFromParent(pos) );
           return;
@@ -1692,7 +1692,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam
 
 static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b)
 {
-    return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false"));
+    return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false"));
 }
 
 
@@ -1731,7 +1731,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName,
     TQStrListIterator it(list);
     for (; it.current(); ++it) {
         TQDomElement subel = doc.createElement(subTagName);
-        subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current())));
+        subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current())));
         el.appendChild(subel);
     }
 
@@ -1801,7 +1801,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
     PMDockWidget *obj1;
     while ( (obj1=(PMDockWidget*)it.current()) ) {
         if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
-            mainWidgetStr = TQString::tqfromLatin1(obj1->name());
+            mainWidgetStr = TQString::fromLatin1(obj1->name());
         nList.append(obj1->name());
         ++it;
     }
@@ -1811,7 +1811,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
         PMDockWidget *obj = getDockWidgetFromName( nList.current() );
         if (obj->isGroup && (nameList.find( obj->firstName.latin1() ) == -1
                              || nameList.find(obj->lastName.latin1()) == -1)) {
-            // Skip until tqchildren are saved (why?)
+            // Skip until children are saved (why?)
             nList.next();
             if ( !nList.current() ) nList.first();
             continue;
@@ -1841,7 +1841,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
             groupEl = doc.createElement("dock");
         }
 
-        groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
+        groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name())));
         groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
         if ( !obj->parent() ) {
             groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
@@ -2039,7 +2039,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
         c->writeEntry( cname+":type", "GROUP");
         if ( !obj->parent() ){
           c->writeEntry( cname+":parent", "___null___");
-          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+          c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
         } else {
           c->writeEntry( cname+":parent", "yes");
@@ -2070,7 +2070,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
         c->writeEntry( cname+":type", "TAB_GROUP");
         if ( !obj->parent() ){
           c->writeEntry( cname+":parent", "___null___");
-          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+          c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
         } else {
           c->writeEntry( cname+":parent", "yes");
@@ -2090,7 +2090,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
 /*************************************************************************************************/
         if ( !obj->parent() ){
           c->writeEntry( cname+":type", "NULL_DOCK");
-          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+          c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
         } else {
           c->writeEntry( cname+":type", "DOCK");
@@ -2200,7 +2200,7 @@ void PMDockManager::readConfig( KConfig* c, TQString group )
     }
 
     if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){
-      TQRect r = c->readRectEntry( oname + ":tqgeometry" );
+      TQRect r = c->readRectEntry( oname + ":geometry" );
       obj = getDockWidgetFromName( oname );
       obj->applyToWidget( 0L );
       obj->setGeometry(r);
@@ -2372,14 +2372,14 @@ void PMDockManager::drawDragRectangle()
     PMDockMainWindow* pMain = 0L;
     PMDockWidget* pTLDockWdg = 0L;
     TQWidget* topWdg;
-    if (pDockWdgAtRect->tqtopLevelWidget() == main) {
+    if (pDockWdgAtRect->topLevelWidget() == main) {
       isOverMainWdg = true;
       topWdg = pMain = (PMDockMainWindow*) main;
       unclipped = pMain->testWFlags( WPaintUnclipped );
       pMain->setWFlags( WPaintUnclipped );
     }
     else {
-      topWdg = pTLDockWdg = (PMDockWidget*) pDockWdgAtRect->tqtopLevelWidget();
+      topWdg = pTLDockWdg = (PMDockWidget*) pDockWdgAtRect->topLevelWidget();
       unclipped = pTLDockWdg->testWFlags( WPaintUnclipped );
       pTLDockWdg->setWFlags( WPaintUnclipped );
     }
@@ -2481,11 +2481,11 @@ void PMDockArea::resizeEvent(TQResizeEvent *rsize)
     delete list;
 #if 0
     PMDockSplitter *split;
-//    for (unsigned int i=0;i<tqchildren()->count();i++)
+//    for (unsigned int i=0;i<children()->count();i++)
     {
-//    	TQPtrList<TQObject> list(tqchildren());
-//       TQObject *obj=((TQPtrList<TQObject*>)tqchildren())->at(i);
-	TQObject *obj=tqchildren()->getFirst();
+//    	TQPtrList<TQObject> list(children());
+//       TQObject *obj=((TQPtrList<TQObject*>)children())->at(i);
+	TQObject *obj=children()->getFirst();
        if (split=dynamic_cast<PMDockSplitter*>(obj))
        {
           split->setGeometry( TQRect(TQPoint(0,0), size() ));
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index 93a323ca..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
@@ -855,7 +855,7 @@ public:
 #ifndef NO_KDE2
   /**
    * Saves the current state of the dockmanager and of all controlled widgets.
-   * State means here to save the tqgeometry, visibility, parents, internal object names, orientation,
+   * State means here to save the geometry, visibility, parents, internal object names, orientation,
    * separator positions, dockwidget-group information, tab widget states (if it is a tab group) and
    * last but not least some necessary things for recovering the dockmainwindow state.
    *
@@ -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);
 
@@ -1224,7 +1224,7 @@ public:
   /**
    * Constructs a dockmainwindow. It calls its base class constructor and does additional things concerning
    * to the dock stuff:
-   * @li information about the dock state of this' tqchildren gets initialized
+   * @li information about the dock state of this' children gets initialized
    * @li a dockmanager is created...
    * @li ...and gets initialized
    * @li the main dockwidget is set to 0
@@ -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/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp
index 9c97888f..a7f45e50 100644
--- a/kpovmodeler/pmdockwidget_private.cpp
+++ b/kpovmodeler/pmdockwidget_private.cpp
@@ -69,20 +69,20 @@ void PMDockSplitter::setupMinMaxSize()
   // Set the minimum and maximum sizes
   int minx, maxx, miny, maxy;
   if (orientation ==Qt::Horizontal) {
-    miny = child0->tqminimumSize().height() + child1->tqminimumSize().height()+4;
-    maxy = child0->tqmaximumSize().height() + child1->tqmaximumSize().height()+4;
-    minx = (child0->tqminimumSize().width() > child1->tqminimumSize().width()) ? child0->tqminimumSize().width() : child1->tqminimumSize().width();
-    maxx = (child0->tqmaximumSize().width() > child1->tqmaximumSize().width()) ? child0->tqmaximumSize().width() : child1->tqmaximumSize().width();
+    miny = child0->minimumSize().height() + child1->minimumSize().height()+4;
+    maxy = child0->maximumSize().height() + child1->maximumSize().height()+4;
+    minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width();
+    maxx = (child0->maximumSize().width() > child1->maximumSize().width()) ? child0->maximumSize().width() : child1->maximumSize().width();
 
     miny = (miny > 4) ? miny : 4;
     maxy = (maxy < 32000) ? maxy : 32000;
     minx = (minx > 2) ? minx : 2;
     maxx = (maxx < 32000) ? maxx : 32000;
   } else {
-    minx = child0->tqminimumSize().width() + child1->tqminimumSize().width()+4;
-    maxx = child0->tqmaximumSize().width() + child1->tqmaximumSize().width()+4;
-    miny = (child0->tqminimumSize().height() > child1->tqminimumSize().height()) ? child0->tqminimumSize().height() : child1->tqminimumSize().height();
-    maxy = (child0->tqmaximumSize().height() > child1->tqmaximumSize().height()) ? child0->tqmaximumSize().height() : child1->tqmaximumSize().height();
+    minx = child0->minimumSize().width() + child1->minimumSize().width()+4;
+    maxx = child0->maximumSize().width() + child1->maximumSize().width()+4;
+    miny = (child0->minimumSize().height() > child1->minimumSize().height()) ? child0->minimumSize().height() : child1->minimumSize().height();
+    maxy = (child0->maximumSize().height() > child1->maximumSize().height()) ? child0->maximumSize().height() : child1->maximumSize().height();
 
     minx = (minx > 4) ? minx : 4;
     maxx = (maxx < 32000) ? maxx : 32000;
@@ -143,15 +143,15 @@ int PMDockSplitter::checkValue( int position ) const
 {
   if (initialised){
     if (orientation ==Qt::Vertical){
-      if (position < (child0->tqminimumSize().width()))
-        position = child0->tqminimumSize().width();
-      if ((width()-4-position) < (child1->tqminimumSize().width()))
-        position = width() - (child1->tqminimumSize().width()) -4;
+      if (position < (child0->minimumSize().width()))
+        position = child0->minimumSize().width();
+      if ((width()-4-position) < (child1->minimumSize().width()))
+        position = width() - (child1->minimumSize().width()) -4;
     } else {
-      if (position < (child0->tqminimumSize().height()))
-        position = (child0->tqminimumSize().height());
-      if ((height()-4-position) < (child1->tqminimumSize().height()))
-        position = height() - (child1->tqminimumSize().height()) -4;
+      if (position < (child0->minimumSize().height()))
+        position = (child0->minimumSize().height());
+      if ((height()-4-position) < (child1->minimumSize().height()))
+        position = height() - (child1->minimumSize().height()) -4;
     }
   }
 
@@ -183,7 +183,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
         } else {
           xpos = factor * checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
           resizeEvent(0);
-          divider->tqrepaint(true);
+          divider->repaint(true);
         }
       } else {
         if (!mOpaqueResize) {
@@ -192,7 +192,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
         } else {
           xpos = factor * checkValue( mapFromGlobal( mev->globalPos()).x() ) / width();
           resizeEvent(0);
-          divider->tqrepaint(true);
+          divider->repaint(true);
         }
       }
       handled= true;
@@ -204,11 +204,11 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
       if (orientation ==Qt::Horizontal){
         xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
         resizeEvent(0);
-        divider->tqrepaint(true);
+        divider->repaint(true);
       } else {
         xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width();
         resizeEvent(0);
-        divider->tqrepaint(true);
+        divider->repaint(true);
       }
       handled= true;
       break;
@@ -221,7 +221,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e)
 bool PMDockSplitter::event( TQEvent* e )
 {
   if ( e->type() == TQEvent::LayoutHint ){
-    // change tqchildren min/max size
+    // change children min/max size
     setupMinMaxSize();
     setSeparatorPos(xpos);
   }
@@ -240,7 +240,7 @@ void PMDockSplitter::updateName()
   TQString new_name = TQString( child0->name() ) + "," + child1->name();
   parentWidget()->setName( new_name.latin1() );
   parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
-  parentWidget()->tqrepaint( false );
+  parentWidget()->repaint( false );
 
   ((PMDockWidget*)parentWidget())->firstName = child0->name();
   ((PMDockWidget*)parentWidget())->lastName = child1->name();
@@ -301,7 +301,7 @@ PMDockButton_Private::~PMDockButton_Private()
 
 void PMDockButton_Private::drawButton( TQPainter* p )
 {
-  p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
+  p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
   p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
   if ( moveMouse && !isDown() ){
     p->setPen( white );
@@ -309,12 +309,12 @@ void PMDockButton_Private::drawButton( TQPainter* p )
     p->lineTo( 0, 0 );
     p->lineTo( width() - 1, 0 );
 
-    p->setPen( tqcolorGroup().dark() );
+    p->setPen( colorGroup().dark() );
     p->lineTo( width() - 1, height() - 1 );
     p->lineTo( 0, height() - 1 );
   }
   if ( isOn() || isDown() ){
-    p->setPen( tqcolorGroup().dark() );
+    p->setPen( colorGroup().dark() );
     p->moveTo( 0, height() - 1 );
     p->lineTo( 0, 0 );
     p->lineTo( width() - 1, 0 );
@@ -328,13 +328,13 @@ void PMDockButton_Private::drawButton( TQPainter* p )
 void PMDockButton_Private::enterEvent( TQEvent * )
 {
   moveMouse = true;
-  tqrepaint();
+  repaint();
 }
 
 void PMDockButton_Private::leaveEvent( TQEvent * )
 {
   moveMouse = false;
-  tqrepaint();
+  repaint();
 }
 
 /*************************************************************************/
diff --git a/kpovmodeler/pmerrordialog.cpp b/kpovmodeler/pmerrordialog.cpp
index eb920fb0..b8cbf043 100644
--- a/kpovmodeler/pmerrordialog.cpp
+++ b/kpovmodeler/pmerrordialog.cpp
@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 #include <tqlabel.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 #include <kconfig.h>
 
diff --git a/kpovmodeler/pmfinish.cpp b/kpovmodeler/pmfinish.cpp
index 80898d97..52bd92c8 100644
--- a/kpovmodeler/pmfinish.cpp
+++ b/kpovmodeler/pmfinish.cpp
@@ -130,11 +130,11 @@ PMFinish::~PMFinish( )
 {
 }
 
-PMMetaObject* PMFinish::tqmetaObject( ) const
+PMMetaObject* PMFinish::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Finish", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Finish", Base::metaObject( ),
                                         createNewFinish );
       s_pMetaObject->addProperty(
          new PMFinishProperty( "ambientColor", &PMFinish::setAmbientColor, &PMFinish::ambientColor ) );
diff --git a/kpovmodeler/pmfinish.h b/kpovmodeler/pmfinish.h
index 2a7fda19..c12f31b1 100644
--- a/kpovmodeler/pmfinish.h
+++ b/kpovmodeler/pmfinish.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmfinishedit.cpp b/kpovmodeler/pmfinishedit.cpp
index e3513a5d..6f0743e9 100644
--- a/kpovmodeler/pmfinishedit.cpp
+++ b/kpovmodeler/pmfinishedit.cpp
@@ -22,7 +22,7 @@
 #include "pmcoloredit.h"
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
@@ -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/pmfog.cpp b/kpovmodeler/pmfog.cpp
index 36f39a30..6af4a2cb 100644
--- a/kpovmodeler/pmfog.cpp
+++ b/kpovmodeler/pmfog.cpp
@@ -81,11 +81,11 @@ PMFog::~PMFog( )
 {
 }
 
-PMMetaObject* PMFog::tqmetaObject( ) const
+PMMetaObject* PMFog::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Fog", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Fog", Base::metaObject( ),
                                         createNewFog );
       s_pMetaObject->addProperty(
          new PMFogProperty( "fogType", &PMFog::setFogType, &PMFog::fogType ) );
diff --git a/kpovmodeler/pmfog.h b/kpovmodeler/pmfog.h
index cfdfa539..fc6d7095 100644
--- a/kpovmodeler/pmfog.h
+++ b/kpovmodeler/pmfog.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmfogedit.cpp b/kpovmodeler/pmfogedit.cpp
index ec9880c1..067bc9dd 100644
--- a/kpovmodeler/pmfogedit.cpp
+++ b/kpovmodeler/pmfogedit.cpp
@@ -22,7 +22,7 @@
 #include "pmvectoredit.h"
 #include "pmcoloredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/kpovmodeler/pmformulalabel.cpp b/kpovmodeler/pmformulalabel.cpp
index 51b5e13f..c6d9cd70 100644
--- a/kpovmodeler/pmformulalabel.cpp
+++ b/kpovmodeler/pmformulalabel.cpp
@@ -84,7 +84,7 @@ void PMFormulaLabel::drawContents( TQPainter* p )
       // draw dot
       int center = ( cr.top( ) + cr.bottom( ) ) / 2;
       int rad = c_dotSize / 2;
-      p->setBrush( TQBrush( tqcolorGroup( ).text( ) ) );
+      p->setBrush( TQBrush( colorGroup( ).text( ) ) );
       p->drawEllipse( cr.left( ), center - rad, c_dotSize, c_dotSize );
       cr.setLeft( cr.left( ) + c_dotSize + c_indent );
 
@@ -131,7 +131,7 @@ void PMFormulaLabel::calculateSizeHint( )
 
    TQFontMetrics m1( font( ) );
    if( sum == 0 )
-      m_tqsizeHint.setWidth( m1.width( s_nullString ) );
+      m_sizeHint.setWidth( m1.width( s_nullString ) );
    else
    {
       TQFontMetrics m2( exponentFont( ) );
@@ -146,19 +146,19 @@ void PMFormulaLabel::calculateSizeHint( )
                width += m2.width( s_digit[m_exponents[i]] ) + 1;
          }
       }
-      m_tqsizeHint.setWidth( width );
+      m_sizeHint.setWidth( width );
    }
-   m_tqsizeHint.setHeight( m1.height( ) + 7 );
+   m_sizeHint.setHeight( m1.height( ) + 7 );
 }
 
-TQSize PMFormulaLabel::tqsizeHint( ) const
+TQSize PMFormulaLabel::sizeHint( ) const
 {
-   return tqminimumSizeHint( );
+   return minimumSizeHint( );
 }
 
-TQSize PMFormulaLabel::tqminimumSizeHint( ) const
+TQSize PMFormulaLabel::minimumSizeHint( ) const
 {
-   return m_tqsizeHint;
+   return m_sizeHint;
 }
 
 void PMFormulaLabel::fontChange( const TQFont& )
diff --git a/kpovmodeler/pmformulalabel.h b/kpovmodeler/pmformulalabel.h
index 00d75ed8..f6b50897 100644
--- a/kpovmodeler/pmformulalabel.h
+++ b/kpovmodeler/pmformulalabel.h
@@ -46,8 +46,8 @@ public:
     * Destructor
     */
    ~PMFormulaLabel( );
-   virtual TQSize tqsizeHint( ) const;
-   virtual TQSize tqminimumSizeHint( ) const;
+   virtual TQSize sizeHint( ) const;
+   virtual TQSize minimumSizeHint( ) const;
    
 protected:
    virtual void drawContents( TQPainter* p );
@@ -58,7 +58,7 @@ private:
    TQFont exponentFont( ) const;
    void calculateSizeHint( );
    
-   TQSize m_tqsizeHint;
+   TQSize m_sizeHint;
    int m_exponents[3];
    
    static TQString s_xyz[3];
diff --git a/kpovmodeler/pmglobalphotons.cpp b/kpovmodeler/pmglobalphotons.cpp
index 5d5835be..ddf32258 100644
--- a/kpovmodeler/pmglobalphotons.cpp
+++ b/kpovmodeler/pmglobalphotons.cpp
@@ -101,11 +101,11 @@ PMGlobalPhotons::~PMGlobalPhotons( )
 {
 }
 
-PMMetaObject* PMGlobalPhotons::tqmetaObject( ) const
+PMMetaObject* PMGlobalPhotons::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "GlobalPhotons", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "GlobalPhotons", Base::metaObject( ),
                                         createNewGlobalPhotons );
 
       PMNumberProperty* p1 = new PMNumberProperty( "numberType",
diff --git a/kpovmodeler/pmglobalphotons.h b/kpovmodeler/pmglobalphotons.h
index 7a32b14e..549e6efc 100644
--- a/kpovmodeler/pmglobalphotons.h
+++ b/kpovmodeler/pmglobalphotons.h
@@ -55,7 +55,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmglobalphotonsedit.cpp b/kpovmodeler/pmglobalphotonsedit.cpp
index 5a4a5572..fff33e7f 100644
--- a/kpovmodeler/pmglobalphotonsedit.cpp
+++ b/kpovmodeler/pmglobalphotonsedit.cpp
@@ -20,7 +20,7 @@
 #include "pmglobalphotons.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/kpovmodeler/pmglobalsettings.cpp b/kpovmodeler/pmglobalsettings.cpp
index 1c75b40a..efa7db36 100644
--- a/kpovmodeler/pmglobalsettings.cpp
+++ b/kpovmodeler/pmglobalsettings.cpp
@@ -104,11 +104,11 @@ PMGlobalSettings::~PMGlobalSettings( )
 {
 }
 
-PMMetaObject* PMGlobalSettings::tqmetaObject( ) const
+PMMetaObject* PMGlobalSettings::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "GlobalSettings", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "GlobalSettings", Base::metaObject( ),
                                         createNewGlobalSettings );
       s_pMetaObject->addProperty(
          new PMGlobalSettingsProperty( "adcBailout", &PMGlobalSettings::setAdcBailout, &PMGlobalSettings::adcBailout ) );
diff --git a/kpovmodeler/pmglobalsettings.h b/kpovmodeler/pmglobalsettings.h
index fad60d92..a95f86d7 100644
--- a/kpovmodeler/pmglobalsettings.h
+++ b/kpovmodeler/pmglobalsettings.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmglobalsettingsedit.cpp b/kpovmodeler/pmglobalsettingsedit.cpp
index 027152e6..6655fd73 100644
--- a/kpovmodeler/pmglobalsettingsedit.cpp
+++ b/kpovmodeler/pmglobalsettingsedit.cpp
@@ -21,7 +21,7 @@
 #include "pmlineedits.h"
 #include "pmcoloredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
@@ -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.cpp b/kpovmodeler/pmglview.cpp
index 2bd819c4..178e195f 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -31,7 +31,7 @@
 #include <tqcursor.h>
 #include <tqcolor.h>
 #include <tqglobal.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqdom.h>
@@ -326,7 +326,7 @@ void PMGLView::initializeGL( )
       Window* colorMapWindows = 0;
       Window* newWindows = 0;
       int num;
-      if( XGetWMColormapWindows( display, tqtopLevelWidget( )->winId( ),
+      if( XGetWMColormapWindows( display, topLevelWidget( )->winId( ),
                                  &colorMapWindows, &num ) )
       {
          // create a new list and append the new window
@@ -357,7 +357,7 @@ void PMGLView::initializeGL( )
       // tell TQt to use this window
       create( w );
 
-      XSetWMColormapWindows( display, tqtopLevelWidget( )->winId( ),
+      XSetWMColormapWindows( display, topLevelWidget( )->winId( ),
                              newWindows, num );
       delete[] newWindows;
 
@@ -367,7 +367,7 @@ void PMGLView::initializeGL( )
    {
       TQVBoxLayout* topLayout = new TQVBoxLayout( this );
       TQLabel* label = new TQLabel( i18n( "No OpenGL support" ), this );
-      label->tqsetAlignment( TQt::AlignCenter );
+      label->setAlignment( TQt::AlignCenter );
       topLayout->addWidget( label );
    }
 
@@ -431,7 +431,7 @@ void PMGLView::resizeEvent( TQResizeEvent* )
 
 void PMGLView::paintEvent( TQPaintEvent* )
 {
-   tqrepaint( );
+   repaint( );
 }
 
 void PMGLView::invalidateProjection( bool graphicalChange /*= true*/ )
@@ -480,7 +480,7 @@ void PMGLView::invalidateProjection( bool graphicalChange /*= true*/ )
       recalculateControlPointPosition( );
    }
    m_projectionUpToDate = false;
-   tqrepaint( graphicalChange );
+   repaint( graphicalChange );
 }
 
 void PMGLView::enableTranslateMode( bool yes )
@@ -900,7 +900,7 @@ void PMGLView::slotAutoScroll( )
       if( m_bGraphicalChangeMode )
          graphicalChange( mapFromGlobal( TQCursor::pos( ) ) );
       else
-         tqrepaint( );
+         repaint( );
 
       m_lastAutoScrollUpdate = now;
    }
@@ -1118,7 +1118,7 @@ void PMGLView::slotRefresh( )
       if( !m_pCamera )
          setCamera( m_pPart->firstCamera( ) );
 
-   tqrepaint( );
+   repaint( );
 }
 
 void PMGLView::slotClear( )
@@ -1238,10 +1238,10 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
       redraw = true;
 
    if( redraw )
-      tqrepaint( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) );
+      repaint( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) );
 }
 
-void PMGLView::tqrepaint( bool graphicalChange )
+void PMGLView::repaint( bool graphicalChange )
 {
    if( isValid( ) )
    {
@@ -1754,7 +1754,7 @@ TQString PMGLViewFactory::description( PMViewOptions* vo ) const
    if( vo && vo->viewType( ) == "glview" )
    {
       PMGLViewOptions* o = ( PMGLViewOptions* ) vo;
-      return i18n( "3D View (%1)" ).tqarg(
+      return i18n( "3D View (%1)" ).arg(
          PMGLView::viewTypeAsString( o->glViewType( ) ) );
    }
    return description( );
diff --git a/kpovmodeler/pmglview.h b/kpovmodeler/pmglview.h
index 9f1035af..a330afba 100644
--- a/kpovmodeler/pmglview.h
+++ b/kpovmodeler/pmglview.h
@@ -336,7 +336,7 @@ private:
    /**
     * Repaints the view
     */
-   void tqrepaint( bool graphicalChange = false );
+   void repaint( bool graphicalChange = false );
    /**
     * Starts a graphical change
     */
@@ -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/pmgraphicalobject.cpp b/kpovmodeler/pmgraphicalobject.cpp
index 59ace7cf..c60c40cb 100644
--- a/kpovmodeler/pmgraphicalobject.cpp
+++ b/kpovmodeler/pmgraphicalobject.cpp
@@ -60,11 +60,11 @@ PMGraphicalObject::~PMGraphicalObject( )
 {
 }
 
-PMMetaObject* PMGraphicalObject::tqmetaObject( ) const
+PMMetaObject* PMGraphicalObject::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "GraphicalObject", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "GraphicalObject", Base::metaObject( ) );
       s_pMetaObject->addProperty(
          new PMGraphicalObjectProperty( "noShadow", &PMGraphicalObject::setNoShadow,
                          &PMGraphicalObject::noShadow ) );
diff --git a/kpovmodeler/pmgraphicalobject.h b/kpovmodeler/pmgraphicalobject.h
index 19ea826d..399e351d 100644
--- a/kpovmodeler/pmgraphicalobject.h
+++ b/kpovmodeler/pmgraphicalobject.h
@@ -46,12 +46,12 @@ public:
     */
    PMGraphicalObject( const PMGraphicalObject& o );
    /**
-    * Deletes the object and all tqchildren
+    * Deletes the object and all children
     */
    virtual ~PMGraphicalObject( );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmgraphicalobjectedit.cpp b/kpovmodeler/pmgraphicalobjectedit.cpp
index 1429d75f..13a024d2 100644
--- a/kpovmodeler/pmgraphicalobjectedit.cpp
+++ b/kpovmodeler/pmgraphicalobjectedit.cpp
@@ -20,7 +20,7 @@
 #include "pmgraphicalobject.h"
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
 #include <klocale.h>
@@ -162,7 +162,7 @@ void PMGraphicalObjectEdit::recalculateResultingVisibility( )
             absoluteFound = true;
       }
    }
-   m_pResultingVisibility->setText( TQString( "(%1)" ).tqarg( level ) );
+   m_pResultingVisibility->setText( TQString( "(%1)" ).arg( level ) );
 }
 
 #include "pmgraphicalobjectedit.moc"
diff --git a/kpovmodeler/pmgridsettings.cpp b/kpovmodeler/pmgridsettings.cpp
index 69319187..604f0cb6 100644
--- a/kpovmodeler/pmgridsettings.cpp
+++ b/kpovmodeler/pmgridsettings.cpp
@@ -22,7 +22,7 @@
 #include "pmcontrolpoint.h"
 #include "pmdefaults.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <kcolorbutton.h>
@@ -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( )
@@ -133,22 +133,22 @@ bool PMGridSettings::validateData( )
 
 void PMGridSettings::applySettings( )
 {
-   bool tqrepaint = false;
+   bool repaint = false;
    PMRenderManager* rm = PMRenderManager::theManager( );
    if( rm->gridColor( ) != m_pGridColor->color( ) )
    {
       rm->setGridColor( m_pGridColor->color( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( rm->gridDistance( ) != m_pGridDistance->value( ) )
    {
       rm->setGridDistance( m_pGridDistance->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    PMControlPoint::setMoveGrid( m_pMoveGrid->value( ) );
    PMControlPoint::setScaleGrid( m_pScaleGrid->value( ) );
    PMControlPoint::setRotateGrid( m_pRotateGrid->value( ) );
-   if( tqrepaint )
+   if( repaint )
       emit repaintViews( );
 }
 
diff --git a/kpovmodeler/pmheightfield.cpp b/kpovmodeler/pmheightfield.cpp
index 154c6f57..6806437a 100644
--- a/kpovmodeler/pmheightfield.cpp
+++ b/kpovmodeler/pmheightfield.cpp
@@ -107,11 +107,11 @@ void PMHeightField::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMHeightField::tqmetaObject( ) const
+PMMetaObject* PMHeightField::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "HeightField", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "HeightField", Base::metaObject( ),
                                         createNewHeightField );
       s_pMetaObject->addProperty(
          new PMHeightFieldProperty( "fileName", &PMHeightField::setFileName, &PMHeightField::fileName ) );
diff --git a/kpovmodeler/pmheightfield.h b/kpovmodeler/pmheightfield.h
index 92d9724b..443226ba 100644
--- a/kpovmodeler/pmheightfield.h
+++ b/kpovmodeler/pmheightfield.h
@@ -60,7 +60,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmheightfieldedit.cpp b/kpovmodeler/pmheightfieldedit.cpp
index cc413acf..22e7712d 100644
--- a/kpovmodeler/pmheightfieldedit.cpp
+++ b/kpovmodeler/pmheightfieldedit.cpp
@@ -20,7 +20,7 @@
 #include "pmheightfield.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/kpovmodeler/pmimagemap.cpp b/kpovmodeler/pmimagemap.cpp
index e867f72e..5f28c49a 100644
--- a/kpovmodeler/pmimagemap.cpp
+++ b/kpovmodeler/pmimagemap.cpp
@@ -275,11 +275,11 @@ void PMImageMap::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMImageMap::tqmetaObject( ) const
+PMMetaObject* PMImageMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ImageMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ImageMap", Base::metaObject( ),
                                         createNewImageMap );
 
       PMBitmapTypeProperty* bp = new PMBitmapTypeProperty(
diff --git a/kpovmodeler/pmimagemap.h b/kpovmodeler/pmimagemap.h
index 4ee38233..3a43d949 100644
--- a/kpovmodeler/pmimagemap.h
+++ b/kpovmodeler/pmimagemap.h
@@ -71,7 +71,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp
index 7f52442e..bb854e8a 100644
--- a/kpovmodeler/pmimagemapedit.cpp
+++ b/kpovmodeler/pmimagemapedit.cpp
@@ -24,7 +24,7 @@
 #include "pmvector.h"
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -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/pminserterrordialog.cpp b/kpovmodeler/pminserterrordialog.cpp
index c0203984..9dd7867a 100644
--- a/kpovmodeler/pminserterrordialog.cpp
+++ b/kpovmodeler/pminserterrordialog.cpp
@@ -31,7 +31,7 @@ PMInsertErrorDialog::PMInsertErrorDialog(
 {
    TQVBox* page = makeVBoxMainWidget( );
    new TQLabel( i18n( "%1 of %2 objects couldn't be inserted." )
-               .tqarg( numErrors ).tqarg( numObj ), page );
+               .arg( numErrors ).arg( numObj ), page );
    
    m_pDetailsLabel = new TQLabel( i18n( "Objects not inserted:" ), page );
    m_pDetailsLabel->hide( );
diff --git a/kpovmodeler/pminsertrulesystem.cpp b/kpovmodeler/pminsertrulesystem.cpp
index 7bd9e95a..3c601df7 100644
--- a/kpovmodeler/pminsertrulesystem.cpp
+++ b/kpovmodeler/pminsertrulesystem.cpp
@@ -181,15 +181,15 @@ PMRuleCondition* newCondition( TQDomElement& e,
 
 PMRuleBase::~PMRuleBase( )
 {
-   m_tqchildren.setAutoDelete( true );
-   m_tqchildren.clear( );
+   m_children.setAutoDelete( true );
+   m_children.clear( );
 }
 
 void PMRuleBase::countChild( const TQString& className, bool afterInsertPoint )
 {
    countChildProtected( className, afterInsertPoint );
 
-   TQPtrListIterator<PMRuleBase> it( m_tqchildren );
+   TQPtrListIterator<PMRuleBase> it( m_children );
    for( ; it.current( ); ++it )
       it.current( )->countChild( className, afterInsertPoint );
 }
@@ -198,7 +198,7 @@ void PMRuleBase::reset( )
 {
    resetProtected( );
 
-   TQPtrListIterator<PMRuleBase> it( m_tqchildren );
+   TQPtrListIterator<PMRuleBase> it( m_children );
    for( ; it.current( ); ++it )
       it.current( )->reset( );
 }
@@ -302,7 +302,7 @@ PMRuleNot::PMRuleNot( TQDomElement& e,
          if( isCondition( me ) )
          {
             m_pChild = newCondition( me, globalGroups, localGroups );
-            m_tqchildren.append( m_pChild );
+            m_children.append( m_pChild );
          }
       }
       m = m.nextSibling( );
@@ -330,7 +330,7 @@ PMRuleAnd::PMRuleAnd( TQDomElement& e,
          if( isCondition( me ) )
          {
             PMRuleCondition* c = newCondition( me, globalGroups, localGroups );
-            m_tqchildren.append( c );
+            m_children.append( c );
             m_conditions.append( c );
          }
       }
@@ -361,7 +361,7 @@ PMRuleOr::PMRuleOr( TQDomElement& e,
          if( isCondition( me ) )
          {
             PMRuleCondition* c = newCondition( me, globalGroups, localGroups );
-            m_tqchildren.append( c );
+            m_children.append( c );
             m_conditions.append( c );
          }
       }
@@ -533,7 +533,7 @@ PMRuleCompare::PMRuleCompare( TQDomElement& e,
          if( isValue( me ) )
          {
             m_pValue[i] = newValue( me, globalGroups, localGroups );
-            m_tqchildren.append( m_pValue[i] );
+            m_children.append( m_pValue[i] );
             i++;
          }
       }
@@ -745,7 +745,7 @@ PMRule::PMRule( TQDomElement& e,
          else if( isCondition( me ) )
          {
             m_pCondition = newCondition( me, globalGroups, localGroups );
-            m_tqchildren.append( m_pCondition );
+            m_children.append( m_pCondition );
          }
       }
       m = m.nextSibling( );
@@ -905,7 +905,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
    bool possible = false;
 
    // find rules for target class
-   PMMetaObject* meta = parentObject->tqmetaObject( );
+   PMMetaObject* meta = parentObject->metaObject( );
    for( ; meta && !possible; meta = meta->superClass( ) )
    {
       PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) );
@@ -996,7 +996,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
 
    // find rules for target class
    TQPtrList<PMRuleTargetClass> targetClassList;
-   PMMetaObject* meta = parentObject->tqmetaObject( );
+   PMMetaObject* meta = parentObject->metaObject( );
    for( ; meta; meta = meta->superClass( ) )
    {
       PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) );
@@ -1006,7 +1006,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
    if( targetClassList.isEmpty( ) )
       return 0; // not rules found
 
-   // count already inserted tqchildren
+   // count already inserted children
    TQPtrListIterator<PMRuleTargetClass> tit( targetClassList );
    for( ; tit.current( ); ++tit ) // ... for all target classes
    {
diff --git a/kpovmodeler/pminsertrulesystem.h b/kpovmodeler/pminsertrulesystem.h
index e8d30039..80ecb525 100644
--- a/kpovmodeler/pminsertrulesystem.h
+++ b/kpovmodeler/pminsertrulesystem.h
@@ -154,7 +154,7 @@ public:
     */
    TQPtrListIterator<PMRuleBase> childIterator( ) const
    {
-      return TQPtrListIterator<PMRuleBase>( m_tqchildren );
+      return TQPtrListIterator<PMRuleBase>( m_children );
    }
 protected:
    /**
@@ -170,7 +170,7 @@ protected:
    /**
     * Add all child nodes to this list.
     */
-   TQPtrList<PMRuleBase> m_tqchildren;
+   TQPtrList<PMRuleBase> m_children;
 };
 
 /**
diff --git a/kpovmodeler/pminterior.cpp b/kpovmodeler/pminterior.cpp
index 7cc2d87c..53a69f79 100644
--- a/kpovmodeler/pminterior.cpp
+++ b/kpovmodeler/pminterior.cpp
@@ -76,11 +76,11 @@ PMInterior::~PMInterior( )
 {
 }
 
-PMMetaObject* PMInterior::tqmetaObject( ) const
+PMMetaObject* PMInterior::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Interior", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Interior", Base::metaObject( ),
                                         createNewInterior );
       s_pMetaObject->addProperty(
          new PMInteriorProperty( "ior", &PMInterior::setIor, &PMInterior::ior ) );
diff --git a/kpovmodeler/pminterior.h b/kpovmodeler/pminterior.h
index 4f08ff80..8e3c9172 100644
--- a/kpovmodeler/pminterior.h
+++ b/kpovmodeler/pminterior.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pminterioredit.cpp b/kpovmodeler/pminterioredit.cpp
index d9b427e7..a25032d0 100644
--- a/kpovmodeler/pminterioredit.cpp
+++ b/kpovmodeler/pminterioredit.cpp
@@ -21,7 +21,7 @@
 #include "pmlineedits.h"
 #include "pmcoloredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
@@ -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/pminteriortexture.cpp b/kpovmodeler/pminteriortexture.cpp
index 191c3c9b..92950050 100644
--- a/kpovmodeler/pminteriortexture.cpp
+++ b/kpovmodeler/pminteriortexture.cpp
@@ -43,11 +43,11 @@ PMInteriorTexture::~PMInteriorTexture( )
 {
 }
 
-PMMetaObject* PMInteriorTexture::tqmetaObject( ) const
+PMMetaObject* PMInteriorTexture::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "InteriorTexture", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "InteriorTexture", Base::metaObject( ),
                                         createNewInteriorTexture );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pminteriortexture.h b/kpovmodeler/pminteriortexture.h
index 59f37af7..0711b5c9 100644
--- a/kpovmodeler/pminteriortexture.h
+++ b/kpovmodeler/pminteriortexture.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pminteriortextureedit.cpp b/kpovmodeler/pminteriortextureedit.cpp
index 73f1e7e9..6b914e71 100644
--- a/kpovmodeler/pminteriortextureedit.cpp
+++ b/kpovmodeler/pminteriortextureedit.cpp
@@ -20,7 +20,7 @@
 #include "pminteriortexture.h"
 #include "pmlinkedit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmisosurface.cpp b/kpovmodeler/pmisosurface.cpp
index c47373f8..c32c0683 100644
--- a/kpovmodeler/pmisosurface.cpp
+++ b/kpovmodeler/pmisosurface.cpp
@@ -157,11 +157,11 @@ void PMIsoSurface::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMIsoSurface::tqmetaObject( ) const
+PMMetaObject* PMIsoSurface::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "IsoSurface", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "IsoSurface", Base::metaObject( ),
                                         createNewIsoSurface );
       // TODO
       /*
diff --git a/kpovmodeler/pmisosurface.h b/kpovmodeler/pmisosurface.h
index b9b799a0..2a2fb358 100644
--- a/kpovmodeler/pmisosurface.h
+++ b/kpovmodeler/pmisosurface.h
@@ -60,7 +60,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmisosurfaceedit.cpp b/kpovmodeler/pmisosurfaceedit.cpp
index 6b775fe4..c0b22932 100644
--- a/kpovmodeler/pmisosurfaceedit.cpp
+++ b/kpovmodeler/pmisosurfaceedit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
@@ -96,7 +96,7 @@ void PMIsoSurfaceEdit::createTopWidgets( )
    hl->addWidget( new TQLabel( i18n( "Values:" ), this ) );
    for( i = 0; i < 3; i++ )
    {
-      hl->addWidget( new TQLabel( TQString( "P%1" ).tqarg( i ), this ) );
+      hl->addWidget( new TQLabel( TQString( "P%1" ).arg( i ), this ) );
       hl->addWidget( m_pEvaluateValue[i] );
    }
 
diff --git a/kpovmodeler/pmjuliafractal.cpp b/kpovmodeler/pmjuliafractal.cpp
index 04aaead7..5929a058 100644
--- a/kpovmodeler/pmjuliafractal.cpp
+++ b/kpovmodeler/pmjuliafractal.cpp
@@ -112,11 +112,11 @@ void PMJuliaFractal::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMJuliaFractal::tqmetaObject( ) const
+PMMetaObject* PMJuliaFractal::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "JuliaFractal", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "JuliaFractal", Base::metaObject( ),
                                         createNewJuliaFractal );
       s_pMetaObject->addProperty(
          new PMJuliaFractalProperty( "juliaParameter", &PMJuliaFractal::setJuliaParameter,
diff --git a/kpovmodeler/pmjuliafractal.h b/kpovmodeler/pmjuliafractal.h
index 1e68a2d3..1a113aa4 100644
--- a/kpovmodeler/pmjuliafractal.h
+++ b/kpovmodeler/pmjuliafractal.h
@@ -61,7 +61,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmjuliafractaledit.cpp b/kpovmodeler/pmjuliafractaledit.cpp
index 4f595b0e..b0c10b04 100644
--- a/kpovmodeler/pmjuliafractaledit.cpp
+++ b/kpovmodeler/pmjuliafractaledit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <klocale.h>
diff --git a/kpovmodeler/pmlathe.cpp b/kpovmodeler/pmlathe.cpp
index 8e058a9b..9f6a00ff 100644
--- a/kpovmodeler/pmlathe.cpp
+++ b/kpovmodeler/pmlathe.cpp
@@ -198,11 +198,11 @@ void PMLathe::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMLathe::tqmetaObject( ) const
+PMMetaObject* PMLathe::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Lathe", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Lathe", Base::metaObject( ),
                                         createNewLathe );
       s_pMetaObject->addProperty(
          new PMLatheProperty( "sturm", &PMLathe::setSturm, &PMLathe::sturm ) );
@@ -549,10 +549,10 @@ void PMLathe::controlPoints( PMControlPointList& list )
             lastPoint = cp;
             if( d == 0 )
                cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DXY, i,
-                                          i18n( "Point %1 (xy)" ).tqarg( i + 1 ) );
+                                          i18n( "Point %1 (xy)" ).arg( i + 1 ) );
             else
                cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DZY, i,
-                                          i18n( "Point %1 (xy)" ).tqarg( i + 1 ) );
+                                          i18n( "Point %1 (xy)" ).arg( i + 1 ) );
 
             if( i == 0 )
                firstPoint = cp;
@@ -573,10 +573,10 @@ void PMLathe::controlPoints( PMControlPointList& list )
             int imod4 = i % 4;
             if( d == 0 )
                cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DXY, i,
-                                          i18n( "Point %1 (xy)" ).tqarg( i + 1 ) );
+                                          i18n( "Point %1 (xy)" ).arg( i + 1 ) );
             else
                cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DZY, i,
-                                          i18n( "Point %1 (xy)" ).tqarg( i + 1 ) );
+                                          i18n( "Point %1 (xy)" ).arg( i + 1 ) );
             switch( imod4 )
             {
                case 0:
diff --git a/kpovmodeler/pmlathe.h b/kpovmodeler/pmlathe.h
index b059b8a8..20fa55b3 100644
--- a/kpovmodeler/pmlathe.h
+++ b/kpovmodeler/pmlathe.h
@@ -63,7 +63,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmlatheedit.cpp b/kpovmodeler/pmlatheedit.cpp
index e90a4397..6e4f8735 100644
--- a/kpovmodeler/pmlatheedit.cpp
+++ b/kpovmodeler/pmlatheedit.cpp
@@ -22,7 +22,7 @@
 #include "pmvectorlistedit.h"
 #include "pmpart.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <tqcombobox.h>
diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp
index df3c13d3..590cbdda 100644
--- a/kpovmodeler/pmlayoutsettings.cpp
+++ b/kpovmodeler/pmlayoutsettings.cpp
@@ -21,7 +21,7 @@
 #include "pmviewfactory.h"
 #include "pmdebug.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
@@ -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/pmlibrarybrowser.cpp b/kpovmodeler/pmlibrarybrowser.cpp
index bc7e1af7..aead0600 100644
--- a/kpovmodeler/pmlibrarybrowser.cpp
+++ b/kpovmodeler/pmlibrarybrowser.cpp
@@ -18,7 +18,7 @@
 
 #include "pmlibrarybrowser.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqsplitter.h>
diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp
index a1ea53a1..d5565bb7 100644
--- a/kpovmodeler/pmlibraryentrypreview.cpp
+++ b/kpovmodeler/pmlibraryentrypreview.cpp
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqmultilineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqdragobject.h>
 
@@ -59,24 +59,24 @@ PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) :
    gl->setColStretch( 1, 1 );
    TQLabel* lbl = new TQLabel( i18n( "Name: " ), this );
    m_pName = new TQLineEdit( this );
-   m_pName->tqsetAlignment( TQt::AlignLeft );
+   m_pName->setAlignment( TQt::AlignLeft );
    m_pName->setReadOnly( true );
    gl->addWidget( lbl, 0, 0 );
    gl->addWidget( m_pName, 0, 1 );
 
    lbl = new TQLabel( i18n( "Description:" ), this );
-   lbl->tqsetAlignment( TQt::AlignTop );
+   lbl->setAlignment( TQt::AlignTop );
    m_pDescription = new TQMultiLineEdit( this );
-   m_pDescription->tqsetAlignment( TQt::AlignTop  | TQt::AlignLeft |
+   m_pDescription->setAlignment( TQt::AlignTop  | TQt::AlignLeft |
                                  TQt::WordBreak | TQt::DontClip );
    m_pDescription->setReadOnly( true );
    gl->addWidget( lbl, 1, 0 );
    gl->addWidget( m_pDescription, 1, 1 );
 
    m_pKeywordsLabel = new TQLabel( i18n( "Keywords:" ), this );
-   m_pKeywordsLabel->tqsetAlignment( TQt::AlignTop );
+   m_pKeywordsLabel->setAlignment( TQt::AlignTop );
    m_pKeywords = new TQMultiLineEdit( this );
-   m_pKeywords->tqsetAlignment( TQt::AlignTop  | TQt::AlignLeft |
+   m_pKeywords->setAlignment( TQt::AlignTop  | TQt::AlignLeft |
                                  TQt::WordBreak | TQt::DontClip );
    m_pKeywords->setReadOnly( true );
    gl->addWidget( m_pKeywordsLabel, 2, 0 );
@@ -302,7 +302,7 @@ bool PMLibraryEntryPreview::saveIfNeeded( bool forceSave )
 
             // Add them to the object to save.
             PMObjectDrag drag( m_pPart, sortedList );
-            objToSave.setObjects( drag.tqencodedData( "application/x-kpovmodeler" ) );
+            objToSave.setObjects( drag.encodedData( "application/x-kpovmodeler" ) );
 
             // Add the preview image
             objToSave.setPreview( m_image.copy( ) );
diff --git a/kpovmodeler/pmlibraryhandle.cpp b/kpovmodeler/pmlibraryhandle.cpp
index 8ba0f387..4b2bddf2 100644
--- a/kpovmodeler/pmlibraryhandle.cpp
+++ b/kpovmodeler/pmlibraryhandle.cpp
@@ -24,7 +24,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqimage.h>
 
 #include <klocale.h>
diff --git a/kpovmodeler/pmlibraryhandleedit.cpp b/kpovmodeler/pmlibraryhandleedit.cpp
index e991af6e..120bde27 100644
--- a/kpovmodeler/pmlibraryhandleedit.cpp
+++ b/kpovmodeler/pmlibraryhandleedit.cpp
@@ -20,9 +20,9 @@
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <klocale.h>
diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp
index 39714cf8..d2588dca 100644
--- a/kpovmodeler/pmlibraryiconview.cpp
+++ b/kpovmodeler/pmlibraryiconview.cpp
@@ -50,11 +50,11 @@ const char* PMLibraryIconDrag::format( int i ) const
    }
 }
 
-TQByteArray PMLibraryIconDrag::tqencodedData( const char* mime ) const
+TQByteArray PMLibraryIconDrag::encodedData( const char* mime ) const
 {
    TQByteArray a;
    if ( TQString( mime ) == "application/x-qiconlist" )
-      a = TQIconDrag::tqencodedData( mime );
+      a = TQIconDrag::encodedData( mime );
    else if ( TQString( mime ) == "text/sublib-list" )
    {
       TQString s , l;
@@ -80,7 +80,7 @@ bool PMLibraryIconDrag::canDecode( TQMimeSource* e )
 
 bool PMLibraryIconDrag::decode( TQMimeSource* e, TQStringList& strList, TQValueList<bool>& subLibList )
 {
-   TQByteArray a = e->tqencodedData( "text/sublib-list" );
+   TQByteArray a = e->encodedData( "text/sublib-list" );
    if( a.isEmpty( ) )
       return false;
 
@@ -277,7 +277,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
 
             if( !success )
             {
-               KMessageBox::error( 0, i18n( "Error moving \"%1\" to \"%2\"" ).tqarg( path ).tqarg( m_path ) );
+               KMessageBox::error( 0, i18n( "Error moving \"%1\" to \"%2\"" ).arg( path ).arg( m_path ) );
                e->ignore( );
                return;
             }
diff --git a/kpovmodeler/pmlibraryiconview.h b/kpovmodeler/pmlibraryiconview.h
index dc297c26..963ba85d 100644
--- a/kpovmodeler/pmlibraryiconview.h
+++ b/kpovmodeler/pmlibraryiconview.h
@@ -41,7 +41,7 @@ public:
    /** @return The ith format, or NULL. */
    const char* format( int i ) const;
    /** @return The encoded payload of this object, in the specified MIME format. */
-   TQByteArray tqencodedData( const char* mime ) const;
+   TQByteArray encodedData( const char* mime ) const;
    /** @return True if the information in e can be decoded */
    static bool canDecode( TQMimeSource* e );
    /**
diff --git a/kpovmodeler/pmlibraryobjectsearch.cpp b/kpovmodeler/pmlibraryobjectsearch.cpp
index 30e5be5c..3b57711c 100644
--- a/kpovmodeler/pmlibraryobjectsearch.cpp
+++ b/kpovmodeler/pmlibraryobjectsearch.cpp
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqframe.h>
diff --git a/kpovmodeler/pmlight.cpp b/kpovmodeler/pmlight.cpp
index 22f1862d..554a09c2 100644
--- a/kpovmodeler/pmlight.cpp
+++ b/kpovmodeler/pmlight.cpp
@@ -268,11 +268,11 @@ void PMLight::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMLight::tqmetaObject( ) const
+PMMetaObject* PMLight::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Light", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Light", Base::metaObject( ),
                                         createNewLight );
       PMTypeProperty* p = new PMTypeProperty( "lightType", &PMLight::setLightType,
                                               &PMLight::lightType );
diff --git a/kpovmodeler/pmlight.h b/kpovmodeler/pmlight.h
index 59053ab8..4fafb2b0 100644
--- a/kpovmodeler/pmlight.h
+++ b/kpovmodeler/pmlight.h
@@ -59,7 +59,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmlightedit.cpp b/kpovmodeler/pmlightedit.cpp
index e652d0a2..a5ef0c48 100644
--- a/kpovmodeler/pmlightedit.cpp
+++ b/kpovmodeler/pmlightedit.cpp
@@ -22,7 +22,7 @@
 #include "pmlineedits.h"
 #include "pmcoloredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
diff --git a/kpovmodeler/pmlightgroup.cpp b/kpovmodeler/pmlightgroup.cpp
index 36f8d17a..acf655e4 100644
--- a/kpovmodeler/pmlightgroup.cpp
+++ b/kpovmodeler/pmlightgroup.cpp
@@ -69,11 +69,11 @@ void PMLightGroup::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMLightGroup::tqmetaObject( ) const
+PMMetaObject* PMLightGroup::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "LightGroup", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "LightGroup", Base::metaObject( ),
                                         createNewLightGroup );
 
       s_pMetaObject->addProperty( new PMLightGroupProperty( "globalLights",
diff --git a/kpovmodeler/pmlightgroup.h b/kpovmodeler/pmlightgroup.h
index 11762efa..9fdf8d6b 100644
--- a/kpovmodeler/pmlightgroup.h
+++ b/kpovmodeler/pmlightgroup.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmlightgroupedit.cpp b/kpovmodeler/pmlightgroupedit.cpp
index 73a75c6d..a0974c2c 100644
--- a/kpovmodeler/pmlightgroupedit.cpp
+++ b/kpovmodeler/pmlightgroupedit.cpp
@@ -19,7 +19,7 @@
 #include "pmlightgroupedit.h"
 #include "pmlightgroup.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
@@ -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/pmlineedits.cpp b/kpovmodeler/pmlineedits.cpp
index 7546894e..19391338 100644
--- a/kpovmodeler/pmlineedits.cpp
+++ b/kpovmodeler/pmlineedits.cpp
@@ -67,28 +67,28 @@ bool PMFloatEdit::isDataValid( )
          if( m_bCheckLower && m_bCheckUpper )
             KMessageBox::error( this, i18n( "Please enter a float value "
                                             "between %1 and %2" )
-                                .tqarg( m_lowerValue ).tqarg( m_upperValue ),
+                                .arg( m_lowerValue ).arg( m_upperValue ),
                                 i18n( "Error" ) );
          else if( m_bCheckLower )
          {
             if( m_lowerOp == OpGreaterEqual )
                KMessageBox::error( this, i18n( "Please enter a float value "
-                                               ">= %1" ).tqarg( m_lowerValue ),
+                                               ">= %1" ).arg( m_lowerValue ),
                                    i18n( "Error" ) );
             else
                KMessageBox::error( this, i18n( "Please enter a float value "
-                                               "> %1" ).tqarg( m_lowerValue ),
+                                               "> %1" ).arg( m_lowerValue ),
                                    i18n( "Error" ) );
          }
          else
          {
             if( m_upperOp == OpLessEqual )
                KMessageBox::error( this, i18n( "Please enter a float value "
-                                               "<= %1" ).tqarg( m_upperValue ),
+                                               "<= %1" ).arg( m_upperValue ),
                                    i18n( "Error" ) );
             else
                KMessageBox::error( this, i18n( "Please enter a float value "
-                                               "< %1" ).tqarg( m_upperValue ),
+                                               "< %1" ).arg( m_upperValue ),
                                    i18n( "Error" ) );
          }
       }
@@ -183,15 +183,15 @@ bool PMIntEdit::isDataValid( )
          if( m_bCheckLower && m_bCheckUpper )
             KMessageBox::error( this, i18n( "Please enter an integer value "
                                             "between %1 and %2" )
-                                .tqarg( m_lowerValue ).tqarg( m_upperValue ),
+                                .arg( m_lowerValue ).arg( m_upperValue ),
                                 i18n( "Error" ) );
          else if( m_bCheckLower )
             KMessageBox::error( this, i18n( "Please enter an integer value "
-                                            ">= %1" ).tqarg( m_lowerValue ),
+                                            ">= %1" ).arg( m_lowerValue ),
                                 i18n( "Error" ) );
          else
             KMessageBox::error( this, i18n( "Please enter an integer value "
-                                            "<= %1" ).tqarg( m_upperValue ),
+                                            "<= %1" ).arg( m_upperValue ),
                                 i18n( "Error" ) );
       }
    }
diff --git a/kpovmodeler/pmlinkedit.cpp b/kpovmodeler/pmlinkedit.cpp
index 87f6203c..54efcf94 100644
--- a/kpovmodeler/pmlinkedit.cpp
+++ b/kpovmodeler/pmlinkedit.cpp
@@ -18,7 +18,7 @@
 #include "pmlinkedit.h"
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kdialog.h>
 #include <kpushbutton.h>
@@ -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/pmlistpattern.cpp b/kpovmodeler/pmlistpattern.cpp
index 3d368209..721369d2 100644
--- a/kpovmodeler/pmlistpattern.cpp
+++ b/kpovmodeler/pmlistpattern.cpp
@@ -114,11 +114,11 @@ void PMListPattern::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMListPattern::tqmetaObject( ) const
+PMMetaObject* PMListPattern::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ListPattern", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "ListPattern", Base::metaObject( ) );
 
       PMListTypeProperty* p = new PMListTypeProperty(
          "listType", &PMListPattern::setListType,
@@ -228,11 +228,11 @@ PMTextureList::~PMTextureList( )
 {
 }
 
-PMMetaObject* PMTextureList::tqmetaObject( ) const
+PMMetaObject* PMTextureList::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "TextureList", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "TextureList", Base::metaObject( ),
                                         createNewTextureList );
    }
    return s_pMetaObject;
@@ -267,11 +267,11 @@ PMPigmentList::~PMPigmentList( )
 {
 }
 
-PMMetaObject* PMPigmentList::tqmetaObject( ) const
+PMMetaObject* PMPigmentList::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "PigmentList", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "PigmentList", Base::metaObject( ),
                                         createNewPigmentList );
    }
    return s_pMetaObject;
@@ -306,11 +306,11 @@ PMColorList::~PMColorList( )
 {
 }
 
-PMMetaObject* PMColorList::tqmetaObject( ) const
+PMMetaObject* PMColorList::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ColorList", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ColorList", Base::metaObject( ),
                                         createNewColorList );
    }
    return s_pMetaObject;
@@ -345,11 +345,11 @@ PMDensityList::~PMDensityList( )
 {
 }
 
-PMMetaObject* PMDensityList::tqmetaObject( ) const
+PMMetaObject* PMDensityList::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "DensityList", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "DensityList", Base::metaObject( ),
                                         createNewDensityList );
    }
    return s_pMetaObject;
@@ -388,11 +388,11 @@ PMNormalList::~PMNormalList( )
 {
 }
 
-PMMetaObject* PMNormalList::tqmetaObject( ) const
+PMMetaObject* PMNormalList::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "NormalList", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "NormalList", Base::metaObject( ),
                                         createNewNormalList );
       s_pMetaObject->addProperty(
          new PMNormalListProperty( "depth", &PMNormalList::setDepth,
diff --git a/kpovmodeler/pmlistpattern.h b/kpovmodeler/pmlistpattern.h
index 876c8c15..6716dadb 100644
--- a/kpovmodeler/pmlistpattern.h
+++ b/kpovmodeler/pmlistpattern.h
@@ -57,7 +57,7 @@ public:
     */
    virtual TQString listObjectType( ) const = 0;
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -150,7 +150,7 @@ public:
    virtual TQString listObjectType( ) const { return TQString( "Texture" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -189,7 +189,7 @@ public:
    virtual TQString listObjectType( ) const { return TQString( "Pigment" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -228,7 +228,7 @@ public:
    virtual TQString listObjectType( ) const { return TQString( "SolidColor" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -267,7 +267,7 @@ public:
    virtual TQString listObjectType( ) const { return TQString( "Density" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -306,7 +306,7 @@ public:
    virtual TQString listObjectType( ) const { return TQString( "Normal" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmlistpatternedit.cpp b/kpovmodeler/pmlistpatternedit.cpp
index bc897c61..5f2842de 100644
--- a/kpovmodeler/pmlistpatternedit.cpp
+++ b/kpovmodeler/pmlistpatternedit.cpp
@@ -22,7 +22,7 @@
 #include "pmvector.h"
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include "pmlineedits.h"
@@ -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( ) ) );
@@ -161,7 +161,7 @@ void PMListPatternEdit::saveContents( )
 
 bool PMListPatternEdit::isDataValid( )
 {
-   int tqchildren = 0;
+   int children = 0;
    PMObject* o;
 
    if( !m_pBrickSize->isDataValid( ) )
@@ -172,13 +172,13 @@ bool PMListPatternEdit::isDataValid( )
    // count child objects
    for( o = m_pDisplayedObject->firstChild( ); o; o = o->nextSibling( ) )
       if( o->type( ) == m_pDisplayedObject->listObjectType( ) )
-         tqchildren++;
+         children++;
 
    switch( m_pTypeCombo->currentItem( ) )
    {
       case 0:
       case 1:
-         if( tqchildren > 2 )
+         if( children > 2 )
          {
             KMessageBox::error( this, i18n( "You can have at most two child"
                                             " items for that list type!" ),
diff --git a/kpovmodeler/pmlookslike.cpp b/kpovmodeler/pmlookslike.cpp
index f6cd5d29..270292e2 100644
--- a/kpovmodeler/pmlookslike.cpp
+++ b/kpovmodeler/pmlookslike.cpp
@@ -49,11 +49,11 @@ TQString PMLooksLike::description( ) const
    return i18n( "looks like" );
 }
 
-PMMetaObject* PMLooksLike::tqmetaObject( ) const
+PMMetaObject* PMLooksLike::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "LooksLike", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "LooksLike", Base::metaObject( ),
                                         createNewLooksLike );
       // no properties
    }
diff --git a/kpovmodeler/pmlookslike.h b/kpovmodeler/pmlookslike.h
index 9e9c9d92..4a191422 100644
--- a/kpovmodeler/pmlookslike.h
+++ b/kpovmodeler/pmlookslike.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmmaterial.cpp b/kpovmodeler/pmmaterial.cpp
index b37d98bb..66f11f94 100644
--- a/kpovmodeler/pmmaterial.cpp
+++ b/kpovmodeler/pmmaterial.cpp
@@ -43,11 +43,11 @@ PMMaterial::~PMMaterial( )
 {
 }
 
-PMMetaObject* PMMaterial::tqmetaObject( ) const
+PMMetaObject* PMMaterial::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Material", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Material", Base::metaObject( ),
                                         createNewMaterial );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pmmaterial.h b/kpovmodeler/pmmaterial.h
index 955e4515..7e790be4 100644
--- a/kpovmodeler/pmmaterial.h
+++ b/kpovmodeler/pmmaterial.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmmaterialedit.cpp b/kpovmodeler/pmmaterialedit.cpp
index f03fcd43..02320aa3 100644
--- a/kpovmodeler/pmmaterialedit.cpp
+++ b/kpovmodeler/pmmaterialedit.cpp
@@ -20,7 +20,7 @@
 #include "pmmaterial.h"
 #include "pmlinkedit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmmaterialmap.cpp b/kpovmodeler/pmmaterialmap.cpp
index 8ef5dc93..28b2c849 100644
--- a/kpovmodeler/pmmaterialmap.cpp
+++ b/kpovmodeler/pmmaterialmap.cpp
@@ -186,11 +186,11 @@ void PMMaterialMap::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMMaterialMap::tqmetaObject( ) const
+PMMetaObject* PMMaterialMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "MaterialMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "MaterialMap", Base::metaObject( ),
                                         createNewMaterialMap );
 
       PMBitmapTypeProperty* bp = new PMBitmapTypeProperty(
diff --git a/kpovmodeler/pmmaterialmap.h b/kpovmodeler/pmmaterialmap.h
index f5cc3ca9..6377c7bd 100644
--- a/kpovmodeler/pmmaterialmap.h
+++ b/kpovmodeler/pmmaterialmap.h
@@ -72,7 +72,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmmaterialmapedit.cpp b/kpovmodeler/pmmaterialmapedit.cpp
index 491f9d76..57707d9a 100644
--- a/kpovmodeler/pmmaterialmapedit.cpp
+++ b/kpovmodeler/pmmaterialmapedit.cpp
@@ -24,7 +24,7 @@
 #include "pmvector.h"
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
diff --git a/kpovmodeler/pmmatrix.cpp b/kpovmodeler/pmmatrix.cpp
index bda58a28..977f48ed 100644
--- a/kpovmodeler/pmmatrix.cpp
+++ b/kpovmodeler/pmmatrix.cpp
@@ -22,7 +22,7 @@
 #include "pmvector.h"
 #include "pmdebug.h"
 
-#include <tqtextstream.h>
+#include <textstream.h>
 
 PMMatrix::PMMatrix( )
 {
diff --git a/kpovmodeler/pmmedia.cpp b/kpovmodeler/pmmedia.cpp
index e487d6e9..c5e32d6e 100644
--- a/kpovmodeler/pmmedia.cpp
+++ b/kpovmodeler/pmmedia.cpp
@@ -97,11 +97,11 @@ PMMedia::~PMMedia( )
 {
 }
 
-PMMetaObject* PMMedia::tqmetaObject( ) const
+PMMetaObject* PMMedia::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Media", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Media", Base::metaObject( ),
                                         createNewMedia );
       s_pMetaObject->addProperty(
          new PMMediaProperty( "method", &PMMedia::setMethod, &PMMedia::method ) );
diff --git a/kpovmodeler/pmmedia.h b/kpovmodeler/pmmedia.h
index 78adc338..4836bf37 100644
--- a/kpovmodeler/pmmedia.h
+++ b/kpovmodeler/pmmedia.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmmediaedit.cpp b/kpovmodeler/pmmediaedit.cpp
index f89f7d10..ea23379b 100644
--- a/kpovmodeler/pmmediaedit.cpp
+++ b/kpovmodeler/pmmediaedit.cpp
@@ -21,7 +21,7 @@
 #include "pmlineedits.h"
 #include "pmcoloredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/kpovmodeler/pmmesh.cpp b/kpovmodeler/pmmesh.cpp
index fc1791bf..d143edf4 100644
--- a/kpovmodeler/pmmesh.cpp
+++ b/kpovmodeler/pmmesh.cpp
@@ -133,11 +133,11 @@ void PMMesh::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMMesh::tqmetaObject( ) const
+PMMetaObject* PMMesh::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Mesh", Base::tqmetaObject( ), createNewMesh );
+      s_pMetaObject = new PMMetaObject( "Mesh", Base::metaObject( ), createNewMesh );
 
       s_pMetaObject->addProperty(
          new PMMeshProperty( "hierarchy", &PMMesh::setHierarchy, &PMMesh::hierarchy ) );
@@ -236,7 +236,7 @@ void PMMesh::restoreMemento( PMMemento* s )
       TQPtrList<PMMemento> list = m->triangleMementos( );
       TQPtrListIterator<PMMemento> Itr( list );
       for ( int i = 0; i < numChildren && ( tm = Itr.current( ) ) != 0; ++i, ++Itr )
-         tqchildAt( i )->restoreMemento( tm );
+         childAt( i )->restoreMemento( tm );
    }
 
    Base::restoreMemento( s );
@@ -259,10 +259,10 @@ void PMMesh::controlPoints( PMControlPointList& list )
    m_pointToPointList.clear( );
    for ( unsigned i = 0; i < numChildren; ++i )
    {
-      if ( tqchildAt( i )->isA( "Triangle" ) )
+      if ( childAt( i )->isA( "Triangle" ) )
       {
 
-         obj = ( PMTriangle * ) tqchildAt( i );
+         obj = ( PMTriangle * ) childAt( i );
          ptp.object = obj;
          for ( unsigned j = 0; j < 3; ++j )
          {
@@ -353,9 +353,9 @@ void PMMesh::controlPointsChangedList( PMControlPointList& list, PMObjectList& o
 
    for ( int i = 0; i < numChildren && validTriangles; ++i )
    {
-      if ( tqchildAt( i )->isA( "Triangle" ) )
+      if ( childAt( i )->isA( "Triangle" ) )
       {
-         obj = ( PMTriangle* )tqchildAt( i );
+         obj = ( PMTriangle* )childAt( i );
          obj->createMemento( );
          objList.append( obj );
          validNormal = false;
@@ -538,7 +538,7 @@ void PMMesh::controlPointsChangedList( PMControlPointList& list, PMObjectList& o
             {
                if ( ( tm = mementoList.getLast( ) ) )
                {
-                  tqchildAt( j )->restoreMemento( tm );
+                  childAt( j )->restoreMemento( tm );
                   delete tm;
                   mementoList.removeLast( );
                }
diff --git a/kpovmodeler/pmmesh.h b/kpovmodeler/pmmesh.h
index 6c1c6054..a6fe0089 100644
--- a/kpovmodeler/pmmesh.h
+++ b/kpovmodeler/pmmesh.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmmeshedit.cpp b/kpovmodeler/pmmeshedit.cpp
index 61bea7a1..ff7aa825 100644
--- a/kpovmodeler/pmmeshedit.cpp
+++ b/kpovmodeler/pmmeshedit.cpp
@@ -20,7 +20,7 @@
 #include "pmmesh.h"
 #include "pmvectoredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 
 #include <klocale.h>
@@ -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/pmmovecommand.cpp b/kpovmodeler/pmmovecommand.cpp
index 7f14e871..bb75b0e4 100644
--- a/kpovmodeler/pmmovecommand.cpp
+++ b/kpovmodeler/pmmovecommand.cpp
@@ -30,7 +30,7 @@
 #include <tqptrdict.h>
 
 PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* parent, PMObject* after )
-      : PMCommand( i18n( "Move %1" ).tqarg( obj->description( ) ) )
+      : PMCommand( i18n( "Move %1" ).arg( obj->description( ) ) )
 {
    m_pParent = parent;
    m_pAfter = after;
@@ -356,10 +356,10 @@ int PMMoveCommand::errorFlags( PMPart* )
       {
          if( declareInsertError )
             m_errors.prepend( i18n( "Can't insert the declare \"%1\" at that point." )
-                              .tqarg( decl->id( ) ) );
+                              .arg( decl->id( ) ) );
          else
             m_errors.prepend( i18n( "The declare \"%1\" can't be moved behind linked objects." )
-                              .tqarg( decl->id( ) ) );
+                              .arg( decl->id( ) ) );
          
          PMDeleteInfo* tmp = info;
          info = m_infoList.prev( );
@@ -450,8 +450,8 @@ int PMMoveCommand::errorFlags( PMPart* )
                                    "contains a link to the declare \"%3\" "
                                    "and the insert point is not after "
                                    "the declare." )
-                             .tqarg( obj->description( ) ).tqarg( name )
-                             .tqarg( decl->id( ) ) );
+                             .arg( obj->description( ) ).arg( name )
+                             .arg( decl->id( ) ) );
          }
          else
             kdError( PMArea ) << "linked is 0 in PMMoveCommand::errorFlags\n";
diff --git a/kpovmodeler/pmmovecommand.h b/kpovmodeler/pmmovecommand.h
index 934f7fa4..5aac246d 100644
--- a/kpovmodeler/pmmovecommand.h
+++ b/kpovmodeler/pmmovecommand.h
@@ -50,10 +50,10 @@ public:
     * Command that moves a list of new PMObjects.
     * The objects don't have to be siblings of each other.
     *
-    * The object in the list will be inserted as tqchildren of parent after
+    * The object in the list will be inserted as children of parent after
     * the object after.
     *
-    * If after is 0, the objects will be inserted as first tqchildren.
+    * If after is 0, the objects will be inserted as first children.
     */
    PMMoveCommand( const PMObjectList& list, PMObject* parent, PMObject* after );
    /**
diff --git a/kpovmodeler/pmnamedobject.cpp b/kpovmodeler/pmnamedobject.cpp
index 70f2bc5a..72553cd4 100644
--- a/kpovmodeler/pmnamedobject.cpp
+++ b/kpovmodeler/pmnamedobject.cpp
@@ -39,11 +39,11 @@ PMNamedObject::~PMNamedObject( )
 {
 }
 
-PMMetaObject* PMNamedObject::tqmetaObject( ) const
+PMMetaObject* PMNamedObject::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "NamedObject", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "NamedObject", Base::metaObject( ) );
       s_pMetaObject->addProperty(
          new PMNamedObjectProperty( "name", &PMNamedObject::setName, &PMNamedObject::name ) );
    }
diff --git a/kpovmodeler/pmnamedobject.h b/kpovmodeler/pmnamedobject.h
index 02ee7eb4..8b7b0b62 100644
--- a/kpovmodeler/pmnamedobject.h
+++ b/kpovmodeler/pmnamedobject.h
@@ -48,7 +48,7 @@ public:
    ~PMNamedObject( );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmnamedobjectedit.cpp b/kpovmodeler/pmnamedobjectedit.cpp
index f9179f74..ca057147 100644
--- a/kpovmodeler/pmnamedobjectedit.cpp
+++ b/kpovmodeler/pmnamedobjectedit.cpp
@@ -19,7 +19,7 @@
 #include "pmnamedobjectedit.h"
 #include "pmnamedobject.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <klocale.h>
@@ -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/pmnormal.cpp b/kpovmodeler/pmnormal.cpp
index b6e7bb07..722a8fc4 100644
--- a/kpovmodeler/pmnormal.cpp
+++ b/kpovmodeler/pmnormal.cpp
@@ -58,11 +58,11 @@ PMNormal::~PMNormal( )
 {
 }
 
-PMMetaObject* PMNormal::tqmetaObject( ) const
+PMMetaObject* PMNormal::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Normal", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Normal", Base::metaObject( ),
                                         createNewNormal );
       s_pMetaObject->addProperty(
          new PMNormProperty( "bumpSize", &PMNormal::setBumpSize, &PMNormal::bumpSize ) );
diff --git a/kpovmodeler/pmnormal.h b/kpovmodeler/pmnormal.h
index a179a3ed..c798d039 100644
--- a/kpovmodeler/pmnormal.h
+++ b/kpovmodeler/pmnormal.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmnormaledit.cpp b/kpovmodeler/pmnormaledit.cpp
index 68d6f1f3..1631a1dd 100644
--- a/kpovmodeler/pmnormaledit.cpp
+++ b/kpovmodeler/pmnormaledit.cpp
@@ -21,7 +21,7 @@
 #include "pmlinkedit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
diff --git a/kpovmodeler/pmobject.cpp b/kpovmodeler/pmobject.cpp
index 579bd00b..94907482 100644
--- a/kpovmodeler/pmobject.cpp
+++ b/kpovmodeler/pmobject.cpp
@@ -57,7 +57,7 @@ PMObject::~PMObject( )
 {
 }
 
-PMMetaObject* PMObject::tqmetaObject( ) const
+PMMetaObject* PMObject::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
@@ -72,7 +72,7 @@ PMMetaObject* PMObject::tqmetaObject( ) const
 
 PMObject* PMObject::newObject( ) const
 {
-   return tqmetaObject( )->newObject( m_pPart );
+   return metaObject( )->newObject( m_pPart );
 }
 
 bool PMObject::insertChildAfter( PMObject*, PMObject* )
@@ -215,7 +215,7 @@ void PMObject::cleanUp( ) const
 
 bool PMObject::setProperty( const TQString& name, const PMVariant& v )
 {
-   PMPropertyBase* p = tqmetaObject( )->property( name );
+   PMPropertyBase* p = metaObject( )->property( name );
    if( !p )
       return false;
    return p->setProperty( this, v );
@@ -224,7 +224,7 @@ bool PMObject::setProperty( const TQString& name, const PMVariant& v )
 TQStringList PMObject::properties( ) const
 {
    TQStringList lst;
-   PMPropertyIterator it = tqmetaObject( )->properties( );
+   PMPropertyIterator it = metaObject( )->properties( );
    
    for( ; it.current( ); ++it )
       lst.append( it.current( )->name( ) );
@@ -234,7 +234,7 @@ TQStringList PMObject::properties( ) const
 
 PMVariant PMObject::property( const TQString& name ) const
 {
-   PMPropertyBase* p = tqmetaObject( )->property( name );
+   PMPropertyBase* p = metaObject( )->property( name );
    if( !p )
       return PMVariant( );
    return p->getProperty( this );
@@ -244,12 +244,12 @@ bool PMObject::isA( const TQString& className ) const
 {
    if( !m_pPart )
       return false;
-   return m_pPart->prototypeManager( )->isA( tqmetaObject( ), className );
+   return m_pPart->prototypeManager( )->isA( metaObject( ), className );
 }
 
 TQString PMObject::type( ) const
 {
-   return tqmetaObject( )->className( );
+   return metaObject( )->className( );
 }
 
 bool PMObject::canInsert( const TQString& className, const PMObject* after,
diff --git a/kpovmodeler/pmobject.h b/kpovmodeler/pmobject.h
index 3bffb7d3..3f454ab5 100644
--- a/kpovmodeler/pmobject.h
+++ b/kpovmodeler/pmobject.h
@@ -54,7 +54,7 @@ typedef TQPtrListIterator<PMObject> PMObjectListIterator;
  * Used pattern: Composite
  *
  * All list/child functionality is disabled in this class. Objects that
- * can have tqchildren has to be inherited from @ref PMCompositeObject.
+ * can have children has to be inherited from @ref PMCompositeObject.
  */
 class PMObject
 {
@@ -69,7 +69,7 @@ public:
     */
    PMObject( const PMObject& o );
    /**
-    * Deletes the object and all tqchildren.
+    * Deletes the object and all children.
     */
    virtual ~PMObject( );
 
@@ -85,7 +85,7 @@ public:
    /**
     * Returns the meta object for the class
     */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /**
     * Returns true if the object is of type t or inherits the object
@@ -157,7 +157,7 @@ public:
    int canInsert( const TQStringList& classes, const PMObject* after ) const;
 
    /**
-    * Returns true if an insert or remove operation of tqchildren will
+    * Returns true if an insert or remove operation of children will
     * change data inside this class
     */
    virtual bool dataChangeOnInsertRemove( ) const { return false; }
@@ -174,7 +174,7 @@ public:
     * Returns a pointer to the child object at position index,
     * or null if the index is out of range.
     */
-   virtual PMObject* tqchildAt( uint ) const { return 0; }
+   virtual PMObject* childAt( uint ) const { return 0; }
    /**
     * Returns the next sibling of that item
     */
@@ -219,7 +219,7 @@ public:
       return false;
    }
    /**
-    * Returns the number of tqchildren. 0 in this class
+    * Returns the number of children. 0 in this class
     */
    virtual int countChildren( ) const { return 0; }
    /**
@@ -235,12 +235,12 @@ public:
 
    /**
     * Called when a child was removed. For classes that have to be informed
-    * when tqchildren are removed
+    * when children are removed
     */
    virtual void childRemoved( PMObject* ) { };
    /**
     * Called when a child was added. For classes that have to be informed
-    * when tqchildren are added
+    * when children are added
     */
    virtual void childAdded( PMObject* ) { };
 
@@ -302,7 +302,7 @@ public:
     * not only this object.
     *
     * If you leave the list empty, only this object was changed.
-    * If you add tqchildren or other objects to the list, add this object
+    * If you add children or other objects to the list, add this object
     * to the list, too, if it was changed!
     *
     * IMPORTANT: When you change additional objects, make sure that
@@ -402,7 +402,7 @@ public:
     */
    bool isReadOnly( ) const;
    /**
-    * Makes this object read only, if yes == true. All tqchildren will
+    * Makes this object read only, if yes == true. All children will
     * be read only, too
     */
    void setReadOnly( bool yes = true ) { m_readOnly = yes; }
@@ -495,7 +495,7 @@ private:
     */
    bool m_selected;
    /**
-    * true if this object is read only. All tqchildren will be read only, too
+    * true if this object is read only. All children will be read only, too
     */
    bool m_readOnly;
    /**
diff --git a/kpovmodeler/pmobjectdrag.cpp b/kpovmodeler/pmobjectdrag.cpp
index 879bbc1c..23631df0 100644
--- a/kpovmodeler/pmobjectdrag.cpp
+++ b/kpovmodeler/pmobjectdrag.cpp
@@ -170,7 +170,7 @@ PMObjectDrag::~PMObjectDrag( )
 {
 }
 
-TQByteArray PMObjectDrag::tqencodedData( const char* format ) const
+TQByteArray PMObjectDrag::encodedData( const char* format ) const
 {
    TQValueList<TQByteArray>::ConstIterator dit;
    TQStringList::ConstIterator sit;
@@ -211,7 +211,7 @@ bool PMObjectDrag::canDecode( const TQMimeSource* e, PMPart* part )
 PMParser* PMObjectDrag::newParser( const TQMimeSource* e, PMPart* part )
 {
    if( e->provides( c_kpmDocumentMimeFormat ) )
-      return new PMXMLParser( part, e->tqencodedData( c_kpmDocumentMimeFormat ) );
+      return new PMXMLParser( part, e->encodedData( c_kpmDocumentMimeFormat ) );
 
    const TQPtrList<PMIOFormat>& formats = part->ioManager( )->formats( );
    TQPtrListIterator<PMIOFormat> fit( formats );
@@ -221,7 +221,7 @@ PMParser* PMObjectDrag::newParser( const TQMimeSource* e, PMPart* part )
       TQString str = f->mimeType( );
       const char* lat = str.latin1( );
       if( f->services( ) & PMIOFormat::Import && e->provides( lat ) )
-         return f->newParser( part, e->tqencodedData( lat ) );
+         return f->newParser( part, e->encodedData( lat ) );
    }
 
    return 0;
diff --git a/kpovmodeler/pmobjectdrag.h b/kpovmodeler/pmobjectdrag.h
index a02b4401..4a6db4b9 100644
--- a/kpovmodeler/pmobjectdrag.h
+++ b/kpovmodeler/pmobjectdrag.h
@@ -56,7 +56,7 @@ public:
     * Returns the encoded payload of this object, in the
     * specified MIME format.
     */
-   virtual TQByteArray tqencodedData( const char* ) const;
+   virtual TQByteArray encodedData( const char* ) const;
    /**
     * Returns the ith format, or NULL.
     */
diff --git a/kpovmodeler/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp
index 93f9f419..4d94a7ea 100644
--- a/kpovmodeler/pmobjectlibrarysettings.cpp
+++ b/kpovmodeler/pmobjectlibrarysettings.cpp
@@ -24,7 +24,7 @@
 #include "pmlibraryhandleedit.h"
 #include "pmdebug.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -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/pmobjectlink.cpp b/kpovmodeler/pmobjectlink.cpp
index f99bb92b..559d3fe4 100644
--- a/kpovmodeler/pmobjectlink.cpp
+++ b/kpovmodeler/pmobjectlink.cpp
@@ -58,11 +58,11 @@ TQString PMObjectLink::description( ) const
    return i18n( "object link" );
 }
 
-PMMetaObject* PMObjectLink::tqmetaObject( ) const
+PMMetaObject* PMObjectLink::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ObjectLink", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ObjectLink", Base::metaObject( ),
                                         createNewObjectLink );
       s_pMetaObject->addProperty(
          new PMObjectLinkProperty( "linkedObject", &PMObjectLink::setLinkedObjectProperty,
@@ -161,7 +161,7 @@ void PMObjectLink::readAttributes( const PMXMLHelper& h )
          }
          else
             h.parser( )->printError( i18n( "Declare \"%1\" has wrong type." )
-                                     .tqarg( id ) );
+                                     .arg( id ) );
       }
    }
    Base::readAttributes( h );
diff --git a/kpovmodeler/pmobjectlink.h b/kpovmodeler/pmobjectlink.h
index 7bc55b59..8ec7b474 100644
--- a/kpovmodeler/pmobjectlink.h
+++ b/kpovmodeler/pmobjectlink.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmobjectlinkedit.cpp b/kpovmodeler/pmobjectlinkedit.cpp
index 98aead0c..ce5f85f8 100644
--- a/kpovmodeler/pmobjectlinkedit.cpp
+++ b/kpovmodeler/pmobjectlinkedit.cpp
@@ -22,7 +22,7 @@
 #include "pmobjectselect.h"
 #include "pmlinkedit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 
 PMObjectLinkEdit::PMObjectLinkEdit( TQWidget* parent, const char* name )
       : Base( parent, name )
diff --git a/kpovmodeler/pmobjectsettings.cpp b/kpovmodeler/pmobjectsettings.cpp
index 77e7f0f5..b7c43187 100644
--- a/kpovmodeler/pmobjectsettings.cpp
+++ b/kpovmodeler/pmobjectsettings.cpp
@@ -37,7 +37,7 @@
 #include "pmheightfield.h"
 #include "pmtext.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
@@ -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( )
@@ -425,125 +425,125 @@ bool PMObjectSettings::validateData( )
 
 void PMObjectSettings::applySettings( )
 {
-   bool tqrepaint = false;
+   bool repaint = false;
 
    PMRenderManager* rm = PMRenderManager::theManager( );
    if( rm->highDetailCameraViews( ) != m_pHighDetailCameraViews->isChecked( ) )
    {
       rm->setHighDetailCameraViews( m_pHighDetailCameraViews->isChecked( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMSphere::uSteps( ) != m_pSphereUSteps->value( ) )
    {
       PMSphere::setUSteps( m_pSphereUSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMSphere::vSteps( ) != m_pSphereVSteps->value( ) )
    {
       PMSphere::setVSteps( m_pSphereVSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMCylinder::steps( ) != m_pCylinderSteps->value( ) )
    {
       PMCylinder::setSteps( m_pCylinderSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMCone::steps( ) != m_pConeSteps->value( ) )
    {
       PMCone::setSteps( m_pConeSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMTorus::uSteps( ) != m_pTorusUSteps->value( ) )
    {
       PMTorus::setUSteps( m_pTorusUSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMTorus::vSteps( ) != m_pTorusVSteps->value( ) )
    {
       PMTorus::setVSteps( m_pTorusVSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMDisc::steps( ) != m_pDiscSteps->value( ) )
    {
       PMDisc::setSteps( m_pDiscSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMBlobSphere::uSteps( ) != m_pBlobSphereUSteps->value( ) )
    {
       PMBlobSphere::setUSteps( m_pBlobSphereUSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMBlobSphere::vSteps( ) != m_pBlobSphereVSteps->value( ) )
    {
       PMBlobSphere::setVSteps( m_pBlobSphereVSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMBlobCylinder::uSteps( ) != m_pBlobCylinderUSteps->value( ) )
    {
       PMBlobCylinder::setUSteps( m_pBlobCylinderUSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMBlobCylinder::vSteps( ) != m_pBlobCylinderVSteps->value( ) )
    {
       PMBlobCylinder::setVSteps( m_pBlobCylinderVSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMPlane::planeSize( ) != m_pPlaneSize->value( ) )
    {
       PMPlane::setPlaneSize( m_pPlaneSize->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMLathe::sSteps( ) != m_pLatheUSteps->value( ) )
    {
       PMLathe::setSSteps( m_pLatheUSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMLathe::rSteps( ) != m_pLatheRSteps->value( ) )
    {
       PMLathe::setRSteps( m_pLatheRSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMSurfaceOfRevolution::sSteps( ) != m_pSorUSteps->value( ) )
    {
       PMSurfaceOfRevolution::setSSteps( m_pSorUSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMSurfaceOfRevolution::rSteps( ) != m_pSorRSteps->value( ) )
    {
       PMSurfaceOfRevolution::setRSteps( m_pSorRSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMPrism::sSteps( ) != m_pPrismSteps->value( ) )
    {
       PMPrism::setSSteps( m_pPrismSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMSuperquadricEllipsoid::uSteps( ) != m_pSqeUSteps->value( ) )
    {
       PMSuperquadricEllipsoid::setUSteps( m_pSqeUSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMSuperquadricEllipsoid::vSteps( ) != m_pSqeVSteps->value( ) )
    {
       PMSuperquadricEllipsoid::setVSteps( m_pSqeVSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMSphereSweep::rSteps( ) != m_pSphereSweepRSteps->value( ) )
    {
       PMSphereSweep::setRSteps( m_pSphereSweepRSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMSphereSweep::sSteps( ) != m_pSphereSweepSSteps->value( ) )
    {
       PMSphereSweep::setSSteps( m_pSphereSweepSSteps->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
    if( PMHeightField::variance( ) != m_pHeightFieldVariance->value( ) )
    {
       PMHeightField::setVariance( m_pHeightFieldVariance->value( ) );
-      tqrepaint = true;
+      repaint = true;
    }
-   if( tqrepaint )
+   if( repaint )
       emit repaintViews( );
 }
 
diff --git a/kpovmodeler/pmopenglsettings.cpp b/kpovmodeler/pmopenglsettings.cpp
index 07376933..d3bf5098 100644
--- a/kpovmodeler/pmopenglsettings.cpp
+++ b/kpovmodeler/pmopenglsettings.cpp
@@ -20,7 +20,7 @@
 #include "pmglview.h"
 #include "pmdefaults.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <klocale.h>
@@ -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/pmoutputdevice.cpp b/kpovmodeler/pmoutputdevice.cpp
index 1ee91b52..bec1675d 100644
--- a/kpovmodeler/pmoutputdevice.cpp
+++ b/kpovmodeler/pmoutputdevice.cpp
@@ -18,7 +18,7 @@
 
 #include "pmoutputdevice.h"
 #include "pmpovrayformat.h"
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <klocale.h>
 
 unsigned int PMOutputDevice::s_indentOffset = 3;
@@ -55,22 +55,22 @@ void PMOutputDevice::callSerialization( const PMObject* o, const PMMetaObject* m
       info->call( o, mo, this );
    else
    {
-      if( mo == o->tqmetaObject( ) )
+      if( mo == o->metaObject( ) )
       {
          printError( i18n( "The object \"%1\" doesn't support %2." )
-                     .tqarg( o->description( ) ).tqarg( description( ) ) );
+                     .arg( o->description( ) ).arg( description( ) ) );
       }
       else
       {
          printError( i18n( "The class \"%1\" doesn't support %2." )
-                     .tqarg( o->description( ) ).tqarg( mo->className( ) ) );
+                     .arg( o->description( ) ).arg( mo->className( ) ) );
       }
    }
 }
 
 void PMOutputDevice::serialize( PMObject* o )
 {
-   callSerialization( o, o->tqmetaObject( ) );
+   callSerialization( o, o->metaObject( ) );
 }
 
 void PMOutputDevice::close( )
diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp
index 25e1ac64..6cedc617 100644
--- a/kpovmodeler/pmpalettevalueedit.cpp
+++ b/kpovmodeler/pmpalettevalueedit.cpp
@@ -22,7 +22,7 @@
 #include "pmdebug.h"
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -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/pmparser.cpp b/kpovmodeler/pmparser.cpp
index 52a64acc..5920c448 100644
--- a/kpovmodeler/pmparser.cpp
+++ b/kpovmodeler/pmparser.cpp
@@ -107,7 +107,7 @@ void PMParser::printMessage( const PMPMessage messageNum )
 void PMParser::printMessage( const TQString& type, const TQString& msg )
 {
    if( m_lineNum >= 0 )
-      m_messages += PMMessage( i18n( "Line %1: " ).tqarg( m_lineNum ) + type + ": " + msg );
+      m_messages += PMMessage( i18n( "Line %1: " ).arg( m_lineNum ) + type + ": " + msg );
    else
       m_messages += PMMessage( type + ": " + msg );
 }
@@ -122,7 +122,7 @@ void PMParser::printError( const TQString& msg )
    else if( m_errors == s_maxErrors )
    {
       m_messages += PMMessage( i18n( "Maximum of %1 errors reached." )
-                    .tqarg( s_maxErrors ) );
+                    .arg( s_maxErrors ) );
       m_errors++;
    }
 }
@@ -137,7 +137,7 @@ void PMParser::printWarning( const TQString& msg )
    else if( m_warnings == s_maxWarnings )
    {
       m_messages += PMMessage( i18n( "Maximum of %1 warnings reached." )
-                    .tqarg( s_maxWarnings ) );
+                    .arg( s_maxWarnings ) );
       m_warnings++;
    }
 }
@@ -145,18 +145,18 @@ void PMParser::printWarning( const TQString& msg )
 void PMParser::printExpected( const char c, const char* sValue )
 {
    printError( i18n( "'%1' expected, found token '%2' instead." )
-               .tqarg( c ).tqarg( sValue ) );
+               .arg( c ).arg( sValue ) );
 }
 
 void PMParser::printExpected( const TQString& str, const char* sValue )
 {
    printError( i18n( "'%1' expected, found token '%2' instead." )
-               .tqarg( str ).tqarg( sValue ) );
+               .arg( str ).arg( sValue ) );
 }
 
 void PMParser::printUnexpected( const TQString& str )
 {
-   printError( i18n( "Unexpected token '%1'." ).tqarg( str ) );
+   printError( i18n( "Unexpected token '%1'." ).arg( str ) );
 }
 
 void PMParser::printInfo( const TQString& msg )
@@ -254,8 +254,8 @@ bool PMParser::insertChild( PMObject* child, PMObject* parent )
       else
       {
          printError( i18n( "Can't insert %1 into %2." )
-                     .tqarg( child->description( ) )
-                     .tqarg( parent->description( ) ) );
+                     .arg( child->description( ) )
+                     .arg( parent->description( ) ) );
       }
    }
    else
@@ -270,8 +270,8 @@ bool PMParser::insertChild( PMObject* child, PMObject* parent )
          else
          {
             printError( i18n( "Can't insert %1 into %2." )
-                        .tqarg( child->description( ) )
-                        .tqarg( m_pTopParent->description( ) ) );
+                        .arg( child->description( ) )
+                        .arg( m_pTopParent->description( ) ) );
          }
       }
       else
@@ -379,9 +379,9 @@ PMDeclare* PMParser::checkLink( const TQString& id )
       s = t->find( id );
    
    if( !s )
-      printError( i18n( "Undefined object \"%1\"." ).tqarg( id ) );
+      printError( i18n( "Undefined object \"%1\"." ).arg( id ) );
    else if( s->type( ) != PMSymbol::Object )
-      printError( i18n( "Undefined object \"%1\"." ).tqarg( id ) );
+      printError( i18n( "Undefined object \"%1\"." ).arg( id ) );
    else
    {
       // the object is declared
@@ -409,7 +409,7 @@ PMDeclare* PMParser::checkLink( const TQString& id )
 
       if( !ok )
          printError( i18n( "Object \"%1\" is undefined at that point." )
-                     .tqarg( id ) );
+                     .arg( id ) );
    }
 
    if( ok )
diff --git a/kpovmodeler/pmparser.h b/kpovmodeler/pmparser.h
index 07a28ab6..6d75abe6 100644
--- a/kpovmodeler/pmparser.h
+++ b/kpovmodeler/pmparser.h
@@ -82,7 +82,7 @@ public:
     * Appends all parsed objects to the list.
     *
     * parent is the object where the parsed objects will be inserted as
-    * tqchildren behind the object after. These parameters are used to check
+    * children behind the object after. These parameters are used to check
     * the consistency of declares and links.
     *
     * Set parent and after to 0 if and only if a document is parsed/opened.
@@ -218,7 +218,7 @@ protected:
    PMPart* m_pPart;
    /**
     * parent object where the parsed top level objects
-    * will be inserted _later_ (not from the parser) as tqchildren
+    * will be inserted _later_ (not from the parser) as children
     */
    const PMObject* m_pTopParent;
    const PMObject* m_pAfter;
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index b9105b29..7409079a 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -20,9 +20,9 @@
 #include <tqapplication.h>
 #include <tqdir.h>
 #include <tqstrlist.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqmessagebox.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
@@ -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 );
@@ -1050,7 +1050,7 @@ bool PMPart::setActiveObject( const TQString& name )
          else
             objIndex = 0;
 
-         // Iterate the tqchildren for this element. We stop when there are no more siblings
+         // Iterate the children for this element. We stop when there are no more siblings
          // or the object is of the correct type and it's index count is also correct
          siblingIndex = 0;
          tmpSibling = tmpObj->firstChild( );
@@ -1373,10 +1373,10 @@ void PMPart::slotFileImport( )
          if( newParser )
          {
             if( m_pActiveObject )
-               insertFromParser( i18n( "Import %1" ).tqarg( selectedFormat->description( ) ),
+               insertFromParser( i18n( "Import %1" ).arg( selectedFormat->description( ) ),
                                  newParser, m_pActiveObject );
             else
-               insertFromParser( i18n( "Import %1" ).tqarg( selectedFormat->description( ) ),
+               insertFromParser( i18n( "Import %1" ).arg( selectedFormat->description( ) ),
                                  newParser, m_pScene );
             delete newParser;
          }
@@ -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/pmpattern.cpp b/kpovmodeler/pmpattern.cpp
index 95a975fc..2d60e9ce 100644
--- a/kpovmodeler/pmpattern.cpp
+++ b/kpovmodeler/pmpattern.cpp
@@ -453,11 +453,11 @@ void PMPattern::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMPattern::tqmetaObject( ) const
+PMMetaObject* PMPattern::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Pattern", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Pattern", Base::metaObject( ),
                                         createNewPattern );
       s_pMetaObject->addProperty(
          new PMPatternProperty( "agateTurbulence", &PMPattern::setAgateTurbulence, &PMPattern::agateTurbulence ) );
diff --git a/kpovmodeler/pmpattern.h b/kpovmodeler/pmpattern.h
index ff184e15..7dcf9cff 100644
--- a/kpovmodeler/pmpattern.h
+++ b/kpovmodeler/pmpattern.h
@@ -76,7 +76,7 @@ public:
    virtual TQString pixmap( ) const { return TQString( "pmpattern" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp
index c8d815a8..54630c83 100644
--- a/kpovmodeler/pmpatternedit.cpp
+++ b/kpovmodeler/pmpatternedit.cpp
@@ -25,7 +25,7 @@
 #include "pmvector.h"
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -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/pmphotons.cpp b/kpovmodeler/pmphotons.cpp
index 8a904f86..cce7665b 100644
--- a/kpovmodeler/pmphotons.cpp
+++ b/kpovmodeler/pmphotons.cpp
@@ -60,11 +60,11 @@ PMPhotons::~PMPhotons( )
 {
 }
 
-PMMetaObject* PMPhotons::tqmetaObject( ) const
+PMMetaObject* PMPhotons::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Photons", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Photons", Base::metaObject( ),
                                        createNewPhotons );
 
       s_pMetaObject->addProperty( new PMPhotonsProperty( "target",
diff --git a/kpovmodeler/pmphotons.h b/kpovmodeler/pmphotons.h
index 34ecf25a..a28041f5 100644
--- a/kpovmodeler/pmphotons.h
+++ b/kpovmodeler/pmphotons.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmphotonsedit.cpp b/kpovmodeler/pmphotonsedit.cpp
index a2fde9a2..a0dd8d9a 100644
--- a/kpovmodeler/pmphotonsedit.cpp
+++ b/kpovmodeler/pmphotonsedit.cpp
@@ -20,7 +20,7 @@
 #include "pmphotons.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
diff --git a/kpovmodeler/pmpigment.cpp b/kpovmodeler/pmpigment.cpp
index d6f611b3..be37cfb1 100644
--- a/kpovmodeler/pmpigment.cpp
+++ b/kpovmodeler/pmpigment.cpp
@@ -45,11 +45,11 @@ PMPigment::~PMPigment( )
 {
 }
 
-PMMetaObject* PMPigment::tqmetaObject( ) const
+PMMetaObject* PMPigment::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Pigment", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Pigment", Base::metaObject( ),
                                         createNewPigment );
       s_pMetaObject->addProperty(
          new PMPigmentProperty( "uvMapping", &PMPigment::setUVMapping, &PMPigment::uvMapping ) );
diff --git a/kpovmodeler/pmpigment.h b/kpovmodeler/pmpigment.h
index 3f88d3ad..b520ad27 100644
--- a/kpovmodeler/pmpigment.h
+++ b/kpovmodeler/pmpigment.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmpigmentedit.cpp b/kpovmodeler/pmpigmentedit.cpp
index 16bfab2c..5b28d545 100644
--- a/kpovmodeler/pmpigmentedit.cpp
+++ b/kpovmodeler/pmpigmentedit.cpp
@@ -20,7 +20,7 @@
 #include "pmpigment.h"
 #include "pmlinkedit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmplane.cpp b/kpovmodeler/pmplane.cpp
index 12574211..db7af35a 100644
--- a/kpovmodeler/pmplane.cpp
+++ b/kpovmodeler/pmplane.cpp
@@ -82,11 +82,11 @@ void PMPlane::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMPlane::tqmetaObject( ) const
+PMMetaObject* PMPlane::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Plane", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Plane", Base::metaObject( ),
                                         createNewPlane );
       s_pMetaObject->addProperty(
          new PMPlaneProperty( "normal", &PMPlane::setNormal, &PMPlane::normal ) );
diff --git a/kpovmodeler/pmplane.h b/kpovmodeler/pmplane.h
index 52fb9d4c..d5321dd8 100644
--- a/kpovmodeler/pmplane.h
+++ b/kpovmodeler/pmplane.h
@@ -57,7 +57,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmplaneedit.cpp b/kpovmodeler/pmplaneedit.cpp
index 5f90b008..ca0620dd 100644
--- a/kpovmodeler/pmplaneedit.cpp
+++ b/kpovmodeler/pmplaneedit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
@@ -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 f53f9f96..30ffa055 100644
--- a/kpovmodeler/pmpluginsettings.cpp
+++ b/kpovmodeler/pmpluginsettings.cpp
@@ -19,7 +19,7 @@
 
 #include "pmpluginmanager.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
@@ -33,14 +33,14 @@ public:
    {
       m_info = info;
       m_enabled = info->enabled( );
-      settqStatus( );
+      setStatus( );
    }
-   void toggletqStatus( )
+   void toggleStatus( )
    {
       m_enabled = !m_enabled;
-      settqStatus( );
+      setStatus( );
    }
-   void settqStatus( )
+   void setStatus( )
    {
       if( m_enabled )
          setText( 2, i18n( "loaded" ) );
@@ -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( )
@@ -122,7 +122,7 @@ void PMPluginSettings::slotToggle( )
       ( PMPluginListViewItem* ) m_pPluginsList->currentItem( );
    if( item )
    {
-      item->toggletqStatus( );
+      item->toggleStatus( );
    
       if( item->m_enabled )
          m_pToggle->setText( i18n( "Deactivate" ) );
diff --git a/kpovmodeler/pmpolynom.cpp b/kpovmodeler/pmpolynom.cpp
index b9d75a13..e44044c5 100644
--- a/kpovmodeler/pmpolynom.cpp
+++ b/kpovmodeler/pmpolynom.cpp
@@ -130,11 +130,11 @@ void PMPolynom::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMPolynom::tqmetaObject( ) const
+PMMetaObject* PMPolynom::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Polynom", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Polynom", Base::metaObject( ),
                                         createNewPolynom );
       s_pMetaObject->addProperty(
          new PMPolynomProperty( "polynomOrder", &PMPolynom::setPolynomOrder,
diff --git a/kpovmodeler/pmpolynom.h b/kpovmodeler/pmpolynom.h
index dc2e9c21..65a9ad20 100644
--- a/kpovmodeler/pmpolynom.h
+++ b/kpovmodeler/pmpolynom.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmpolynomedit.cpp b/kpovmodeler/pmpolynomedit.cpp
index ec3176d0..54a8cf16 100644
--- a/kpovmodeler/pmpolynomedit.cpp
+++ b/kpovmodeler/pmpolynomedit.cpp
@@ -22,7 +22,7 @@
 #include "pmlineedits.h"
 #include "pmformulalabel.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 #include <tqlabel.h>
@@ -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/pmpovray31serialization.cpp b/kpovmodeler/pmpovray31serialization.cpp
index 543fec5b..d153261d 100644
--- a/kpovmodeler/pmpovray31serialization.cpp
+++ b/kpovmodeler/pmpovray31serialization.cpp
@@ -21,7 +21,7 @@
 
 const double c_defaultPatchFlatness = 0;
 
-void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBicubicPatch* o = ( PMBicubicPatch* ) object;
 
@@ -53,7 +53,7 @@ void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaO
       dev->writeLine( line );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -102,16 +102,16 @@ void PMPov31SerBlendMapModifiers( const PMObject* object, const PMMetaObject*, P
    }
 }
 
-void PMPov31SerBlob( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBlob( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBlob* o = ( PMBlob* ) object;
 
    dev->objectBegin( "blob" );
 
    dev->writeName( object->name( ) );
-   dev->writeLine( TQString( "threshold %1" ).tqarg( o->threshold( ) ) );
+   dev->writeLine( TQString( "threshold %1" ).arg( o->threshold( ) ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->sturm( ) )
       dev->writeLine( "sturm" );
@@ -121,7 +121,7 @@ void PMPov31SerBlob( const PMObject* object, const PMMetaObject* tqmetaObject, P
    dev->objectEnd( );
 }
 
-void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBlobCylinder* o = ( PMBlobCylinder* ) object;
 
@@ -132,36 +132,36 @@ void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* tqmetaO
    str1.setNum( o->radius( ) );
    dev->writeLine( o->end1( ).serialize( ) + ", " + o->end2( ).serialize( )
                   + ", " + str1 + "," );
-   dev->writeLine( TQString( "strength %1" ).tqarg( o->strength( ) ) );
+   dev->writeLine( TQString( "strength %1" ).arg( o->strength( ) ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBlobSphere* o = ( PMBlobSphere* ) object;
 
    dev->objectBegin( "sphere" );
    dev->writeName( object->name( ) );
-   dev->writeLine( o->centre( ).serialize( ) + TQString( ", %1," ).tqarg( o->radius( ) ) );
-   dev->writeLine( TQString( "strength %1" ).tqarg( o->strength( ) ) );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->writeLine( o->centre( ).serialize( ) + TQString( ", %1," ).arg( o->radius( ) ) );
+   dev->writeLine( TQString( "strength %1" ).arg( o->strength( ) ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBoundedBy* o = ( PMBoundedBy* ) object;
 
    dev->objectBegin( "bounded_by" );
    if( o->clippedBy( ) )
       dev->writeLine( "clipped_by" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerBox( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBox( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBox* o = ( PMBox* ) object;
 
@@ -170,7 +170,7 @@ void PMPov31SerBox( const PMObject* object, const PMMetaObject* tqmetaObject, PM
    dev->writeName( object->name( ) );
    dev->writeLine( o->corner1( ).serialize( ) + ", " + o->corner2( ).serialize( ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -257,7 +257,7 @@ void PMPov31SerBumpMap( const PMObject* object, const PMMetaObject*, PMOutputDev
    dev->objectEnd( );
 }
 
-void PMPov31SerCamera( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerCamera( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMCamera* o = ( PMCamera* ) object;
 
@@ -301,18 +301,18 @@ void PMPov31SerCamera( const PMObject* object, const PMMetaObject* tqmetaObject,
       dev->writeLine( "variance " + str );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMClippedBy* o = ( PMClippedBy* ) object;
 
    dev->objectBegin( "clipped_by" );
    if( o->boundedBy( ) )
       dev->writeLine( "bounded_by" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -334,7 +334,7 @@ void PMPov31SerCompositeObject( const PMObject* object, const PMMetaObject*, PMO
          dev->serialize( tmp );
 }
 
-void PMPov31SerCone( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerCone( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMCone* o = ( PMCone* ) object;
 
@@ -349,11 +349,11 @@ void PMPov31SerCone( const PMObject* object, const PMMetaObject* tqmetaObject, P
    if( o->open( ) )
       dev->writeLine( TQString( "open" ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerCSG( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerCSG( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMCSG* o = ( PMCSG* ) object;
 
@@ -374,11 +374,11 @@ void PMPov31SerCSG( const PMObject* object, const PMMetaObject* tqmetaObject, PM
    }
 
    dev->writeName( object->name( ) );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMCylinder* o = ( PMCylinder* ) object;
 
@@ -392,22 +392,22 @@ void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* tqmetaObjec
    if( o->open( ) )
       dev->writeLine( TQString( "open" ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMDeclare* o = ( PMDeclare* ) object;
 
    if( o->firstChild( ) )
    {
       dev->declareBegin( o->id( ) );
-      dev->callSerialization( object, tqmetaObject->superClass( ) );
+      dev->callSerialization( object, metaObject->superClass( ) );
    }
 }
 
-void PMPov31SerDensity( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDensity( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    bool bObject = true;
    if( object->parent( ) )
@@ -416,12 +416,12 @@ void PMPov31SerDensity( const PMObject* object, const PMMetaObject* tqmetaObject
 
    if( bObject )
       dev->objectBegin( "density" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( bObject )
       dev->objectEnd( );
 }
 
-void PMPov31SerDisc( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDisc( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMDisc* o = ( PMDisc* ) object;
 
@@ -439,11 +439,11 @@ void PMPov31SerDisc( const PMObject* object, const PMMetaObject* tqmetaObject, P
    {
       dev->writeLine( o->center( ).serialize( ) + ","  + o->normal( ).serialize( ) + ", "  + str1 );
    }
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMFinish* o = ( PMFinish* ) object;
 
@@ -451,7 +451,7 @@ void PMPov31SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject,
 
    dev->objectBegin( "finish" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isAmbientEnabled( ) )
       dev->writeLine( "ambient " + o->ambientColor( ).serialize( ) );
@@ -544,7 +544,7 @@ void PMPov31SerFog( const PMObject* object, const PMMetaObject*, PMOutputDevice*
          if( text.isEmpty( ) )
             text = o->description( );
 
-         dev->writeComment( TQString( "No prototype for %1" ).tqarg( text ) );
+         dev->writeComment( TQString( "No prototype for %1" ).arg( text ) );
       }
    }
 
@@ -587,8 +587,8 @@ void PMPov31SerFog( const PMObject* object, const PMMetaObject*, PMOutputDevice*
       dev->writeLine( "fog_alt " + str );
       dev->writeLine( "up " + o->up( ).serialize( ) );
    }
-   // Serialize the tqchildren of this object
-   dev->callSerialization( object, object->tqmetaObject( )->superClass( )->superClass( ) );
+   // Serialize the children of this object
+   dev->callSerialization( object, object->metaObject( )->superClass( )->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -708,16 +708,16 @@ void PMPov31SerGlobalSettings( const PMObject* object, const PMMetaObject*, PMOu
    dev->objectEnd( );
 }
 
-void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMGraphicalObject* o = ( PMGraphicalObject* ) object;
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( o->noShadow( ) )
       dev->writeLine( "no_shadow" );
 }
 
-void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMHeightField* o = ( PMHeightField* ) object;
 
@@ -727,13 +727,13 @@ void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* tqmetaOb
 
    dev->writeLine( o->typeToString( o->heightFieldType( ) ) + " \"" + o->fileName( ) + "\"" );
    if( o->waterLevel( ) > 0.0 )
-      dev->writeLine( TQString( "water_level %1" ).tqarg( o->waterLevel( ) ) );
+      dev->writeLine( TQString( "water_level %1" ).arg( o->waterLevel( ) ) );
    if( !o->hierarchy( ) )
       dev->writeLine( "hierarchy off" );
    if( o->smooth( ) )
       dev->writeLine( "smooth" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -842,14 +842,14 @@ void PMPov31SerImageMap( const PMObject* object, const PMMetaObject*, PMOutputDe
    dev->objectEnd( );
 }
 
-void PMPov31SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMInterior* o = ( PMInterior* ) object;
 
    TQString str1;
 
    dev->objectBegin( "interior" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isIorEnabled( ) )
    {
@@ -874,7 +874,7 @@ void PMPov31SerInterior( const PMObject* object, const PMMetaObject* tqmetaObjec
    dev->objectEnd( );
 }
 
-void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMJuliaFractal* o = ( PMJuliaFractal* ) object;
 
@@ -885,22 +885,22 @@ void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* tqmetaO
    dev->writeLine( o->algebraTypeToString( o->algebraType( ) ) );
 
    if( o->functionType( ) == PMJuliaFractal::FTpwr )
-      dev->writeLine( TQString( "pwr(%1, %2)" ).tqarg( o->exponent( )[0] ).
+      dev->writeLine( TQString( "pwr(%1, %2)" ).arg( o->exponent( )[0] ).
                      arg( o->exponent( )[1] ) );
    else
       dev->writeLine( o->functionTypeToString( o->functionType( ) ) );
 
-   dev->writeLine( TQString( "max_iteration %1" ).tqarg( o->maximumIterations( ) ) );
-   dev->writeLine( TQString( "precision %1" ).tqarg( o->precision( ) ) );
-   dev->writeLine( TQString( "slice %1, %2" ).tqarg( o->sliceNormal( ).serialize( ) )
-                  .tqarg( o->sliceDistance( ) ) );
+   dev->writeLine( TQString( "max_iteration %1" ).arg( o->maximumIterations( ) ) );
+   dev->writeLine( TQString( "precision %1" ).arg( o->precision( ) ) );
+   dev->writeLine( TQString( "slice %1, %2" ).arg( o->sliceNormal( ).serialize( ) )
+                  .arg( o->sliceDistance( ) ) );
 
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerLathe( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerLathe( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMLathe* o = ( PMLathe* ) object;
 
@@ -925,7 +925,7 @@ void PMPov31SerLathe( const PMObject* object, const PMMetaObject* tqmetaObject,
    }
 
    int num = o->points( ).count( );
-   dev->writeLine( TQString( "%1," ).tqarg( num ) );
+   dev->writeLine( TQString( "%1," ).arg( num ) );
 
    bool first = true;
    TQValueList<PMVector> points = o->points( );
@@ -942,14 +942,14 @@ void PMPov31SerLathe( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( o->sturm( ) )
       dev->writeLine( "sturm" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
 const double c_defaultLightTightness = 10;
 const int c_defaultLightAdaptive = 0;
 
-void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMLight* o = ( PMLight* ) object;
 
@@ -968,10 +968,10 @@ void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( ( o->lightType( ) == PMLight::SpotLight ) ||
        ( o->lightType( ) == PMLight::CylinderLight ) )
    {
-      dev->writeLine( TQString( "radius %1" ).tqarg( o->radius( ) ) );
-      dev->writeLine( TQString( "falloff %1" ).tqarg( o->falloff( ) ) );
+      dev->writeLine( TQString( "radius %1" ).arg( o->radius( ) ) );
+      dev->writeLine( TQString( "falloff %1" ).arg( o->falloff( ) ) );
       if( o->tightness( ) != c_defaultLightTightness )
-         dev->writeLine( TQString( "tightness %1" ).tqarg( o->tightness( ) ) );
+         dev->writeLine( TQString( "tightness %1" ).arg( o->tightness( ) ) );
       dev->writeLine( TQString( "point_at " ) + o->pointAt( ).serialize( ) );
    }
 
@@ -979,17 +979,17 @@ void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject,
    {
       dev->writeLine( TQString( "area_light " ) + o->axis1( ).serialize( )
                      + TQString( ", " ) + o->axis2( ).serialize( )
-                     + TQString( ", %1, %2" ).tqarg( o->size1( ) ).tqarg( o->size2( ) ) );
+                     + TQString( ", %1, %2" ).arg( o->size1( ) ).arg( o->size2( ) ) );
       if( o->adaptive( ) != c_defaultLightAdaptive )
-         dev->writeLine( TQString( "adaptive %1" ).tqarg( o->adaptive( ) ) );
+         dev->writeLine( TQString( "adaptive %1" ).arg( o->adaptive( ) ) );
       if( o->jitter( ) )
          dev->writeLine( TQString( "jitter" ) );
    }
 
    if( o->fading( ) )
    {
-      dev->writeLine( TQString( "fade_distance %1" ).tqarg( o->fadeDistance( ) ) );
-      dev->writeLine( TQString( "fade_power %1" ).tqarg( o->fadePower( ) ) );
+      dev->writeLine( TQString( "fade_distance %1" ).arg( o->fadeDistance( ) ) );
+      dev->writeLine( TQString( "fade_power %1" ).arg( o->fadePower( ) ) );
    }
 
    if( !o->mediaInteraction( ) )
@@ -997,11 +997,11 @@ void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( !o->mediaAttenuation( ) )
       dev->writeLine( TQString( "media_attenuation off" ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMListPattern* o = ( PMListPattern* ) object;
 
@@ -1020,7 +1020,7 @@ void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaOb
          break;
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->listType( ) == PMListPattern::ListPatternBrick )
    {
@@ -1031,24 +1031,24 @@ void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaOb
    }
 }
 
-void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
-void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
-void PMPov31SerColorList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerColorList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
-void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
 void PMPov31SerNormalList( const PMObject* object, const PMMetaObject*, PMOutputDevice* dev )
@@ -1083,22 +1083,22 @@ void PMPov31SerNormalList( const PMObject* object, const PMMetaObject*, PMOutput
    }
 }
 
-void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "looks_like" );
    dev->writeName( object->name( ) );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "material" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMMaterialMap* o = ( PMMaterialMap* ) object;
 
@@ -1169,7 +1169,7 @@ void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* tqmetaOb
          break;
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    dev->objectEnd( );
 }
@@ -1183,7 +1183,7 @@ const double c_defaultMediaRatio = 0.9;
 const double c_defaultMediaScatteringEccentricity = 0;
 const double c_defaultMediaScatteringExtinction = 1.0;
 
-void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMMedia* o = ( PMMedia* ) object;
 
@@ -1191,7 +1191,7 @@ void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject,
    TQString str2;
 
    dev->objectBegin( "media" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( o->intervals( ) != c_defaultMediaIntervals )
    {
       str1.setNum( o->intervals( ) );
@@ -1248,12 +1248,12 @@ void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject,
    dev->objectEnd( );
 }
 
-void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
-void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMNormal* o = ( PMNormal* ) object;
 
@@ -1266,7 +1266,7 @@ void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject,
 
    if( bObject )
       dev->objectBegin( "normal" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( o->isBumpSizeEnabled( ) )
    {
       str1.setNum( o->bumpSize( ) );
@@ -1276,7 +1276,7 @@ void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject,
       dev->objectEnd( );
 }
 
-void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMObjectLink* o = ( PMObjectLink* ) object;
 
@@ -1289,7 +1289,7 @@ void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* tqmetaObj
 
          dev->writeName( object->name( ) );
          dev->writeLine( o->linkedObject( )->id( ) );
-         dev->callSerialization( object, tqmetaObject->superClass( ) );
+         dev->callSerialization( object, metaObject->superClass( ) );
          writeComment = false;
 
          dev->objectEnd( );
@@ -1302,7 +1302,7 @@ void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* tqmetaObj
       if( text.isEmpty( ) )
          text = o->description( );
 
-      dev->writeComment( TQString( "No prototype for %1" ).tqarg( text ) );
+      dev->writeComment( TQString( "No prototype for %1" ).arg( text ) );
    }
 }
 
@@ -1453,7 +1453,7 @@ void PMPov31SerPattern( const PMObject* object, const PMMetaObject*, PMOutputDev
    }
 }
 
-void PMPov31SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMPigment* o = ( PMPigment* ) object;
 
@@ -1464,12 +1464,12 @@ void PMPov31SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject
 
    if( bObject )
       dev->objectBegin( "pigment" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( bObject )
       dev->objectEnd( );
 }
 
-void PMPov31SerPlane( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPlane( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMPlane* o = ( PMPlane* ) object;
 
@@ -1479,11 +1479,11 @@ void PMPov31SerPlane( const PMObject* object, const PMMetaObject* tqmetaObject,
    TQString str1;
    str1.setNum( o->distance( ) );
    dev->writeLine( o->normal( ).serialize( ) + ", "  + str1 );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMPolynom* o = ( PMPolynom* ) object;
    PMVector coefficients = o->coefficients( );
@@ -1501,18 +1501,18 @@ void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* tqmetaObject
 
    if( o->polynomOrder( ) == 2 )
    {
-      dev->writeLine( TQString( "<%1, %2, %3>," ).tqarg( coefficients[0] )
-                     .tqarg( coefficients[4] ).tqarg( coefficients[7] ) );
-      dev->writeLine( TQString( "<%1, %2, %3>," ).tqarg( coefficients[1] )
-                     .tqarg( coefficients[2] ).tqarg( coefficients[5] ) );
-      dev->writeLine( TQString( "<%1, %2, %3>, %4" ).tqarg( coefficients[3] )
-                     .tqarg( coefficients[6] ).tqarg( coefficients[8] )
-                     .tqarg( coefficients[9] ) );
+      dev->writeLine( TQString( "<%1, %2, %3>," ).arg( coefficients[0] )
+                     .arg( coefficients[4] ).arg( coefficients[7] ) );
+      dev->writeLine( TQString( "<%1, %2, %3>," ).arg( coefficients[1] )
+                     .arg( coefficients[2] ).arg( coefficients[5] ) );
+      dev->writeLine( TQString( "<%1, %2, %3>, %4" ).arg( coefficients[3] )
+                     .arg( coefficients[6] ).arg( coefficients[8] )
+                     .arg( coefficients[9] ) );
    }
    else
    {
       if( o->polynomOrder( ) > 4 )
-         dev->writeLine( TQString( "%1," ).tqarg( o->polynomOrder( ) ) );
+         dev->writeLine( TQString( "%1," ).arg( o->polynomOrder( ) ) );
 
       int size = coefficients.size( );
 
@@ -1537,7 +1537,7 @@ void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* tqmetaObject
          dev->writeLine( "sturm" );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -1545,17 +1545,17 @@ void PMPov31SerPovrayMatrix( const PMObject* object, const PMMetaObject*, PMOutp
 {
    PMPovrayMatrix* o = ( PMPovrayMatrix* ) object;
 
-   dev->writeLine( TQString( "matrix < %1, %2, %3," ).tqarg( o->values( )[0] )
-                  .tqarg( o->values( )[1] ).tqarg( o->values( )[2] ) );
-   dev->writeLine( TQString( "         %1, %2, %3," ).tqarg( o->values( )[3] )
-                  .tqarg( o->values( )[4] ).tqarg( o->values( )[5] ) );
-   dev->writeLine( TQString( "         %1, %2, %3," ).tqarg( o->values( )[6] )
-                  .tqarg( o->values( )[7] ).tqarg( o->values( )[8] ) );
-   dev->writeLine( TQString( "         %1, %2, %3 >" ).tqarg( o->values( )[9] )
-                  .tqarg( o->values( )[10] ).tqarg( o->values( )[11] ) );
+   dev->writeLine( TQString( "matrix < %1, %2, %3," ).arg( o->values( )[0] )
+                  .arg( o->values( )[1] ).arg( o->values( )[2] ) );
+   dev->writeLine( TQString( "         %1, %2, %3," ).arg( o->values( )[3] )
+                  .arg( o->values( )[4] ).arg( o->values( )[5] ) );
+   dev->writeLine( TQString( "         %1, %2, %3," ).arg( o->values( )[6] )
+                  .arg( o->values( )[7] ).arg( o->values( )[8] ) );
+   dev->writeLine( TQString( "         %1, %2, %3 >" ).arg( o->values( )[9] )
+                  .arg( o->values( )[10] ).arg( o->values( )[11] ) );
 }
 
-void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPrism( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMPrism* o = ( PMPrism* ) object;
 
@@ -1587,7 +1587,7 @@ void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject,
          dev->writeLine( "conic_sweep" );
          break;
    }
-   dev->writeLine( TQString( "%1, %2," ).tqarg( o->height1( ) ).tqarg( o->height2( ) ) );
+   dev->writeLine( TQString( "%1, %2," ).arg( o->height1( ) ).arg( o->height2( ) ) );
 
    // count number of points
    TQValueList< TQValueList<PMVector> > points = o->points( );
@@ -1600,7 +1600,7 @@ void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject,
       else
          lines += ( *spit ).count( ) / 3 * 4;
    }
-   dev->writeLine( TQString( "%1," ).tqarg( lines ) );
+   dev->writeLine( TQString( "%1," ).arg( lines ) );
 
    for( spit = points.begin( ); spit != points.end( ); ++spit )
    {
@@ -1628,7 +1628,7 @@ void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( o->sturm( ) )
       dev->writeLine( "sturm" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -1639,14 +1639,14 @@ void PMPov31SerQuickColor( const PMObject* object, const PMMetaObject*, PMOutput
    dev->writeLine( "quick_color " + o->color( ).serialize( ) );
 }
 
-void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMRainbow* o = ( PMRainbow* ) object;
 
    TQString str1;
 
    dev->objectBegin( "rainbow" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isDirectionEnabled( ) )
       dev->writeLine( "direction " + o->direction( ).serialize( ) );
@@ -1756,20 +1756,20 @@ void PMPov31SerScale( const PMObject* object, const PMMetaObject* , PMOutputDevi
 
    if( approx( scale[0], scale[1] ) &&
        approx( scale[1], scale[2] ) )
-      dev->writeLine( TQString( "scale %1" ).tqarg( scale[0] ) );
+      dev->writeLine( TQString( "scale %1" ).arg( scale[0] ) );
    else
       dev->writeLine( "scale " + scale.serialize( ) );
 }
 
-void PMPov31SerScene( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerScene( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
-void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "sky_sphere" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -1792,11 +1792,11 @@ void PMPov31SerSolidColor( const PMObject* object, const PMMetaObject* , PMOutpu
    dev->writeLine( o->color( ).serialize( true ) );
 }
 
-void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMSolidObject* o = ( PMSolidObject* ) object;
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    switch( o->hollow( ) )
    {
       case PMTrue:
@@ -1812,7 +1812,7 @@ void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* tqmetaOb
       dev->writeLine( "inverse" );
 }
 
-void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMSurfaceOfRevolution* o = ( PMSurfaceOfRevolution* ) object;
 
@@ -1821,7 +1821,7 @@ void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject*
    dev->writeName( object->name( ) );
 
    int num = o->points( ).count( );
-   dev->writeLine( TQString( "%1," ).tqarg( num ) );
+   dev->writeLine( TQString( "%1," ).arg( num ) );
 
    bool first = true;
    TQValueList<PMVector> points = o->points( );
@@ -1840,11 +1840,11 @@ void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject*
    if( o->sturm( ) )
       dev->writeLine( "sturm" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMSphere* o = ( PMSphere* ) object;
 
@@ -1853,25 +1853,25 @@ void PMPov31SerSphere( const PMObject* object, const PMMetaObject* tqmetaObject,
    TQString str;
    str.setNum( o->radius( ) );
    dev->writeLine( o->centre( ).serialize( ) + ", " + str );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMSuperquadricEllipsoid* o = ( PMSuperquadricEllipsoid* ) object;
 
    dev->objectBegin( "superellipsoid" );
 
    dev->writeName( object->name( ) );
-   dev->writeLine( TQString( "<%1, %2>" ).tqarg( o->eastWestExponent( ) )
-                  .tqarg( o->northSouthExponent( ) ) );
+   dev->writeLine( TQString( "<%1, %2>" ).arg( o->eastWestExponent( ) )
+                  .arg( o->northSouthExponent( ) ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerText( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerText( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMText* o = ( PMText* ) object;
 
@@ -1880,14 +1880,14 @@ void PMPov31SerText( const PMObject* object, const PMMetaObject* tqmetaObject, P
    dev->writeName( object->name( ) );
    dev->writeLine( TQString( "ttf \"" ) + o->font( ) + "\"" );
    dev->writeLine( PMOutputDevice::escapeAndQuoteString( o->text( ) ) );
-   dev->writeLine( TQString( "%1, " ).tqarg( o->thickness( ) )
+   dev->writeLine( TQString( "%1, " ).arg( o->thickness( ) )
                   + o->offset( ).serialize( ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTexture* o = ( PMTexture* ) object;
 
@@ -1898,12 +1898,12 @@ void PMPov31SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject
 
    if( bObject )
       dev->objectBegin( "texture" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( bObject )
       dev->objectEnd( );
 }
 
-void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTextureBase* o = ( PMTextureBase* ) object;
 
@@ -1922,11 +1922,11 @@ void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* tqmetaOb
          if( text.isEmpty( ) )
             text = o->description( );
 
-         dev->writeComment( TQString( "No prototype for %1" ).tqarg( text ) );
+         dev->writeComment( TQString( "No prototype for %1" ).arg( text ) );
       }
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
 void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* , PMOutputDevice* dev )
@@ -1950,7 +1950,7 @@ void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* , PMO
          if( text.isEmpty( ) )
             text = o->description( );
 
-         dev->writeComment( TQString( "No prototype for %1" ).tqarg( text ) );
+         dev->writeComment( TQString( "No prototype for %1" ).arg( text ) );
       }
    }
 
@@ -1962,7 +1962,7 @@ void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* , PMO
          value = 1.0;
          if( it != mapValues.end( ) )
             value = *it;
-         dev->write( TQString( "[ %1 " ).tqarg( value ) );
+         dev->write( TQString( "[ %1 " ).arg( value ) );
          dev->serialize( c );
          dev->writeLine( "]" );
          ++it;
@@ -1970,49 +1970,49 @@ void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* , PMO
    }
 }
 
-void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "texture_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "pigment_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "color_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "normal_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "slope_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "density_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerTorus( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTorus( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTorus* o = ( PMTorus* ) object;
 
@@ -2027,7 +2027,7 @@ void PMPov31SerTorus( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( o->sturm( ) )
       dev->writeLine( TQString( "sturm" ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -2081,7 +2081,7 @@ void PMPov31SerTranslate( const PMObject* object, const PMMetaObject* , PMOutput
    dev->writeLine( "translate " + vector );
 }
 
-void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTriangle* o = ( PMTriangle* ) object;
 
@@ -2094,7 +2094,7 @@ void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObjec
       dev->writeLine( o->point( 1 ).serialize( ) + ", " + o->normal( 1 ).serialize( ) + "," );
       dev->writeLine( o->point( 2 ).serialize( ) + ", " + o->normal( 2 ).serialize( ) );
 
-      dev->callSerialization( object, tqmetaObject->superClass( ) );
+      dev->callSerialization( object, metaObject->superClass( ) );
       dev->objectEnd( );
    }
    else
@@ -2105,7 +2105,7 @@ void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObjec
       dev->writeLine( o->point( 0 ).serialize( ) + ", " + o->point( 1 ).serialize( )
                      + ", " + o->point( 2 ).serialize( ) );
 
-      dev->callSerialization( object, tqmetaObject->superClass( ) );
+      dev->callSerialization( object, metaObject->superClass( ) );
       dev->objectEnd( );
    }
 }
@@ -2193,7 +2193,7 @@ void PMPov31SerWarp( const PMObject* object, const PMMetaObject* , PMOutputDevic
    dev->objectEnd( );
 }
 
-void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
diff --git a/kpovmodeler/pmpovray31serialization.h b/kpovmodeler/pmpovray31serialization.h
index 397ae9e9..5c48c0cd 100644
--- a/kpovmodeler/pmpovray31serialization.h
+++ b/kpovmodeler/pmpovray31serialization.h
@@ -24,80 +24,80 @@ class PMOutputDevice;
 
 // serialization methods for POV-Ray 3.1
 
-void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBlendMapModifiers( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBlob( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBox( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBumpMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerCamera( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerComment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerCompositeObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerCone( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerCSG( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDensity( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDisc( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerFog( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerImageMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerLathe( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerColorList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerNormalList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPlane( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPovrayMatrix( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerQuickColor( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerRaw( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerRotate( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerScale( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerScene( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSlope( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSolidColor( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerText( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTorus( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTranslate( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerWarp( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
+void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBlendMapModifiers( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBlob( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBox( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBumpMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerCamera( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerComment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerCompositeObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerCone( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerCSG( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDensity( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDisc( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerFog( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerGlobalSettings( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerImageMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerLathe( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerColorList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerNormalList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPlane( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPovrayMatrix( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPrism( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerQuickColor( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerRaw( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerRotate( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerScale( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerScene( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSlope( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSolidColor( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerText( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTorus( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTranslate( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerWarp( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
 
 #endif
diff --git a/kpovmodeler/pmpovray35serialization.cpp b/kpovmodeler/pmpovray35serialization.cpp
index a012c646..d567100e 100644
--- a/kpovmodeler/pmpovray35serialization.cpp
+++ b/kpovmodeler/pmpovray35serialization.cpp
@@ -58,7 +58,7 @@ const double c_defaultIsoOpen = false;
 const int c_defaultIsoMaxTrace = 1;
 const bool c_defaultIsoAllIntersections = false;
 
-void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMIsoSurface* o = ( PMIsoSurface* ) object;
    TQString str;
@@ -102,8 +102,8 @@ void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* tqmetaObj
    }
    if( o->evaluate( ) )
    {
-      str = TQString( "%1, %2, %3" ).tqarg( o->evaluateValue( 0 ) )
-            .tqarg( o->evaluateValue( 1 ) ).tqarg( o->evaluateValue( 2 ) );
+      str = TQString( "%1, %2, %3" ).arg( o->evaluateValue( 0 ) )
+            .arg( o->evaluateValue( 1 ) ).arg( o->evaluateValue( 2 ) );
       dev->writeLine( "evaluate " + str );
    }
    if( o->allIntersections( ) )
@@ -116,14 +116,14 @@ void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* tqmetaObj
    if( o->open( ) )
       dev->writeLine( "open" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
 const double c_defaultLightTightness = 10;
 const int c_defaultLightAdaptive = 0;
 
-void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMLight* o = ( PMLight* ) object;
 
@@ -145,10 +145,10 @@ void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( ( o->lightType( ) == PMLight::SpotLight ) ||
        ( o->lightType( ) == PMLight::CylinderLight ) )
    {
-      dev->writeLine( TQString( "radius %1" ).tqarg( o->radius( ) ) );
-      dev->writeLine( TQString( "falloff %1" ).tqarg( o->falloff( ) ) );
+      dev->writeLine( TQString( "radius %1" ).arg( o->radius( ) ) );
+      dev->writeLine( TQString( "falloff %1" ).arg( o->falloff( ) ) );
       if( o->tightness( ) != c_defaultLightTightness )
-         dev->writeLine( TQString( "tightness %1" ).tqarg( o->tightness( ) ) );
+         dev->writeLine( TQString( "tightness %1" ).arg( o->tightness( ) ) );
       dev->writeLine( TQString( "point_at " ) + o->pointAt( ).serialize( ) );
    }
 
@@ -156,9 +156,9 @@ void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject,
    {
       dev->writeLine( TQString( "area_light " ) + o->axis1( ).serialize( )
                      + TQString( ", " ) + o->axis2( ).serialize( )
-                     + TQString( ", %1, %2" ).tqarg( o->size1( ) ).tqarg( o->size2( ) ) );
+                     + TQString( ", %1, %2" ).arg( o->size1( ) ).arg( o->size2( ) ) );
       if( o->adaptive( ) != c_defaultLightAdaptive )
-         dev->writeLine( TQString( "adaptive %1" ).tqarg( o->adaptive( ) ) );
+         dev->writeLine( TQString( "adaptive %1" ).arg( o->adaptive( ) ) );
       if( o->jitter( ) )
          dev->writeLine( TQString( "jitter" ) );
       if ( o->areaType( ) == PMLight::Circular )
@@ -169,8 +169,8 @@ void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject,
 
    if( o->fading( ) )
    {
-      dev->writeLine( TQString( "fade_distance %1" ).tqarg( o->fadeDistance( ) ) );
-      dev->writeLine( TQString( "fade_power %1" ).tqarg( o->fadePower( ) ) );
+      dev->writeLine( TQString( "fade_distance %1" ).arg( o->fadeDistance( ) ) );
+      dev->writeLine( TQString( "fade_power %1" ).arg( o->fadePower( ) ) );
    }
 
    if( !o->mediaInteraction( ) )
@@ -178,15 +178,15 @@ void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( !o->mediaAttenuation( ) )
       dev->writeLine( TQString( "media_attenuation off" ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "projected_through" );
    dev->writeName( object->name( ) );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -209,7 +209,7 @@ const double c_defaultGlobalSettingsMinimumReuse = 0.015;
 const int c_defaultGlobalSettingsNearestCount = 5;
 const int c_defaultGlobalSettingsRecursionLimit = 2;
 
-void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMGlobalSettings* o = ( PMGlobalSettings* ) object;
 
@@ -310,7 +310,7 @@ void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmet
       dev->objectEnd( );
    }
    else
-      dev->callSerialization( object, tqmetaObject->superClass( ) );
+      dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -559,14 +559,14 @@ void PMPov35SerPhotons( const PMObject* object, const PMMetaObject*, PMOutputDev
    dev->objectEnd( );
 }
 
-void PMPov35SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMInterior* o = ( PMInterior* ) object;
 
    TQString str1;
 
    dev->objectBegin( "interior" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isIorEnabled( ) )
    {
@@ -601,14 +601,14 @@ void PMPov35SerInterior( const PMObject* object, const PMMetaObject* tqmetaObjec
    dev->objectEnd( );
 }
 
-void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMLightGroup* o = ( PMLightGroup* ) object;
 
    dev->objectBegin( "light_group" );
 
    dev->writeName( object->name( ) );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if ( o->globalLights( ) )
       dev->writeLine( "global_lights on" );
@@ -887,7 +887,7 @@ void PMPov35SerPattern( const PMObject* object, const PMMetaObject*, PMOutputDev
 
 const double c_defaultNormalAccuracy = 0.02;
 
-void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMNormal* o = ( PMNormal* ) object;
 
@@ -907,7 +907,7 @@ void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject,
          dev->writeLine( "uv_mapping" );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isBumpSizeEnabled( ) )
    {
@@ -925,10 +925,10 @@ void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject,
       dev->objectEnd( );
 }
 
-void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "interior_texture" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -1057,7 +1057,7 @@ void PMPov35SerWarp( const PMObject* object, const PMMetaObject* , PMOutputDevic
 
 const double c_sphereSweepToleranceDefault = 1e-6;
 
-void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMSphereSweep* o = ( PMSphereSweep* ) object;
 
@@ -1099,11 +1099,11 @@ void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* tqmetaOb
       dev->writeLine( "tolerance " + str1 );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMFinish* o = ( PMFinish* ) object;
 
@@ -1111,7 +1111,7 @@ void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject,
 
    dev->objectBegin( "finish" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isAmbientEnabled( ) )
       dev->writeLine( "ambient " + o->ambientColor( ).serialize( ) );
@@ -1216,7 +1216,7 @@ void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject,
    dev->objectEnd( );
 }
 
-void PMPov35SerMesh( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerMesh( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMMesh* o = ( PMMesh* ) object;
 
@@ -1225,7 +1225,7 @@ void PMPov35SerMesh( const PMObject* object, const PMMetaObject* tqmetaObject, P
    if( o->isInsideVectorEnabled( ) )
       dev->writeLine( "inside_vector " + o->insideVector( ).serialize( ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( !o->hierarchy( ) )
       dev->writeLine( "hierarchy off" );
@@ -1245,7 +1245,7 @@ const double c_defaultMediaAAThreshold = 0.1;
 const double c_defaultMediaScatteringEccentricity = 0;
 const double c_defaultMediaScatteringExtinction = 1.0;
 
-void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMMedia* o = ( PMMedia* ) object;
 
@@ -1253,7 +1253,7 @@ void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject,
    TQString str2;
 
    dev->objectBegin( "media" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->method( ) != c_defaultMediaMethod )
    {
@@ -1332,11 +1332,11 @@ void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject,
    dev->objectEnd( );
 }
 
-void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMGraphicalObject* o = ( PMGraphicalObject* ) object;
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->noShadow( ) )
       dev->writeLine( "no_shadow" );
@@ -1351,7 +1351,7 @@ void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* tqme
       dev->writeLine( "double_illuminate" );
 }
 
-void PMPov35SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMPigment* o = ( PMPigment* ) object;
 
@@ -1366,12 +1366,12 @@ void PMPov35SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject
       if ( o->uvMapping() )
          dev->writeLine( "uv_mapping" );
    }
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( bObject )
       dev->objectEnd( );
 }
 
-void PMPov35SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTexture* o = ( PMTexture* ) object;
 
@@ -1386,14 +1386,14 @@ void PMPov35SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject
       if ( o->uvMapping() )
          dev->writeLine( "uv_mapping" );
    }
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( bObject )
       dev->objectEnd( );
 }
 
 const double c_defaultPatchFlatness = 0;
 
-void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBicubicPatch* o = ( PMBicubicPatch* ) object;
 
@@ -1433,11 +1433,11 @@ void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaO
       dev->writeLine( line );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTriangle* o = ( PMTriangle* ) object;
 
@@ -1466,6 +1466,6 @@ void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObjec
                       " " + o->uvVector( 2 ).serialize( ) );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
diff --git a/kpovmodeler/pmpovray35serialization.h b/kpovmodeler/pmpovray35serialization.h
index 507b941b..4e511d55 100644
--- a/kpovmodeler/pmpovray35serialization.h
+++ b/kpovmodeler/pmpovray35serialization.h
@@ -24,26 +24,26 @@ class PMOutputDevice;
 
 // serialization methods for POV-Ray 3.5
 
-void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerRadiosity( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerGlobalPhotons( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerPhotons( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerWarp( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerMesh( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
+void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerRadiosity( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerGlobalPhotons( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerPhotons( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerWarp( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerMesh( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
 #endif
diff --git a/kpovmodeler/pmpovraymatrix.cpp b/kpovmodeler/pmpovraymatrix.cpp
index fd90ad92..d51610f1 100644
--- a/kpovmodeler/pmpovraymatrix.cpp
+++ b/kpovmodeler/pmpovraymatrix.cpp
@@ -72,11 +72,11 @@ void PMPovrayMatrix::readAttributes( const PMXMLHelper& h )
    m_values.resize( 12 );
 }
 
-PMMetaObject* PMPovrayMatrix::tqmetaObject( ) const
+PMMetaObject* PMPovrayMatrix::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "PovrayMatrix", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "PovrayMatrix", Base::metaObject( ),
                                         createNewPovrayMatrix );
       s_pMetaObject->addProperty(
          new PMPovrayMatrixProperty( "values", &PMPovrayMatrix::setValues, &PMPovrayMatrix::values ) );
diff --git a/kpovmodeler/pmpovraymatrix.h b/kpovmodeler/pmpovraymatrix.h
index d42e5f22..c4e0d886 100644
--- a/kpovmodeler/pmpovraymatrix.h
+++ b/kpovmodeler/pmpovraymatrix.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmpovraymatrixedit.cpp b/kpovmodeler/pmpovraymatrixedit.cpp
index 1e0f7833..b905fb77 100644
--- a/kpovmodeler/pmpovraymatrixedit.cpp
+++ b/kpovmodeler/pmpovraymatrixedit.cpp
@@ -20,7 +20,7 @@
 #include "pmpovraymatrix.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmpovrayoutputwidget.cpp b/kpovmodeler/pmpovrayoutputwidget.cpp
index b2230272..13bd967a 100644
--- a/kpovmodeler/pmpovrayoutputwidget.cpp
+++ b/kpovmodeler/pmpovrayoutputwidget.cpp
@@ -17,8 +17,8 @@
 
 #include "pmpovrayoutputwidget.h"
 
-#include <tqtextedit.h>
-#include <tqlayout.h>
+#include <textedit.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kglobalsettings.h>
diff --git a/kpovmodeler/pmpovrayparser.cpp b/kpovmodeler/pmpovrayparser.cpp
index c4fa41ce..7f041b3e 100644
--- a/kpovmodeler/pmpovrayparser.cpp
+++ b/kpovmodeler/pmpovrayparser.cpp
@@ -384,7 +384,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* parent,
                }
                break;
             case TURBULENCE_TOK:
-               //  Search for a PMPattern in the object's tqchildren
+               //  Search for a PMPattern in the object's children
                child = parent->firstChild( );
                while( child && !child->isA( "Pattern" ) )
                   child = child->nextSibling( );
@@ -408,7 +408,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* parent,
             case SCALLOP_WAVE_TOK:
             case CUBIC_WAVE_TOK:
             case POLY_WAVE_TOK:
-               //  Search for a PMBlendMapModifiers in the object's tqchildren
+               //  Search for a PMBlendMapModifiers in the object's children
                child = parent->firstChild( );
                while( child && !child->isA( "BlendMapModifiers" ) )
                   child = child->nextSibling( );
@@ -972,7 +972,7 @@ bool PMPovrayParser::parseNumericItem( PMValue& v, bool checkForBool /*=false*/
          else
          {
             printError( i18n( "Undefined identifier \"%1\"." )
-                        .tqarg( m_pScanner->sValue( ) ) );
+                        .arg( m_pScanner->sValue( ) ) );
             nextToken( );
          }
          break;
@@ -2587,7 +2587,7 @@ bool PMPovrayParser::parsePolynom( PMPolynom* pNewPoly )
       if( vector.size( ) != ( unsigned ) c_polynomSize[order] )
       {
          printError( i18n( "%1 coefficients are needed for a polynom with order %2" )
-                     .tqarg( c_polynomSize[order] ).tqarg( order ) );
+                     .arg( c_polynomSize[order] ).arg( order ) );
          vector.resize( c_polynomSize[order] );
       }
       pNewPoly->setCoefficients( vector );
@@ -2883,7 +2883,7 @@ bool PMPovrayParser::parseLathe( PMLathe* pNewLathe )
 
    if( nump < minp )
       printError( i18n( "At least %1 points are needed for that spline type" )
-                  .tqarg( minp ) );
+                  .arg( minp ) );
    else if( ( pNewLathe->splineType( ) == PMLathe::BezierSpline ) &&
             ( ( nump % 4 ) != 0 ) )
       printError( i18n( "Bezier splines need 4 points for each segment" ) );
@@ -3231,7 +3231,7 @@ bool PMPovrayParser::parseSor( PMSurfaceOfRevolution* pNewSor )
             if( approxZero( ( *it1 )[1] - ( *it3 )[1], c_sorTolerance ) )
             {
                printError( i18n( "The v coordinate of point %1 and %2 must be different; fixed" )
-                           .tqarg( pnr + 1 ).tqarg( pnr + 3 ) );
+                           .arg( pnr + 1 ).arg( pnr + 3 ) );
                if( pnr == 0 )
                   ( *it1 )[1] = ( *it3 )[1] - c_sorTolerance;
                else
diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp
index ac95309c..fa67ac6f 100644
--- a/kpovmodeler/pmpovrayrenderwidget.cpp
+++ b/kpovmodeler/pmpovrayrenderwidget.cpp
@@ -28,7 +28,7 @@
 #include <ktempfile.h>
 #include <tqcolor.h>
 #include <tqpainter.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdragobject.h>
 
 #ifdef KDE_NO_COMPAT
@@ -134,7 +134,7 @@ bool PMPovrayRenderWidget::render( const TQByteArray& scene,
    m_image.setAlphaBuffer( m_renderMode.alpha( ) );
    m_image.fill( tqRgb( 0, 0, 0 ) );
    m_bPixmapUpToDate = false;
-   tqrepaint( );
+   repaint( );
 
    if( !m_pProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) )
    {
@@ -393,7 +393,7 @@ void PMPovrayRenderWidget::cleanup( )
    m_pTempFile = 0;
 }
 
-TQSize PMPovrayRenderWidget::tqsizeHint( ) const
+TQSize PMPovrayRenderWidget::sizeHint( ) const
 {
    TQSize s;
    if( m_image.isNull( ) )
@@ -401,7 +401,7 @@ TQSize PMPovrayRenderWidget::tqsizeHint( ) const
    else
       s = m_image.size( );
 
-   return s.expandedTo( tqminimumSize( ) );
+   return s.expandedTo( minimumSize( ) );
 }
 
 void PMPovrayRenderWidget::saveConfig( KConfig* cfg )
diff --git a/kpovmodeler/pmpovrayrenderwidget.h b/kpovmodeler/pmpovrayrenderwidget.h
index 8f9d0533..7e295172 100644
--- a/kpovmodeler/pmpovrayrenderwidget.h
+++ b/kpovmodeler/pmpovrayrenderwidget.h
@@ -91,7 +91,7 @@ public:
     */
    static void setPovrayLibraryPaths( const TQStringList& slist )
    { s_libraryPaths = slist; }
-   virtual TQSize tqsizeHint( ) const;
+   virtual TQSize sizeHint( ) const;
 
    virtual void startDrag( );
 signals:
diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp
index eac93134..321aee04 100644
--- a/kpovmodeler/pmpovraysettings.cpp
+++ b/kpovmodeler/pmpovraysettings.cpp
@@ -23,7 +23,7 @@
 #include "pmresourcelocator.h"
 #include "pmtext.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
@@ -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/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp
index c4ce83cb..f5035c04 100644
--- a/kpovmodeler/pmpovraywidget.cpp
+++ b/kpovmodeler/pmpovraywidget.cpp
@@ -30,7 +30,7 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqprogressbar.h>
 #include <tqlabel.h>
 #include <tqscrollview.h>
@@ -140,13 +140,13 @@ bool PMPovrayWidget::render( const TQByteArray& scene, const PMRenderMode& m,
       int w, h;
 
       w = maxSize.width( ) + KDialog::spacingHint( ) * 2;
-      h = maxSize.height( ) + m_pSaveButton->tqsizeHint( ).height( ) * 2
+      h = maxSize.height( ) + m_pSaveButton->sizeHint( ).height( ) * 2
          + KDialog::spacingHint( ) * 6;
-      if( m_pProgressLabel->tqsizeHint( ).height( )
-          > m_pProgressBar->tqsizeHint( ).height( ) )
-         h += m_pProgressLabel->tqsizeHint( ).height( );
+      if( m_pProgressLabel->sizeHint( ).height( )
+          > m_pProgressBar->sizeHint( ).height( ) )
+         h += m_pProgressLabel->sizeHint( ).height( );
       else
-         h += m_pProgressBar->tqsizeHint( ).height( );
+         h += m_pProgressBar->sizeHint( ).height( );
 
       w += 16;
       h += 16;
@@ -319,11 +319,11 @@ void PMPovrayWidget::slotPovrayOutput( )
    m_pPovrayOutputWidget->show( );
 }
 
-void PMPovrayWidget::slotRenderingFinished( int returntqStatus )
+void PMPovrayWidget::slotRenderingFinished( int returnStatus )
 {
-   kdDebug( PMArea ) << "Povray exited with status " << returntqStatus << endl;
+   kdDebug( PMArea ) << "Povray exited with status " << returnStatus << endl;
    m_bRunning = false;
-   if( returntqStatus == 0 )
+   if( returnStatus == 0 )
       m_pSaveButton->setEnabled( true );
    m_pStopButton->setEnabled( false );
    m_pSuspendButton->setEnabled( false );
@@ -331,11 +331,11 @@ void PMPovrayWidget::slotRenderingFinished( int returntqStatus )
    m_pProgressLabel->setText( i18n( "finished" ) );
    m_pProgressTimer->stop( );
 
-   if( ( returntqStatus != 0 ) && !m_stopped )
+   if( ( returnStatus != 0 ) && !m_stopped )
    {
       KMessageBox::error( this, i18n( "Povray exited abnormally.\n"
                                       "See the povray output for details." )
-                          .tqarg( returntqStatus ) );
+                          .arg( returnStatus ) );
    }
    else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) )
    {
@@ -405,7 +405,7 @@ void PMPovrayWidget::showSpeed( double pps )
    else
       num.setNum( pps, 'g', 3 );
 
-   m_pProgressLabel->setText( i18n( "running, %1 pixels/second" ).tqarg( num ) );
+   m_pProgressLabel->setText( i18n( "running, %1 pixels/second" ).arg( num ) );
 }
 
 #include "pmpovraywidget.moc"
diff --git a/kpovmodeler/pmpovraywidget.h b/kpovmodeler/pmpovraywidget.h
index c21cdc7b..27c37cb3 100644
--- a/kpovmodeler/pmpovraywidget.h
+++ b/kpovmodeler/pmpovraywidget.h
@@ -70,7 +70,7 @@ public slots:
    void slotPovrayOutput( );
 
 protected slots:
-   void slotRenderingFinished( int returntqStatus );
+   void slotRenderingFinished( int returnStatus );
    void slotProgress( int i );
    void slotLineFinished( int line );
    void slotUpdateSpeed( );
diff --git a/kpovmodeler/pmpreviewsettings.cpp b/kpovmodeler/pmpreviewsettings.cpp
index a08ff1fe..58147bb3 100644
--- a/kpovmodeler/pmpreviewsettings.cpp
+++ b/kpovmodeler/pmpreviewsettings.cpp
@@ -21,7 +21,7 @@
 #include "pmdialogeditbase.h"
 #include "pmdefaults.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
@@ -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/pmprism.cpp b/kpovmodeler/pmprism.cpp
index a7c5c8f7..81417ba3 100644
--- a/kpovmodeler/pmprism.cpp
+++ b/kpovmodeler/pmprism.cpp
@@ -272,11 +272,11 @@ void PMPrism::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMPrism::tqmetaObject( ) const
+PMMetaObject* PMPrism::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Prism", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Prism", Base::metaObject( ),
                                         createNewPrism );
       s_pMetaObject->addProperty(
          new PMPrismProperty( "sturm", &PMPrism::setSturm, &PMPrism::sturm ) );
@@ -645,7 +645,7 @@ void PMPrism::controlPoints( PMControlPointList& list )
          for( i2 = 0; it2 != ( *it1 ).end( ); ++it2, ++i2 )
          {
             cp = new PM2DControlPoint( *it2, PM2DControlPoint::PM2DXZ, i2,
-                                       i18n( "Point %1.%2" ).tqarg( i1 + 1 ).tqarg( i2 + 1 ) );
+                                       i18n( "Point %1.%2" ).arg( i1 + 1 ).arg( i2 + 1 ) );
             if( i2 == 0 )
                firstPoint = cp;
             else if( i2 == 1 )
@@ -678,7 +678,7 @@ void PMPrism::controlPoints( PMControlPointList& list )
          {
             int i2mod4 = i2 % 4;
             cp = new PM2DControlPoint( *it2, PM2DControlPoint::PM2DXZ, i2,
-                                       i18n( "Point %1.%2" ).tqarg( i1 + 1 ).tqarg( i2 + 1 ) );
+                                       i18n( "Point %1.%2" ).arg( i1 + 1 ).arg( i2 + 1 ) );
             if( i2mod4 == 0 )
                firstPoint = cp;
             if( i2mod4 == 2 )
diff --git a/kpovmodeler/pmprism.h b/kpovmodeler/pmprism.h
index facce467..a22fb748 100644
--- a/kpovmodeler/pmprism.h
+++ b/kpovmodeler/pmprism.h
@@ -67,7 +67,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp
index 78960007..64b68229 100644
--- a/kpovmodeler/pmprismedit.cpp
+++ b/kpovmodeler/pmprismedit.cpp
@@ -23,7 +23,7 @@
 #include "pmvectorlistedit.h"
 #include "pmpart.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <tqcombobox.h>
@@ -206,7 +206,7 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp )
       {
          // create all edits for one sub prism
          hl = new TQHBoxLayout( tvl );
-         label = new TQLabel( i18n( "Sub prism %1:" ).tqarg( spnr + 1 ),
+         label = new TQLabel( i18n( "Sub prism %1:" ).arg( spnr + 1 ),
                              m_pEditWidget );
          hl->addWidget( label );
          hl->addStretch( 1 );
@@ -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/pmprojectedthrough.cpp b/kpovmodeler/pmprojectedthrough.cpp
index 71710395..96c0c00a 100644
--- a/kpovmodeler/pmprojectedthrough.cpp
+++ b/kpovmodeler/pmprojectedthrough.cpp
@@ -49,11 +49,11 @@ TQString PMProjectedThrough::description( ) const
    return i18n( "projected through" );
 }
 
-PMMetaObject* PMProjectedThrough::tqmetaObject( ) const
+PMMetaObject* PMProjectedThrough::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ProjectedThrough", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ProjectedThrough", Base::metaObject( ),
                                         createNewProjectedThrough );
       // no properties
    }
diff --git a/kpovmodeler/pmprojectedthrough.h b/kpovmodeler/pmprojectedthrough.h
index 606aa972..4212097f 100644
--- a/kpovmodeler/pmprojectedthrough.h
+++ b/kpovmodeler/pmprojectedthrough.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmprototypemanager.cpp b/kpovmodeler/pmprototypemanager.cpp
index fd02e50b..ac8f5140 100644
--- a/kpovmodeler/pmprototypemanager.cpp
+++ b/kpovmodeler/pmprototypemanager.cpp
@@ -147,33 +147,33 @@ void PMPrototypeManager::addPrototype( PMObject* obj )
    if( !obj )
       return;
 
-   PMMetaObject* tqmetaObject = obj->tqmetaObject( );
-   PMMetaObject* m2 = m_metaDict.find( tqmetaObject->className( ) );
+   PMMetaObject* metaObject = obj->metaObject( );
+   PMMetaObject* m2 = m_metaDict.find( metaObject->className( ) );
    if( m2 )
    {
       kdError( PMArea ) << "PMPrototypeManager: Class '"
-                        << tqmetaObject->className( )
+                        << metaObject->className( )
                         << "' already registered." << endl;
    }
    else
    {
-      if( tqmetaObject->isAbstract( ) )
+      if( metaObject->isAbstract( ) )
          kdError( PMArea ) << "PMPrototypeManager: The meta object for the prototype "
-                           << tqmetaObject->className( )
+                           << metaObject->className( )
                            << " doesn't have a factory method" << endl;
 
-      m_prototypes.append( tqmetaObject );
-      m_lowerCaseDict[tqmetaObject->className( ).lower( )] = tqmetaObject->className( );
+      m_prototypes.append( metaObject );
+      m_lowerCaseDict[metaObject->className( ).lower( )] = metaObject->className( );
 
       // insert the meta object and all super classes into the hash table
-      while( tqmetaObject )
+      while( metaObject )
       {
-         if( m_metaDict.find( tqmetaObject->className( ) ) )
-            tqmetaObject = 0;
+         if( m_metaDict.find( metaObject->className( ) ) )
+            metaObject = 0;
          else
          {
-            m_metaDict.insert( tqmetaObject->className( ), tqmetaObject );
-            tqmetaObject = tqmetaObject->superClass( );
+            m_metaDict.insert( metaObject->className( ), metaObject );
+            metaObject = metaObject->superClass( );
          }
       }
    }
@@ -184,7 +184,7 @@ void PMPrototypeManager::addDeclarationType( const TQString& className,
                                              const TQString& description,
                                              const TQString& pixmap )
 {
-   PMMetaObject* m = tqmetaObject( className );
+   PMMetaObject* m = metaObject( className );
    if( !m )
       kdError( PMArea ) << "PMPrototypeManager::addDeclarationType: Unknown class " << className << endl;
    else
@@ -212,7 +212,7 @@ PMObject* PMPrototypeManager::newObject( const TQString& name ) const
    return meta->newObject( m_pPart );
 }
 
-PMMetaObject* PMPrototypeManager::tqmetaObject( const TQString& name ) const
+PMMetaObject* PMPrototypeManager::metaObject( const TQString& name ) const
 {
    if( name.isNull( ) )
       return 0;
@@ -222,13 +222,13 @@ PMMetaObject* PMPrototypeManager::tqmetaObject( const TQString& name ) const
 bool PMPrototypeManager::isA( const TQString& className,
                               const TQString& baseClass ) const
 {
-   return isA( tqmetaObject( className ), baseClass );
+   return isA( metaObject( className ), baseClass );
 }
 
 bool PMPrototypeManager::isA( PMMetaObject* c,
                               const TQString& baseClass ) const
 {
-   PMMetaObject* bc = tqmetaObject( baseClass );
+   PMMetaObject* bc = metaObject( baseClass );
    while( c && c != bc )
       c = c->superClass( );
    return( c && ( c == bc ) );
diff --git a/kpovmodeler/pmprototypemanager.h b/kpovmodeler/pmprototypemanager.h
index f37a5852..bade9e29 100644
--- a/kpovmodeler/pmprototypemanager.h
+++ b/kpovmodeler/pmprototypemanager.h
@@ -111,13 +111,13 @@ public:
     * not exist.
     * @see PMMetaObject
     */
-   PMMetaObject* tqmetaObject( const TQString& name ) const;
+   PMMetaObject* metaObject( const TQString& name ) const;
    /**
     * Returns true if the class exists
     */
    bool existsClass( const TQString& name ) const
    {
-      return tqmetaObject( name );
+      return metaObject( name );
    }
    /**
     * Returns true if the second class is a base class for
diff --git a/kpovmodeler/pmquickcolor.cpp b/kpovmodeler/pmquickcolor.cpp
index d1bcf100..25fc7aff 100644
--- a/kpovmodeler/pmquickcolor.cpp
+++ b/kpovmodeler/pmquickcolor.cpp
@@ -67,11 +67,11 @@ void PMQuickColor::readAttributes( const PMXMLHelper& h )
    m_color = h.colorAttribute( "quickcolor", colorDefault );
 }
 
-PMMetaObject* PMQuickColor::tqmetaObject( ) const
+PMMetaObject* PMQuickColor::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "QuickColor", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "QuickColor", Base::metaObject( ),
                                         createNewQuickColor );
       s_pMetaObject->addProperty(
          new PMQuickColorProperty( "color", &PMQuickColor::setColor, &PMQuickColor::color ) );
diff --git a/kpovmodeler/pmquickcolor.h b/kpovmodeler/pmquickcolor.h
index 0fe9ccbe..c64d363f 100644
--- a/kpovmodeler/pmquickcolor.h
+++ b/kpovmodeler/pmquickcolor.h
@@ -57,7 +57,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmquickcoloredit.cpp b/kpovmodeler/pmquickcoloredit.cpp
index 9e0a2d29..c4b803a4 100644
--- a/kpovmodeler/pmquickcoloredit.cpp
+++ b/kpovmodeler/pmquickcoloredit.cpp
@@ -21,7 +21,7 @@
 #include "pmcoloredit.h"
 #include "pmdebug.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
@@ -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/pmradiosity.cpp b/kpovmodeler/pmradiosity.cpp
index 39d61342..86d36e74 100644
--- a/kpovmodeler/pmradiosity.cpp
+++ b/kpovmodeler/pmradiosity.cpp
@@ -86,11 +86,11 @@ PMRadiosity::~PMRadiosity( )
 {
 }
 
-PMMetaObject* PMRadiosity::tqmetaObject( ) const
+PMMetaObject* PMRadiosity::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Radiosity", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Radiosity", Base::metaObject( ),
                                         createNewRadiosity );
       s_pMetaObject->addProperty(
          new PMRadiosityProperty( "adcBailout", &PMRadiosity::setAdcBailout, &PMRadiosity::adcBailout ) );
diff --git a/kpovmodeler/pmradiosity.h b/kpovmodeler/pmradiosity.h
index 4a1c1ad1..c56ccec2 100644
--- a/kpovmodeler/pmradiosity.h
+++ b/kpovmodeler/pmradiosity.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmradiosityedit.cpp b/kpovmodeler/pmradiosityedit.cpp
index 97494ff8..8b17d153 100644
--- a/kpovmodeler/pmradiosityedit.cpp
+++ b/kpovmodeler/pmradiosityedit.cpp
@@ -20,7 +20,7 @@
 #include "pmradiosity.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
diff --git a/kpovmodeler/pmrainbow.cpp b/kpovmodeler/pmrainbow.cpp
index 62def615..1fd9e8ca 100644
--- a/kpovmodeler/pmrainbow.cpp
+++ b/kpovmodeler/pmrainbow.cpp
@@ -87,11 +87,11 @@ PMRainbow::~PMRainbow( )
 {
 }
 
-PMMetaObject* PMRainbow::tqmetaObject( ) const
+PMMetaObject* PMRainbow::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Rainbow", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Rainbow", Base::metaObject( ),
                                         createNewRainbow );
       s_pMetaObject->addProperty(
          new PMRainbowProperty( "direction", &PMRainbow::setDirection, &PMRainbow::direction ) );
diff --git a/kpovmodeler/pmrainbow.h b/kpovmodeler/pmrainbow.h
index 1b631ed1..64dae5d7 100644
--- a/kpovmodeler/pmrainbow.h
+++ b/kpovmodeler/pmrainbow.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmrainbowedit.cpp b/kpovmodeler/pmrainbowedit.cpp
index 7765f720..83440c7f 100644
--- a/kpovmodeler/pmrainbowedit.cpp
+++ b/kpovmodeler/pmrainbowedit.cpp
@@ -23,7 +23,7 @@
 #include "pmvector.h"
 #include "pmmath.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <klocale.h>
diff --git a/kpovmodeler/pmraw.cpp b/kpovmodeler/pmraw.cpp
index 4971433c..f29b6e4c 100644
--- a/kpovmodeler/pmraw.cpp
+++ b/kpovmodeler/pmraw.cpp
@@ -23,7 +23,7 @@
 #include "pmmemento.h"
 
 #include <klocale.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 PMDefinePropertyClass( PMRaw, PMRawProperty );
 
@@ -69,11 +69,11 @@ void PMRaw::setCode( const TQString& code )
    }
 }
 
-PMMetaObject* PMRaw::tqmetaObject( ) const
+PMMetaObject* PMRaw::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Raw", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Raw", Base::metaObject( ),
                                         createNewRaw );
       s_pMetaObject->addProperty(
          new PMRawProperty( "code", &PMRaw::setCode, &PMRaw::code ) );
diff --git a/kpovmodeler/pmraw.h b/kpovmodeler/pmraw.h
index 541687c8..11c28ad2 100644
--- a/kpovmodeler/pmraw.h
+++ b/kpovmodeler/pmraw.h
@@ -67,7 +67,7 @@ public:
    virtual void readAttributes( const PMXMLHelper& h );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmrawedit.cpp b/kpovmodeler/pmrawedit.cpp
index 98cc5ec1..715d2f8e 100644
--- a/kpovmodeler/pmrawedit.cpp
+++ b/kpovmodeler/pmrawedit.cpp
@@ -19,7 +19,7 @@
 #include "pmrawedit.h"
 #include "pmraw.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqmultilineedit.h>
 #include <kglobalsettings.h>
diff --git a/kpovmodeler/pmrendermanager.cpp b/kpovmodeler/pmrendermanager.cpp
index 6ba1fe99..31f553e5 100644
--- a/kpovmodeler/pmrendermanager.cpp
+++ b/kpovmodeler/pmrendermanager.cpp
@@ -394,7 +394,7 @@ void PMRenderManager::renderTask( )
 
 void PMRenderManager::renderObject( PMObject* objectToRender )
 {
-   bool tqchildren = false;
+   bool children = false;
    PMGraphicalObject* go = 0;
 
    m_objectToRenderStack.append( objectToRender );
@@ -426,8 +426,8 @@ void PMRenderManager::renderObject( PMObject* objectToRender )
    {
       PMObject* obj = 0;
 
-      tqchildren = objectToRender->lastChild( ) || objectToRender->linkedObject( );
-      if( tqchildren )
+      children = objectToRender->lastChild( ) || objectToRender->linkedObject( );
+      if( children )
       {
          bool stop;
 
@@ -438,7 +438,7 @@ void PMRenderManager::renderObject( PMObject* objectToRender )
             matrix = new PMMatrix( PMMatrix::modelviewMatrix( ) );
          m_matrixStack.push( matrix );
 
-         // render the tqchildren and the linked object
+         // render the children and the linked object
          obj = objectToRender->lastChild( );
          while( obj && !m_bStopTask && !m_bStartTask )
          {
@@ -469,7 +469,7 @@ void PMRenderManager::renderObject( PMObject* objectToRender )
 
       if( !m_bStopTask && !m_bStartTask )
       {
-         // tqchildren of the object are rendered
+         // children of the object are rendered
          // render the object
 
          if( objectToRender == m_pCurrentTask->activeObject( ) )
@@ -538,7 +538,7 @@ void PMRenderManager::renderObject( PMObject* objectToRender )
    }
    if( !m_bStopTask && !m_bStartTask )
    {
-      if( tqchildren )
+      if( children )
       {
          PMMatrix* matrix = m_matrixStack.pop( );
 
@@ -1410,7 +1410,7 @@ void PMRenderManager::renderGrid( )
          glVertex2d( screenx, height/2 );
          glEnd( );
 
-         TQString label = TQString( "%1" ).tqarg( x * signx, 0, 'g', 4 );
+         TQString label = TQString( "%1" ).arg( x * signx, 0, 'g', 4 );
          if( approxZero( x ) && label.find( "e-" ) )
             label = "0";
 
@@ -1431,7 +1431,7 @@ void PMRenderManager::renderGrid( )
          glVertex2d( width/2, screeny );
          glEnd( );
 
-         TQString label = TQString( "%1" ).tqarg( y * signy, 0, 'g', 4 );
+         TQString label = TQString( "%1" ).arg( y * signy, 0, 'g', 4 );
          if( approxZero( y ) && label.find( "e-" ) )
             label = "0";
 
diff --git a/kpovmodeler/pmrendermode.cpp b/kpovmodeler/pmrendermode.cpp
index 622f7b2f..8ef8d207 100644
--- a/kpovmodeler/pmrendermode.cpp
+++ b/kpovmodeler/pmrendermode.cpp
@@ -160,33 +160,33 @@ TQStringList PMRenderMode::commandLineSwitches( ) const
    TQStringList cl;
    TQString tmp;
 
-   cl.append( TQString( "+W%1" ).tqarg( m_width ) );
-   cl.append( TQString( "+H%1" ).tqarg( m_height ) );
+   cl.append( TQString( "+W%1" ).arg( m_width ) );
+   cl.append( TQString( "+H%1" ).arg( m_height ) );
    if( m_subSection )
    {
       if( m_startRow < 1.0 )
          tmp.sprintf( "+SR%4.2f", m_startRow );
       else
-         tmp = TQString( "+SR%1" ).tqarg( ( int ) ( m_startRow + 0.5 ) );
+         tmp = TQString( "+SR%1" ).arg( ( int ) ( m_startRow + 0.5 ) );
       cl.append( tmp );
       if( m_endRow < 1.0 )
          tmp.sprintf( "+ER%4.2f", m_endRow );
       else
-         tmp = TQString( "+ER%1" ).tqarg( ( int ) ( m_endRow + 0.5 ) );
+         tmp = TQString( "+ER%1" ).arg( ( int ) ( m_endRow + 0.5 ) );
       cl.append( tmp );
       
       if( m_startColumn < 1.0 )
          tmp.sprintf( "+SC%4.2f", m_startColumn );
       else
-         tmp = TQString( "+SC%1" ).tqarg( ( int ) ( m_startColumn + 0.5 ) );
+         tmp = TQString( "+SC%1" ).arg( ( int ) ( m_startColumn + 0.5 ) );
       cl.append( tmp );
       if( m_endColumn < 1.0 )
          tmp.sprintf( "+EC%4.2f", m_endColumn );
       else
-         tmp = TQString( "+EC%1" ).tqarg( ( int ) ( m_endColumn + 0.5 ) );
+         tmp = TQString( "+EC%1" ).arg( ( int ) ( m_endColumn + 0.5 ) );
       cl.append( tmp );
    }
-   cl.append( TQString( "+Q%1" ).tqarg( m_quality ) );
+   cl.append( TQString( "+Q%1" ).arg( m_quality ) );
    if( m_radiosity )
       cl.append( TQString( "+QR" ) );
    else
@@ -195,7 +195,7 @@ TQStringList PMRenderMode::commandLineSwitches( ) const
    if( m_antialiasing )
    {
       cl.append( TQString( "+A" ) );
-      cl.append( TQString( "+AM%1" ).tqarg( m_samplingMethod ) );
+      cl.append( TQString( "+AM%1" ).arg( m_samplingMethod ) );
       tmp.sprintf( "+A%5.3f", m_antialiasThreshold );
       cl.append( tmp );
       if( m_antialiasJitter )
@@ -205,7 +205,7 @@ TQStringList PMRenderMode::commandLineSwitches( ) const
       }
       else
          cl.append( TQString( "-J" ) );
-      cl.append( TQString( "+R%1" ).tqarg( m_antialiasDepth ) );
+      cl.append( TQString( "+R%1" ).arg( m_antialiasDepth ) );
    }
    else
       cl.append( TQString( "-A" ) );
diff --git a/kpovmodeler/pmrendermodesdialog.cpp b/kpovmodeler/pmrendermodesdialog.cpp
index 4fa8f09f..e22a5207 100644
--- a/kpovmodeler/pmrendermodesdialog.cpp
+++ b/kpovmodeler/pmrendermodesdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqlineedit.h>
 #include <tqtabwidget.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 
diff --git a/kpovmodeler/pmrotate.cpp b/kpovmodeler/pmrotate.cpp
index feed0091..5a432c91 100644
--- a/kpovmodeler/pmrotate.cpp
+++ b/kpovmodeler/pmrotate.cpp
@@ -66,11 +66,11 @@ void PMRotate::readAttributes( const PMXMLHelper& h )
    m_rotate = h.vectorAttribute( "value", rotateDefault );
 }
 
-PMMetaObject* PMRotate::tqmetaObject( ) const
+PMMetaObject* PMRotate::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Rotate", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Rotate", Base::metaObject( ),
                                         createNewRotate );
       s_pMetaObject->addProperty(
          new PMRotateProperty( "rotation", &PMRotate::setRotation, &PMRotate::rotation ) );
diff --git a/kpovmodeler/pmrotate.h b/kpovmodeler/pmrotate.h
index 5090a933..4ecc6d9a 100644
--- a/kpovmodeler/pmrotate.h
+++ b/kpovmodeler/pmrotate.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmrotateedit.cpp b/kpovmodeler/pmrotateedit.cpp
index 2ad5f06e..e310f632 100644
--- a/kpovmodeler/pmrotateedit.cpp
+++ b/kpovmodeler/pmrotateedit.cpp
@@ -20,7 +20,7 @@
 #include "pmrotate.h"
 #include "pmvectoredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 
 
diff --git a/kpovmodeler/pmscale.cpp b/kpovmodeler/pmscale.cpp
index 5e1c4717..af8245b8 100644
--- a/kpovmodeler/pmscale.cpp
+++ b/kpovmodeler/pmscale.cpp
@@ -66,11 +66,11 @@ void PMScale::readAttributes( const PMXMLHelper& h )
    m_scale = h.vectorAttribute( "value", scaleDefault );
 }
 
-PMMetaObject* PMScale::tqmetaObject( ) const
+PMMetaObject* PMScale::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Scale", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Scale", Base::metaObject( ),
                                         createNewScale );
       s_pMetaObject->addProperty(
          new PMScaleProperty( "scale", &PMScale::setScale, &PMScale::scale ) );
diff --git a/kpovmodeler/pmscale.h b/kpovmodeler/pmscale.h
index 55a40eaf..72821041 100644
--- a/kpovmodeler/pmscale.h
+++ b/kpovmodeler/pmscale.h
@@ -55,7 +55,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmscaleedit.cpp b/kpovmodeler/pmscaleedit.cpp
index 24f3a471..d9f16452 100644
--- a/kpovmodeler/pmscaleedit.cpp
+++ b/kpovmodeler/pmscaleedit.cpp
@@ -20,7 +20,7 @@
 #include "pmscale.h"
 #include "pmvectoredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 
 
diff --git a/kpovmodeler/pmscanner.cpp b/kpovmodeler/pmscanner.cpp
index 15e50489..d85fa3fb 100644
--- a/kpovmodeler/pmscanner.cpp
+++ b/kpovmodeler/pmscanner.cpp
@@ -577,10 +577,10 @@ void PMScanner::scanError( int c )
    m_token = SCANNER_ERROR_TOK;
    if( isprint( c ) )
       m_error = i18n( "Unexpected character '%1' after \"%2\"" )
-         .tqarg( ( char )c ).tqarg( m_svalue );
+         .arg( ( char )c ).arg( m_svalue );
    else
       m_error = i18n( "Unexpected character %1 after \"%2\"" )
-         .tqarg( c, 4, 16 ).tqarg( m_svalue );
+         .arg( c, 4, 16 ).arg( m_svalue );
 
 #ifdef PMSCAN_DEBUG
    kdDebug( PMArea ) << "Line " << m_line << ": Error " << m_error << "\n";
diff --git a/kpovmodeler/pmscene.cpp b/kpovmodeler/pmscene.cpp
index 810fa84c..cd6593cd 100644
--- a/kpovmodeler/pmscene.cpp
+++ b/kpovmodeler/pmscene.cpp
@@ -52,11 +52,11 @@ TQString PMScene::description( ) const
    return i18n( "scene" );
 }
 
-PMMetaObject* PMScene::tqmetaObject( ) const
+PMMetaObject* PMScene::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Scene", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Scene", Base::metaObject( ),
                                         createNewScene );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pmscene.h b/kpovmodeler/pmscene.h
index 3a93875f..ed7cf227 100644
--- a/kpovmodeler/pmscene.h
+++ b/kpovmodeler/pmscene.h
@@ -51,7 +51,7 @@ public:
    virtual ~PMScene( );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmserializer.cpp b/kpovmodeler/pmserializer.cpp
index 149e6020..2f58d0c1 100644
--- a/kpovmodeler/pmserializer.cpp
+++ b/kpovmodeler/pmserializer.cpp
@@ -72,7 +72,7 @@ void PMSerializer::printError( const TQString& msg )
    else if( m_errors == s_maxErrors )
    {
       m_messages += PMMessage( i18n( "Maximum of %1 errors reached." )
-                    .tqarg( s_maxErrors ) );
+                    .arg( s_maxErrors ) );
       m_errors++;
    }
 }
@@ -87,7 +87,7 @@ void PMSerializer::printWarning( const TQString& msg )
    else if( m_warnings == s_maxWarnings )
    {
       m_messages += PMMessage( i18n( "Maximum of %1 warnings reached." )
-                    .tqarg( s_maxWarnings ) );
+                    .arg( s_maxWarnings ) );
       m_warnings++;
    }
 }
diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp
index 35324495..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 );
 
@@ -187,13 +187,13 @@ bool PMSettingsDialog::validateData( )
 
 void PMSettingsDialog::saveSettings( )
 {
-   m_tqrepaint = false;
+   m_repaint = false;
 
    TQValueList<PMRegisteredSettingsPage>::const_iterator it;
    for( it = m_pages.begin( ); it != m_pages.end( ); ++it )
       ( *it ).page->applySettings( );
 
-   if( m_tqrepaint )
+   if( m_repaint )
    {
       PMRenderManager* rm = PMRenderManager::theManager( );
       rm->slotRenderingSettingsChanged( );
@@ -236,7 +236,7 @@ void PMSettingsDialog::registerPage( TQWidget* topPage,
 
 void PMSettingsDialog::slotRepaint( )
 {
-   m_tqrepaint = true;
+   m_repaint = true;
 }
 
 void PMSettingsDialog::slotShowPage( )
diff --git a/kpovmodeler/pmsettingsdialog.h b/kpovmodeler/pmsettingsdialog.h
index e30abf7b..e830ed8e 100644
--- a/kpovmodeler/pmsettingsdialog.h
+++ b/kpovmodeler/pmsettingsdialog.h
@@ -179,7 +179,7 @@ private:
    bool validateData( );
    void saveSettings( );
    int findPage( const PMSettingsDialogPage* page );
-   bool m_tqrepaint;
+   bool m_repaint;
    TQValueList<PMRegisteredSettingsPage> m_pages;
    PMPart* m_pPart;
    
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index e03ce3b8..fd0c5a73 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -188,7 +188,7 @@ PMDockWidget* PMShell::createView( const TQString& t, PMViewOptions* o,
       PMViewFactory::theFactory( )->viewFactory( t );
 
    m_viewNumber++;
-   TQString name = TQString( "View (%1)" ).tqarg( m_viewNumber );
+   TQString name = TQString( "View (%1)" ).arg( m_viewNumber );
 
    if( factory )
    {
@@ -231,7 +231,7 @@ PMDockWidget* PMShell::createTreeView( )
 {
    PMDockWidget* dock = 0;
    m_numTreeViews++;
-   TQString name = TQString( "Object Tree (%1)" ).tqarg( m_numTreeViews );
+   TQString name = TQString( "Object Tree (%1)" ).arg( m_numTreeViews );
    dock = createDockWidget( name, SmallIcon( "pmtreeview" ),
                             0L, i18n( "Object Tree" ), i18n( "Object Tree" ) );
    dock->setDockSite( PMDockWidget::DockFullSite );
@@ -248,7 +248,7 @@ PMDockWidget* PMShell::createDialogView( )
 {
    PMDockWidget* dock = 0;
    m_numDialogViews++;
-   TQString name = TQString( "Object Properties (%1)" ).tqarg( m_numDialogViews );
+   TQString name = TQString( "Object Properties (%1)" ).arg( m_numDialogViews );
    dock = createDockWidget( name, SmallIcon( "pmdialogview" ),
                             0L, i18n( "Object Properties" ), i18n( "Object Properties" ) );
    dock->setDockSite( PMDockWidget::DockFullSite );
@@ -265,7 +265,7 @@ PMDockWidget* PMShell::create3DView( PMGLView::PMViewType t )
 {
    PMDockWidget* dock = 0;
    m_numGLViews++;
-   TQString name = TQString( "3D View (%1)" ).tqarg( m_numGLViews );
+   TQString name = TQString( "3D View (%1)" ).arg( m_numGLViews );
    dock = createDockWidget( name, SmallIcon( "pmglview" ),
                             0L, i18n( "3D View" ), i18n( "3D View" ) );
    dock->setDockSite( PMDockWidget::DockFullSite );
diff --git a/kpovmodeler/pmskysphere.cpp b/kpovmodeler/pmskysphere.cpp
index 39724548..a31cc475 100644
--- a/kpovmodeler/pmskysphere.cpp
+++ b/kpovmodeler/pmskysphere.cpp
@@ -44,11 +44,11 @@ PMSkySphere::~PMSkySphere( )
 {
 }
 
-PMMetaObject* PMSkySphere::tqmetaObject( ) const
+PMMetaObject* PMSkySphere::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SkySphere", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SkySphere", Base::metaObject( ),
                                         createNewSkySphere );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pmskysphere.h b/kpovmodeler/pmskysphere.h
index d466cb68..116af543 100644
--- a/kpovmodeler/pmskysphere.h
+++ b/kpovmodeler/pmskysphere.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmskysphereedit.cpp b/kpovmodeler/pmskysphereedit.cpp
index 4a1590b2..a7dc62b2 100644
--- a/kpovmodeler/pmskysphereedit.cpp
+++ b/kpovmodeler/pmskysphereedit.cpp
@@ -20,7 +20,7 @@
 #include "pmskysphere.h"
 #include "pmlinkedit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmslope.cpp b/kpovmodeler/pmslope.cpp
index 663a19fe..1d2d2977 100644
--- a/kpovmodeler/pmslope.cpp
+++ b/kpovmodeler/pmslope.cpp
@@ -69,11 +69,11 @@ void PMSlope::readAttributes( const PMXMLHelper& h )
    m_slope = h.doubleAttribute( "slope", slopeDefault );
 }
 
-PMMetaObject* PMSlope::tqmetaObject( ) const
+PMMetaObject* PMSlope::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Slope", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Slope", Base::metaObject( ),
                                         createNewSlope );
       s_pMetaObject->addProperty(
          new PMSlopeProperty( "height", &PMSlope::setHeight, &PMSlope::height ) );
diff --git a/kpovmodeler/pmslope.h b/kpovmodeler/pmslope.h
index e32455c5..eb860373 100644
--- a/kpovmodeler/pmslope.h
+++ b/kpovmodeler/pmslope.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmslopeedit.cpp b/kpovmodeler/pmslopeedit.cpp
index 63b0ee44..f9d2d346 100644
--- a/kpovmodeler/pmslopeedit.cpp
+++ b/kpovmodeler/pmslopeedit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
diff --git a/kpovmodeler/pmsolidcolor.cpp b/kpovmodeler/pmsolidcolor.cpp
index 8ec9ba6d..dd50d030 100644
--- a/kpovmodeler/pmsolidcolor.cpp
+++ b/kpovmodeler/pmsolidcolor.cpp
@@ -65,11 +65,11 @@ void PMSolidColor::readAttributes( const PMXMLHelper& h )
    m_color = h.colorAttribute( "color", colorDefault );
 }
 
-PMMetaObject* PMSolidColor::tqmetaObject( ) const
+PMMetaObject* PMSolidColor::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SolidColor", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SolidColor", Base::metaObject( ),
                                         createNewSolidColor );
       s_pMetaObject->addProperty(
          new PMSolidColorProperty( "color", &PMSolidColor::setColor, &PMSolidColor::color ) );
diff --git a/kpovmodeler/pmsolidcolor.h b/kpovmodeler/pmsolidcolor.h
index 8b8b36e9..225a3a5b 100644
--- a/kpovmodeler/pmsolidcolor.h
+++ b/kpovmodeler/pmsolidcolor.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmsolidcoloredit.cpp b/kpovmodeler/pmsolidcoloredit.cpp
index 62ce6c9e..c72d5c0f 100644
--- a/kpovmodeler/pmsolidcoloredit.cpp
+++ b/kpovmodeler/pmsolidcoloredit.cpp
@@ -20,7 +20,7 @@
 #include "pmsolidcolor.h"
 #include "pmcoloredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
@@ -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/pmsolidobject.cpp b/kpovmodeler/pmsolidobject.cpp
index 0c98ded9..61ddd45c 100644
--- a/kpovmodeler/pmsolidobject.cpp
+++ b/kpovmodeler/pmsolidobject.cpp
@@ -43,11 +43,11 @@ PMSolidObject::~PMSolidObject( )
 {
 }
 
-PMMetaObject* PMSolidObject::tqmetaObject( ) const
+PMMetaObject* PMSolidObject::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SolidObject", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "SolidObject", Base::metaObject( ) );
       s_pMetaObject->addProperty(
          new PMSolidObjectProperty( "inverse", &PMSolidObject::setInverse, &PMSolidObject::inverse ) );
       s_pMetaObject->addProperty(
diff --git a/kpovmodeler/pmsolidobject.h b/kpovmodeler/pmsolidobject.h
index 9406aa0e..be2d2f5c 100644
--- a/kpovmodeler/pmsolidobject.h
+++ b/kpovmodeler/pmsolidobject.h
@@ -44,11 +44,11 @@ public:
    PMSolidObject( const PMSolidObject& s );
 
    /**
-    * Deletes the object and all tqchildren
+    * Deletes the object and all children
     */
    virtual ~PMSolidObject( );
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmsolidobjectedit.cpp b/kpovmodeler/pmsolidobjectedit.cpp
index 4a1a2205..c5217a39 100644
--- a/kpovmodeler/pmsolidobjectedit.cpp
+++ b/kpovmodeler/pmsolidobjectedit.cpp
@@ -20,7 +20,7 @@
 #include "pmsolidobject.h"
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 
 PMSolidObjectEdit::PMSolidObjectEdit( TQWidget* parent, const char* name )
diff --git a/kpovmodeler/pmsor.cpp b/kpovmodeler/pmsor.cpp
index 997447c4..2ede8b8a 100644
--- a/kpovmodeler/pmsor.cpp
+++ b/kpovmodeler/pmsor.cpp
@@ -194,11 +194,11 @@ void PMSurfaceOfRevolution::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMSurfaceOfRevolution::tqmetaObject( ) const
+PMMetaObject* PMSurfaceOfRevolution::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SurfaceOfRevolution", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SurfaceOfRevolution", Base::metaObject( ),
                                         createNewSurfaceOfRevolution );
       s_pMetaObject->addProperty(
          new PMSurfaceOfRevolutionProperty( "sturm", &PMSurfaceOfRevolution::setSturm,
@@ -421,7 +421,7 @@ void PMSurfaceOfRevolution::controlPoints( PMControlPointList& list )
    {
       lastPoint = cp;
       cp = new PMSorControlPoint( lastPoint, *it, PMSorControlPoint::PM2DXY, i,
-                                  i18n( "Point %1 (xy)" ).tqarg( i + 1 ) );
+                                  i18n( "Point %1 (xy)" ).arg( i + 1 ) );
       tmp1.append( cp );
    }
 
@@ -432,7 +432,7 @@ void PMSurfaceOfRevolution::controlPoints( PMControlPointList& list )
    {
       lastPoint = cp;
       cp = new PMSorControlPoint( lastPoint, *it, PMSorControlPoint::PM2DZY, i,
-                                  i18n( "Point %1 (yz)" ).tqarg( i + 1 ) );
+                                  i18n( "Point %1 (yz)" ).arg( i + 1 ) );
       tmp2.append( cp );
    }
 
diff --git a/kpovmodeler/pmsor.h b/kpovmodeler/pmsor.h
index 720987fc..46db677e 100644
--- a/kpovmodeler/pmsor.h
+++ b/kpovmodeler/pmsor.h
@@ -60,7 +60,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmsoredit.cpp b/kpovmodeler/pmsoredit.cpp
index 728aa20f..5fe2b631 100644
--- a/kpovmodeler/pmsoredit.cpp
+++ b/kpovmodeler/pmsoredit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectorlistedit.h"
 #include "pmpart.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <tqcombobox.h>
@@ -160,7 +160,7 @@ bool PMSurfaceOfRevolutionEdit::isDataValid( )
          {
             m_pPoints->setCurrentCell( pnr, 1 );            
             KMessageBox::error( this, i18n( "The v coordinate of point %1 and %2 must be different." )
-                                .tqarg( pnr + 1 ).tqarg( pnr + 3 ),
+                                .arg( pnr + 1 ).arg( pnr + 3 ),
                                 i18n( "Error" ) );
             return false;
          }
diff --git a/kpovmodeler/pmsphere.cpp b/kpovmodeler/pmsphere.cpp
index bbdd3b88..cca385c9 100644
--- a/kpovmodeler/pmsphere.cpp
+++ b/kpovmodeler/pmsphere.cpp
@@ -71,11 +71,11 @@ TQString PMSphere::description( ) const
    return i18n( "sphere" );
 }
 
-PMMetaObject* PMSphere::tqmetaObject( ) const
+PMMetaObject* PMSphere::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Sphere", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Sphere", Base::metaObject( ),
                                         createNewSphere );
       s_pMetaObject->addProperty(
          new PMSphereProperty( "radius", &PMSphere::setRadius, &PMSphere::radius ) );
diff --git a/kpovmodeler/pmsphere.h b/kpovmodeler/pmsphere.h
index 871b7375..984bc6d6 100644
--- a/kpovmodeler/pmsphere.h
+++ b/kpovmodeler/pmsphere.h
@@ -57,7 +57,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmsphereedit.cpp b/kpovmodeler/pmsphereedit.cpp
index 99bac3ea..4a74cc7b 100644
--- a/kpovmodeler/pmsphereedit.cpp
+++ b/kpovmodeler/pmsphereedit.cpp
@@ -22,7 +22,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
@@ -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/pmspheresweep.cpp b/kpovmodeler/pmspheresweep.cpp
index ff2e8e1a..9660335e 100644
--- a/kpovmodeler/pmspheresweep.cpp
+++ b/kpovmodeler/pmspheresweep.cpp
@@ -216,11 +216,11 @@ void PMSphereSweep::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMSphereSweep::tqmetaObject( ) const
+PMMetaObject* PMSphereSweep::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SphereSweep", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SphereSweep", Base::metaObject( ),
                                         createNewSphereSweep );
       s_pMetaObject->addProperty(
          new PMSphereSweepProperty( "tolerance", &PMSphereSweep::setTolerance, &PMSphereSweep::tolerance ) );
@@ -434,19 +434,19 @@ void PMSphereSweep::controlPoints( PMControlPointList& list )
         it != m_points.end( ) && it2 != m_radii.end( ); ++it, ++it2, ++nr )
    {
       PM3DControlPoint* p = new PM3DControlPoint( *it, i++,
-                                                  i18n( "Center %1" ).tqarg( nr ) );
+                                                  i18n( "Center %1" ).arg( nr ) );
       list.append( p );
       list.append( new PMDistanceControlPoint( p, PMVector( 1.0, 0.0, 0.0 ),
                                                *it2, i++,
-                                               i18n( "Radius %1 (x)" ).tqarg( nr ),
+                                               i18n( "Radius %1 (x)" ).arg( nr ),
                                                true ) );
       list.append( new PMDistanceControlPoint( p, PMVector( 0.0, 1.0, 0.0 ),
                                                *it2, i++,
-                                               i18n( "Radius %1 (y)" ).tqarg( nr ),
+                                               i18n( "Radius %1 (y)" ).arg( nr ),
                                                true ) );
       list.append( new PMDistanceControlPoint( p, PMVector( 0.0, 0.0, 1.0 ),
                                                *it2, i++,
-                                               i18n( "Radius %1 (z)" ).tqarg( nr ),
+                                               i18n( "Radius %1 (z)" ).arg( nr ),
                                                true ) );
    }
 }
diff --git a/kpovmodeler/pmspheresweep.h b/kpovmodeler/pmspheresweep.h
index f4488e1b..b28d69a5 100644
--- a/kpovmodeler/pmspheresweep.h
+++ b/kpovmodeler/pmspheresweep.h
@@ -63,7 +63,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmspheresweepedit.cpp b/kpovmodeler/pmspheresweepedit.cpp
index 9798a304..dd8253e6 100644
--- a/kpovmodeler/pmspheresweepedit.cpp
+++ b/kpovmodeler/pmspheresweepedit.cpp
@@ -23,7 +23,7 @@
 #include "pmvectorlistedit.h"
 #include "pmpart.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <tqcombobox.h>
diff --git a/kpovmodeler/pmsqe.cpp b/kpovmodeler/pmsqe.cpp
index 8a0946fb..61279251 100644
--- a/kpovmodeler/pmsqe.cpp
+++ b/kpovmodeler/pmsqe.cpp
@@ -80,11 +80,11 @@ void PMSuperquadricEllipsoid::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMSuperquadricEllipsoid::tqmetaObject( ) const
+PMMetaObject* PMSuperquadricEllipsoid::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SuperquadricEllipsoid", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SuperquadricEllipsoid", Base::metaObject( ),
                                         createNewSuperquadricEllipsoid );
       s_pMetaObject->addProperty(
          new PMSuperquadricEllipsoidProperty( "eastWestExponent",
diff --git a/kpovmodeler/pmsqe.h b/kpovmodeler/pmsqe.h
index 835f52c0..acc4e030 100644
--- a/kpovmodeler/pmsqe.h
+++ b/kpovmodeler/pmsqe.h
@@ -58,7 +58,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmsqeedit.cpp b/kpovmodeler/pmsqeedit.cpp
index 377b552b..bbea3896 100644
--- a/kpovmodeler/pmsqeedit.cpp
+++ b/kpovmodeler/pmsqeedit.cpp
@@ -20,7 +20,7 @@
 #include "pmsqe.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmsymboltable.cpp b/kpovmodeler/pmsymboltable.cpp
index 5cb72b94..e8a15c3d 100644
--- a/kpovmodeler/pmsymboltable.cpp
+++ b/kpovmodeler/pmsymboltable.cpp
@@ -94,7 +94,7 @@ TQString PMSymbolTable::findNewID( const TQString& prefix )
    // find next free id
    do
    {
-      testID = prefix + TQString( "%1" ).tqarg( number );
+      testID = prefix + TQString( "%1" ).arg( number );
       symbol = find( testID );
       if( symbol )
          number++;
diff --git a/kpovmodeler/pmtext.cpp b/kpovmodeler/pmtext.cpp
index e4b7f0da..9410228d 100644
--- a/kpovmodeler/pmtext.cpp
+++ b/kpovmodeler/pmtext.cpp
@@ -89,11 +89,11 @@ void PMText::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMText::tqmetaObject( ) const
+PMMetaObject* PMText::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Text", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Text", Base::metaObject( ),
                                         createNewText );
       s_pMetaObject->addProperty(
          new PMTextProperty( "font", &PMText::setFont, &PMText::font ) );
diff --git a/kpovmodeler/pmtext.h b/kpovmodeler/pmtext.h
index 5b769dc7..7ab4aff7 100644
--- a/kpovmodeler/pmtext.h
+++ b/kpovmodeler/pmtext.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmtextedit.cpp b/kpovmodeler/pmtextedit.cpp
index e1e4e038..d9a3fcc8 100644
--- a/kpovmodeler/pmtextedit.cpp
+++ b/kpovmodeler/pmtextedit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
diff --git a/kpovmodeler/pmtexture.cpp b/kpovmodeler/pmtexture.cpp
index 3ae367dd..a40da8cb 100644
--- a/kpovmodeler/pmtexture.cpp
+++ b/kpovmodeler/pmtexture.cpp
@@ -45,11 +45,11 @@ PMTexture::~PMTexture( )
 {
 }
 
-PMMetaObject* PMTexture::tqmetaObject( ) const
+PMMetaObject* PMTexture::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Texture", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Texture", Base::metaObject( ),
                                         createNewTexture );
       s_pMetaObject->addProperty(
          new PMTextureProperty( "uvMapping", &PMTexture::setUVMapping, &PMTexture::uvMapping ) );
diff --git a/kpovmodeler/pmtexture.h b/kpovmodeler/pmtexture.h
index daeaf427..b2675b11 100644
--- a/kpovmodeler/pmtexture.h
+++ b/kpovmodeler/pmtexture.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmtexturebase.cpp b/kpovmodeler/pmtexturebase.cpp
index 93c3cdb3..a49b103f 100644
--- a/kpovmodeler/pmtexturebase.cpp
+++ b/kpovmodeler/pmtexturebase.cpp
@@ -49,11 +49,11 @@ PMTextureBase::~PMTextureBase( )
 {
 }
 
-PMMetaObject* PMTextureBase::tqmetaObject( ) const
+PMMetaObject* PMTextureBase::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "TextureBase", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "TextureBase", Base::metaObject( ) );
       s_pMetaObject->addProperty(
          new PMTextureBaseProperty( "linkedObject", &PMTextureBase::setLinkedObjectProperty,
                          &PMTextureBase::linkedObjectProperty ) );
@@ -150,7 +150,7 @@ void PMTextureBase::readAttributes( const PMXMLHelper& h )
          }
          else
             h.parser( )->printError( i18n( "Declare \"%1\" has wrong type." )
-                                     .tqarg( id ) );
+                                     .arg( id ) );
       }
    }
 }
diff --git a/kpovmodeler/pmtexturebase.h b/kpovmodeler/pmtexturebase.h
index 3d57d70f..a3ecdc0a 100644
--- a/kpovmodeler/pmtexturebase.h
+++ b/kpovmodeler/pmtexturebase.h
@@ -55,7 +55,7 @@ public:
    virtual void readAttributes( const PMXMLHelper& h );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmtexturebaseedit.cpp b/kpovmodeler/pmtexturebaseedit.cpp
index 0768adc1..1a340f27 100644
--- a/kpovmodeler/pmtexturebaseedit.cpp
+++ b/kpovmodeler/pmtexturebaseedit.cpp
@@ -20,7 +20,7 @@
 #include "pmpigment.h"
 #include "pmlinkedit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmtextureedit.cpp b/kpovmodeler/pmtextureedit.cpp
index 768cc3cc..e01088bd 100644
--- a/kpovmodeler/pmtextureedit.cpp
+++ b/kpovmodeler/pmtextureedit.cpp
@@ -20,7 +20,7 @@
 #include "pmtexture.h"
 #include "pmlinkedit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmtexturemap.cpp b/kpovmodeler/pmtexturemap.cpp
index dc9f3b76..b3673f0c 100644
--- a/kpovmodeler/pmtexturemap.cpp
+++ b/kpovmodeler/pmtexturemap.cpp
@@ -22,7 +22,7 @@
 #include "pmxmlhelper.h"
 #include "pmmapmemento.h"
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <klocale.h>
 
 class PMValueProperty : public PMPropertyBase
@@ -119,7 +119,7 @@ TQString PMTextureMapBase::valuesToString( ) const
       str.setNum( *it );
       ++it;
       for( ; it != m_mapValues.end( ); ++it )
-         str += TQString( " %1" ).tqarg( *it );
+         str += TQString( " %1" ).arg( *it );
    }
    return str;
 }
@@ -138,11 +138,11 @@ void PMTextureMapBase::stringToValues( const TQString& str )
    }
 }
 
-PMMetaObject* PMTextureMapBase::tqmetaObject( ) const
+PMMetaObject* PMTextureMapBase::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "TextureMapBase", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "TextureMapBase", Base::metaObject( ) );
       s_pMetaObject->addProperty( new PMValueProperty( ) );
    }
    return s_pMetaObject;
@@ -342,11 +342,11 @@ PMTextureMap::~PMTextureMap( )
 {
 }
 
-PMMetaObject* PMTextureMap::tqmetaObject( ) const
+PMMetaObject* PMTextureMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "TextureMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "TextureMap", Base::metaObject( ),
                                         createNewTextureMap );
    }
    return s_pMetaObject;
@@ -388,11 +388,11 @@ PMPigmentMap::~PMPigmentMap( )
 {
 }
 
-PMMetaObject* PMPigmentMap::tqmetaObject( ) const
+PMMetaObject* PMPigmentMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "PigmentMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "PigmentMap", Base::metaObject( ),
                                         createNewPigmentMap );
    }
    return s_pMetaObject;
@@ -434,11 +434,11 @@ PMColorMap::~PMColorMap( )
 {
 }
 
-PMMetaObject* PMColorMap::tqmetaObject( ) const
+PMMetaObject* PMColorMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ColorMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ColorMap", Base::metaObject( ),
                                         createNewColorMap );
    }
    return s_pMetaObject;
@@ -480,11 +480,11 @@ PMNormalMap::~PMNormalMap( )
 {
 }
 
-PMMetaObject* PMNormalMap::tqmetaObject( ) const
+PMMetaObject* PMNormalMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "NormalMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "NormalMap", Base::metaObject( ),
                                         createNewNormalMap );
    }
    return s_pMetaObject;
@@ -526,11 +526,11 @@ PMSlopeMap::~PMSlopeMap( )
 {
 }
 
-PMMetaObject* PMSlopeMap::tqmetaObject( ) const
+PMMetaObject* PMSlopeMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SlopeMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SlopeMap", Base::metaObject( ),
                                         createNewSlopeMap );
    }
    return s_pMetaObject;
@@ -572,11 +572,11 @@ PMDensityMap::~PMDensityMap( )
 {
 }
 
-PMMetaObject* PMDensityMap::tqmetaObject( ) const
+PMMetaObject* PMDensityMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "DensityMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "DensityMap", Base::metaObject( ),
                                         createNewDensityMap );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pmtexturemap.h b/kpovmodeler/pmtexturemap.h
index 26907ed3..6a7b020d 100644
--- a/kpovmodeler/pmtexturemap.h
+++ b/kpovmodeler/pmtexturemap.h
@@ -54,7 +54,7 @@ public:
    virtual bool dataChangeOnInsertRemove( ) const { return true; }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -153,7 +153,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "Texture" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -193,7 +193,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "Pigment" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -233,7 +233,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "SolidColor" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -274,7 +274,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "Normal" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -314,7 +314,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "Slope" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -354,7 +354,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "Density" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmtexturemapedit.cpp b/kpovmodeler/pmtexturemapedit.cpp
index 2efa7708..8b153bb3 100644
--- a/kpovmodeler/pmtexturemapedit.cpp
+++ b/kpovmodeler/pmtexturemapedit.cpp
@@ -20,7 +20,7 @@
 #include "pmtexturemap.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kpovmodeler/pmtorus.cpp b/kpovmodeler/pmtorus.cpp
index a32d04e7..5e5be5ea 100644
--- a/kpovmodeler/pmtorus.cpp
+++ b/kpovmodeler/pmtorus.cpp
@@ -74,11 +74,11 @@ TQString PMTorus::description( ) const
    return i18n( "torus" );
 }
 
-PMMetaObject* PMTorus::tqmetaObject( ) const
+PMMetaObject* PMTorus::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Torus", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Torus", Base::metaObject( ),
                                         createNewTorus );
       s_pMetaObject->addProperty(
          new PMTorusProperty( "minorRadius", &PMTorus::setMinorRadius,
diff --git a/kpovmodeler/pmtorus.h b/kpovmodeler/pmtorus.h
index 59b16e3c..a7f1ee6a 100644
--- a/kpovmodeler/pmtorus.h
+++ b/kpovmodeler/pmtorus.h
@@ -58,7 +58,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmtorusedit.cpp b/kpovmodeler/pmtorusedit.cpp
index e47301b9..4cde4935 100644
--- a/kpovmodeler/pmtorusedit.cpp
+++ b/kpovmodeler/pmtorusedit.cpp
@@ -20,7 +20,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <tqcheckbox.h>
diff --git a/kpovmodeler/pmtranslate.cpp b/kpovmodeler/pmtranslate.cpp
index 0cbfe58d..a0a09b7b 100644
--- a/kpovmodeler/pmtranslate.cpp
+++ b/kpovmodeler/pmtranslate.cpp
@@ -65,11 +65,11 @@ void PMTranslate::readAttributes( const PMXMLHelper& h )
    m_move = h.vectorAttribute( "value", moveDefault );
 }
 
-PMMetaObject* PMTranslate::tqmetaObject( ) const
+PMMetaObject* PMTranslate::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Translate", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Translate", Base::metaObject( ),
                                         createNewTranslate );
       s_pMetaObject->addProperty(
          new PMTranslateProperty( "translation", &PMTranslate::setTranslation, &PMTranslate::translation ) );
diff --git a/kpovmodeler/pmtranslate.h b/kpovmodeler/pmtranslate.h
index e121615d..d1272bf6 100644
--- a/kpovmodeler/pmtranslate.h
+++ b/kpovmodeler/pmtranslate.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmtranslateedit.cpp b/kpovmodeler/pmtranslateedit.cpp
index f98bcf00..e7a3e7e7 100644
--- a/kpovmodeler/pmtranslateedit.cpp
+++ b/kpovmodeler/pmtranslateedit.cpp
@@ -20,7 +20,7 @@
 #include "pmtranslate.h"
 #include "pmvectoredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 
 
diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp
index 8ec640d7..ba64c277 100644
--- a/kpovmodeler/pmtreeview.cpp
+++ b/kpovmodeler/pmtreeview.cpp
@@ -20,7 +20,7 @@
 
 #include <tqlistview.h>
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpopupmenu.h>
 #include <tqcursor.h>
 
@@ -292,7 +292,7 @@ void PMTreeView::addChildItems( PMTreeViewItem* item )
       else
          // first child
          listItem = new PMTreeViewItem( obj, item );
-      // recursive call, if child has tqchildren
+      // recursive call, if child has children
       if( obj->countChildren( ) > 0 )
          addChildItems( listItem );
    }
diff --git a/kpovmodeler/pmtreeviewitem.cpp b/kpovmodeler/pmtreeviewitem.cpp
index e3017b40..cac3b3c7 100644
--- a/kpovmodeler/pmtreeviewitem.cpp
+++ b/kpovmodeler/pmtreeviewitem.cpp
@@ -78,7 +78,7 @@ void PMTreeViewItem::setDescriptions( )
       {
          PMTextureMapBase* tm = ( PMTextureMapBase* ) m_pObject->parent( );
          if( m_pObject->type( ) == tm->mapType( ) )
-            text = TQString( "[%1] " ).tqarg( tm->mapValue( m_pObject ), 4, 'f', 2 ) + text;
+            text = TQString( "[%1] " ).arg( tm->mapValue( m_pObject ), 4, 'f', 2 ) + text;
       }
    }
    setText( 0, text );
@@ -113,5 +113,5 @@ void PMTreeViewItem::initSelection( )
 {
    TQListViewItem::setSelected( m_pObject->isSelected( ) );
 //   if( m_pObject->isSelected( ) )
-//      tqrepaint( );
+//      repaint( );
 }
diff --git a/kpovmodeler/pmtreeviewitem.h b/kpovmodeler/pmtreeviewitem.h
index 7792871a..4ec2b44e 100644
--- a/kpovmodeler/pmtreeviewitem.h
+++ b/kpovmodeler/pmtreeviewitem.h
@@ -41,17 +41,17 @@ public:
    PMTreeViewItem( PMObject* object, TQListView* parent );
    /**
     * Constructs a new list view item which is a child of parent and
-    * first in the parent's list of tqchildren.
+    * first in the parent's list of children.
     */
    PMTreeViewItem( PMObject* object, TQListViewItem* parent );
    /**
     * Constructs a list view item which is a child of parent
-    * and is after after in the parent's list of tqchildren.
+    * and is after after in the parent's list of children.
     */
    PMTreeViewItem( PMObject* object, TQListView* parent, TQListViewItem* after );
    /**
     * Constructs a list view item which is a child of parent
-    * and is after after in the parent's list of tqchildren.
+    * and is after after in the parent's list of children.
     */
    PMTreeViewItem( PMObject* object, TQListViewItem* parent,
                    TQListViewItem* after );
@@ -61,7 +61,7 @@ public:
    PMObject* object( ) const { return m_pObject; }
    /**
     * Returns a key that can be used for sorting, here the index in the
-    * parents list of tqchildren
+    * parents list of children
     */
    virtual TQString key( int column, bool ascending ) const;
    /**
diff --git a/kpovmodeler/pmtriangle.cpp b/kpovmodeler/pmtriangle.cpp
index db88443e..ecf00f8c 100644
--- a/kpovmodeler/pmtriangle.cpp
+++ b/kpovmodeler/pmtriangle.cpp
@@ -228,11 +228,11 @@ void PMTriangle::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMTriangle::tqmetaObject( ) const
+PMMetaObject* PMTriangle::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Triangle", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Triangle", Base::metaObject( ),
                                         createNewTriangle );
       s_pMetaObject->addProperty(
          new PMTriangleProperty( "smooth", &PMTriangle::setSmoothTriangle,
diff --git a/kpovmodeler/pmtriangle.h b/kpovmodeler/pmtriangle.h
index aeb590d2..e2ef3026 100644
--- a/kpovmodeler/pmtriangle.h
+++ b/kpovmodeler/pmtriangle.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmtriangleedit.cpp b/kpovmodeler/pmtriangleedit.cpp
index b6d544a0..52c751ce 100644
--- a/kpovmodeler/pmtriangleedit.cpp
+++ b/kpovmodeler/pmtriangleedit.cpp
@@ -20,7 +20,7 @@
 #include "pmtriangle.h"
 #include "pmvectoredit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
@@ -55,21 +55,21 @@ void PMTriangleEdit::createTopWidgets( )
    for( i = 0; i < 3; i++ )
    {
       m_pPoint[i] = new PMVectorEdit( "x", "y", "z", this );
-      gl->addWidget( new TQLabel( i18n( "Point %1:" ).tqarg( i+1 ), this ),
+      gl->addWidget( new TQLabel( i18n( "Point %1:" ).arg( i+1 ), this ),
                      i * 3, 0 );
       gl->addWidget( m_pPoint[i], i * 3, 1 );
       connect( m_pPoint[i], TQT_SIGNAL( dataChanged( ) ),
                TQT_SIGNAL( dataChanged( ) ) );
 
       m_pNormal[i] = new PMVectorEdit( "x", "y", "z", this );
-      m_pNormalLabel[i] = new TQLabel( i18n( "Normal %1:" ).tqarg( i+1 ), this );
+      m_pNormalLabel[i] = new TQLabel( i18n( "Normal %1:" ).arg( i+1 ), this );
       gl->addWidget( m_pNormalLabel[i], i * 3 + 1, 0 );
       gl->addWidget( m_pNormal[i], i * 3 + 1, 1 );
       connect( m_pNormal[i], TQT_SIGNAL( dataChanged( ) ),
                TQT_SIGNAL( dataChanged( ) ) );
 
       m_pUVVector[i] = new PMVectorEdit( "u", "v", this );
-      m_pUVVectorLabel[i] = new TQLabel( i18n( "UV vector %1:" ).tqarg( i+1 ), this );
+      m_pUVVectorLabel[i] = new TQLabel( i18n( "UV vector %1:" ).arg( i+1 ), this );
       gl->addWidget( m_pUVVectorLabel[i], i * 3 + 2,  0 );
       gl->addWidget( m_pUVVector[i], i * 3 + 2, 1 );
       connect( m_pUVVector[i], 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/pmunknownview.cpp b/kpovmodeler/pmunknownview.cpp
index 646aa619..45f06002 100644
--- a/kpovmodeler/pmunknownview.cpp
+++ b/kpovmodeler/pmunknownview.cpp
@@ -17,7 +17,7 @@
 
 #include "pmunknownview.h"
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 PMUnknownView::PMUnknownView( const TQString& viewType,
                               TQWidget* parent, const char* name )
@@ -25,8 +25,8 @@ PMUnknownView::PMUnknownView( const TQString& viewType,
 {
    TQHBoxLayout* hl = new TQHBoxLayout( this );
    TQLabel* l;
-   l = new TQLabel( i18n( "Unknown view type \"%1\"" ).tqarg( viewType ), this );
-   l->tqsetAlignment( TQt::AlignCenter );
+   l = new TQLabel( i18n( "Unknown view type \"%1\"" ).arg( viewType ), this );
+   l->setAlignment( TQt::AlignCenter );
    hl->addWidget( l );
    m_viewType = viewType;
 }
diff --git a/kpovmodeler/pmvector.cpp b/kpovmodeler/pmvector.cpp
index 13ba6ba4..fc0e8aad 100644
--- a/kpovmodeler/pmvector.cpp
+++ b/kpovmodeler/pmvector.cpp
@@ -21,7 +21,7 @@
 #include "pmmatrix.h"
 #include "pmdebug.h"
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/kpovmodeler/pmvectoredit.cpp b/kpovmodeler/pmvectoredit.cpp
index 79075dc3..214a3c6e 100644
--- a/kpovmodeler/pmvectoredit.cpp
+++ b/kpovmodeler/pmvectoredit.cpp
@@ -19,7 +19,7 @@
 #include "pmvectoredit.h"
 #include "pmdebug.h"
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <kdialog.h>
 #include <kmessagebox.h>
@@ -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/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp
index fed18026..4d785b52 100644
--- a/kpovmodeler/pmvectorlistedit.cpp
+++ b/kpovmodeler/pmvectorlistedit.cpp
@@ -20,7 +20,7 @@
 
 #include <tqheader.h>
 #include <tqapplication.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpainter.h>
 #include <kmessagebox.h>
 #include <klocale.h>
@@ -53,7 +53,7 @@ void PMTableItem::paint( TQPainter* p, const TQColorGroup& cg,
    else
       p->setPen( cg.text( ) );
    p->drawText( x + 2, 0, w - x - 4, h,
-                wordWrap( ) ? ( tqalignment( ) | WordBreak ) : tqalignment( ), text( ) );
+                wordWrap( ) ? ( alignment( ) | WordBreak ) : alignment( ), text( ) );
 }
 */
 
@@ -121,7 +121,7 @@ void PMVectorListEdit::init( int dimensions )
       setColumnStretchable( i, true );
    connect( this, TQT_SIGNAL( valueChanged( int, int ) ),
             TQT_SLOT( slotTextChanged( int, int ) ) );
-   tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+   setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
 }
 
 void PMVectorListEdit::setVectors( const TQValueList<PMVector>& l,
@@ -256,7 +256,7 @@ void PMVectorListEdit::setLink( int p1, int p2 )
    if( p2 >= 0 )
    {
       m_disabled[p2] = true;
-      str = TQString( "%1 (=%2)" ).tqarg( p2 + 1 ).tqarg( p1 + 1 );
+      str = TQString( "%1 (=%2)" ).arg( p2 + 1 ).arg( p1 + 1 );
       h->setLabel( p2, str );
       if( !isReadOnly( ) )
          setRowReadOnly( p2, true );
@@ -315,11 +315,11 @@ bool PMVectorListEdit::isDataValid( )
    return valid;
 }
 
-TQSize PMVectorListEdit::tqsizeHint( ) const
+TQSize PMVectorListEdit::sizeHint( ) const
 {
    return TQSize( c_columnWidth * m_dimension + frameWidth( ) * 2,
                  frameWidth( ) * 2 + horizontalHeader( )->height( )
-                 + verticalHeader( )->tqsizeHint( ).height( ) );
+                 + verticalHeader( )->sizeHint( ).height( ) );
 }
 
 void PMVectorListEdit::slotTextChanged( int, int )
diff --git a/kpovmodeler/pmvectorlistedit.h b/kpovmodeler/pmvectorlistedit.h
index d415e9a9..a52be9db 100644
--- a/kpovmodeler/pmvectorlistedit.h
+++ b/kpovmodeler/pmvectorlistedit.h
@@ -147,7 +147,7 @@ public:
    bool isDataValid( );
 
    /** */
-   virtual TQSize tqsizeHint( ) const;
+   virtual TQSize sizeHint( ) const;
    /** */
    bool eventFilter( TQObject* o, TQEvent* e );
 
diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp
index 98fb2f61..90e47e69 100644
--- a/kpovmodeler/pmview.cpp
+++ b/kpovmodeler/pmview.cpp
@@ -19,7 +19,7 @@
 #include <tqprinter.h>
 #include <tqpainter.h>
 #include <tqsplitter.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <kconfig.h>
 #include <kdialog.h>
@@ -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..7d45224d 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -32,7 +32,7 @@
 #include <tqwidgetlist.h>
 #include <tqlistbox.h>
 #include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include "pmshell.h"
@@ -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/kpovmodeler/pmwarp.cpp b/kpovmodeler/pmwarp.cpp
index e97817bb..166777ce 100644
--- a/kpovmodeler/pmwarp.cpp
+++ b/kpovmodeler/pmwarp.cpp
@@ -221,11 +221,11 @@ void PMWarp::readAttributes( const PMXMLHelper& h )
    }
 }
 
-PMMetaObject* PMWarp::tqmetaObject( ) const
+PMMetaObject* PMWarp::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Warp", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Warp", Base::metaObject( ),
                                         createNewWarp );
 
       PMWarpTypeProperty* p = new PMWarpTypeProperty(
diff --git a/kpovmodeler/pmwarp.h b/kpovmodeler/pmwarp.h
index 15e86b65..6b50f498 100644
--- a/kpovmodeler/pmwarp.h
+++ b/kpovmodeler/pmwarp.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmwarpedit.cpp b/kpovmodeler/pmwarpedit.cpp
index 64e327f2..f18f8d67 100644
--- a/kpovmodeler/pmwarpedit.cpp
+++ b/kpovmodeler/pmwarpedit.cpp
@@ -21,7 +21,7 @@
 #include "pmvectoredit.h"
 #include "pmlineedits.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
diff --git a/kpovmodeler/pmxmlparser.cpp b/kpovmodeler/pmxmlparser.cpp
index eb5d0123..11d42015 100644
--- a/kpovmodeler/pmxmlparser.cpp
+++ b/kpovmodeler/pmxmlparser.cpp
@@ -143,7 +143,7 @@ void PMXMLParser::parseChildObjects( TQDomElement& e, PMObject* parent )
                delete obj;
          }
          else if( ce.tagName( ) != "extra_data" )
-            printError( i18n( "Unknown object %1" ).tqarg( ce.tagName( ) ) );
+            printError( i18n( "Unknown object %1" ).arg( ce.tagName( ) ) );
       }
       c = c.nextSibling( );
    }
diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp
index dfe02b20..efa57d07 100644
--- a/kruler/klineal.cpp
+++ b/kruler/klineal.cpp
@@ -165,7 +165,7 @@ KLineal::KLineal(TQWidget*parent,const char* name):KMainWindow(parent,name){
   mMenu->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), helpMenu());
   mMenu->insertSeparator();
   mMenu->insertItem(SmallIcon( "exit" ), KStdGuiItem::quit().text(), kapp, TQT_SLOT(quit()), CTRL+Key_Q);
-  mLastClickPos = tqgeometry().topLeft()+TQPoint(width()/2, height()/2);
+  mLastClickPos = geometry().topLeft()+TQPoint(width()/2, height()/2);
 }
 
 KLineal::~KLineal(){
@@ -293,7 +293,7 @@ void KLineal::setOrientation(int inOrientation) {
     mLenMenu->changeItem(FULLSCREENID, mOrientation % 2 ? i18n("&Full Screen Height") : i18n("&Full Screen Width"));
   setCursor(mCurrentCursor);
   setupBackground();
-  tqrepaint();
+  repaint();
 }
 void KLineal::setNorth() {
   setOrientation(North);
@@ -390,7 +390,7 @@ void KLineal::choseFont() {
 void KLineal::setFont(TQFont &font) {
 	mScaleFont = font;
 	saveSettings();
-  tqrepaint();
+  repaint();
 }
 
 
@@ -451,7 +451,7 @@ void KLineal::enterEvent(TQEvent * /*inEvent*/) {
 * overwritten to switch the value label and line cursor off
 */
 void KLineal::leaveEvent(TQEvent * /*inEvent*/) {
-  if (!tqgeometry().contains(TQCursor::pos())) {
+  if (!geometry().contains(TQCursor::pos())) {
     hideLabel();
   }
 }
@@ -569,7 +569,7 @@ void KLineal::mousePressEvent(TQMouseEvent *inEvent) {
   mLastClickPos = TQCursor::pos();
   hideLabel();
 
-  TQRect gr = tqgeometry();
+  TQRect gr = geometry();
   mDragOffset = mLastClickPos - TQPoint(gr.left(), gr.top());
   if (inEvent->button() == Qt::LeftButton) {
     if (!mDragging) {
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index 881f67a2..4ed8c110 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -26,7 +26,7 @@
 #include <tqbitmap.h>
 #include <tqdragobject.h>
 #include <tqimage.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqvbox.h>
 
 #include <kaccel.h>
@@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url )
 {
     if ( KIO::NetAccess::exists( url, false, this ) ) {
         const TQString title = i18n( "File Exists" );
-        const TQString text = i18n( "<qt>Do you really want to overwrite <b>%1</b>?</qt>" ).tqarg(url.prettyURL());
+        const TQString text = i18n( "<qt>Do you really want to overwrite <b>%1</b>?</qt>" ).arg(url.prettyURL());
         if (KMessageBox::Continue != KMessageBox::warningContinueCancel( this, text, title, i18n("Overwrite") ) ) 
         {
             return false;
@@ -199,7 +199,7 @@ bool KSnapshot::save( const KURL& url )
 
 	TQString caption = i18n("Unable to save image");
 	TQString text = i18n("KSnapshot was unable to save the image to\n%1.")
-	               .tqarg(url.prettyURL());
+	               .arg(url.prettyURL());
 	KMessageBox::error(this, text, caption);
     }
 
@@ -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 c0d5becc..1e186b19 100644
--- a/ksnapshot/ksnapshot.h
+++ b/ksnapshot/ksnapshot.h
@@ -29,7 +29,7 @@ class KSnapshotPreview : public TQLabel
         KSnapshotPreview(TQWidget *parent, const char *name = 0)
             : TQLabel(parent, name)
         {
-            tqsetAlignment(AlignHCenter | AlignVCenter);
+            setAlignment(AlignHCenter | AlignVCenter);
             setCursor(TQCursor(TQt::PointingHandCursor));
         }
         virtual ~KSnapshotPreview() {}
@@ -44,14 +44,14 @@ class KSnapshotPreview : public TQLabel
 
             {
                 TQPainter p(&mask);
-                tqstyle().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), tqpalette().active());
+                tqstyle().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());
+                tqstyle().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 86e942f2..95590cb4 100644
--- a/ksnapshot/ksnapshotwidget.ui
+++ b/ksnapshot/ksnapshotwidget.ui
@@ -23,7 +23,7 @@
             <property name="name">
                 <cstring>lblImage</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>200</width>
                     <height>130</height>
@@ -107,7 +107,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>156</width>
                     <height>16</height>
@@ -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">
@@ -193,7 +193,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>16</height>
diff --git a/ksnapshot/ksnapshotwidget.ui.h b/ksnapshot/ksnapshotwidget.ui.h
index 601b624f..921accc9 100644
--- a/ksnapshot/ksnapshotwidget.ui.h
+++ b/ksnapshot/ksnapshotwidget.ui.h
@@ -47,7 +47,7 @@ void KSnapshotWidget::setPreview( const TQPixmap &pm )
     TQToolTip::remove( lblImage );
     TQToolTip::add( lblImage,
         TQString( "Preview of the snapshot image (%1 x %2)" )
-        .tqarg( pm.width() ).tqarg( pm.height() ) );
+        .arg( pm.width() ).arg( pm.height() ) );
 
     lblImage->setPixmap( img );
     lblImage->adjustSize();
diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp
index 74ac960a..f35f61ce 100644
--- a/ksnapshot/regiongrabber.cpp
+++ b/ksnapshot/regiongrabber.cpp
@@ -21,7 +21,7 @@
 
 #include <tqapplication.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqstyle.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
@@ -41,8 +41,8 @@ SizeTip::SizeTip( TQWidget *parent, const char *name )
 
 void SizeTip::setTip( const TQRect &rect )
 {
-  TQString tip = TQString( "%1x%2" ).tqarg( rect.width() )
-      .tqarg( rect.height() );
+  TQString tip = TQString( "%1x%2" ).arg( rect.width() )
+      .arg( rect.height() );
 
   setText( tip );
   adjustSize();
@@ -52,7 +52,7 @@ void SizeTip::setTip( const TQRect &rect )
 
 void SizeTip::positionTip( const TQRect &rect )
 {
-  TQRect tipRect = tqgeometry();
+  TQRect tipRect = geometry();
   tipRect.moveTopLeft( TQPoint( 0, 0 ) );
 
   if ( rect.intersects( tipRect ) )
@@ -61,7 +61,7 @@ void SizeTip::positionTip( const TQRect &rect )
 
     tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) );
     if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) )
-      tipRect.moveBottomRight( tqgeometry().bottomRight() );
+      tipRect.moveBottomRight( geometry().bottomRight() );
   }
 
   move( tipRect.topLeft() );
@@ -92,7 +92,7 @@ void RegionGrabber::initGrabber()
   TQDesktopWidget desktopWidget;
   TQRect desktopSize;
   if ( desktopWidget.isVirtualDesktop() )
-    desktopSize = desktopWidget.tqgeometry();
+    desktopSize = desktopWidget.geometry();
   else
     desktopSize = desktopWidget.screenGeometry( qt_xrootwin() );
 
@@ -168,8 +168,8 @@ void RegionGrabber::drawRubber()
   p.setPen( TQPen( color0, 1 ) );
   p.setBrush( NoBrush );
 
-  tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(),
-      TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) );
+  tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
+      TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) );
 
   p.end();
 }
diff --git a/ksnapshot/windowgrabber.cpp b/ksnapshot/windowgrabber.cpp
index 189fb856..afc337e5 100644
--- a/ksnapshot/windowgrabber.cpp
+++ b/ksnapshot/windowgrabber.cpp
@@ -39,7 +39,7 @@ bool operator< ( const TQRect& r1, const TQRect& r2 )
     return r1.width() * r1.height() < r2.width() * r2.height();
 }
 
-// Recursively iterates over the window w and its tqchildren, thereby building
+// Recursively iterates over the window w and its children, thereby building
 // a tree of window descriptors. Windows in non-viewable state or with height
 // or width smaller than minSize will be ignored.
 static
@@ -62,15 +62,15 @@ void getWindowsRecursive( std::vector<TQRect>& windows, Window w,
 	}
 
 	Window root, parent;
-	Window* tqchildren;
-	unsigned int ntqchildren;
+	Window* children;
+	unsigned int nchildren;
 
-	if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) {
-            for( unsigned int i = 0; i < ntqchildren; ++i ) {
-                getWindowsRecursive( windows, tqchildren[ i ], x, y, depth + 1 );
+	if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) {
+            for( unsigned int i = 0; i < nchildren; ++i ) {
+                getWindowsRecursive( windows, children[ i ], x, y, depth + 1 );
 	    }
-            if( tqchildren != NULL )
-		XFree( tqchildren );
+            if( children != NULL )
+		XFree( children );
 	}
     }
     if ( depth == 0 )
@@ -95,16 +95,16 @@ Window findRealWindow( Window w, int depth = 0 )
 	    return w;
     }
     Window root, parent;
-    Window* tqchildren;
-    unsigned int ntqchildren;
+    Window* children;
+    unsigned int nchildren;
     Window ret = None;
-    if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) {
+    if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) {
 	for( unsigned int i = 0;
-	     i < ntqchildren && ret == None;
+	     i < nchildren && ret == None;
 	     ++i )
-	    ret = findRealWindow( tqchildren[ i ], depth + 1 );
-	if( tqchildren != NULL )
-	    XFree( tqchildren );
+	    ret = findRealWindow( children[ i ], depth + 1 );
+	if( children != NULL )
+	    XFree( children );
     }
     return ret;
 }
@@ -143,7 +143,7 @@ TQPixmap grabWindow( Window child, int x, int y, uint w, uint h, uint border )
 	int count, order;
 	XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child,
 						 ShapeBounding, &count, &order );
-	//The ShapeBounding region is the outermost tqshape of the window;
+	//The ShapeBounding region is the outermost shape of the window;
 	//ShapeBounding - ShapeClipping is defined to be the border.
 	//Since the border area is part of the window, we use bounding
 	// to limit our work region
@@ -168,7 +168,7 @@ TQPixmap grabWindow( Window child, int x, int y, uint w, uint h, uint border )
 
 	    //Get the masked away area.
 	    TQRegion maskedAway = bbox - contents;
-	    TQMemArray<TQRect> maskedAwayRects = maskedAway.tqrects();
+	    TQMemArray<TQRect> maskedAwayRects = maskedAway.rects();
 
 	    //Construct a bitmap mask from the rectangles
 	    TQPainter p(&mask);
@@ -219,12 +219,12 @@ TQPixmap WindowGrabber::grabCurrent( bool includeDecorations )
     Window child = windowUnderCursor( includeDecorations );
     XGetGeometry( qt_xdisplay(), child, &root, &x, &y, &w, &h, &border, &depth );
     Window parent;
-    Window* tqchildren;
-    unsigned int ntqchildren;
+    Window* children;
+    unsigned int nchildren;
     if( XQueryTree( qt_xdisplay(), child, &root, &parent,
-                    &tqchildren, &ntqchildren ) != 0 ) {
-	if( tqchildren != NULL )
-	    XFree( tqchildren );
+                    &children, &nchildren ) != 0 ) {
+	if( children != NULL )
+	    XFree( children );
 	int newx, newy;
 	Window dummy;
 	if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(),
@@ -339,7 +339,7 @@ int WindowGrabber::windowIndex( const TQPoint &pos ) const
 // Draws a border around the (child) window currently containing the pointer
 void WindowGrabber::drawBorder()
 {
-    tqrepaint();
+    repaint();
 
     if ( current >= 0 ) {
 	TQPainter p;
diff --git a/ksvg/core/CanvasItems.cpp b/ksvg/core/CanvasItems.cpp
index 2e43a97f..333f4608 100644
--- a/ksvg/core/CanvasItems.cpp
+++ b/ksvg/core/CanvasItems.cpp
@@ -380,7 +380,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
 				params->setTextPathStartOffset(pathAdvance);
 				if(tp && tp->dy()->baseVal()->numberOfItems() > 0)
 					pathDy += tp->dy()->baseVal()->getItem(0)->value();
-				TQString shift = TQString("%1%%").tqarg((pathDy / font->fontParams()->size()) * -100.0);
+				TQString shift = TQString("%1%%").arg((pathDy / font->fontParams()->size()) * -100.0);
 				params->setBaselineShift(shift.latin1());
 			}
 
@@ -484,26 +484,26 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
 
 // #####
 
-void MarkerHelper::doMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle, const TQString &markerId)
+void MarkerHelper::doMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle, const TQString &markerId)
 {
-	SVGMarkerElementImpl *marker = dynamic_cast<SVGMarkerElementImpl *>(tqshape->ownerSVGElement()->getElementById(markerId));
+	SVGMarkerElementImpl *marker = dynamic_cast<SVGMarkerElementImpl *>(shape->ownerSVGElement()->getElementById(markerId));
 	if(marker)
-		marker->draw(tqshape, x, y, style->getStrokeWidth()->baseVal()->value(), angle);
+		marker->draw(shape, x, y, style->getStrokeWidth()->baseVal()->value(), angle);
 }
 
-void MarkerHelper::doStartMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle)
+void MarkerHelper::doStartMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle)
 {
-	doMarker(tqshape, style, x, y, angle, style->getStartMarker());
+	doMarker(shape, style, x, y, angle, style->getStartMarker());
 }
 
-void MarkerHelper::doMidMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle)
+void MarkerHelper::doMidMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle)
 {
-	doMarker(tqshape, style, x, y, angle, style->getMidMarker());
+	doMarker(shape, style, x, y, angle, style->getMidMarker());
 }
 
-void MarkerHelper::doEndMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle)
+void MarkerHelper::doEndMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle)
 {
-	doMarker(tqshape, style, x, y, angle, style->getEndMarker());
+	doMarker(shape, style, x, y, angle, style->getEndMarker());
 }
 
 // vim:ts=4:noet
diff --git a/ksvg/core/CanvasItems.h b/ksvg/core/CanvasItems.h
index 45818712..9f5eed43 100644
--- a/ksvg/core/CanvasItems.h
+++ b/ksvg/core/CanvasItems.h
@@ -80,12 +80,12 @@ protected:
 class MarkerHelper
 {
 protected:
-	void doStartMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle = 0.0);
-	void doMidMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle = 0.0);
-	void doEndMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle = 0.0);
+	void doStartMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle = 0.0);
+	void doMidMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle = 0.0);
+	void doEndMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle = 0.0);
 
 private:
-	void doMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle, const TQString &marker);
+	void doMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle, const TQString &marker);
 };
 
 class CanvasText : public CanvasItem
diff --git a/ksvg/core/KSVGCanvas.cpp b/ksvg/core/KSVGCanvas.cpp
index d16676ab..bbd63524 100644
--- a/ksvg/core/KSVGCanvas.cpp
+++ b/ksvg/core/KSVGCanvas.cpp
@@ -362,7 +362,7 @@ T2P::FontVisualParams *KSVGCanvas::fontVisualParams(SVGStylableImpl *style) cons
 	return fontVisualParams;
 }
 
-void KSVGCanvas::tqinvalidate(CanvasItem *item, bool recalc)
+void KSVGCanvas::invalidate(CanvasItem *item, bool recalc)
 {
 	if(m_chunksByItem.find(item) != m_chunksByItem.end())
 	{
@@ -395,7 +395,7 @@ void KSVGCanvas::insert(CanvasItem *item, int z)
 
 		bool visible = item->isVisible();
 		if(visible)
-			tqinvalidate(item, false);
+			invalidate(item, false);
 
 		if(m_immediateUpdate)
 		{
@@ -462,15 +462,15 @@ void KSVGCanvas::addToChunks(CanvasItem *item)
 
 unsigned int KSVGCanvas::setElementItemZIndexRecursive(SVGElementImpl *element, unsigned int z)
 {
-	SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
+	SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
 
-	if(tqshape)
+	if(shape)
 	{
-		CanvasItem *item = tqshape->item();
+		CanvasItem *item = shape->item();
 
 		if(item)
 		{
-			SVGImageElementImpl *image = dynamic_cast<SVGImageElementImpl *>(tqshape);
+			SVGImageElementImpl *image = dynamic_cast<SVGImageElementImpl *>(shape);
 
 			if(image && image->svgImageRootElement())
 			{
@@ -481,7 +481,7 @@ unsigned int KSVGCanvas::setElementItemZIndexRecursive(SVGElementImpl *element,
 			else
 			{
 				item->setZIndex(z);
-				tqinvalidate(item, false);
+				invalidate(item, false);
 				z++;
 			}
 		}
@@ -766,7 +766,7 @@ void KSVGCanvas::blit()
 
 void KSVGCanvas::ChunkManager::addChunk(CanvasChunk *chunk)
 {
-	TQString key = TQString("%1 %2").tqarg(chunk->x()).tqarg(chunk->y());
+	TQString key = TQString("%1 %2").arg(chunk->x()).arg(chunk->y());
 //	kdDebug(26005) << k_funcinfo << "Adding chunk : " << chunk << endl;
 	m_chunks.insert(key, chunk);
 }
@@ -774,7 +774,7 @@ void KSVGCanvas::ChunkManager::addChunk(CanvasChunk *chunk)
 CanvasChunk *KSVGCanvas::ChunkManager::getChunk(short x, short y) const
 {
 //	kdDebug(26005) << k_funcinfo << "getting chunk from : " << x << ", " << y << endl;
-	TQString key = TQString("%1 %2").tqarg(x).tqarg(y);
+	TQString key = TQString("%1 %2").arg(x).arg(y);
 	return m_chunks[key];
 }
 
diff --git a/ksvg/core/KSVGCanvas.h b/ksvg/core/KSVGCanvas.h
index 367d17d4..24f28ac6 100644
--- a/ksvg/core/KSVGCanvas.h
+++ b/ksvg/core/KSVGCanvas.h
@@ -75,7 +75,7 @@ public:
 	void update(const TQPoint &panPoint, bool erase = true);
 	void resize(unsigned int w, unsigned int h);
 	void retune(unsigned int csh, unsigned int csv);
-	void tqinvalidate(CanvasItem *item, bool recalc = true);
+	void invalidate(CanvasItem *item, bool recalc = true);
 	CanvasItemList collisions(const TQPoint &p, bool exact = false) const;
 
 	void setBackgroundColor(const TQColor &c) { m_backgroundColor = c; }
@@ -126,7 +126,7 @@ public:
 	T2P::FontVisualParams *fontVisualParams(SVGStylableImpl *style) const;
 	virtual T2P::BezierPath *toBezierPath(CanvasItem *item) const { Q_UNUSED(item); return 0; }
 
-	// Assign z indices to the element and its tqchildren, starting with z, and 
+	// Assign z indices to the element and its children, starting with z, and 
 	// return the next z value to be used.
 	unsigned int setElementItemZIndexRecursive(SVGElementImpl *element, unsigned int z);
 
diff --git a/ksvg/core/KSVGReader.cc b/ksvg/core/KSVGReader.cc
index 6d142b1d..e3dc186f 100644
--- a/ksvg/core/KSVGReader.cc
+++ b/ksvg/core/KSVGReader.cc
@@ -146,13 +146,13 @@ SVGSVGElementImpl *Helper::nextSVGElement(SVGElementImpl *elem)
 SVGSVGElementImpl *Helper::nextSVGElement(DOM::Node elem)
 {
 	DOM::Node foundSVG;
-	DOM::Node tqshape = elem.parentNode();
+	DOM::Node shape = elem.parentNode();
 	
-	for(; !tqshape.isNull(); tqshape = tqshape.parentNode())
+	for(; !shape.isNull(); shape = shape.parentNode())
 	{
-		if(reinterpret_cast<DOM::Element &>(tqshape).nodeName() == "svg")
+		if(reinterpret_cast<DOM::Element &>(shape).nodeName() == "svg")
 		{
-			foundSVG = tqshape;
+			foundSVG = shape;
 			break;
 		}
 	}
@@ -245,7 +245,7 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &,
 					SVGLengthImpl *height = SVGSVGElementImpl::createSVGLength();
 					width->setValueAsString(svg->getAttribute("width").string());
 					height->setValueAsString(svg->getAttribute("height").string());
-					TQString viewbox = TQString("0 0 %1 %2").tqarg(width->value()).tqarg(height->value());
+					TQString viewbox = TQString("0 0 %1 %2").arg(width->value()).arg(height->value());
 					//kdDebug(26001) << "VIEWBOX : " << viewbox.latin1() << endl;
 					svg->setAttribute("viewBox", viewbox);
 					width->deref();
@@ -349,7 +349,7 @@ bool InputHandler::endElement(const TQString &, const TQString &, const TQString
 
 	SVGSVGElementImpl *root = Helper::self()->nextSVGElement(*m_currentNode);
 	SVGElementImpl *element = root ? root->ownerDoc()->getElementFromHandle(m_currentNode->handle()) : Helper::self()->doc()->getElementFromHandle(m_currentNode->handle());
-	SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
+	SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
 	SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
 	SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
 
@@ -386,7 +386,7 @@ bool InputHandler::endElement(const TQString &, const TQString &, const TQString
 
 		if(haveCanvas && (tests ? tests->ok() : true))
 		{
-			if((tqshape && !tqshape->isContainer()) || (!tqshape && element))
+			if((shape && !shape->isContainer()) || (!shape && element))
 				element->createItem();
 		}
 	}
@@ -397,7 +397,7 @@ bool InputHandler::endElement(const TQString &, const TQString &, const TQString
 		m_noRendering = false;
 		bool ok = tests ? tests->ok() : true;
 
-		if(haveCanvas && element && style && ok && style->getDisplay() && style->getVisible() && qName == "pattern" || (tqshape && tqshape->directRender()))
+		if(haveCanvas && element && style && ok && style->getDisplay() && style->getVisible() && qName == "pattern" || (shape && shape->directRender()))
 			element->createItem();
 	}
 
@@ -429,7 +429,7 @@ bool InputHandler::fatalError(const TQXmlParseException &e)
 		Helper::self()->setErrorDescription(TQString());
 	}
 	else
-		error = TQString("[%1:%2]: FATAL ERROR: %3").tqarg(e.lineNumber()).tqarg(e.columnNumber()).tqarg(e.message());
+		error = TQString("[%1:%2]: FATAL ERROR: %3").arg(e.lineNumber()).arg(e.columnNumber()).arg(e.message());
 
 	kdDebug(26001) << "InputHandler::fatalError, " << error << endl;
 
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/SVGCircleElement.h b/ksvg/dom/SVGCircleElement.h
index d621ce8b..65406a1c 100644
--- a/ksvg/dom/SVGCircleElement.h
+++ b/ksvg/dom/SVGCircleElement.h
@@ -51,7 +51,7 @@ class SVGAnimatedLength;
  * point and radius.
  *
  * For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/tqshapes.html#CircleElement">9.3 The
+ * "http://www.w3.org/TR/SVG/shapes.html#CircleElement">9.3 The
  * 'circle' element</a>.
  */
 class SVGCircleElement : public SVGElement,
diff --git a/ksvg/dom/SVGEllipseElement.h b/ksvg/dom/SVGEllipseElement.h
index 07d86504..78399779 100644
--- a/ksvg/dom/SVGEllipseElement.h
+++ b/ksvg/dom/SVGEllipseElement.h
@@ -52,7 +52,7 @@ class SVGEllipseElementImpl;
  * center point and two radii.
  *
  * For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/tqshapes.html#EllipseElement">9.4 The
+ * "http://www.w3.org/TR/SVG/shapes.html#EllipseElement">9.4 The
  * 'ellipse' element</a>.
  */
 class SVGEllipseElement : public SVGElement,
diff --git a/ksvg/dom/SVGLength.cc b/ksvg/dom/SVGLength.cc
index 6ae3f55f..bb2db73f 100644
--- a/ksvg/dom/SVGLength.cc
+++ b/ksvg/dom/SVGLength.cc
@@ -77,7 +77,7 @@ void SVGLength::setValue(float value)
 	{
 		impl->setValue(value);
 
-		// Automatic updating of the tqshape if any value is changed, imagine:
+		// Automatic updating of the shape if any value is changed, imagine:
 		// SVGCircleElement c; [...] c.r().baseVal().setValue(150);
 		if(impl->context() && dynamic_cast<SVGShapeImpl *>(impl->context()))
 			dynamic_cast<SVGShapeImpl *>(impl->context())->update(UPDATE_TRANSFORM, 0, 0);
diff --git a/ksvg/dom/SVGLineElement.h b/ksvg/dom/SVGLineElement.h
index 0bd2e58f..b08a78ba 100644
--- a/ksvg/dom/SVGLineElement.h
+++ b/ksvg/dom/SVGLineElement.h
@@ -51,7 +51,7 @@ class SVGLineElementImpl;
  * one point and ends at another.
  *
  * For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/tqshapes.html#CircleElement">9.5 The
+ * "http://www.w3.org/TR/SVG/shapes.html#CircleElement">9.5 The
  * 'line' element</a>.
  */
 class SVGLineElement : public SVGElement,
diff --git a/ksvg/dom/SVGLocatable.h b/ksvg/dom/SVGLocatable.h
index f078b778..ecb93adc 100644
--- a/ksvg/dom/SVGLocatable.h
+++ b/ksvg/dom/SVGLocatable.h
@@ -66,7 +66,7 @@ public:
 
 	/**
 	 * Returns the tight bounding box in current user space (i.e., after application of
-	 * the <code>transform</code> attribute, if any) on the tqgeometry of all contained graphics
+	 * the <code>transform</code> attribute, if any) on the geometry of all contained graphics
 	 * elements, exclusive of stroke-width and filter effects).
 	 *
 	 * @return An SVGRect object that defines the bounding box.
diff --git a/ksvg/dom/SVGPolygonElement.h b/ksvg/dom/SVGPolygonElement.h
index 7347c53f..526e9815 100644
--- a/ksvg/dom/SVGPolygonElement.h
+++ b/ksvg/dom/SVGPolygonElement.h
@@ -48,11 +48,11 @@ class SVGPointList;
 class SVGPolygonElementImpl;
 
 /**
- * The <code>polygon</code> element defines a closed tqshape consisting
+ * The <code>polygon</code> element defines a closed shape consisting
  * of connected straight line segments.
  *
  * For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/tqshapes.html#PolylineElement">9.7 The
+ * "http://www.w3.org/TR/SVG/shapes.html#PolylineElement">9.7 The
  * 'polygon' element</a>.
  */
 class SVGPolygonElement : public SVGElement,
diff --git a/ksvg/dom/SVGPolylineElement.h b/ksvg/dom/SVGPolylineElement.h
index 78afaf2f..35e948f7 100644
--- a/ksvg/dom/SVGPolylineElement.h
+++ b/ksvg/dom/SVGPolylineElement.h
@@ -47,10 +47,10 @@ namespace KSVG
 /**
  * The <code>polyline</code> element defines a set of connected
  * straight line segments. Typically, <code>polyline</code> elements
- * define open tqshapes.
+ * define open shapes.
  *
  * For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/tqshapes.html#PolylineElement">9.6 The
+ * "http://www.w3.org/TR/SVG/shapes.html#PolylineElement">9.6 The
  * 'polyline' element</a>.
  */
 class SVGPointList;
diff --git a/ksvg/dom/SVGRectElement.h b/ksvg/dom/SVGRectElement.h
index 2c33b045..2a77420d 100644
--- a/ksvg/dom/SVGRectElement.h
+++ b/ksvg/dom/SVGRectElement.h
@@ -55,7 +55,7 @@ class SVGRectElementImpl;
  * for attributes <code> x </code> and <code> y</code>.
  *
  * For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/tqshapes.html#RectElement"> 9.2 The
+ * "http://www.w3.org/TR/SVG/shapes.html#RectElement"> 9.2 The
  * 'rect' element</a>.
  */
 class SVGRectElement : public SVGElement,
@@ -130,7 +130,7 @@ public:
 	 * "http://www.w3.org/TR/SVG/implnote.html#ErrorProcessing"> Error
 	 * processing</a>).
 	 *
-	 * See <a href="http://www.w3.org/TR/SVG/tqshapes.html#RectElement">
+	 * See <a href="http://www.w3.org/TR/SVG/shapes.html#RectElement">
 	 * 9.2 The 'rect' element </a> for info about what happens if the
 	 * attribute is not specified.
 	 *
@@ -148,7 +148,7 @@ public:
 	 * "http://www.w3.org/TR/SVG/implnote.html#ErrorProcessing">Error
 	 * processing</a>).
 	 *
-	 * See <a href="http://www.w3.org/TR/SVG/tqshapes.html#RectElement">
+	 * See <a href="http://www.w3.org/TR/SVG/shapes.html#RectElement">
 	 * 9.2 The 'rect' element </a> for info about what happens if the
 	 * attribute is not specified.
 	 *
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/dom/SVGTextElement.h b/ksvg/dom/SVGTextElement.h
index e4fb8a9f..0bf459fe 100644
--- a/ksvg/dom/SVGTextElement.h
+++ b/ksvg/dom/SVGTextElement.h
@@ -58,7 +58,7 @@ class SVGTextElementImpl;
  * the characters. Since <code>text</code> elements are rendered using the
  * same rendering methods as other graphics elements, all of the same
  * coordinate system transformations, painting, clipping and masking
- * features that apply to tqshapes such as paths and rectangles also
+ * features that apply to shapes such as paths and rectangles also
  * apply to <code>text</code> elements.
  *
  * It is possible to apply a gradient, pattern, clipping path, mask or
diff --git a/ksvg/ecma/ksvg_ecma.cpp b/ksvg/ecma/ksvg_ecma.cpp
index 7fb9c6c1..aa2af84b 100644
--- a/ksvg/ecma/ksvg_ecma.cpp
+++ b/ksvg/ecma/ksvg_ecma.cpp
@@ -38,16 +38,16 @@
 using namespace KSVG;
 using namespace KJS;
 
-class AsynctqStatus : public ObjectImp
+class AsyncStatus : public ObjectImp
 {
 public:
-	AsynctqStatus() : ObjectImp() { }
+	AsyncStatus() : ObjectImp() { }
 
 	virtual bool implementsCall() const { return true; }
 	virtual Value call(ExecState *exec, Object &thisObj, const List &args);
 };
 
-Value AsynctqStatus::call(ExecState *exec, Object &, const List &args)
+Value AsyncStatus::call(ExecState *exec, Object &, const List &args)
 {
 	kdDebug(26004) << "[AsyncStatus] " << args[0].toString(exec).ascii() << endl;
 
@@ -194,7 +194,7 @@ void KSVGEcma::finishedWithEvent(SVGEventImpl *event)
 
 Value KSVGEcma::getUrl(ExecState *exec, ::KURL url)
 {
-	Object *status = new Object(new AsynctqStatus());
+	Object *status = new Object(new AsyncStatus());
 
 	// FIXME: Security issue, allows local testing of getURL(), REMOVE BEFORE RELEASE! (Niko)
 	TQString svgDocument = KSVGLoader::getUrl(url, true);
@@ -214,7 +214,7 @@ Value KSVGEcma::getUrl(ExecState *exec, ::KURL url)
 
 void KSVGEcma::postUrl(ExecState *exec, ::KURL url, const TQString &data, const TQString &mimeType, const TQString &contentEncoding, Object &callBackFunction)
 {
-	Object *status = new Object(new AsynctqStatus());
+	Object *status = new Object(new AsyncStatus());
 	status->put(exec, Identifier("content"), String(""));
     status->put(exec, Identifier("success"), Boolean(false));
 
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/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp
index 90194781..5574cd5a 100644
--- a/ksvg/ecma/ksvg_window.cpp
+++ b/ksvg/ecma/ksvg_window.cpp
@@ -42,7 +42,7 @@
 #include <kparts/part.h>
 #include <assert.h>
 #include <kdebug.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kinputdialog.h>
@@ -330,11 +330,11 @@ Value WindowFunc::call(ExecState *exec, Object &thisObj, const List &args)
 		case KSVG::Window::_GetURL:
 		{
 			KURL url((const_cast<Window *>(window))->doc()->baseUrl(), args[0].toString(exec).qstring());
-			Value asynctqStatus = (const_cast<Window *>(window))->doc()->ecmaEngine()->getUrl(exec, url);
+			Value asyncStatus = (const_cast<Window *>(window))->doc()->ecmaEngine()->getUrl(exec, url);
 			Object callBackFunction = Object::dynamicCast(args[1]);
 			List callBackArgs;
 
-			callBackArgs.append(asynctqStatus);
+			callBackArgs.append(asyncStatus);
 			callBackFunction.call(exec, callBackFunction, callBackArgs);
 
 			return Undefined();
diff --git a/ksvg/impl/SVGAnimateMotionElementImpl.cc b/ksvg/impl/SVGAnimateMotionElementImpl.cc
index 9be742c0..fe816769 100644
--- a/ksvg/impl/SVGAnimateMotionElementImpl.cc
+++ b/ksvg/impl/SVGAnimateMotionElementImpl.cc
@@ -64,7 +64,7 @@ void SVGAnimateMotionElementImpl::setAttributes()
 /*	if(!m_pathArray)
 	{
 		bool temp;
-		m_pathArray = m_path->preparePath(&temp, p->tqworldMatrix());
+		m_pathArray = m_path->preparePath(&temp, p->worldMatrix());
 	}*/
 //}
 
diff --git a/ksvg/impl/SVGContainerImpl.cc b/ksvg/impl/SVGContainerImpl.cc
index 63487227..e4a7c0db 100644
--- a/ksvg/impl/SVGContainerImpl.cc
+++ b/ksvg/impl/SVGContainerImpl.cc
@@ -36,21 +36,21 @@ SVGContainerImpl::~SVGContainerImpl()
 
 SVGRectImpl *SVGContainerImpl::getBBox()
 {
-	// just get the union of the tqchildren bboxes
+	// just get the union of the children bboxes
 	TQRect rect;
 	DOM::Node node = firstChild();
 	for(; !node.isNull(); node = node.nextSibling())
 	{
 		SVGElementImpl *elem = ownerDoc()->getElementFromHandle(node.handle());
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(elem);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(elem);
 		SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(elem);
 		SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(elem);
 
 		bool ok = tests ? tests->ok() : true;
 
-		if(tqshape && style && ok && style->getVisible() && style->getDisplay())
+		if(shape && style && ok && style->getVisible() && style->getDisplay())
 		{
-			SVGRectImpl *current = tqshape->getBBox();
+			SVGRectImpl *current = shape->getBBox();
 			rect = rect.unite(current->qrect());
 			current->deref();
 		}
@@ -90,21 +90,21 @@ void SVGContainerImpl::update(CanvasItemUpdate reason, int param1, int param2)
 
 	for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling())
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
-		if(tqshape)
-			tqshape->update(reason, param1, param2);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
+		if(shape)
+			shape->update(reason, param1, param2);
 	}
 }
 
-void SVGContainerImpl::tqinvalidate(KSVGCanvas *c, bool recalc)
+void SVGContainerImpl::invalidate(KSVGCanvas *c, bool recalc)
 {
-	SVGShapeImpl::tqinvalidate(c, recalc);
+	SVGShapeImpl::invalidate(c, recalc);
 
 	for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling())
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
-		if(tqshape)
-			tqshape->tqinvalidate(c, recalc);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
+		if(shape)
+			shape->invalidate(c, recalc);
 	}
 }
 
@@ -114,9 +114,9 @@ void SVGContainerImpl::setReferenced(bool referenced)
 
 	for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling())
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
-		if(tqshape)
-			tqshape->setReferenced(referenced);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
+		if(shape)
+			shape->setReferenced(referenced);
 	}
 }
 
@@ -126,9 +126,9 @@ void SVGContainerImpl::draw()
 
 	for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling())
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
-		if(tqshape)
-			tqshape->draw();
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
+		if(shape)
+			shape->draw();
 	}
 }
 
diff --git a/ksvg/impl/SVGContainerImpl.h b/ksvg/impl/SVGContainerImpl.h
index 2d01fdc8..353a6154 100644
--- a/ksvg/impl/SVGContainerImpl.h
+++ b/ksvg/impl/SVGContainerImpl.h
@@ -40,7 +40,7 @@ public:
 	virtual void removeItem(KSVGCanvas *c);
 
 	virtual void update(CanvasItemUpdate reason, int param1, int param2);
-	virtual void tqinvalidate(KSVGCanvas *c, bool recalc);
+	virtual void invalidate(KSVGCanvas *c, bool recalc);
 	virtual void setReferenced(bool referenced);
 	virtual void draw();
 
diff --git a/ksvg/impl/SVGDocumentImpl.cc b/ksvg/impl/SVGDocumentImpl.cc
index 4e541847..c2b412f3 100644
--- a/ksvg/impl/SVGDocumentImpl.cc
+++ b/ksvg/impl/SVGDocumentImpl.cc
@@ -112,9 +112,9 @@ SVGDocumentImpl::~SVGDocumentImpl()
 	DOM::Node node = firstChild();
 	for(; !node.isNull(); node = node.nextSibling())
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(getElementFromHandle(node.handle()));
-		if(tqshape)
-			killList.append(tqshape);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(getElementFromHandle(node.handle()));
+		if(shape)
+			killList.append(shape);
 	}
 
 	SVGShapeImpl *rend = 0;
@@ -478,7 +478,7 @@ bool SVGDocumentImpl::dispatchRecursiveEvent(SVGEvent::EventId id, DOM::Node sta
 	
 		if(element && element->hasChildNodes())
 		{
-			// Dispatch to all tqchildren
+			// Dispatch to all children
 			eventExecuted = dispatchRecursiveEvent(id, element->lastChild()) ? true : eventExecuted;
 
 			// Dispatch, locally
diff --git a/ksvg/impl/SVGEcma.cc b/ksvg/impl/SVGEcma.cc
index 111b2887..87eca6e0 100644
--- a/ksvg/impl/SVGEcma.cc
+++ b/ksvg/impl/SVGEcma.cc
@@ -169,9 +169,9 @@ void removeItem(ExecState *exec, DOM::Node &node)
 	SVGDocumentImpl *doc = KSVG::Window::retrieveActive(exec)->doc();
 
 	// Update canvas
-	SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(doc->getElementFromHandle(node.handle()));
-	if(tqshape && tqshape->item())
-		doc->canvas()->removeItem(tqshape->item());
+	SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(doc->getElementFromHandle(node.handle()));
+	if(shape && shape->item())
+		doc->canvas()->removeItem(shape->item());
 }
 
 // parseXML + getURL() need all these 5 functions to work properly
diff --git a/ksvg/impl/SVGElementImpl.cc b/ksvg/impl/SVGElementImpl.cc
index deab7476..940790f2 100644
--- a/ksvg/impl/SVGElementImpl.cc
+++ b/ksvg/impl/SVGElementImpl.cc
@@ -496,9 +496,9 @@ void SVGElementImpl::setAttributes(bool deep)
 
 bool SVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SVGMouseEventImpl *mev)
 {
-	SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(this);
-	if(tqshape)
-		return tqshape->prepareMouseEvent(p, a, mev);
+	SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(this);
+	if(shape)
+		return shape->prepareMouseEvent(p, a, mev);
 
 	return false;
 }
diff --git a/ksvg/impl/SVGEventImpl.cc b/ksvg/impl/SVGEventImpl.cc
index f665d25c..e1252af8 100644
--- a/ksvg/impl/SVGEventImpl.cc
+++ b/ksvg/impl/SVGEventImpl.cc
@@ -43,7 +43,7 @@ SVGEventImpl::SVGEventImpl()
 	m_defaultPrevented = false;
 	m_id = SVGEvent::UNKNOWN_EVENT;
 	m_eventPhase = 0;
-	m_createTime = TQDateTime::tqcurrentDateTime();
+	m_createTime = TQDateTime::currentDateTime();
 	m_defaultHandled = false;
 
 	m_target = 0;
@@ -62,7 +62,7 @@ SVGEventImpl::SVGEventImpl(SVGEvent::EventId _id, bool canBubbleArg, bool cancel
 	m_defaultPrevented = false;
 	m_id = _id;
 	m_eventPhase = 0;
-	m_createTime = TQDateTime::tqcurrentDateTime();
+	m_createTime = TQDateTime::currentDateTime();
 	m_defaultHandled = false;
 
 	m_target = 0;
@@ -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/SVGHelperImpl.cc b/ksvg/impl/SVGHelperImpl.cc
index 0a5f1093..7378b8f4 100644
--- a/ksvg/impl/SVGHelperImpl.cc
+++ b/ksvg/impl/SVGHelperImpl.cc
@@ -58,13 +58,13 @@ void SVGHelperImpl::updateItem(KJS::ExecState *exec, const DOM::Node node)
 	SVGDocumentImpl *doc = Window::retrieveActive(exec)->doc();
 
 	// Update canvas, recursively if needed
-	SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(doc->getElementFromHandle(node.handle()));
+	SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(doc->getElementFromHandle(node.handle()));
 
-	if(tqshape && tqshape->item())
+	if(shape && shape->item())
 	{
-		tqshape->item()->update(UPDATE_TRANSFORM);
-		tqshape->item()->draw();
-		tqshape->blit(doc->canvas());
+		shape->item()->update(UPDATE_TRANSFORM);
+		shape->item()->draw();
+		shape->blit(doc->canvas());
 	}
 
 	if(const_cast<DOM::Node &>(node).hasChildNodes())
diff --git a/ksvg/impl/SVGImageElementImpl.cc b/ksvg/impl/SVGImageElementImpl.cc
index 258ce95e..49f48e7d 100644
--- a/ksvg/impl/SVGImageElementImpl.cc
+++ b/ksvg/impl/SVGImageElementImpl.cc
@@ -320,10 +320,10 @@ void SVGImageElementImpl::removeItem(KSVGCanvas *c)
 void SVGImageElementImpl::setupSVGElement(SVGSVGElementImpl *svg)
 {
 	// Set up the root svg for an svg image.
-	svg->setAttributeInternal("x", TQString("%1").tqarg(x()->baseVal()->value()));
-	svg->setAttributeInternal("y", TQString("%1").tqarg(y()->baseVal()->value()));
-	svg->setAttributeInternal("width", TQString("%1").tqarg(width()->baseVal()->value()));
-	svg->setAttributeInternal("height", TQString("%1").tqarg(height()->baseVal()->value()));
+	svg->setAttributeInternal("x", TQString("%1").arg(x()->baseVal()->value()));
+	svg->setAttributeInternal("y", TQString("%1").arg(y()->baseVal()->value()));
+	svg->setAttributeInternal("width", TQString("%1").arg(width()->baseVal()->value()));
+	svg->setAttributeInternal("height", TQString("%1").arg(height()->baseVal()->value()));
 
 	TQString par = getAttribute("preserveAspectRatio").string().stripWhiteSpace();
 
@@ -408,7 +408,7 @@ void SVGImageElementImpl::setImage(TQImage *image)
 
 		if(m_item)
 		{
-			ownerDoc()->canvas()->tqinvalidate(m_item, false);
+			ownerDoc()->canvas()->invalidate(m_item, false);
 			ownerDoc()->rerender();
 		}
 	}
@@ -508,12 +508,12 @@ void SVGImageElementImpl::applyColorProfile(SVGColorProfileElementImpl *profile,
 
 	if(image->m_image)
 	{
-		// Image is already painted, we apply the color profile and tqrepaint it
+		// Image is already painted, we apply the color profile and repaint it
 		image->applyColorProfile();
 
 		if(image->item())
 		{
-			image->ownerDoc()->canvas()->tqinvalidate(image->item(), false);
+			image->ownerDoc()->canvas()->invalidate(image->item(), false);
 			image->ownerDoc()->rerender();
 		}
 	}
diff --git a/ksvg/impl/SVGImageElementImpl.h b/ksvg/impl/SVGImageElementImpl.h
index 64a96421..fc9be8cc 100644
--- a/ksvg/impl/SVGImageElementImpl.h
+++ b/ksvg/impl/SVGImageElementImpl.h
@@ -86,7 +86,7 @@ public:
 
 	virtual SVGRectImpl *getBBox();
 	
-	// Screen-space clipping tqshape
+	// Screen-space clipping shape
 	KSVGPolygon clippingShape();
 
 	void onScreenCTMUpdated();
diff --git a/ksvg/impl/SVGLocatableImpl.cc b/ksvg/impl/SVGLocatableImpl.cc
index 63384d7e..0ae143fa 100644
--- a/ksvg/impl/SVGLocatableImpl.cc
+++ b/ksvg/impl/SVGLocatableImpl.cc
@@ -92,13 +92,13 @@ void SVGLocatableImpl::updateCachedScreenCTM(const SVGMatrixImpl *parentScreenCT
 	// Notify the element
 	onScreenCTMUpdated();
 
-	SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(this);
+	SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(this);
 
-	if(tqshape)
+	if(shape)
 	{
 		// TODO: Update due to matrix animations
-		//if(tqshape->item())
-		//	tqshape->item()->update(updateReason);
+		//if(shape->item())
+		//	shape->item()->update(updateReason);
 
 		SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(this);
 
@@ -119,9 +119,9 @@ void SVGLocatableImpl::checkCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM
 	if(m_cachedScreenCTMIsValid)
 	{
 		SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(this);
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(this);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(this);
 
-		if(tqshape)
+		if(shape)
 		{
 			DOM::Node node = element->firstChild();
 			for(; !node.isNull(); node = node.nextSibling())
@@ -184,9 +184,9 @@ Value SVGLocatableImplProtoFunc::call(ExecState *exec, Object &thisObj, const Li
 				return container->getBBox()->cache(exec);
 			else
 			{
-				SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(obj);
-				if(tqshape)
-					return tqshape->getBBox()->cache(exec);
+				SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(obj);
+				if(shape)
+					return shape->getBBox()->cache(exec);
 				else
 					return obj->getBBox()->cache(exec);
 			}
diff --git a/ksvg/impl/SVGMarkerElementImpl.cc b/ksvg/impl/SVGMarkerElementImpl.cc
index c10d5280..a621b47f 100644
--- a/ksvg/impl/SVGMarkerElementImpl.cc
+++ b/ksvg/impl/SVGMarkerElementImpl.cc
@@ -236,21 +236,21 @@ void SVGMarkerElementImpl::draw(SVGShapeImpl *referencingElement, double x, doub
 	for(; !node.isNull(); node = node.nextSibling())
 	{
 		SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
 		SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
 		SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
 
 		bool ok = tests ? tests->ok() : true;
-		if(element && tqshape && style && ok && style->getVisible() && style->getDisplay())
+		if(element && shape && style && ok && style->getVisible() && style->getDisplay())
 		{
 			SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(element);
 			if(locatable)
 				locatable->updateCachedScreenCTM(mtx);
 
-			tqshape->update(UPDATE_TRANSFORM);
-			tqshape->setReferenced(true);
-			tqshape->draw();
-			tqshape->setReferenced(false);
+			shape->update(UPDATE_TRANSFORM);
+			shape->setReferenced(true);
+			shape->draw();
+			shape->setReferenced(false);
 		}
 	}
 
diff --git a/ksvg/impl/SVGMaskElementImpl.cc b/ksvg/impl/SVGMaskElementImpl.cc
index 51c97be9..16491eb9 100644
--- a/ksvg/impl/SVGMaskElementImpl.cc
+++ b/ksvg/impl/SVGMaskElementImpl.cc
@@ -296,22 +296,22 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 	for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling())
 	{
 		SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
 		SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
 		SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
 
 		bool ok = tests ? tests->ok() : true;
-		if(element && tqshape && style && ok && style->getVisible() && style->getDisplay())
+		if(element && shape && style && ok && style->getVisible() && style->getDisplay())
 		{
 			SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(element);
 			if(locatable)
 				locatable->updateCachedScreenCTM(baseMatrix);
 
 			element->createItem(m_canvas);
-			if(tqshape->item())
+			if(shape->item())
 			{
-				tqshape->item()->setReferenced(true);
-				m_canvas->tqinvalidate(tqshape->item(), true);
+				shape->item()->setReferenced(true);
+				m_canvas->invalidate(shape->item(), true);
 			}
 		}
 	}
@@ -321,15 +321,15 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 	for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling())
 	{
 		SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
 		SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
 		SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
 
 		bool ok = tests ? tests->ok() : true;
-		if(element && tqshape && style && ok && style->getVisible() && style->getDisplay())
+		if(element && shape && style && ok && style->getVisible() && style->getDisplay())
 		{
-			if(tqshape)
-				tqshape->removeItem(m_canvas);
+			if(shape)
+				shape->removeItem(m_canvas);
 		}
 	}
 
@@ -453,17 +453,17 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 	return mask;
 }
 
-TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle)
+TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *shape, const TQRect& screenRectangle)
 {
 	TQByteArray cumulativeMask;
 
 	do
 	{
-		SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(tqshape);
+		SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(shape);
 
 		if(style && style->hasMask())
 		{
-			SVGElementImpl *element = tqshape->ownerDoc()->rootElement()->getElementById(style->getMask());
+			SVGElementImpl *element = shape->ownerDoc()->rootElement()->getElementById(style->getMask());
 
 			if(element)
 			{
@@ -471,7 +471,7 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec
 
 				if(maskElement)
 				{
-					SVGMaskElementImpl::Mask mask = maskElement->createMask(tqshape);
+					SVGMaskElementImpl::Mask mask = maskElement->createMask(shape);
 					
 					if(!mask.isEmpty())
 					{
@@ -495,21 +495,21 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec
 			}
 		}
 
-		DOM::Node parentNode = tqshape->parentNode();
+		DOM::Node parentNode = shape->parentNode();
 
 		if(!parentNode.isNull())
 		{
-			SVGElementImpl *parent = tqshape->ownerDoc()->getElementFromHandle(parentNode.handle());
+			SVGElementImpl *parent = shape->ownerDoc()->getElementFromHandle(parentNode.handle());
 
 			if(parent)
-				tqshape = dynamic_cast<SVGShapeImpl *>(parent);
+				shape = dynamic_cast<SVGShapeImpl *>(parent);
 			else
-				tqshape = 0;
+				shape = 0;
 		}
 		else
-			tqshape = 0;
+			shape = 0;
 
-	} while(tqshape);
+	} while(shape);
 
 	return cumulativeMask;
 }
diff --git a/ksvg/impl/SVGMaskElementImpl.h b/ksvg/impl/SVGMaskElementImpl.h
index 5b61d713..2a96967c 100644
--- a/ksvg/impl/SVGMaskElementImpl.h
+++ b/ksvg/impl/SVGMaskElementImpl.h
@@ -89,10 +89,10 @@ public:
 
 	Mask createMask(SVGShapeImpl *referencingElement);
 	
-	// Compute the mask on a given tqshape, taking into account all masks defined
-	// on the tqshape's ancestors. This is a workaround for us not having a buffer
+	// Compute the mask on a given shape, taking into account all masks defined
+	// on the shape's ancestors. This is a workaround for us not having a buffer
 	// for container elements, so we can't mask containers directly.
-	static TQByteArray maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle);
+	static TQByteArray maskRectangle(SVGShapeImpl *shape, const TQRect& screenRectangle);
 
 private:
 	class CacheKey
diff --git a/ksvg/impl/SVGPathSegArcImpl.h b/ksvg/impl/SVGPathSegArcImpl.h
index d77f0497..d8a1f8f9 100644
--- a/ksvg/impl/SVGPathSegArcImpl.h
+++ b/ksvg/impl/SVGPathSegArcImpl.h
@@ -36,7 +36,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_ARC_ABS; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "A"; }
-	virtual TQString toString() const { return TQString("A %1 %2 %3 %4 %5 %6 %7").tqarg(m_r1).tqarg(m_r2).tqarg(m_angle).tqarg(m_largeArcFlag).tqarg(m_sweepFlag).tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("A %1 %2 %3 %4 %5 %6 %7").arg(m_r1).arg(m_r2).arg(m_angle).arg(m_largeArcFlag).arg(m_sweepFlag).arg(m_x).arg(m_y); }
 
 	void setX(double x);
 	double x() const;
@@ -94,7 +94,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_ARC_REL; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "a"; }
-	virtual TQString toString() const { return TQString("a %1 %2 %3 %4 %5 %6 %7").tqarg(m_r1).tqarg(m_r2).tqarg(m_angle).tqarg(m_largeArcFlag).tqarg(m_sweepFlag).tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("a %1 %2 %3 %4 %5 %6 %7").arg(m_r1).arg(m_r2).arg(m_angle).arg(m_largeArcFlag).arg(m_sweepFlag).arg(m_x).arg(m_y); }
 
 	void setX(double x);
 	double x() const;
diff --git a/ksvg/impl/SVGPathSegCurvetoCubicImpl.h b/ksvg/impl/SVGPathSegCurvetoCubicImpl.h
index 7ab3a87b..83f4de6b 100644
--- a/ksvg/impl/SVGPathSegCurvetoCubicImpl.h
+++ b/ksvg/impl/SVGPathSegCurvetoCubicImpl.h
@@ -36,7 +36,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_ABS; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "C"; }
-	virtual TQString toString() const { return TQString("C %1 %2 %3 %4 %5 %6").tqarg(m_x1).tqarg(m_y1).tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("C %1 %2 %3 %4 %5 %6").arg(m_x1).arg(m_y1).arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); }
 
 	void setX(const double &);
 	double x() const;
@@ -88,7 +88,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_REL; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "c"; }
-	virtual TQString toString() const { return TQString("c %1 %2 %3 %4 %5 %6").tqarg(m_x1).tqarg(m_y1).tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("c %1 %2 %3 %4 %5 %6").arg(m_x1).arg(m_y1).arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); }
 
 	void setX(const double &);
 	double x() const;
diff --git a/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h b/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h
index ff52bfab..3bcc8c87 100644
--- a/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h
+++ b/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h
@@ -36,7 +36,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_SMOOTH_ABS; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "S"; }
-	virtual TQString toString() const { return TQString("S %1 %2 %3 %4").tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("S %1 %2 %3 %4").arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); }
 
 	void setX(const double &);
 	double x() const;
@@ -88,7 +88,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_SMOOTH_REL; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "s"; }
-	virtual TQString toString() const { return TQString("s %1 %2 %3 %4").tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("s %1 %2 %3 %4").arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); }
 
 	void setX(const double &);
 	double x() const;
diff --git a/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h b/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h
index d8e876b5..1fa0aa17 100644
--- a/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h
+++ b/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h
@@ -36,7 +36,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_ABS; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "Q"; }
-	virtual TQString toString() const { return TQString("Q %1 %2 %3 %4").tqarg(m_x1).tqarg(m_y1).tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("Q %1 %2 %3 %4").arg(m_x1).arg(m_y1).arg(m_x).arg(m_y); }
 
 	void setX(const double &);
 	double x() const;
@@ -80,7 +80,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_REL; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "q"; }
-	virtual TQString toString() const { return TQString("q %1 %2 %3 %4").tqarg(m_x1).tqarg(m_y1).tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("q %1 %2 %3 %4").arg(m_x1).arg(m_y1).arg(m_x).arg(m_y); }
  
 	void setX(const double &);
 	double x() const;
diff --git a/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h b/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h
index be0a4033..1d1bdf39 100644
--- a/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h
+++ b/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h
@@ -36,7 +36,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "T"; }
-	virtual TQString toString() const { return TQString("T %1 %2").tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("T %1 %2").arg(m_x).arg(m_y); }
 
 	void setX(const double &);
 	double x() const;
@@ -80,7 +80,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "t"; }
-	virtual TQString toString() const { return TQString("t %1 %2").tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("t %1 %2").arg(m_x).arg(m_y); }
 
 	void setX(const double &);
 	double x() const;
diff --git a/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h b/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h
index f170b303..52355c5d 100644
--- a/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h
+++ b/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h
@@ -36,7 +36,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_LINETO_HORIZONTAL_ABS; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "H"; }
-	virtual TQString toString() const { return TQString("H %1").tqarg(m_x); }
+	virtual TQString toString() const { return TQString("H %1").arg(m_x); }
 
 	void setX(const double &);
 	double x() const;
@@ -68,7 +68,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_LINETO_HORIZONTAL_REL; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "h"; }
-	virtual TQString toString() const { return TQString("h %1").tqarg(m_x); }
+	virtual TQString toString() const { return TQString("h %1").arg(m_x); }
 
 	void setX(const double &);
 	double x() const;
diff --git a/ksvg/impl/SVGPathSegLinetoImpl.h b/ksvg/impl/SVGPathSegLinetoImpl.h
index 69caeba4..78df51b9 100644
--- a/ksvg/impl/SVGPathSegLinetoImpl.h
+++ b/ksvg/impl/SVGPathSegLinetoImpl.h
@@ -36,7 +36,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_LINETO_ABS; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "L"; }
-	virtual TQString toString() const { return TQString("L %1 %2").tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("L %1 %2").arg(m_x).arg(m_y); }
 
 	void setX(const double &);
 	double x() const;
@@ -72,7 +72,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_LINETO_REL; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "l"; }
-	virtual TQString toString() const { return TQString("l %1 %2").tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("l %1 %2").arg(m_x).arg(m_y); }
 
 	void setX(const double &);
 	double x() const;
diff --git a/ksvg/impl/SVGPathSegLinetoVerticalImpl.h b/ksvg/impl/SVGPathSegLinetoVerticalImpl.h
index 9e50405f..1bbf41f4 100644
--- a/ksvg/impl/SVGPathSegLinetoVerticalImpl.h
+++ b/ksvg/impl/SVGPathSegLinetoVerticalImpl.h
@@ -36,7 +36,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_LINETO_VERTICAL_ABS; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "V"; }
-	virtual TQString toString() const { return TQString("V %1").tqarg(m_y); }
+	virtual TQString toString() const { return TQString("V %1").arg(m_y); }
 
 	void setY(const double &);
 	double y() const;
@@ -68,7 +68,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_LINETO_VERTICAL_REL; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "v"; }
-	virtual TQString toString() const { return TQString("v %1").tqarg(m_y); }
+	virtual TQString toString() const { return TQString("v %1").arg(m_y); }
 
 	void setY(const double &);
 	double y() const;
diff --git a/ksvg/impl/SVGPathSegMovetoImpl.h b/ksvg/impl/SVGPathSegMovetoImpl.h
index dfa25935..6db95702 100644
--- a/ksvg/impl/SVGPathSegMovetoImpl.h
+++ b/ksvg/impl/SVGPathSegMovetoImpl.h
@@ -36,7 +36,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_ABS; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "M"; }
-	virtual TQString toString() const { return TQString("M %1 %2").tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("M %1 %2").arg(m_x).arg(m_y); }
 
 	void setX(const double &);
 	double x() const;
@@ -72,7 +72,7 @@ public:
 
 	virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_REL; }
 	virtual DOM::DOMString pathSegTypeAsLetter() const { return "m"; }
-	virtual TQString toString() const { return TQString("m %1 %2").tqarg(m_x).tqarg(m_y); }
+	virtual TQString toString() const { return TQString("m %1 %2").arg(m_x).arg(m_y); }
 
 	void setX(const double &);
 	double x() const;
diff --git a/ksvg/impl/SVGPatternElementImpl.cc b/ksvg/impl/SVGPatternElementImpl.cc
index 672e62d3..1b088240 100644
--- a/ksvg/impl/SVGPatternElementImpl.cc
+++ b/ksvg/impl/SVGPatternElementImpl.cc
@@ -350,22 +350,22 @@ TQImage SVGPatternElementImpl::createTile(SVGShapeImpl *referencingElement, int
 	for(DOM::Node node = m_location->firstChild(); !node.isNull(); node = node.nextSibling())
 	{
 		SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
 		SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
 		SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
 
 		bool ok = tests ? tests->ok() : true;
-		if(element && tqshape && style && ok && style->getVisible() && style->getDisplay())
+		if(element && shape && style && ok && style->getVisible() && style->getDisplay())
 		{
 			SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(element);
 			if(locatable)
 				locatable->updateCachedScreenCTM(baseMatrix);
 
 			element->createItem(m_canvas);
-			if(tqshape->item())
+			if(shape->item())
 			{
-				tqshape->item()->setReferenced(true);
-				m_canvas->tqinvalidate(tqshape->item(), true);
+				shape->item()->setReferenced(true);
+				m_canvas->invalidate(shape->item(), true);
 			}
 		}
 	}
@@ -433,7 +433,7 @@ void SVGPatternElementImpl::reference(const TQString &href)
 		SVGHelperImpl::copyAttributes(src, this);
 
 		// Spec: Change location to referenced element so we
-		// can take the tqchildren elements to render from there
+		// can take the children elements to render from there
 		if(m_location == this)
 			m_location = src;
 	}
diff --git a/ksvg/impl/SVGSVGElementImpl.cc b/ksvg/impl/SVGSVGElementImpl.cc
index d72b488f..c9b82445 100644
--- a/ksvg/impl/SVGSVGElementImpl.cc
+++ b/ksvg/impl/SVGSVGElementImpl.cc
@@ -372,18 +372,18 @@ DOM::NodeList SVGSVGElementImpl::getEnclosureList(SVGRectImpl *rect, SVGElementI
 	for(; !node.isNull(); node = node.nextSibling())
 	{
 		SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
-		if(tqshape)
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
+		if(shape)
 		{
-			if(tqshape->isContainer())
+			if(shape->isContainer())
 				// TODO : pass it on to container::getEnclosureList() which should return a NodeList
-				kdDebug() << "!tqshape" << endl;
+				kdDebug() << "!shape" << endl;
 			else
 			{
-				// TODO : add the tqshape to list if the test succeeds
-				SVGRectImpl *current = tqshape->getBBox();
+				// TODO : add the shape to list if the test succeeds
+				SVGRectImpl *current = shape->getBBox();
 				if(rect->qrect().contains(current->qrect(), true))
-					kdDebug() << "tqshape : " << element->nodeName().string() << " is fully enclosed" << endl;
+					kdDebug() << "shape : " << element->nodeName().string() << " is fully enclosed" << endl;
 
 				current->deref();
 			}
@@ -395,11 +395,11 @@ DOM::NodeList SVGSVGElementImpl::getEnclosureList(SVGRectImpl *rect, SVGElementI
 
 bool SVGSVGElementImpl::checkIntersection(SVGElementImpl *element, SVGRectImpl *rect)
 {
-	SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
-	if(!tqshape)
+	SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
+	if(!shape)
 		return false;
 
-	SVGRectImpl *current = tqshape->getBBox();
+	SVGRectImpl *current = shape->getBBox();
 	bool result = rect->qrect().intersects(current->qrect());
 	current->deref();
 	return result;
@@ -407,11 +407,11 @@ bool SVGSVGElementImpl::checkIntersection(SVGElementImpl *element, SVGRectImpl *
 
 bool SVGSVGElementImpl::checkEnclosure(SVGElementImpl *element, SVGRectImpl *rect)
 {
-	SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
-	if(!tqshape)
+	SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
+	if(!shape)
 		return false;
 
-	SVGRectImpl *current = tqshape->getBBox();
+	SVGRectImpl *current = shape->getBBox();
 	bool result = rect->qrect().contains(current->qrect());
 	current->deref();
 	return result;
@@ -672,7 +672,7 @@ bool SVGSVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SV
 		elem = (*it)->element();
 		if(elem)
 		{
-			// Check if mouse is over a certain tqshape...
+			// Check if mouse is over a certain shape...
 			// mop: once an element has been found check eventlisteners and leave immediately
 			ret = elem->prepareMouseEvent(p, userA, mev);
 			if(ret) break;
@@ -693,7 +693,7 @@ bool SVGSVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SV
 			dorerender = true; // mop: if it has the event then rerender
 		}
 
-		// If a mouse "moves" over a tqshape, it's also "over" the tqshape
+		// If a mouse "moves" over a shape, it's also "over" the shape
 		if(mev->id() == SVGEvent::MOUSEMOVE_EVENT)
 		{
 			mev->target()->setMouseOver(true);
@@ -742,7 +742,7 @@ bool SVGSVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SV
 			}
 		}
 
-		// The mouse is over a tqshape, so we have a target..we need to register that for a mouseout
+		// The mouse is over a shape, so we have a target..we need to register that for a mouseout
 		ownerDoc()->setLastTarget(mev->target());
 	}
 
diff --git a/ksvg/impl/SVGShapeImpl.cc b/ksvg/impl/SVGShapeImpl.cc
index 755bbd13..d8ef45c5 100644
--- a/ksvg/impl/SVGShapeImpl.cc
+++ b/ksvg/impl/SVGShapeImpl.cc
@@ -125,10 +125,10 @@ void SVGShapeImpl::update(CanvasItemUpdate reason, int param1, int param2)
 		m_item->update(reason, param1, param2);
 }
 
-void SVGShapeImpl::tqinvalidate(KSVGCanvas *c, bool recalc)
+void SVGShapeImpl::invalidate(KSVGCanvas *c, bool recalc)
 {
 	if(m_item && c)
-		c->tqinvalidate(m_item, recalc);
+		c->invalidate(m_item, recalc);
 }
 
 void SVGShapeImpl::setReferenced(bool referenced)
diff --git a/ksvg/impl/SVGShapeImpl.h b/ksvg/impl/SVGShapeImpl.h
index c059d448..c61038d2 100644
--- a/ksvg/impl/SVGShapeImpl.h
+++ b/ksvg/impl/SVGShapeImpl.h
@@ -49,7 +49,7 @@ public:
 	virtual bool isContainer() const { return false; }
 
 	virtual void update(CanvasItemUpdate reason, int param1 = 0, int param2 = 0);
-	virtual void tqinvalidate(KSVGCanvas *c, bool recalc);
+	virtual void invalidate(KSVGCanvas *c, bool recalc);
 	virtual void setReferenced(bool referenced);
 	virtual void draw();
 	virtual void blit(KSVGCanvas *);
diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc
index d1019ff8..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 ||
@@ -1276,16 +1276,16 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value &
 
 	if(redraw)
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_object);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_object);
 		if(inherit)
 			processStyle();
 			
-		if(tqshape && tqshape->item())
+		if(shape && shape->item())
 		{
 			if(update > -1)
-				tqshape->item()->update(static_cast<CanvasItemUpdate>(update));
+				shape->item()->update(static_cast<CanvasItemUpdate>(update));
 			else if(m_object)
-				m_object->ownerDoc()->canvas()->tqinvalidate(tqshape->item(), false);
+				m_object->ownerDoc()->canvas()->invalidate(shape->item(), false);
 		}
 	}
 }
diff --git a/ksvg/impl/SVGSwitchElementImpl.cc b/ksvg/impl/SVGSwitchElementImpl.cc
index f6861521..613a1982 100644
--- a/ksvg/impl/SVGSwitchElementImpl.cc
+++ b/ksvg/impl/SVGSwitchElementImpl.cc
@@ -41,13 +41,13 @@ void SVGSwitchElementImpl::createItem(KSVGCanvas *c)
 	for(; !node.isNull(); node = node.nextSibling())
 	{
 		SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
 		SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
 		SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
 
 		bool ok = tests ? tests->ok() : true;
 
-		if(element && tqshape && ok && style->getVisible() && style->getDisplay() && (tqshape->directRender() || !directRender()))
+		if(element && shape && ok && style->getVisible() && style->getDisplay() && (shape->directRender() || !directRender()))
 		{
 			element->createItem(c);
 			break;
diff --git a/ksvg/impl/SVGTimeScheduler.cc b/ksvg/impl/SVGTimeScheduler.cc
index 29862959..caddf81f 100644
--- a/ksvg/impl/SVGTimeScheduler.cc
+++ b/ksvg/impl/SVGTimeScheduler.cc
@@ -101,9 +101,9 @@ void SVGTimer::notifyAll()
 	TQValueList<SVGElementImpl *>::iterator it2;
 	for(it2 = elements.begin(); it2 != elements.end(); ++it2)
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(*it2);
-		if(tqshape && tqshape->item())
-			tqshape->item()->update(UPDATE_TRANSFORM);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(*it2);
+		if(shape && shape->item())
+			shape->item()->update(UPDATE_TRANSFORM);
 	}
 }
 
diff --git a/ksvg/impl/SVGUseElementImpl.cc b/ksvg/impl/SVGUseElementImpl.cc
index 872bb0bc..db822a64 100644
--- a/ksvg/impl/SVGUseElementImpl.cc
+++ b/ksvg/impl/SVGUseElementImpl.cc
@@ -182,9 +182,9 @@ SVGRectImpl *SVGUseElementImpl::getBBox()
 {
 	if(m_instanceRoot)
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
-		if(KSVG_TOKEN_NOT_PARSED(Width) && KSVG_TOKEN_NOT_PARSED(Height) && tqshape)
-			return tqshape->getBBox();
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
+		if(KSVG_TOKEN_NOT_PARSED(Width) && KSVG_TOKEN_NOT_PARSED(Height) && shape)
+			return shape->getBBox();
 	}
 
 	SVGRectImpl *ret = new SVGRectImpl();
@@ -370,19 +370,19 @@ void SVGUseElementImpl::update(CanvasItemUpdate reason, int param1, int param2)
 {
 	if(m_instanceRoot)
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
-		if(tqshape)
-			tqshape->update(reason, param1, param2);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
+		if(shape)
+			shape->update(reason, param1, param2);
 	}
 }
 
-void SVGUseElementImpl::tqinvalidate(KSVGCanvas *c, bool recalc)
+void SVGUseElementImpl::invalidate(KSVGCanvas *c, bool recalc)
 {
 	if(m_instanceRoot)
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
-		if(tqshape)
-			tqshape->tqinvalidate(c, recalc);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
+		if(shape)
+			shape->invalidate(c, recalc);
 	}
 }
 
@@ -390,9 +390,9 @@ void SVGUseElementImpl::setReferenced(bool referenced)
 {
 	if(m_instanceRoot)
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
-		if(tqshape)
-			tqshape->setReferenced(referenced);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
+		if(shape)
+			shape->setReferenced(referenced);
 	}
 }
 
@@ -400,9 +400,9 @@ void SVGUseElementImpl::draw()
 {
 	if(m_instanceRoot)
 	{
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
-		if(tqshape)
-			tqshape->draw();
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
+		if(shape)
+			shape->draw();
 	}
 }
 
diff --git a/ksvg/impl/SVGUseElementImpl.h b/ksvg/impl/SVGUseElementImpl.h
index 15c644f7..02eb8d88 100644
--- a/ksvg/impl/SVGUseElementImpl.h
+++ b/ksvg/impl/SVGUseElementImpl.h
@@ -59,7 +59,7 @@ public:
 	virtual void createItem(KSVGCanvas *c);
 	virtual void removeItem(KSVGCanvas *c);
 	virtual void update(CanvasItemUpdate reason, int param1, int param2);
-	virtual void tqinvalidate(KSVGCanvas *c, bool recalc);
+	virtual void invalidate(KSVGCanvas *c, bool recalc);
 	virtual void setReferenced(bool referenced);
 	virtual void draw();
 
diff --git a/ksvg/impl/SVGWindowImpl.cc b/ksvg/impl/SVGWindowImpl.cc
index f1506c14..3e70d4de 100644
--- a/ksvg/impl/SVGWindowImpl.cc
+++ b/ksvg/impl/SVGWindowImpl.cc
@@ -26,7 +26,7 @@
 #include <ksvg_ecma.h>
 #include <ksvg_scriptinterpreter.h>
 
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include <kurl.h>
 #include <kmessagebox.h>
@@ -133,9 +133,9 @@ DOM::DOMString SVGWindowImpl::printNode(const DOM::Node &node, unsigned short le
 		TQDictIterator<DOM::DOMString> it(elem->attributes());
 		for(;it.current(); ++it)
 		         ret += " " + it.currentKey() + "=\"" + it.current()->string() + '\"';
-		if(elem->firstChild().isNull()) // no tqchildren
+		if(elem->firstChild().isNull()) // no children
 			ret += " />\n";
-		else // handle tqchildren
+		else // handle children
 		{
 			ret += ">\n";
 			for(DOM::Node child = node.firstChild();!child.isNull();child = child.nextSibling())
diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.c b/ksvg/impl/libs/art_support/art_rgba_svp.c
index 04ea81fc..47c7d924 100644
--- a/ksvg/impl/libs/art_support/art_rgba_svp.c
+++ b/ksvg/impl/libs/art_support/art_rgba_svp.c
@@ -415,7 +415,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y,
  * @rowstride: Rowstride of @buf buffer.
  * @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing.
  *
- * Renders the tqshape specified with @svp over the @buf RGB buffer.
+ * Renders the shape specified with @svp over the @buf RGB buffer.
  * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height,
  * of the rectangle rendered. The new pixels are stored starting at
  * the first byte of @buf. Thus, the @x0 and @y0 parameters specify
@@ -600,7 +600,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
  * @rowstride: Rowstride of @buf buffer.
  * @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing.
  *
- * Renders the tqshape specified with @svp over the @buf RGB buffer.
+ * Renders the shape specified with @svp over the @buf RGB buffer.
  * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height,
  * of the rectangle rendered. The new pixels are stored starting at
  * the first byte of @buf. Thus, the @x0 and @y0 parameters specify
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/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
index 70c00262..01f60976 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
@@ -1103,19 +1103,19 @@ xlib_window_is_viewable (Window w)
 	XWindowAttributes wa;
 
 	while (w != 0) {
-		Window parent, root, *tqchildren;
-		int ntqchildren;
+		Window parent, root, *children;
+		int nchildren;
 
 		XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa);
 		if (wa.map_state != IsViewable)
 			return 0;
 
 		if (!XQueryTree (gdk_pixbuf_dpy, w, &root,
-				 &parent, &tqchildren, &ntqchildren))
+				 &parent, &children, &nchildren))
 			return 0;
 
-		if (ntqchildren > 0)
-			XFree (tqchildren);
+		if (nchildren > 0)
+			XFree (children);
 
 		if (parent == root)
 			return 1;
diff --git a/ksvg/plugin/backends/agg/AggCanvasItems.cpp b/ksvg/plugin/backends/agg/AggCanvasItems.cpp
index 36b84e86..1052edb8 100644
--- a/ksvg/plugin/backends/agg/AggCanvasItems.cpp
+++ b/ksvg/plugin/backends/agg/AggCanvasItems.cpp
@@ -239,13 +239,13 @@ void AggShape::update(CanvasItemUpdate reason, int param1, int param2)
 			m_fillPainter->update(m_style);
 		if(m_strokePainter)
 			m_strokePainter->update(m_style);
-		m_canvas->tqinvalidate(this, false);
+		m_canvas->invalidate(this, false);
 	}
 	else if(reason == UPDATE_TRANSFORM)
 	{
 		freeSVPs();
 		init();
-		m_canvas->tqinvalidate(this, true);
+		m_canvas->invalidate(this, true);
 	}
 	else if(reason == UPDATE_ZOOM)
 		init();
@@ -257,13 +257,13 @@ void AggShape::update(CanvasItemUpdate reason, int param1, int param2)
 	else if(reason == UPDATE_LINEWIDTH)
 	{
 		init();
-		m_canvas->tqinvalidate(this, true);
+		m_canvas->invalidate(this, true);
 	}
 }
 
-void AggShape::draw(SVGShapeImpl *tqshape)
+void AggShape::draw(SVGShapeImpl *shape)
 {
-	if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !tqshape->directRender()))
+	if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !shape->directRender()))
 		return;
 
 	//if(!m_strokeSVP && (!m_fillSVP || !m_style->isFilled()))
@@ -292,14 +292,14 @@ void AggShape::draw(SVGShapeImpl *tqshape)
 	m_curved.approximation_scale(pow(m_transform.scale(), 0.75));
 
 	if(m_fillPainter)
-		m_fillPainter->draw(m_canvas, m_curved_trans, m_style, tqshape);
+		m_fillPainter->draw(m_canvas, m_curved_trans, m_style, shape);
 	if(m_strokePainter)
-		m_strokePainter->draw(m_canvas, m_curved_stroked_trans, m_style, tqshape);
+		m_strokePainter->draw(m_canvas, m_curved_stroked_trans, m_style, shape);
 }
 
-bool AggShape::isVisible(SVGShapeImpl *tqshape)
+bool AggShape::isVisible(SVGShapeImpl *shape)
 {
-	return m_referenced || (m_style->getVisible() && m_style->getDisplay() && tqshape->directRender());
+	return m_referenced || (m_style->getVisible() && m_style->getDisplay() && shape->directRender());
 }
 
 void AggShape::calcSVPs(const SVGMatrixImpl *matrix)
@@ -376,14 +376,14 @@ void AggStrokePaintServer::update(SVGStylableImpl *style)
 }
 
 template<class VertexSource>
-void AggStrokePaintServer::draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape)
+void AggStrokePaintServer::draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *shape)
 {
 	canvas->m_ras.reset();
 	if(style->getStrokeColor()->paintType() == SVG_PAINTTYPE_URI)
 	{
-		AggPaintServer *pserver = static_cast<AggPaintServer *>(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), style->getStrokeColor()->uri().string()));
+		AggPaintServer *pserver = static_cast<AggPaintServer *>(SVGPaintServerImpl::paintServer(shape->ownerDoc(), style->getStrokeColor()->uri().string()));
 		if(!pserver) return;
-		pserver->setBBoxTarget(tqshape);
+		pserver->setBBoxTarget(shape);
 
 		// TODO : Clipping
 		if(!pserver->finalized())
@@ -425,14 +425,14 @@ void AggFillPaintServer::update(SVGStylableImpl *style)
 }
 
 template<class VertexSource>
-void AggFillPaintServer::draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape)
+void AggFillPaintServer::draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *shape)
 {
 	canvas->m_ras.reset();
 	if(style->getFillColor()->paintType() == SVG_PAINTTYPE_URI)
 	{
-		AggPaintServer *pserver = static_cast<AggPaintServer *>(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), style->getFillColor()->uri().string()));
+		AggPaintServer *pserver = static_cast<AggPaintServer *>(SVGPaintServerImpl::paintServer(shape->ownerDoc(), style->getFillColor()->uri().string()));
 		if(!pserver) return;
-		pserver->setBBoxTarget(tqshape);
+		pserver->setBBoxTarget(shape);
 
 		// TODO : Clipping
 		if(!pserver->finalized())
@@ -1166,13 +1166,13 @@ void AggText::update(CanvasItemUpdate reason, int param1, int param2)
 
 			svpelement = ++it;
 		}
-		m_canvas->tqinvalidate(this, false);
+		m_canvas->invalidate(this, false);
 	}
 	else if(reason == UPDATE_TRANSFORM)
 	{
 		clearCurved();
 		init();
-		m_canvas->tqinvalidate(this, true);
+		m_canvas->invalidate(this, true);
 	}
 	else if(reason == UPDATE_ZOOM)
 	{
diff --git a/ksvg/plugin/backends/agg/AggCanvasItems.h b/ksvg/plugin/backends/agg/AggCanvasItems.h
index 7612b234..f6b1d44a 100644
--- a/ksvg/plugin/backends/agg/AggCanvasItems.h
+++ b/ksvg/plugin/backends/agg/AggCanvasItems.h
@@ -270,7 +270,7 @@ namespace KSVG
 		AggFillPaintServer(SVGStylableImpl *style);
 		void update(SVGStylableImpl *style);
 		template<class VertexSource>
-		void draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape);
+		void draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *shape);
 
 	private:
 		agg::rgba8 m_color;
@@ -282,7 +282,7 @@ namespace KSVG
 		AggStrokePaintServer(SVGStylableImpl *style);
 		void update(SVGStylableImpl *style);
 		template<class VertexSource>
-		void draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape);
+		void draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *shape);
 
 	private:
 		agg::rgba8 m_color;
@@ -311,11 +311,11 @@ namespace KSVG
 		virtual bool fillContains(const TQPoint &p);
 		virtual bool strokeContains(const TQPoint &p);
 		virtual void update(CanvasItemUpdate reason, int param1 = 0, int param2 = 0);
-		void draw(SVGShapeImpl *tqshape);
+		void draw(SVGShapeImpl *shape);
 		void calcSVPs(const SVGMatrixImpl *matrix);
 		virtual void init();
 		virtual void init(const SVGMatrixImpl *);
-		bool isVisible(SVGShapeImpl *tqshape);
+		bool isVisible(SVGShapeImpl *shape);
 
 		void setRenderContext(RenderContext context) { m_context = context; }
 
diff --git a/ksvg/plugin/backends/libart/LibartCanvas.cpp b/ksvg/plugin/backends/libart/LibartCanvas.cpp
index 1d2ee30c..55b371dd 100644
--- a/ksvg/plugin/backends/libart/LibartCanvas.cpp
+++ b/ksvg/plugin/backends/libart/LibartCanvas.cpp
@@ -187,15 +187,15 @@ CanvasPaintServer *LibartCanvas::createPaintServer(SVGElementImpl *pserver)
 
 void LibartCanvas::drawImage(TQImage image, SVGStylableImpl *style, const SVGMatrixImpl *matrix, const KSVGPolygon& clippingPolygon)
 {
-	SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(style);
+	SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(style);
 
-	if(tqshape)
+	if(shape)
 	{
 		if(image.depth() != 32)
 			image = image.convertDepth(32);
 
 		ArtSVP *imageBorder = svpFromPolygon(clippingPolygon);
-		ArtSVP *clipSvp = clipSingleSVP(imageBorder, tqshape);
+		ArtSVP *clipSvp = clipSingleSVP(imageBorder, shape);
 
 		ArtDRect bbox;
 		art_drect_svp(&bbox, clipSvp);
@@ -214,7 +214,7 @@ void LibartCanvas::drawImage(TQImage image, SVGStylableImpl *style, const SVGMat
 
 			TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1);
 
-			TQByteArray mask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox);
+			TQByteArray mask = SVGMaskElementImpl::maskRectangle(shape, screenBBox);
 
 			double affine[6];
 			KSVGHelper::matrixToAffine(matrix, affine);
@@ -266,10 +266,10 @@ ArtSVP *LibartCanvas::clippingRect(const TQRect &rect, const SVGMatrixImpl *ctm)
 	return result;
 }
 
-ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
+ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *shape)
 {
 	ArtSVP *clippedSvp = copy_svp(svp);
-	SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(tqshape);
+	SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(shape);
 
 	if(style)
 	{
@@ -282,7 +282,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
 			if(clipPath)
 			{
 				LibartClipPath *lclip = dynamic_cast<LibartClipPath *>(clipPath);
-				reinterpret_cast<SVGClipPathElementImpl *>(clipPath->element())->setBBoxTarget(tqshape);
+				reinterpret_cast<SVGClipPathElementImpl *>(clipPath->element())->setBBoxTarget(shape);
 
 				lclip->init();
 
@@ -296,7 +296,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
 		}
 	}
 
-	SVGSVGElementImpl *svg = dynamic_cast<SVGSVGElementImpl *>(tqshape);
+	SVGSVGElementImpl *svg = dynamic_cast<SVGSVGElementImpl *>(shape);
 
 	// Clip outer svg, unless width and height not set
 	if(svg && (!svg->isRootElement() || !svg->getAttribute("width").isEmpty() || !svg->getAttribute("height").isEmpty()) && !svg->getOverflow())
@@ -308,13 +308,13 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
 		clippedSvp = s;
 	}
 
-	if(dynamic_cast<SVGPatternElementImpl *>(tqshape) != 0)
+	if(dynamic_cast<SVGPatternElementImpl *>(shape) != 0)
 	{
 		// TODO: inherit clipping paths into tile space
 	}
-	else if(dynamic_cast<SVGMarkerElementImpl *>(tqshape) != 0)
+	else if(dynamic_cast<SVGMarkerElementImpl *>(shape) != 0)
 	{
-		SVGMarkerElementImpl *marker = static_cast<SVGMarkerElementImpl *>(tqshape);
+		SVGMarkerElementImpl *marker = static_cast<SVGMarkerElementImpl *>(shape);
 
 		if(!marker->clipShape().isEmpty())
 		{
@@ -329,7 +329,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
 	}
 	else
 	{
-		SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(tqshape);
+		SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(shape);
 		DOM::Node parentNode = element->parentNode();
 
 		if(!parentNode.isNull())
diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
index 1434931b..aca4c517 100644
--- a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
+++ b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
@@ -129,9 +129,9 @@ TQRect LibartShape::bbox() const
 	return rect;
 }
 
-bool LibartShape::isVisible(SVGShapeImpl *tqshape)
+bool LibartShape::isVisible(SVGShapeImpl *shape)
 {
-	return m_referenced || (m_style->getVisible() && m_style->getDisplay() && tqshape->directRender());
+	return m_referenced || (m_style->getVisible() && m_style->getDisplay() && shape->directRender());
 }
 
 bool LibartShape::fillContains(const TQPoint &p)
@@ -160,12 +160,12 @@ void LibartShape::update(CanvasItemUpdate reason, int param1, int param2)
 			m_fillPainter->update(m_style);
 		if(m_strokePainter)
 			m_strokePainter->update(m_style);
-		m_canvas->tqinvalidate(this, false);
+		m_canvas->invalidate(this, false);
 	}
 	else if(reason == UPDATE_TRANSFORM)
 	{
 		reset();
-		m_canvas->tqinvalidate(this, true);
+		m_canvas->invalidate(this, true);
 	}
 	else if(reason == UPDATE_ZOOM)
 		reset();
@@ -184,13 +184,13 @@ void LibartShape::update(CanvasItemUpdate reason, int param1, int param2)
 			m_strokeSVP = 0;
 		}
 		init();
-		m_canvas->tqinvalidate(this, true);
+		m_canvas->invalidate(this, true);
 	}
 }
 
-void LibartShape::draw(SVGShapeImpl *tqshape)
+void LibartShape::draw(SVGShapeImpl *shape)
 {
-	if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !tqshape->directRender()))
+	if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !shape->directRender()))
 		return;
 
 	bool fillOk = m_fillSVP && m_style->isFilled();
@@ -199,10 +199,10 @@ void LibartShape::draw(SVGShapeImpl *tqshape)
 	if(fillOk || strokeOk)
 	{
 		if(m_fillPainter && m_fillSVP)
-			m_fillPainter->draw(m_canvas, m_fillSVP, m_style, tqshape);
+			m_fillPainter->draw(m_canvas, m_fillSVP, m_style, shape);
 
 		if(m_strokePainter && m_strokeSVP)
-			m_strokePainter->draw(m_canvas, m_strokeSVP, m_style, tqshape);
+			m_strokePainter->draw(m_canvas, m_strokeSVP, m_style, shape);
 	}
 }
 
@@ -230,9 +230,9 @@ void LibartPainter::update(SVGStylableImpl *style)
 	}
 }
 
-void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *tqshape)
+void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *shape)
 {
-	ArtSVP *clippedSvp = canvas->clipSingleSVP(svp, tqshape);
+	ArtSVP *clippedSvp = canvas->clipSingleSVP(svp, shape);
 
 	// Clipping
 	ArtDRect bbox;
@@ -252,15 +252,15 @@ void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *st
 
 		TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1);
 
-		TQByteArray mask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox);
+		TQByteArray mask = SVGMaskElementImpl::maskRectangle(shape, screenBBox);
 
 		if(paintType(style) == SVG_PAINTTYPE_URI)
 		{
-			LibartPaintServer *pserver = static_cast<LibartPaintServer *>(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), paintUri(style)));
+			LibartPaintServer *pserver = static_cast<LibartPaintServer *>(SVGPaintServerImpl::paintServer(shape->ownerDoc(), paintUri(style)));
 
 			if(pserver)
 			{
-				pserver->setBBoxTarget(tqshape);
+				pserver->setBBoxTarget(shape);
 				if(!pserver->finalized())
 					pserver->finalizePaintServer();
 				pserver->render(canvas, clippedSvp, opacity(style), mask, screenBBox);
@@ -1285,28 +1285,28 @@ void LibartClipPath::init()
 	for(; !node.isNull(); node = node.nextSibling())
 	{
 		SVGElementImpl *element = m_clipPath->ownerDoc()->getElementFromHandle(node.handle());
-		SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
+		SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
 		SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
 
 		bool ok = tests ? tests->ok() : true;
 
-		if(element && tqshape && ok && !tqshape->isContainer())
+		if(element && shape && ok && !shape->isContainer())
 		{
-			LibartClipItem *clipElement = dynamic_cast<LibartClipItem *>(tqshape->item());
+			LibartClipItem *clipElement = dynamic_cast<LibartClipItem *>(shape->item());
 			
-			if(dynamic_cast<LibartText *>(tqshape->item()))
+			if(dynamic_cast<LibartText *>(shape->item()))
 			{
 				// The cast to a clipElement above is failing when it is valid. But only
 				// in the plugin - svgdisplay works fine. What's going on? (Adrian)
-				clipElement = dynamic_cast<LibartText *>(tqshape->item());
+				clipElement = dynamic_cast<LibartText *>(shape->item());
 			}
 
 			if(clipElement)
 			{
 				clipElement->setRenderContext(CLIPPING);
 
-				// Push coordinate system down to tqchildren.
-				SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(tqshape);
+				// Push coordinate system down to children.
+				SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(shape);
 				if(locatable)
 					locatable->updateCachedScreenCTM(clipMatrix);
 
@@ -1514,13 +1514,13 @@ void LibartText::update(CanvasItemUpdate reason, int param1, int param2)
 			fill = ++it1;
 			stroke = ++it2;
 		}
-		m_canvas->tqinvalidate(this, false);
+		m_canvas->invalidate(this, false);
 	}
 	else if(reason == UPDATE_TRANSFORM)
 	{
 		clearSVPs();
 		init();
-		m_canvas->tqinvalidate(this, true);
+		m_canvas->invalidate(this, true);
 	}
 	else if(reason == UPDATE_ZOOM)
 	{
@@ -2085,7 +2085,7 @@ void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQB
 			// Here we're undoing the unit-converter's work because putting the
 			// bounding box transform into the matrix here lets the gradient transform
 			// sit at the right point in the chain to work with bounding box coordinates.
-			// It also produces the elliptical tqshape due to the non-uniform scaling.
+			// It also produces the elliptical shape due to the non-uniform scaling.
 			SVGRectImpl *userBBox = getBBoxTarget()->getBBox();
 
 			double width = userBBox->width();
diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.h b/ksvg/plugin/backends/libart/LibartCanvasItems.h
index b5b9984b..1e750144 100644
--- a/ksvg/plugin/backends/libart/LibartCanvasItems.h
+++ b/ksvg/plugin/backends/libart/LibartCanvasItems.h
@@ -138,7 +138,7 @@ namespace KSVG
 		virtual ~LibartPainter() {}
 		
 		void update(SVGStylableImpl *style);
-		void draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *tqshape);
+		void draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *shape);
 
 		virtual float opacity(SVGStylableImpl *style) const = 0;
 		virtual unsigned short paintType(SVGStylableImpl *style) const = 0;
@@ -195,8 +195,8 @@ namespace KSVG
 		virtual bool fillContains(const TQPoint &p);
 		virtual bool strokeContains(const TQPoint &p);
 		virtual void update(CanvasItemUpdate reason, int param1 = 0, int param2 = 0);
-		void draw(SVGShapeImpl *tqshape);
-		bool isVisible(SVGShapeImpl *tqshape);
+		void draw(SVGShapeImpl *shape);
+		bool isVisible(SVGShapeImpl *shape);
 
 		virtual void init();
 		virtual void init(const SVGMatrixImpl *);
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 1a2e3f8d..49a95760 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -398,7 +398,7 @@ void KSVGPlugin::update()
 void KSVGPlugin::slotSetDescription(const TQString &desc)
 {
 	ksvgd->description = desc;
-	emit setStatusBarText(i18n("Description: %1").tqarg(desc));
+	emit setStatusBarText(i18n("Description: %1").arg(desc));
 }
 
 void KSVGPlugin::slotSetTitle(const TQString &title)
@@ -409,7 +409,7 @@ void KSVGPlugin::slotSetTitle(const TQString &title)
 void KSVGPlugin::slotGotURL(const TQString &text)
 {
 	if(text.isNull() && !ksvgd->description.isEmpty())
-		emit setStatusBarText(i18n("Description: %1").tqarg(ksvgd->description));
+		emit setStatusBarText(i18n("Description: %1").arg(ksvgd->description));
 	else
 		emit setStatusBarText(text);
 }
diff --git a/ksvg/test/W3C_TESTSUITE_1.1 b/ksvg/test/W3C_TESTSUITE_1.1
index 226c04c3..b0766355 100644
--- a/ksvg/test/W3C_TESTSUITE_1.1
+++ b/ksvg/test/W3C_TESTSUITE_1.1
@@ -169,12 +169,12 @@ script-handle-03-t	x
 script-handle-04-t	x
 
 [SHAPES]
-tqshapes-circle-01-t	x
-tqshapes-ellipse-01-t	x
-tqshapes-line-01-t	x
-tqshapes-polygon-01-t	x
-tqshapes-polyline-01-t	x
-tqshapes-rect-01-t	x
+shapes-circle-01-t	x
+shapes-ellipse-01-t	x
+shapes-line-01-t	x
+shapes-polygon-01-t	x
+shapes-polyline-01-t	x
+shapes-rect-01-t	x
 
 [STRUCT]
 struct-cond-01-t	x
diff --git a/ksvg/test/ZVON-TEST-PASSED b/ksvg/test/ZVON-TEST-PASSED
index c83c567e..81cb6d52 100644
--- a/ksvg/test/ZVON-TEST-PASSED
+++ b/ksvg/test/ZVON-TEST-PASSED
@@ -112,7 +112,7 @@ path-lines-BE-01.svg:			x
 
 Group 16: [Rendering] - 21.09.2003
 rendering-orderGr-BE-01.svg:	x
-rendering-tqshape-BE-03.svg:		x
+rendering-shape-BE-03.svg:		x
 rendering-text-BE-02.svg:		x
 
 Group 17: [Script] - 21.09.2003
@@ -120,12 +120,12 @@ script-eventDom-BE-01.svg:		x
 script-uiEvents-BE-02.svg:		x
 
 Group 18: [Shapes] - 21.09.2003
-tqshapes-circle-BE-03.svg:		x
-tqshapes-ellipse-BE-02.svg:		x
-tqshapes-line-BE-04.svg:			x
-tqshapes-polygon-BE-05.svg:		x
-tqshapes-polyline-BE-06.svg:		x
-tqshapes-rect-BE-01.svg:			x
+shapes-circle-BE-03.svg:		x
+shapes-ellipse-BE-02.svg:		x
+shapes-line-BE-04.svg:			x
+shapes-polygon-BE-05.svg:		x
+shapes-polyline-BE-06.svg:		x
+shapes-rect-BE-01.svg:			x
 
 Group 19: [Structure] - 21.09.2003
 structure-allElem-BE-09.svg:	x
@@ -146,8 +146,8 @@ style-selector-BE-02.svg:		o
 style-selector-BE-03.svg:		o
 
 Group 21: [Text] - 29.09.2003
-text-tqalignment-BE-10.svg:		x
-text-tqalignment-BE-11.svg:		x
+text-alignment-BE-10.svg:		x
+text-alignment-BE-11.svg:		x
 text-altGlyph-BE-07.svg:		o	FONTS SUPPORT MISSING
 text-decoration-BE-12.svg:		x
 text-extTref-BE-18.svg:			x
diff --git a/ksvg/test/ecma/bbox/bbox.js b/ksvg/test/ecma/bbox/bbox.js
index 88eaa592..2d692694 100644
--- a/ksvg/test/ecma/bbox/bbox.js
+++ b/ksvg/test/ecma/bbox/bbox.js
@@ -13,12 +13,12 @@ function bbox_loop(drawit, number)
 
 	for(var i = 0; i < number; i++)
 	{
-		var tqshape = doc.getElementById("test-" + i);
-		var bbox = tqshape.getBBox();
+		var shape = doc.getElementById("test-" + i);
+		var bbox = shape.getBBox();
 	
 		if(drawit == "true")
 		{
-			draw_it(doc, bbox, tqshape, i + 1);
+			draw_it(doc, bbox, shape, i + 1);
 		}
 		else
 		{
@@ -27,13 +27,13 @@ function bbox_loop(drawit, number)
 	}
 }	
 
-function do_string(tqshape, number)
+function do_string(shape, number)
 {
-	var string = "\nShape " + number + "\nX = " + tqshape.x + "\nY = " + tqshape.y + "\nW = " + tqshape.width + "\nH = " + shape.height;
+	var string = "\nShape " + number + "\nX = " + shape.x + "\nY = " + shape.y + "\nW = " + shape.width + "\nH = " + shape.height;
 	alert(string);
 }
 
-function draw_it(doc, bbox, tqshape, number)
+function draw_it(doc, bbox, shape, number)
 {
 	var element = doc.createElement("rect");
 	element.setAttribute("x", bbox.x);
@@ -45,7 +45,7 @@ function draw_it(doc, bbox, tqshape, number)
 	element.setAttribute("stroke-width", "3");
 	element.setAttribute("id", "bbox" + number);
 	
-	tqshape.getParentNode().appendChild(element);
+	shape.getParentNode().appendChild(element);
 }
 
 function gen_buttons(evt, number)
diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
index d5d3a841..dc43578f 100644
--- a/kuickshow/src/aboutwidget.cpp
+++ b/kuickshow/src/aboutwidget.cpp
@@ -41,7 +41,7 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name )
 
     TQGroupBox *gBox = new TQGroupBox( 1,Qt::Horizontal, this);
     gBox->setGeometry( 10, 10, width()-20, height()-20 );
-    gBox->tqsetAlignment( AlignHCenter );
+    gBox->setAlignment( AlignHCenter );
     gBox->installEventFilter( this );
 
     gBox->setPalette( TQPalette( TQColor( white ) ) );
@@ -57,14 +57,14 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name )
 
     TQLabel *authors = new TQLabel("Kuickshow " KUICKSHOWVERSION
 				 " was brought to you by", gBox);
-    authors->tqsetAlignment( AlignCenter );
+    authors->setAlignment( AlignCenter );
 
     m_homepage = new KURLWidget("Carsten Pfeiffer", gBox);
     m_homepage->setURL( "http://devel-home.kde.org/~pfeiffer/kuickshow/" );
-    m_homepage->tqsetAlignment( AlignCenter );
+    m_homepage->setAlignment( AlignCenter );
 
     TQLabel *copy = new TQLabel("(C) 1998-2006", gBox);
-    copy->tqsetAlignment( AlignCenter );
+    copy->setAlignment( AlignCenter );
 
     ImlibWidget *im = new ImlibWidget( 0L, gBox, "KuickShow Logo" );
     if ( im->loadImage( file ) )
@@ -84,7 +84,7 @@ bool AboutWidget::eventFilter( TQObject *o, TQEvent *e )
 {
     if ( e->type() == TQEvent::MouseButtonPress ) {
         TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
-        if ( !m_homepage->tqgeometry().contains( ev->pos() ) ) {
+        if ( !m_homepage->geometry().contains( ev->pos() ) ) {
             deleteLater();
             return true;
         }
diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
index c0bef522..55d752f5 100644
--- a/kuickshow/src/defaultswidget.cpp
+++ b/kuickshow/src/defaultswidget.cpp
@@ -19,7 +19,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvgroupbox.h>
 
 #include <kcombobox.h>
@@ -92,7 +92,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
   // --
 
   gbPreview = new TQGroupBox( i18n("Preview"), this );
-  gbPreview->tqsetAlignment( AlignCenter );
+  gbPreview->setAlignment( AlignCenter );
 
   lbImOrig = new TQLabel( i18n("Original"), gbPreview );
   imOrig = new ImlibWidget( 0L, gbPreview, "original image" );
@@ -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/filecache.cpp b/kuickshow/src/filecache.cpp
index d68bc897..2fb4f6df 100644
--- a/kuickshow/src/filecache.cpp
+++ b/kuickshow/src/filecache.cpp
@@ -68,7 +68,7 @@ TQString FileCache::tempDir()
 
 KTempDir * FileCache::createTempDir()
 {
-    TQString tmpName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() );
+    TQString tmpName = TQString::fromLatin1( KGlobal::instance()->instanceName() );
     tmpName.append( TQString::number( getpid() ) );
     TQString dirName = locateLocal( "tmp", tmpName );
     KTempDir *dir = new KTempDir( dirName );
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
index 403269bf..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 ) {
@@ -448,7 +448,7 @@ void FileWidget::slotFinishedLoading()
     emit finished();
 }
 
-TQSize FileWidget::tqsizeHint() const
+TQSize FileWidget::sizeHint() const
 {
   return TQSize( 300, 300 );
 }
diff --git a/kuickshow/src/filewidget.h b/kuickshow/src/filewidget.h
index 64f11605..82996644 100644
--- a/kuickshow/src/filewidget.h
+++ b/kuickshow/src/filewidget.h
@@ -71,7 +71,7 @@ protected:
     virtual bool eventFilter( TQObject *o, TQEvent * );
     virtual void resizeEvent( TQResizeEvent * );
     virtual void activatedMenu( const KFileItem *, const TQPoint& );
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
 private slots:
     void slotReturnPressed( const TQString& text );
diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp
index bde353d6..d26ef387 100644
--- a/kuickshow/src/generalwidget.cpp
+++ b/kuickshow/src/generalwidget.cpp
@@ -18,7 +18,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqvgroupbox.h>
 
@@ -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/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index f56c7b30..12aa9118 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -310,8 +310,8 @@ void ImageWindow::updateGeometry( int imWidth, int imHeight )
 	
     TQString caption = i18n( "Filename (Imagewidth x Imageheight)",
                             "%3 (%1 x %2)" );
-    caption = caption.tqarg( m_kuim->originalWidth() ).
-              tqarg( m_kuim->originalHeight() ).tqarg( m_kuim->url().prettyURL() );
+    caption = caption.arg( m_kuim->originalWidth() ).
+              arg( m_kuim->originalHeight() ).arg( m_kuim->url().prettyURL() );
     setCaption( kapp->makeStdCaption( caption ) );
 }
 
@@ -403,7 +403,7 @@ void ImageWindow::scrollImage( int x, int y, bool restrict )
 //     XUnmapWindow();
 //     XSetWindowBackgroundPixmap()
 //     resize window to fit image size, center image
-//     XClearWindow(); // tqrepaint
+//     XClearWindow(); // repaint
 //     XMapWindow(), XSync();
 //
 bool ImageWindow::showNextImage( const KURL& url )
@@ -412,7 +412,7 @@ bool ImageWindow::showNextImage( const KURL& url )
     switch ( file->waitForDownload( this ) ) {
     	case KuickFile::ERROR:
     	{
-    	    TQString tmp = i18n("Unable to download the image from %1.").tqarg(url.prettyURL());
+    	    TQString tmp = i18n("Unable to download the image from %1.").arg(url.prettyURL());
 	        emit sigImageError( file, tmp );
 	        return false;
     	}
@@ -430,7 +430,7 @@ bool ImageWindow::showNextImage( KuickFile *file )
     if ( !loadImage( file ) ) {
    	    TQString tmp = i18n("Unable to load the image %1.\n"
                        "Perhaps the file format is unsupported or "
-                       "your Imlib is not installed properly.").tqarg(file->url().prettyURL());
+                       "your Imlib is not installed properly.").arg(file->url().prettyURL());
         emit sigImageError( file, tmp );
         return false;
     }
@@ -1128,7 +1128,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
 {
     if ( myIsFullscreen || totalScreen )
     {
-        return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).width();
+        return KGlobalSettings::desktopGeometry(topLevelWidget()).width();
     } else
 	return Kuick::workArea().width();
 }
@@ -1137,7 +1137,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
 int ImageWindow::desktopHeight( bool totalScreen ) const
 {
     if ( myIsFullscreen || totalScreen ) {
-        return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).height();
+        return KGlobalSettings::desktopGeometry(topLevelWidget()).height();
     } else {
 	return Kuick::workArea().height();
     }
@@ -1146,7 +1146,7 @@ int ImageWindow::desktopHeight( bool totalScreen ) const
 TQSize ImageWindow::maxImageSize() const
 {
     if ( myIsFullscreen ) {
-        return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size();
+        return KGlobalSettings::desktopGeometry(topLevelWidget()).size();
     }
     else {
 	return Kuick::workArea().size() - Kuick::frameSize( winId() );
@@ -1193,7 +1193,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight )
     if ( !ImlibWidget::canZoomTo( newWidth, newHeight ) )
         return false;
     
-    TQSize desktopSize = KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size();
+    TQSize desktopSize = KGlobalSettings::desktopGeometry(topLevelWidget()).size();
 
     int desktopArea = desktopSize.width() * desktopSize.height();
     int imageArea = newWidth * newHeight;
@@ -1203,7 +1203,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight )
         return KMessageBox::warningContinueCancel(
             this,
             i18n("You are about to view a very large image (%1 x %2 pixels), which can be very resource-consuming and even make your computer hang.\nDo you want to continue?")
-            .tqarg( newWidth ).tqarg( newHeight ),
+            .arg( newWidth ).arg( newHeight ),
             TQString(),
             KStdGuiItem::cont(),
             "ImageWindow_confirm_very_large_window"
diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp
index f42e6c14..a3356d17 100644
--- a/kuickshow/src/imlibwidget.cpp
+++ b/kuickshow/src/imlibwidget.cpp
@@ -29,7 +29,7 @@
 #include <tqglobal.h>
 #include <tqimage.h>
 #include <tqobject.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <kcursor.h>
 #include <kdebug.h>
@@ -475,7 +475,7 @@ void ImlibWidget::setBackgroundColor( const TQColor& color )
 {
     myBackgroundColor = color;
     setPalette( TQPalette( myBackgroundColor ));
-    tqrepaint( false); // FIXME - false? necessary at all?
+    repaint( false); // FIXME - false? necessary at all?
 }
 
 const TQColor& ImlibWidget::backgroundColor() const
@@ -515,7 +515,7 @@ void ImlibWidget::setBusyCursor()
 
 void ImlibWidget::restoreCursor()
 {
-    if ( cursor().shape() == KCursor::waitCursor().tqshape() ) // only if nobody changed the cursor in the meantime!
+    if ( cursor().shape() == KCursor::waitCursor().shape() ) // only if nobody changed the cursor in the meantime!
          setCursor( m_oldCursor );
 }
 
diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
index 4e0aa573..247e56a8 100644
--- a/kuickshow/src/kuickfile.cpp
+++ b/kuickshow/src/kuickfile.cpp
@@ -94,7 +94,7 @@ bool KuickFile::download()
     return m_job != 0L;
 }
 
-KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *parent )
+KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent )
 {
     if ( isAvailable() )
         return OK;
@@ -106,8 +106,8 @@ KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *parent )
 
     KProgressDialog *dialog = new KProgressDialog( parent );
     dialog->setModal( true );
-    dialog->setCaption( i18n("Downloading %1...").tqarg( m_url.fileName() ) );
-    dialog->setLabel( i18n("Please wait while downloading\n%1").tqarg( m_url.prettyURL() ));
+    dialog->setCaption( i18n("Downloading %1...").arg( m_url.fileName() ) );
+    dialog->setLabel( i18n("Please wait while downloading\n%1").arg( m_url.prettyURL() ));
     dialog->setAllowCancel( true );
     dialog->setAutoClose( true );
 
@@ -152,7 +152,7 @@ void KuickFile::slotResult( KIO::Job *job )
 
         TQString canceledFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
         TQFile::remove( canceledFile );
-        m_progress->tqtopLevelWidget()->hide();
+        m_progress->topLevelWidget()->hide();
     }
     else {
 	    m_localFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
@@ -162,7 +162,7 @@ void KuickFile::slotResult( KIO::Job *job )
 	        m_progress->setProgress( 100 );
 #define BUGGY_VERSION KDE_MAKE_VERSION(3,5,2)
 	        if ( KDE::version() <= BUGGY_VERSION ) {
-	            m_progress->tqtopLevelWidget()->hide(); // ### workaround broken KProgressDialog
+	            m_progress->topLevelWidget()->hide(); // ### workaround broken KProgressDialog
 	        }
 	    }
     }
diff --git a/kuickshow/src/kuickfile.h b/kuickshow/src/kuickfile.h
index af92355f..49ee3894 100644
--- a/kuickshow/src/kuickfile.h
+++ b/kuickshow/src/kuickfile.h
@@ -27,7 +27,7 @@ class KuickFile : public TQObject
   TQ_OBJECT
 
 public:
-	enum DownloadtqStatus
+	enum DownloadStatus
 	{
 		OK = 1,
 		CANCELED,
@@ -72,7 +72,7 @@ public:
      * immediately.
      * @return true when the download has finished or false when the user aborted the dialog
      */
-    KuickFile::DownloadtqStatus waitForDownload( TQWidget *parent );
+    KuickFile::DownloadStatus waitForDownload( TQWidget *parent );
 
 //    bool needsDownload();
 
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index fc086313..d566adfb 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -24,7 +24,7 @@
 #include <tqdialog.h>
 #include <tqglobal.h>
 #include <tqkeycode.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsize.h>
 #include <tqstring.h>
 
@@ -133,7 +133,7 @@ KuickShow::KuickShow( const char *name )
         if ( KMessageBox::warningYesNo(
                  this,
                  i18n("Do you really want to display this 1 image at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.", 
-                      "Do you really want to display these %n images at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.", numArgs).tqarg(KStdGuiItem::no().plainText()),
+                      "Do you really want to display these %n images at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.", numArgs).arg(KStdGuiItem::no().plainText()),
                  i18n("Display Multiple Images?"))
              != KMessageBox::Yes )
         {
@@ -253,7 +253,7 @@ void KuickShow::initGUI( const KURL& startDir )
                                         coll, "kuick_print" );
     print->setText( i18n("Print Image...") );
 
-    KAction *configure = new KAction( i18n("Configure %1...").tqarg( KGlobal::instance()->aboutData()->programName() ), "configure",
+    KAction *configure = new KAction( i18n("Configure %1...").arg( KGlobal::instance()->aboutData()->programName() ), "configure",
                                       KShortcut(),
                                       TQT_TQOBJECT(this), TQT_SLOT( configuration() ),
                                       coll, "kuick_configure" );
@@ -552,7 +552,7 @@ bool KuickShow::showImage( const KFileItem *fi,
                      this, TQT_SLOT (slotTrashCurrentImage (ImageWindow *)));
             if ( s_viewers.count() == 1 && moveToTopLeft ) {
                 // we have to move to 0x0 before showing _and_
-                // after showing, otherwise we get some bogus tqgeometry()
+                // after showing, otherwise we get some bogus geometry()
                 m_viewer->move( Kuick::workArea().topLeft() );
             }
 
@@ -641,7 +641,7 @@ void KuickShow::performDeleteCurrentImage(TQWidget *parent)
 
     if (KMessageBox::warningContinueCancel(
             parent,
-            i18n("<qt>Do you really want to delete\n <b>'%1'</b>?</qt>").tqarg(item->url().pathOrURL()),
+            i18n("<qt>Do you really want to delete\n <b>'%1'</b>?</qt>").arg(item->url().pathOrURL()),
             i18n("Delete File"),
             KStdGuiItem::del(),
             "Kuick_delete_current_image")
@@ -666,7 +666,7 @@ void KuickShow::performTrashCurrentImage(TQWidget *parent)
 
     if (KMessageBox::warningContinueCancel(
             parent,
-            i18n("<qt>Do you really want to trash\n <b>'%1'</b>?</qt>").tqarg(item->url().pathOrURL()),
+            i18n("<qt>Do you really want to trash\n <b>'%1'</b>?</qt>").arg(item->url().pathOrURL()),
             i18n("Trash File"),
             KGuiItem(i18n("to trash", "&Trash"),"edittrash"),
             "Kuick_trash_current_image")
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 2c78a925..2983f60b 100644
--- a/kuickshow/src/printing.cpp
+++ b/kuickshow/src/printing.cpp
@@ -21,7 +21,7 @@
 #include <tqfontmetrics.h>
 #include <tqgrid.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqimage.h>
 #include <kimageeffect.h>
 #include <tqpaintdevicemetrics.h>
@@ -52,7 +52,7 @@ bool Printing::printImage( ImageWindow& imageWin, TQWidget *parent )
 
     KPrinter::addDialogPage( new KuickPrintDialogPage( parent, "kuick page"));
 
-    if ( printer.setup( parent, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) )
+    if ( printer.setup( parent, i18n("Print %1").arg(printer.docName().section('/', -1)) ) )
     {
         KTempFile tmpFile( TQString(), ".png" );
         if ( tmpFile.status() == 0 )
@@ -109,7 +109,7 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer,
     bool shrinkToFit = (printer.option( "app-kuickshow-shrinkToFit" ) != f);
     TQSize imagesize = image.size();
     if ( shrinkToFit && (image.width() > w || image.height() > h) ) {
-        imagesize.tqscale( w, h, TQSize::ScaleMin );
+        imagesize.scale( w, h, TQSize::ScaleMin );
     }
 
 
@@ -117,28 +117,28 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer,
     // align image
     //
     bool ok = false;
-    int tqalignment = printer.option("app-kuickshow-tqalignment").toInt( &ok );
+    int alignment = printer.option("app-kuickshow-alignment").toInt( &ok );
     if ( !ok )
-        tqalignment = TQt::AlignCenter; // default
+        alignment = TQt::AlignCenter; // default
 
     int x = 0;
     int y = 0;
 
     // ### need a GUI for this in KuickPrintDialogPage!
-    // x - tqalignment
-    if ( tqalignment & TQt::AlignHCenter )
+    // x - alignment
+    if ( alignment & TQt::AlignHCenter )
         x = (w - imagesize.width())/2;
-    else if ( tqalignment & TQt::AlignLeft )
+    else if ( alignment & TQt::AlignLeft )
         x = 0;
-    else if ( tqalignment & TQt::AlignRight )
+    else if ( alignment & TQt::AlignRight )
         x = w - imagesize.width();
 
-    // y - tqalignment
-    if ( tqalignment & TQt::AlignVCenter )
+    // y - alignment
+    if ( alignment & TQt::AlignVCenter )
         y = (h - imagesize.height())/2;
-    else if ( tqalignment & TQt::AlignTop )
+    else if ( alignment & TQt::AlignTop )
         y = 0;
-    else if ( tqalignment & TQt::AlignBottom )
+    else if ( alignment & TQt::AlignBottom )
         y = h - imagesize.height();
 
     //
@@ -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 );
@@ -258,7 +258,7 @@ void KuickPrintDialogPage::getOptions( TQMap<TQString,TQString>& opts,
     TQString t = "true";
     TQString f = "false";
 
-//    ### opts["app-kuickshow-tqalignment"] = ;
+//    ### opts["app-kuickshow-alignment"] = ;
     opts["app-kuickshow-printFilename"] = m_addFileName->isChecked() ? t : f;
     opts["app-kuickshow-blackwhite"] = m_blackwhite->isChecked() ? t : f;
     opts["app-kuickshow-shrinkToFit"] = m_shrinkToFit->isChecked() ? t : f;
diff --git a/kuickshow/src/slideshowwidget.cpp b/kuickshow/src/slideshowwidget.cpp
index ed2bedc6..8bac8718 100644
--- a/kuickshow/src/slideshowwidget.cpp
+++ b/kuickshow/src/slideshowwidget.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -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 0a448b1a..1c93b8fc 100644
--- a/kview/config/kviewconfmodules.cpp
+++ b/kview/config/kviewconfmodules.cpp
@@ -18,7 +18,7 @@
 
 #include "kviewconfmodules.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 
@@ -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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+	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 a67ad03a..d17e1cbf 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -46,7 +46,7 @@
 #include <tqsize.h>
 #include <tqscrollbar.h>
 #include <tqstyle.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdragobject.h>
 #include <tqvaluelist.h>
 #include <tqtimer.h>
@@ -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 * ) ),
@@ -120,7 +120,7 @@ KView::KView()
 		// create status bar (hidden by default)
 		statusBar()->insertItem( "", STATUSBAR_SPEED_ID, 0, true );
 		statusBar()->setItemFixed( STATUSBAR_SPEED_ID,
-				8 + fontMetrics().width( i18n( "%1/s" ).tqarg( KIO::convertSize( 999000 ) ) ) );
+				8 + fontMetrics().width( i18n( "%1/s" ).arg( KIO::convertSize( 999000 ) ) ) );
 		statusBar()->insertItem( "", STATUSBAR_CURSOR_ID, 0, true );
 		statusBar()->setItemFixed( STATUSBAR_CURSOR_ID, 8 + fontMetrics().width( "8888, 8888" ) );
 		statusBar()->insertItem( "", STATUSBAR_SIZE_ID, 0, true );
@@ -163,13 +163,13 @@ void KView::load( const KURL & url )
 		if( url.isLocalFile() )
 		{
 			// XXX: this code is what
-			//KRecentDirs::add( TQString::tqfromLatin1( ":load_image" ), url.directory() );
+			//KRecentDirs::add( TQString::fromLatin1( ":load_image" ), url.directory() );
 			// would do:
 			TQString directory = url.directory();
-			TQString key = TQString::tqfromLatin1( "load_image" );
+			TQString key = TQString::fromLatin1( "load_image" );
 			KConfig * config = KGlobal::config();
 
-			config->setGroup( TQString::tqfromLatin1( "Recent Dirs" ) );
+			config->setGroup( TQString::fromLatin1( "Recent Dirs" ) );
 			TQStringList result = config->readPathListEntry( key );
 			// make sure the dir is first in history
 			result.remove( directory );
@@ -208,7 +208,7 @@ TQSize KView::sizeForCentralWidgetSize( TQSize size )
 	if( ! mb->isHidden() )
 	{
 		size.rheight() += mb->heightForWidth( width() );
-		if( tqstyle().tqstyleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) )
+		if( tqstyle().styleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) )
 			size.rheight() += dockWindowsMovable() ? 1 : 2;
 	}
 	kdDebug( 4600 ) << "added Menubar:           " << size << endl;
@@ -262,7 +262,7 @@ bool KView::eventFilter( TQObject * obj, TQEvent * ev )
 void KView::imageSizeChanged( const TQSize & /*size*/ )
 {
 	TQSize size = m_pCanvas->imageSize();
-	statusBar()->changeItem( TQString( "%1 x %2" ).tqarg( size.width() ).tqarg( size.height() ), STATUSBAR_SIZE_ID );
+	statusBar()->changeItem( TQString( "%1 x %2" ).arg( size.width() ).arg( size.height() ), STATUSBAR_SIZE_ID );
 	handleResize();
 }
 
@@ -272,7 +272,7 @@ void KView::selectionChanged( const TQRect & rect )
 	if( rect.isNull() )
 		statusBar()->changeItem( TQString(), STATUSBAR_SELECTION_ID );
 	else
-		statusBar()->changeItem( TQString( "%1, %2 - %3 x %4" ).tqarg( rect.x() ).tqarg( rect.y() ).tqarg( rect.width() ).tqarg( rect.height() ), STATUSBAR_SELECTION_ID );
+		statusBar()->changeItem( TQString( "%1, %2 - %3 x %4" ).arg( rect.x() ).arg( rect.y() ).arg( rect.width() ).arg( rect.height() ), STATUSBAR_SELECTION_ID );
 	action( "crop" )->setEnabled( ! rect.isNull() );
 }
 
@@ -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 );
@@ -466,7 +466,7 @@ void KView::speedProgress( KIO::Job *, unsigned long bytesPerSecond )
 	TQString sizeStr;
 
 	if( bytesPerSecond > 0 )
-		sizeStr = i18n( "%1/s" ).tqarg( KIO::convertSize( bytesPerSecond ) );
+		sizeStr = i18n( "%1/s" ).arg( KIO::convertSize( bytesPerSecond ) );
 	else
 		sizeStr = i18n( "Stalled" );
 
@@ -483,7 +483,7 @@ void KView::slotSetStatusBarText( const TQString & msg )
 
 void KView::cursorPos( const TQPoint & pos )
 {
-	statusBar()->changeItem( TQString( "%1, %2" ).tqarg( pos.x() ).tqarg( pos.y() ), STATUSBAR_CURSOR_ID );
+	statusBar()->changeItem( TQString( "%1, %2" ).arg( pos.x() ).arg( pos.y() ), STATUSBAR_CURSOR_ID );
 }
 
 void KView::setupActions( TQObject * partobject )
@@ -498,7 +498,7 @@ void KView::setupActions( TQObject * partobject )
 	TQObject * extension = partobject->child( 0, "KParts::BrowserExtension", false );
 	if( extension )
 	{
-		TQStrList slotNames = extension->tqmetaObject()->slotNames();
+		TQStrList slotNames = extension->metaObject()->slotNames();
 		if( slotNames.contains( "print()" ) )
 			KStdAction::print( extension, TQT_SLOT( print() ), actionCollection(), "print" );
 		if( slotNames.contains( "del()" ) )
@@ -614,7 +614,7 @@ void KView::fitWindowToImage()
 			winsize.setWidth( workarea.width() );
 	}
 
-	TQRect winrect( tqgeometry() );
+	TQRect winrect( geometry() );
 	winrect.setSize( winsize );
 
 	int xdiff = winrect.x() + winrect.width()  - workarea.x() - workarea.width();
@@ -653,7 +653,7 @@ TQSize KView::barSize( int mainwinwidth, BarSizeFrom from )
 				width += toolBar()->width();
 				break;
 			case KToolBar::Flat:
-				height += kapp->tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent );
+				height += kapp->tqstyle().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..0aeb3b1b 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -20,7 +20,7 @@
 #include "generalconfigwidget.h"
 #include "defaults.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqframe.h>
 
@@ -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 746fa02c..108ed82e 100644
--- a/kview/kviewcanvas/config/generalconfigwidget.ui
+++ b/kview/kviewcanvas/config/generalconfigwidget.ui
@@ -110,7 +110,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -127,7 +127,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -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">
@@ -239,7 +239,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>32</width>
                             <height>32</height>
@@ -259,7 +259,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>151</width>
                             <height>21</height>
diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp
index a2e6c5b7..3efd8228 100644
--- a/kview/kviewcanvas/kimagecanvas.cpp
+++ b/kview/kviewcanvas/kimagecanvas.cpp
@@ -543,7 +543,7 @@ void KImageCanvas::slotUpdateImage()
 
 		if( m_bSizeChanged || m_bNewImage )
 		{
-			TQSize sh = m_client->tqsizeHint();
+			TQSize sh = m_client->sizeHint();
 			if( ! sh.isValid() )
 				sh = TQSize( 0, 0 );
 			m_client->resize( sh );
@@ -587,7 +587,7 @@ void KImageCanvas::slotUpdateImage()
 
 void KImageCanvas::mouseMoveEvent( TQMouseEvent * )
 {
-	if( m_cursor.tqshape() == TQt::BlankCursor )
+	if( m_cursor.shape() == TQt::BlankCursor )
 	{
 		m_cursor.setShape( Qt::CrossCursor );
 		viewport()->setCursor( m_cursor );
diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp
index f2e54462..b34cfab2 100644
--- a/kview/kviewcanvas/kimageholder.cpp
+++ b/kview/kviewcanvas/kimageholder.cpp
@@ -207,7 +207,7 @@ void KImageHolder::eraseSelect()
 	inner.rBottom() -= 1;
 	r -= inner;
 
-	TQMemArray<TQRect> rects = r.tqrects();
+	TQMemArray<TQRect> rects = r.rects();
 
 	if( m_pDoubleBuffer )
 		for( unsigned int i = 0; i < rects.size(); ++i )
@@ -269,7 +269,7 @@ TQRect KImageHolder::selection() const
 		return TQRect();
 }
 
-TQSize KImageHolder::tqsizeHint() const
+TQSize KImageHolder::sizeHint() const
 {
 	if( m_pPixmap )
 		return m_pPixmap->size();
diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h
index 165ec0bc..a5555e2b 100644
--- a/kview/kviewcanvas/kimageholder.h
+++ b/kview/kviewcanvas/kimageholder.h
@@ -57,7 +57,7 @@ class KImageHolder : public TQWidget
 		 */
 		TQRect selection() const;
 
-		TQSize tqsizeHint() const;
+		TQSize sizeHint() const;
 
 		void setDrawRect( const TQRect & rect ) { m_drawRect = rect; }
 		const TQRect & drawRect() const { return m_drawRect; }
diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp
index a4259b05..0a2e0dc3 100644
--- a/kview/kviewviewer/imagesettings.cpp
+++ b/kview/kviewviewer/imagesettings.cpp
@@ -19,7 +19,7 @@
 #include "imagesettings.h"
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kdialog.h>
@@ -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/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp
index ed93d6ea..2d4f8bb9 100644
--- a/kview/kviewviewer/kviewkonqextension.cpp
+++ b/kview/kviewviewer/kviewkonqextension.cpp
@@ -68,7 +68,7 @@ void KViewKonqExtension::print()
 	printer.addDialogPage( new ImageSettings );
 	printer.setDocName( "KView: " + m_pViewer->url().fileName( false ) );
 
-	if ( !printer.setup( ((KViewViewer *)parent())->widget(), i18n("Print %1").tqarg(m_pViewer->url().fileName( false )) ) )
+	if ( !printer.setup( ((KViewViewer *)parent())->widget(), i18n("Print %1").arg(m_pViewer->url().fileName( false )) ) )
 		return;
 
 	TQPainter painter;
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 73d1bd92..a2b3b4a9 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -29,7 +29,7 @@
 #include <assert.h>
 
 #include <tqbuffer.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
 #include <tqregexp.h>
@@ -397,7 +397,7 @@ bool KViewViewer::openFile()
 		}
 		else
 		{
-			emit setStatusBarText( i18n( "Unknown image format: %1" ).tqarg( m_url.prettyURL() ) );
+			emit setStatusBarText( i18n( "Unknown image format: %1" ).arg( m_url.prettyURL() ) );
 			return false;
 		}
 	}
@@ -406,12 +406,12 @@ bool KViewViewer::openFile()
 		kdDebug( 4610 ) << k_funcinfo << " load from file: " << m_file << endl;
 		if( ! TQFile::exists( m_file ) )
 		{
-			emit setStatusBarText( i18n( "No such file: %1" ).tqarg( m_file ) );
+			emit setStatusBarText( i18n( "No such file: %1" ).arg( m_file ) );
 			return false;
 		}
 		if( TQImage::imageFormat( m_file ) == 0 )
 		{
-			emit setStatusBarText( i18n( "Unknown image format: %1" ).tqarg( m_file ) );
+			emit setStatusBarText( i18n( "Unknown image format: %1" ).arg( m_file ) );
 			return false;
 		}
 		// determine Mime Type
@@ -567,7 +567,7 @@ void KViewViewer::writeSettings()
 void KViewViewer::zoomChanged( double zoom )
 {
 	kdDebug( 4610 ) << k_funcinfo << endl;
-	emit setWindowCaption( m_sCaption + TQString( " (%1%)" ).tqarg( zoom * 100, 0, 'f', 0 ) );
+	emit setWindowCaption( m_sCaption + TQString( " (%1%)" ).arg( zoom * 100, 0, 'f', 0 ) );
 	updateZoomMenu( zoom );
 }
 
@@ -685,7 +685,7 @@ void KViewViewer::updateZoomMenu( double zoom )
 	}
 
 	// first look if it's a new value (not in the list yet)
-	TQString z = TQString( "%1%" ).tqarg( zoom * 100, 0, 'f', 0 );
+	TQString z = TQString( "%1%" ).arg( zoom * 100, 0, 'f', 0 );
 	TQStringList items = m_paZoom->items();
 	int idx = items.findIndex( z );
 	if( -1 == idx )
@@ -803,21 +803,21 @@ void KViewViewer::slotFileDirty( const TQString & )
 	if( isModified() && isReadWrite() )
 	{
 		KPassivePopup * pop = new KPassivePopup( m_pParentWidget );
-		TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).tqarg( kapp->aboutData()->programName() ),
+		TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).arg( kapp->aboutData()->programName() ),
 				TQString(), kapp->miniIcon() );
 		( void )new TQLabel( i18n( "The image %1 which you have modified has changed on disk.\n"
 								  "Do you want to reload the file and lose your changes?\n"
 								  "If you don't and subsequently save the image, you will lose the\n"
-								  "changes that have already been saved." ).tqarg( url().fileName() ), vb );
+								  "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 2eed3c78..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">
@@ -149,7 +149,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -168,7 +168,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>0</height>
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp
index 3f868694..f05cc936 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.cpp
+++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp
@@ -18,7 +18,7 @@
 
 #include "kviewpresenterconfig.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqframe.h>
 
@@ -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/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index d56343dc..05d3b90f 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -60,7 +60,7 @@
             <property name="name">
                 <cstring>m_pListView</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>400</width>
                     <height>0</height>
@@ -140,7 +140,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -188,7 +188,7 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>80</height>
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index e7275c0d..4a309902 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -24,7 +24,7 @@
 
 #include <tqvbox.h>
 #include <tqobjectlist.h>
-#include <tqsignalslotimp.h>
+#include <signalslotimp.h>
 #include <tqtimer.h>
 #include <tqevent.h>
 #include <tqdragobject.h>
@@ -412,7 +412,7 @@ void KViewPresenter::loadList()
 	TQString tempfile;
 	if( ! KIO::NetAccess::download( url, tempfile, m_pViewer->widget() ) )
 	{
-		KMessageBox::error( m_pImageList, i18n( "Could not load\n%1" ).tqarg( url.prettyURL() ) );
+		KMessageBox::error( m_pImageList, i18n( "Could not load\n%1" ).arg( url.prettyURL() ) );
 		return;
 	}
 	TQFile file( tempfile );
@@ -442,7 +442,7 @@ void KViewPresenter::loadList()
 		}
 		else
 		{
-			KMessageBox::error( m_pImageList, i18n( "Wrong format\n%1" ).tqarg( url.prettyURL() ) );
+			KMessageBox::error( m_pImageList, i18n( "Wrong format\n%1" ).arg( url.prettyURL() ) );
 		}
 		file.close();
 	}
diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp
index b6818271..3c9ce04f 100644
--- a/kview/modules/presenter/kviewpresenterconfmodule.cpp
+++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp
@@ -20,7 +20,7 @@
 
 #include "kviewpresenterconfmodule.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqframe.h>
 
@@ -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 95802df4..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() );
@@ -75,21 +75,21 @@ void KViewScale::slotScaleDlg()
 
 	// show original width
 	label = new TQLabel( i18n( "Original width:" ), pixelgroup );
-	label->tqsetAlignment( TQLabel::AlignRight );
+	label->setAlignment( TQLabel::AlignRight );
 	pixelgroupgrid->addWidget( label, 0, 0 );
 	pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.width() ), pixelgroup ), 0, 1 );
 	label = new TQLabel( i18n( "Height:" ), pixelgroup );
-	label->tqsetAlignment( TQLabel::AlignRight );
+	label->setAlignment( TQLabel::AlignRight );
 	pixelgroupgrid->addWidget( label, 1, 0 );
 	pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.height() ), pixelgroup ), 1, 1 );
 
 	pixelgroupgrid->addRowSpacing( 2, KDialog::spacingHint() );
 
 	label = new TQLabel( i18n( "New width:" ), pixelgroup );
-	label->tqsetAlignment( TQLabel::AlignRight );
+	label->setAlignment( TQLabel::AlignRight );
 	pixelgroupgrid->addWidget( label, 3, 0 );
 	label = new TQLabel( i18n( "Height:" ), pixelgroup );
-	label->tqsetAlignment( TQLabel::AlignRight );
+	label->setAlignment( TQLabel::AlignRight );
 	pixelgroupgrid->addWidget( label, 4, 0 );
 	TQSpinBox * newwidth = new TQSpinBox( 1, 100000, 1, pixelgroup );
 	pixelgroupgrid->addWidget( newwidth, 3, 1 );
@@ -103,10 +103,10 @@ void KViewScale::slotScaleDlg()
 	pixelgroupgrid->addRowSpacing( 5, KDialog::spacingHint() );
 
 	label = new TQLabel( i18n( "Ratio X:" ), pixelgroup );
-	label->tqsetAlignment( TQLabel::AlignRight );
+	label->setAlignment( TQLabel::AlignRight );
 	pixelgroupgrid->addWidget( label, 6, 0 );
 	label = new TQLabel( i18n( "Y:" ), pixelgroup );
-	label->tqsetAlignment( TQLabel::AlignRight );
+	label->setAlignment( TQLabel::AlignRight );
 	pixelgroupgrid->addWidget( label, 7, 0 );
 	TQSpinBox * ratiox = new TQSpinBox( pixelgroup );
 	ratiox->setValidator( new TQDoubleValidator( 0.0001, 10000, 4, ratiox ) );
@@ -116,16 +116,16 @@ 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() );
 
 	label = new TQLabel( i18n( "New width:" ), printgroup );
-	label->tqsetAlignment( TQLabel::AlignRight );
+	label->setAlignment( TQLabel::AlignRight );
 	printgroupgrid->addWidget( label, 0, 0 );
 	label = new TQLabel( i18n( "Height:" ), printgroup );
-	label->tqsetAlignment( TQLabel::AlignRight );
+	label->setAlignment( TQLabel::AlignRight );
 	printgroupgrid->addWidget( label, 1, 0 );
 	TQSpinBox * newwidth2 = new TQSpinBox( printgroup );
 	printgroupgrid->addWidget( newwidth2, 0, 1 );
@@ -139,10 +139,10 @@ void KViewScale::slotScaleDlg()
 	printgroupgrid->addRowSpacing( 2, KDialog::spacingHint() );
 
 	label = new TQLabel( i18n( "Resolution X:" ), printgroup );
-	label->tqsetAlignment( TQLabel::AlignRight );
+	label->setAlignment( TQLabel::AlignRight );
 	printgroupgrid->addWidget( label, 3, 0 );
 	label = new TQLabel( i18n( "Y:" ), printgroup );
-	label->tqsetAlignment( TQLabel::AlignRight );
+	label->setAlignment( TQLabel::AlignRight );
 	printgroupgrid->addWidget( label, 4, 0 );
 	TQSpinBox * resx = new TQSpinBox( printgroup );
 	printgroupgrid->addWidget( resx, 3, 1 );
diff --git a/kview/modules/scale/scaledlg.cpp b/kview/modules/scale/scaledlg.cpp
index 335ab1c9..3105bd85 100644
--- a/kview/modules/scale/scaledlg.cpp
+++ b/kview/modules/scale/scaledlg.cpp
@@ -21,7 +21,7 @@
 #include "scaledlg.h"
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
@@ -61,53 +61,53 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name
 	pixelgroupgrid->addRowSpacing( 0, KDialog::spacingHint() );
 
 	label = new TQLabel( i18n( "Original width:" ), pixelgroup );
-    label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	pixelgroupgrid->addWidget( label, 1, 0 );
 	label = new TQLabel( i18n( "Height:" ), pixelgroup );
-    label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	pixelgroupgrid->addWidget( label, 2, 0 );
 
 	pixelgroupgrid->addRowSpacing( 3, KDialog::spacingHint() );
 
 	label = new TQLabel( i18n( "New width:" ), pixelgroup );
-    label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	pixelgroupgrid->addWidget( label, 4, 0 );
 	label = new TQLabel( i18n( "Height:" ), pixelgroup );
-    label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	pixelgroupgrid->addWidget( label, 5, 0 );
 
 	pixelgroupgrid->addRowSpacing( 6, KDialog::spacingHint() );
 
 	label = new TQLabel( i18n( "Ratio X:" ), pixelgroup );
-    label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	pixelgroupgrid->addWidget( label, 7, 0 );
 	label = new TQLabel( i18n( "Y:" ), pixelgroup );
-    label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	pixelgroupgrid->addWidget( label, 8, 0 );
 
 	printgroupgrid->addRowSpacing( 0, KDialog::spacingHint() );
 
 	label = new TQLabel( i18n( "New width:" ), printgroup );
-    label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	printgroupgrid->addWidget( label, 1, 0 );
 	label = new TQLabel( i18n( "Height:" ), printgroup );
-    label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	printgroupgrid->addWidget( label, 2, 0 );
 
 	printgroupgrid->addRowSpacing( 3, KDialog::spacingHint() );
 
 	label = new TQLabel( i18n( "Resolution X:" ), printgroup );
-    label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	printgroupgrid->addWidget( label, 4, 0 );
 	label = new TQLabel( i18n( "Y:" ), printgroup );
-    label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	printgroupgrid->addWidget( label, 5, 0 );
 
 	m_pOldWidth = new TQLabel( TQString::number( origsize.width() ), pixelgroup );
-    m_pOldWidth->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    m_pOldWidth->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	pixelgroupgrid->addWidget( m_pOldWidth, 1, 1 );
 	m_pOldHeight = new TQLabel( TQString::number( origsize.height() ), pixelgroup );
-    m_pOldHeight->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    m_pOldHeight->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 	pixelgroupgrid->addWidget( m_pOldHeight, 2, 1 );
 
 	m_pNewWidth = new KFloatSpinBox( 1.0, 100000.0, 10.0, 0, pixelgroup );
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/documentWidget.cpp b/kviewshell/documentWidget.cpp
index f370daba..850bec40 100644
--- a/kviewshell/documentWidget.cpp
+++ b/kviewshell/documentWidget.cpp
@@ -17,7 +17,7 @@
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcursor.h>
 #include <tqimage.h>
 #include <tqpainter.h>
@@ -147,7 +147,7 @@ void DocumentWidget::timerEvent( TQTimerEvent *e )
     animationCounter = 0;
   }
 
-  tqrepaint(flashRect, false);
+  repaint(flashRect, false);
 }
 
 
@@ -160,7 +160,7 @@ void DocumentWidget::flash(int fo)
     animationCounter = 10;
     TQRect flashRect = linkFlashRect();
     flashRect.addCoords(-1, -1, 1, 1);
-    tqrepaint(flashRect, false);
+    repaint(flashRect, false);
   }
   animationCounter = 0;
   flashOffset      = fo;
@@ -203,7 +203,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e)
   p.drawRect(outlineRect);
 
   // Paint page shadow
-  TQColor backgroundColor = tqcolorGroup().mid();
+  TQColor backgroundColor = colorGroup().mid();
 
   // (Re-)generate the Pixmaps for the shadow corners, if necessary
   if (backgroundColor != backgroundColorForCorners)
@@ -273,7 +273,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e)
     return;
   }
 
-  TQMemArray<TQRect> damagedRects = TQRegion(e->region()).tqrects();
+  TQMemArray<TQRect> damagedRects = TQRegion(e->region()).rects();
   for (unsigned int i = 0; i < damagedRects.count(); i++)
   {
     // Paint the page where it intersects with the damaged area.
@@ -345,7 +345,7 @@ void DocumentWidget::paintEvent(TQPaintEvent *e)
     p.setBrush(white);
     p.setRasterOp(TQt::XorROP);
 
-    TQMemArray<TQRect> selectionRects = selectedRegion.tqrects();
+    TQMemArray<TQRect> selectionRects = selectedRegion.rects();
 
     for (unsigned int i = 0; i < selectionRects.count(); i++)
       p.drawRect(selectionRects[i]);
@@ -545,7 +545,7 @@ void DocumentWidget::mouseMoveEvent ( TQMouseEvent * e )
         if ( link.startsWith("#") )
           link = link.remove(0,1);
 
-        emit setStatusBarText( i18n("Link to %1").tqarg(link) );
+        emit setStatusBarText( i18n("Link to %1").arg(link) );
 
         indexOfUnderlinedLink = i;
         if (KVSPrefs::underlineLinks() == KVSPrefs::EnumUnderlineLinks::OnlyOnHover &&
@@ -661,10 +661,10 @@ void DocumentWidget::updateSelection(const TextSelection& newTextSelection)
 
       selectedRegion = newlySelectedRegion;
 
-      TQMemArray<TQRect> rectangles = updateRegion.tqrects();
+      TQMemArray<TQRect> rectangles = updateRegion.rects();
       for (unsigned int i = 0; i < rectangles.count(); i++)
       {
-        tqrepaint(rectangles[i]);
+        repaint(rectangles[i]);
       }
     }
   }
diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp
index 7fc41986..1325b50f 100644
--- a/kviewshell/kmultipage.cpp
+++ b/kviewshell/kmultipage.cpp
@@ -11,7 +11,7 @@
 #include <kprinter.h>
 #include <kstdaction.h>
 #include <tqobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqprogressdialog.h>
 #include <tqsplitter.h>
@@ -54,7 +54,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject
   
   splitterWidget = new TQSplitter(verticalBox, widgetName);
   splitterWidget->setOpaqueResize(false);
-  splitterWidget->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+  splitterWidget->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
   
   // Create SideBar
   sideBar = new TQToolBox(splitterWidget, "sidebar");
@@ -117,7 +117,7 @@ void KMultiPage::readSettings()
 
 void KMultiPage::writeSettings()
 {
-  // Save TOC tqlayout
+  // Save TOC layout
   tableOfContents->writeSettings();
 
   KVSPrefs::setGuiLayout(splitterWidget->sizes());
@@ -166,7 +166,7 @@ void KMultiPage::slotSave()
     fileName = fileName+ending;
 
   if (TQFile(fileName).exists()) {
-    int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Shall I overwrite that file?").tqarg(fileName),
+    int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Shall I overwrite that file?").arg(fileName),
 				       i18n("Overwrite File"), i18n("Overwrite"));
     if (r == KMessageBox::Cancel)
       return;
@@ -216,7 +216,7 @@ bool KMultiPage::closeURL()
   // Clear Table of Contents
   tableOfContents->clear();
   
-  // Clear tqStatus Bar
+  // Clear Status Bar
   emit setStatusBarText(TQString());
 
   return true;
@@ -767,7 +767,7 @@ void KMultiPage::print()
     return;
 
   // initialize the printer using the print dialog
-  if ( printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) {    
+  if ( printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1))) ) {    
     // Now do the printing. 
     TQValueList<int> pageList = printer->pageList();
     if (pageList.isEmpty()) 
@@ -1427,7 +1427,7 @@ void KMultiPage::findNextText()
 
     if (i != 0)
     {
-      setStatusBarText(i18n("Search page %1 of %2").tqarg(pageNumber).tqarg(numberOfPages()));
+      setStatusBarText(i18n("Search page %1 of %2").arg(pageNumber).arg(numberOfPages()));
       kapp->processEvents();
     }
 
@@ -1474,7 +1474,7 @@ void KMultiPage::findNextText()
         int answ = KMessageBox::questionYesNo(scrollView(),
                    i18n("<qt>The search string <strong>%1</strong> could not be found by the "
                         "end of the document. Should the search be restarted from the beginning "
-                        "of the document?</qt>").tqarg(searchText),
+                        "of the document?</qt>").arg(searchText),
                    i18n("Text Not Found"), KStdGuiItem::cont(), KStdGuiItem::cancel());
 
         if (answ != KMessageBox::Yes)
@@ -1499,7 +1499,7 @@ void KMultiPage::findNextText()
     }
   }
 
-  KMessageBox::sorry(scrollView(), i18n("<qt>The search string <strong>%1</strong> could not be found.</qt>").tqarg(searchText));
+  KMessageBox::sorry(scrollView(), i18n("<qt>The search string <strong>%1</strong> could not be found.</qt>").arg(searchText));
   setStatusBarText(TQString());
   searchInProgress = false;
   if (!cachedPage)
@@ -1569,7 +1569,7 @@ void KMultiPage::findPrevText()
 
     if (i != 0)
     {
-      setStatusBarText(i18n("Search page %1 of %2").tqarg(pageNumber).tqarg(numberOfPages()));
+      setStatusBarText(i18n("Search page %1 of %2").arg(pageNumber).arg(numberOfPages()));
       kapp->processEvents();
     }
 
@@ -1616,7 +1616,7 @@ void KMultiPage::findPrevText()
         int answ = KMessageBox::questionYesNo(scrollView(),
                   i18n("<qt>The search string <strong>%1</strong> could not be found by the "
                         "beginning of the document. Should the search be restarted from the end "
-                        "of the document?</qt>").tqarg(searchText),
+                        "of the document?</qt>").arg(searchText),
                   i18n("Text Not Found"), KStdGuiItem::cont(), KStdGuiItem::cancel());
 
         if (answ != KMessageBox::Yes)
@@ -1641,7 +1641,7 @@ void KMultiPage::findPrevText()
     }
   }
 
-  KMessageBox::sorry(scrollView(), i18n("<qt>The search string <strong>%1</strong> could not be found.</qt>").tqarg(searchText));
+  KMessageBox::sorry(scrollView(), i18n("<qt>The search string <strong>%1</strong> could not be found.</qt>").arg(searchText));
   setStatusBarText(TQString());
   searchInProgress = false;
   if (!cachedPage)
@@ -1710,7 +1710,7 @@ void KMultiPage::reload()
     pageCache->clear();
     pageCache->deselectText();
     document_history.clear();
-    emit setStatusBarText(i18n("Reloading file %1").tqarg(m_file));
+    emit setStatusBarText(i18n("Reloading file %1").arg(m_file));
     TQ_INT32 pg = currentPageNumber();
 
     killTimer(timer_id);
@@ -1746,7 +1746,7 @@ bool KMultiPage::openFile()
   pageCache->deselectText();
   document_history.clear();
   pageCache->clear();
-  emit setStatusBarText(i18n("Loading file %1").tqarg(m_file));
+  emit setStatusBarText(i18n("Loading file %1").arg(m_file));
 
   bool r = renderer->setFile(m_file, m_url);
 
@@ -1887,9 +1887,9 @@ KPrinter *KMultiPage::getPrinter(bool enablePageSizeFeatures)
       } else
 	it++;
       if (endval == val)
-	range +=  TQString("%1").tqarg(val);
+	range +=  TQString("%1").arg(val);
       else
-	range +=  TQString("%1-%2").tqarg(val).tqarg(endval);
+	range +=  TQString("%1-%2").arg(val).arg(endval);
     } while (it != selectedPageNo.end() );
     printer->setOption( "kde-range", range );
   }
@@ -1912,7 +1912,7 @@ void KMultiPage::doExportText()
   if (finfo.exists())
   {
     int r = KMessageBox::warningContinueCancel (scrollView(),
-                i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
+                i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
                 i18n("Overwrite File"), i18n("Overwrite"));
 
     if (r == KMessageBox::Cancel)
diff --git a/kviewshell/kmultipage.h b/kviewshell/kmultipage.h
index d09115fd..4f0aa6f1 100644
--- a/kviewshell/kmultipage.h
+++ b/kviewshell/kmultipage.h
@@ -121,7 +121,7 @@ public:
 
   // Show the printer options dialog. Return immediately if the user
   // aborts.
-  if (!printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) )) {
+  if (!printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1)) )) {
     delete printer;
     return;
   }
@@ -155,7 +155,7 @@ public:
 
   // Show the printer options dialog. Return immediately if the user
   // aborts.
-  if (!printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) )) {
+  if (!printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1)) )) {
     delete printer;
     return;
   }
diff --git a/kviewshell/kprintDialogPage_pageoptions.cpp b/kviewshell/kprintDialogPage_pageoptions.cpp
index 603c2552..ea5e2ff1 100644
--- a/kviewshell/kprintDialogPage_pageoptions.cpp
+++ b/kviewshell/kprintDialogPage_pageoptions.cpp
@@ -12,7 +12,7 @@
 #include <klocale.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <kdebug.h>
@@ -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;
   }
     
@@ -91,7 +91,7 @@ KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions( TQWidget *parent, co
   }
 
   
-  resize( TQSize(319, 166).expandedTo(tqminimumSizeHint()) );
+  resize( TQSize(319, 166).expandedTo(minimumSizeHint()) );
   clearWState( WState_Polished );
 }
 
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index 186a2823..898557e3 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -1,6 +1,6 @@
 #include <tqfileinfo.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqscrollview.h>
 #include <tqscrollbar.h>
 #include <tqtimer.h>
@@ -96,18 +96,18 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
     // If a default MimeType is specified try to load a MultiPage supporting it.
     TQString defaultMimeType = args.first();
     offers = KTrader::self()->query(
-        TQString::tqfromLatin1("KViewShell/MultiPage" ),
+        TQString::fromLatin1("KViewShell/MultiPage" ),
         TQString("([X-KDE-MultiPageVersion] == %1) and "
-                "([X-KDE-MimeTypes] == '%2')").tqarg(MULTIPAGE_VERSION).tqarg(defaultMimeType));
+                "([X-KDE-MimeTypes] == '%2')").arg(MULTIPAGE_VERSION).arg(defaultMimeType));
   }
 
   // If no default MimeType is given or no MultiPage has been found, try to load the Empty MultiPage.
   if (offers.isEmpty())
   {
     offers = KTrader::self()->query(
-        TQString::tqfromLatin1("KViewShell/MultiPage" ),
+        TQString::fromLatin1("KViewShell/MultiPage" ),
         TQString("([X-KDE-MultiPageVersion] == %1) and "
-                "([X-KDE-EmptyMultiPage] == 1)").tqarg(MULTIPAGE_VERSION));
+                "([X-KDE-EmptyMultiPage] == 1)").arg(MULTIPAGE_VERSION));
   }
 
   // If still no MultiPage has been found, report an error and abort.
@@ -137,7 +137,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
       break;
     case KParts::ComponentFactory::ErrNoLibrary:
       reason = i18n("<qt><p>The specified library <b>%1</b> could not be loaded. The error message returned was:</p>"
-		    "<p><b>%2</b></p></qt>").tqarg(service->library()).tqarg(KLibLoader::self()->lastErrorMessage());
+		    "<p><b>%2</b></p></qt>").arg(service->library()).arg(KLibLoader::self()->lastErrorMessage());
       break;
     case KParts::ComponentFactory::ErrNoFactory:
       reason = i18n("<qt>The library does not export a factory for creating components.</qt>");
@@ -155,7 +155,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
 			"question. If that does not help, you could file an error report, either to the "
 			"provider of your software (e.g. the vendor of your Linux distribution), or "
 			"directly to the authors of the software. The entry <b>Report Bug...</b> in the "
-			"<b>Help</b> menu helps you to contact the KDE programmers.</p></qt>").tqarg(m_file).tqarg(service->library());
+			"<b>Help</b> menu helps you to contact the KDE programmers.</p></qt>").arg(m_file).arg(service->library());
     TQString caption = i18n("Error Initializing Software Component");
     KMessageBox::detailedError(mainWidget, text, reason, caption);
     emit setStatusBarText(TQString());
@@ -420,9 +420,9 @@ TQString KViewPart::pageSizeDescription()
   TQString size = " ";
   if (s.formatNumber() == -1) {
     if (KGlobal::locale()-> measureSystem() == KLocale::Metric)
-      size += TQString("%1x%2 mm").tqarg(s.width().getLength_in_mm(), 0, 'f', 0).tqarg(s.height().getLength_in_mm(), 0, 'f', 0);
+      size += TQString("%1x%2 mm").arg(s.width().getLength_in_mm(), 0, 'f', 0).arg(s.height().getLength_in_mm(), 0, 'f', 0);
     else
-      size += TQString("%1x%2 in").tqarg(s.width().getLength_in_inch(), 0, 'g', 2).tqarg(s.height().getLength_in_inch(), 0, 'g', 2);
+      size += TQString("%1x%2 in").arg(s.width().getLength_in_inch(), 0, 'g', 2).arg(s.height().getLength_in_inch(), 0, 'g', 2);
   } else {
     size += s.formatName() + "/";
     if (s.getOrientation() == 0)
@@ -471,8 +471,8 @@ TQStringList KViewPart::supportedMimeTypes()
 
   // Search for service
   KTrader::OfferList offers = KTrader::self()->query(
-      TQString::tqfromLatin1("KViewShell/MultiPage"),
-      TQString("([X-KDE-MultiPageVersion] == %1)").tqarg(MULTIPAGE_VERSION)
+      TQString::fromLatin1("KViewShell/MultiPage"),
+      TQString("([X-KDE-MultiPageVersion] == %1)").arg(MULTIPAGE_VERSION)
   );
 
   if (!offers.isEmpty())
@@ -516,8 +516,8 @@ TQStringList KViewPart::fileFormats() const
 
   // Search for service
   KTrader::OfferList offers = KTrader::self()->query(
-      TQString::tqfromLatin1("KViewShell/MultiPage"),
-      TQString("([X-KDE-MultiPageVersion] == %1)").tqarg(MULTIPAGE_VERSION)
+      TQString::fromLatin1("KViewShell/MultiPage"),
+      TQString("([X-KDE-MultiPageVersion] == %1)").arg(MULTIPAGE_VERSION)
   );
 
   if (!offers.isEmpty())
@@ -642,7 +642,7 @@ bool KViewPart::openFile()
     // If we still have not found a file. Show an error message and return.
     if (!fi.exists())
     {
-      KMessageBox::error(mainWidget, i18n("<qt>File <nobr><strong>%1</strong></nobr> does not exist.</qt>").tqarg(m_file));
+      KMessageBox::error(mainWidget, i18n("<qt>File <nobr><strong>%1</strong></nobr> does not exist.</qt>").arg(m_file));
       emit setStatusBarText(TQString());
       return false;
     }
@@ -651,7 +651,7 @@ bool KViewPart::openFile()
 
   // Set the window caption now, before we do any uncompression and generation of temporary files.
   tmpFileURL.setPath(m_file);
-  emit setStatusBarText(i18n("Loading '%1'...").tqarg(tmpFileURL.prettyURL()));
+  emit setStatusBarText(i18n("Loading '%1'...").arg(tmpFileURL.prettyURL()));
   emit setWindowCaption( tmpFileURL.prettyURL() ); // set Window caption WITHOUT the reference part!
 
   // Check if the file is compressed
@@ -678,7 +678,7 @@ bool KViewPart::openFile()
     if(tmpUnzipped->status() != 0)
     {
       KMessageBox::error(mainWidget, i18n("<qt><strong>File Error!</strong> Could not create temporary file "
-                         "<nobr><strong>%1</strong></nobr>.</qt>").tqarg(strerror(tmpUnzipped->status())));
+                         "<nobr><strong>%1</strong></nobr>.</qt>").arg(strerror(tmpUnzipped->status())));
       emit setWindowCaption(TQString());
       emit setStatusBarText(TQString());
       return false;
@@ -700,7 +700,7 @@ bool KViewPart::openFile()
     {
       KMessageBox::detailedError(mainWidget, i18n("<qt><strong>File Error!</strong> Could not open the file "
           "<nobr><strong>%1</strong></nobr> for uncompression. "
-          "The file will not be loaded.</qt>").tqarg(m_file),
+          "The file will not be loaded.</qt>").arg(m_file),
           i18n("<qt>This error typically occurs if you do not have enough permissions to read the file. "
           "You can check ownership and permissions if you right-click on the file in the Konqueror "
           "file manager and then choose the 'Properties' menu.</qt>"));
@@ -712,7 +712,7 @@ bool KViewPart::openFile()
 
     KProgressDialog* prog = new KProgressDialog(0L, "uncompress-progress",
         i18n("Uncompressing..."),
-        i18n("<qt>Uncompressing the file <nobr><strong>%1</strong></nobr>. Please wait.</qt>").tqarg(m_file));
+        i18n("<qt>Uncompressing the file <nobr><strong>%1</strong></nobr>. Please wait.</qt>").arg(m_file));
 
     prog->progressBar()->setTotalSteps((int) fi.size()/1024);
     prog->progressBar()->setProgress(0);
@@ -746,7 +746,7 @@ bool KViewPart::openFile()
     if ((read != 0) || (tmpUnzipped->file()->size() == 0))
     {
       KMessageBox::detailedError(mainWidget, i18n("<qt><strong>File Error!</strong> Could not uncompress "
-          "the file <nobr><strong>%1</strong></nobr>. The file will not be loaded.</qt>").tqarg( m_file ),
+          "the file <nobr><strong>%1</strong></nobr>. The file will not be loaded.</qt>").arg( m_file ),
           i18n("<qt>This error typically occurs if the file is corrupt. "
           "If you want to be sure, try to decompress the file manually using command-line tools.</qt>"));
       emit setWindowCaption(TQString());
@@ -768,15 +768,15 @@ bool KViewPart::openFile()
 
   // Search for service
   KTrader::OfferList offers = KTrader::self()->query(
-      TQString::tqfromLatin1("KViewShell/MultiPage" ),
+      TQString::fromLatin1("KViewShell/MultiPage" ),
   TQString("([X-KDE-MultiPageVersion] == %1) and "
-          "([X-KDE-MimeTypes] == '%2')").tqarg(MULTIPAGE_VERSION).tqarg(mimetype->name()));
+          "([X-KDE-MimeTypes] == '%2')").arg(MULTIPAGE_VERSION).arg(mimetype->name()));
 
   if (offers.isEmpty()) {
     KMessageBox::detailedError(mainWidget, i18n("<qt>The document <b>%1</b> cannot be shown because "
-						"its file type is not supported.</qt>").tqarg(m_file),
+						"its file type is not supported.</qt>").arg(m_file),
 			       i18n("<qt>The file has mime type <b>%1</b> which is not supported by "
-				    "any of the installed KViewShell plugins.</qt>").tqarg(mimetype->name()));
+				    "any of the installed KViewShell plugins.</qt>").arg(mimetype->name()));
     emit setWindowCaption(TQString());
     emit setStatusBarText(TQString());
     return false;
@@ -813,7 +813,7 @@ bool KViewPart::openFile()
 	reason = i18n("<qt>The specified service provides no shared library.</qt>");
 	break;
       case KParts::ComponentFactory::ErrNoLibrary:
-	reason = i18n("<qt><p>The specified library <b>%1</b> could not be loaded. The error message returned was:</p> <p><b>%2</b></p></qt>").tqarg(service->library()).tqarg(KLibLoader::self()->lastErrorMessage());
+	reason = i18n("<qt><p>The specified library <b>%1</b> could not be loaded. The error message returned was:</p> <p><b>%2</b></p></qt>").arg(service->library()).arg(KLibLoader::self()->lastErrorMessage());
 	break;
       case KParts::ComponentFactory::ErrNoFactory:
 	reason = i18n("<qt>The library does not export a factory for creating components.</qt>");
@@ -832,7 +832,7 @@ bool KViewPart::openFile()
 			  "question. If that does not help, you could file an error report, either to the "
 			  "provider of your software (e.g. the vendor of your Linux distribution), or "
 			  "directly to the authors of the software. The entry <b>Report Bug...</b> in the "
-			  "<b>Help</b> menu helps you to contact the KDE programmers.</p></qt>").tqarg(m_file).tqarg(service->library()).tqarg(mimetype->name());
+			  "<b>Help</b> menu helps you to contact the KDE programmers.</p></qt>").arg(m_file).arg(service->library()).arg(mimetype->name());
       TQString caption = i18n("Error Initializing Software Component");
       if (reason.isEmpty())
 	KMessageBox::error(mainWidget, text, caption);
@@ -900,7 +900,7 @@ bool KViewPart::openFile()
   }
 
   checkActions();
-  emit zoomChanged(TQString("%1%").tqarg((int)(_zoomVal.value()*100.0+0.5)));
+  emit zoomChanged(TQString("%1%").arg((int)(_zoomVal.value()*100.0+0.5)));
   emit setStatusBarText(TQString());
   return r;
 }
@@ -994,7 +994,7 @@ void KViewPart::pageInfo(int numpages, int currentpage)
   updateZoomLevel();
 
   // ATTN: The string here must be the same as in setPage() below
-  TQString pageString = i18n("Page %1 of %2").tqarg(currentpage).tqarg(numpages);
+  TQString pageString = i18n("Page %1 of %2").arg(currentpage).arg(numpages);
   if (pageChangeIsConnected) {
     emit pageChanged(pageString);
     emit sizeChanged(pageSizeDescription());
@@ -1397,7 +1397,7 @@ void KViewPart::setStatusBarTextFromMultiPage( const TQString &msg )
     {
       int currentPage = multiPage->currentPageNumber();
       int numberOfPages = multiPage->numberOfPages();
-      emit setStatusBarText(i18n("Page %1 of %2").tqarg(currentPage).tqarg(numberOfPages));
+      emit setStatusBarText(i18n("Page %1 of %2").arg(currentPage).arg(numberOfPages));
     }
   }
   else
diff --git a/kviewshell/main.cpp b/kviewshell/main.cpp
index ba7a72f1..1a858049 100644
--- a/kviewshell/main.cpp
+++ b/kviewshell/main.cpp
@@ -88,13 +88,13 @@ int main(int argc, char **argv)
       KURL url(args->url(0));
 
       if (!args->url(0).isValid()) {
-        kdError(1223) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl;
+        kdError(1223) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl;
         return -1;
       }
 
       if (!args->url(0).isLocalFile()) {
         kdError(1223) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local "
-                   "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
+                   "files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
         return -1;
       }
 
diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp
index 19d17b06..df41dca8 100644
--- a/kviewshell/marklist.cpp
+++ b/kviewshell/marklist.cpp
@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
@@ -69,7 +69,7 @@ ThumbnailWidget::ThumbnailWidget(MarkListWidget* _parent, const PageNumber& _pag
 
 void ThumbnailWidget::paintEvent(TQPaintEvent* e)
 {
-  // Only tqrepaint if the widget is really visible. We need to check this because TQt
+  // Only repaint if the widget is really visible. We need to check this because TQt
   // sends paintEvents to all widgets that have ever been visible in the Scrollview
   // whenever the ScrollView is resized. This also increases the percieved performance
   // only thumbnails that are really needed are rendered.
@@ -169,23 +169,23 @@ 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);
   TQToolTip::add(checkBox, i18n("Select for printing"));
   bottomLayout->addWidget(checkBox, 0, TQt::AlignAuto);
 
-  pageLabel = new TQLabel(TQString("%1").tqarg(pageNumber), this);
+  pageLabel = new TQLabel(TQString("%1").arg(pageNumber), this);
   bottomLayout->addWidget(pageLabel, 1);
 
   _backgroundColor = KGlobalSettings::baseColor();
@@ -217,7 +217,7 @@ void MarkListWidget::setChecked( bool checked )
 void MarkListWidget::setSelected( bool selected )
 {
     if (selected)
-      setPaletteBackgroundColor( TQApplication::tqpalette().active().highlight() );
+      setPaletteBackgroundColor( TQApplication::palette().active().highlight() );
     else
       setPaletteBackgroundColor( _backgroundColor );
 }
@@ -284,7 +284,7 @@ MarkList::MarkList(TQWidget* parent, const char* name)
   setVScrollBarMode(TQScrollView::AlwaysOn);
   setHScrollBarMode(TQScrollView::AlwaysOff);
 
-  tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+  setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 
   viewport()->setBackgroundMode(TQt::PaletteBase);
   enableClipper(true);
diff --git a/kviewshell/marklist.h b/kviewshell/marklist.h
index 25c44aac..80d796a7 100644
--- a/kviewshell/marklist.h
+++ b/kviewshell/marklist.h
@@ -140,7 +140,7 @@ public:
 
   PageNumber numberOfPages() { return widgetList.count(); }
 
-  virtual TQSize tqsizeHint() const { return TQSize(); }
+  virtual TQSize sizeHint() const { return TQSize(); }
 
 public slots:
   void setNumberOfPages(int numberOfPages, bool showThumbnails = true);
diff --git a/kviewshell/optionDialogAccessibilityWidget.ui b/kviewshell/optionDialogAccessibilityWidget.ui
index 09ff3af3..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">
@@ -138,7 +138,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>20</height>
@@ -180,7 +180,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>20</height>
@@ -199,7 +199,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -218,7 +218,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>48</width>
                                             <height>21</height>
@@ -246,7 +246,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>20</height>
@@ -274,7 +274,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>48</width>
                                             <height>21</height>
@@ -302,7 +302,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>20</height>
@@ -332,7 +332,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -359,7 +359,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>20</height>
@@ -376,7 +376,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>16</width>
                                             <height>20</height>
diff --git a/kviewshell/pageSize.cpp b/kviewshell/pageSize.cpp
index f3419217..d9182d6b 100644
--- a/kviewshell/pageSize.cpp
+++ b/kviewshell/pageSize.cpp
@@ -304,7 +304,7 @@ TQString pageSize::serialize() const
   if ((currentSize >= 0) && (fabs(staticList[currentSize].height-pageHeight.getLength_in_mm()) <= 0.5))
     return staticList[currentSize].name;
   else 
-    return TQString("%1x%2").tqarg(pageWidth.getLength_in_mm()).tqarg(pageHeight.getLength_in_mm());
+    return TQString("%1x%2").arg(pageWidth.getLength_in_mm()).arg(pageHeight.getLength_in_mm());
 }
 
 
diff --git a/kviewshell/pageSizeDialog.cpp b/kviewshell/pageSizeDialog.cpp
index fba7f752..91cc7de6 100644
--- a/kviewshell/pageSizeDialog.cpp
+++ b/kviewshell/pageSizeDialog.cpp
@@ -14,7 +14,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqvalidator.h>
 #include <tqhbox.h>
@@ -31,7 +31,7 @@ pageSizeDialog::pageSizeDialog( TQWidget *parent, pageSize *userPrefdPageSize, c
 {
   userPreferredPageSize = userPrefdPageSize;
   pageSizeW = new pageSizeWidget(this, "PageSizeWidget");
-  pageSizeW->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, 
+  pageSizeW->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, 
 					 pageSizeW->sizePolicy().hasHeightForWidth() ) );
   setMainWidget(pageSizeW);
 }
diff --git a/kviewshell/pageSizeWidget_base.ui b/kviewshell/pageSizeWidget_base.ui
index e7ddbde3..3940deda 100644
--- a/kviewshell/pageSizeWidget_base.ui
+++ b/kviewshell/pageSizeWidget_base.ui
@@ -209,7 +209,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>250</width>
                             <height>50</height>
diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp
index 6dad756b..2be0a51a 100644
--- a/kviewshell/pageView.cpp
+++ b/kviewshell/pageView.cpp
@@ -499,10 +499,10 @@ void PageView::viewportPaintEvent(TQPaintEvent* e)
       DocumentWidget* item = widgetList->at(i);
 
       // Check if the Widget needs to be updated.
-      if (!item->tqgeometry().intersects(e->rect()))
+      if (!item->geometry().intersects(e->rect()))
         continue;
 
-      TQRect widgetGeometry = item->tqgeometry();
+      TQRect widgetGeometry = item->geometry();
 
       // Draw the widget.
       if (e->rect().intersects(widgetGeometry))
@@ -521,10 +521,10 @@ void PageView::viewportPaintEvent(TQPaintEvent* e)
   // Paint the background.
   TQPainter p(viewport());
 
-  TQMemArray<TQRect> backgroundRects = backgroundArea.tqrects();
+  TQMemArray<TQRect> backgroundRects = backgroundArea.rects();
 
   for (unsigned int i = 0; i < backgroundRects.count(); i++)
-    p.fillRect(backgroundRects[i], tqcolorGroup().mid());
+    p.fillRect(backgroundRects[i], colorGroup().mid());
 }
 
 
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/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index ea78a48c..edc7e256 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -220,7 +220,7 @@ void DjVuMultiPage::print()
   printer->addDialogPage( conversionOptions );
   
   // initialize the printer using the print dialog
-  if ( printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) {    
+  if ( printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1))) ) {    
     // Now do the printing. 
     TQValueList<int> pageList = printer->pageList();
     if (pageList.isEmpty()) 
@@ -334,7 +334,7 @@ void DjVuMultiPage::slotSave()
     fileName = fileName+ending;
 
   if (TQFile(fileName).exists()) {
-    int r = KMessageBox::warningContinueCancel(parentWdg, i18n("The file %1\nalready exists. Do you want to overwrite it?").tqarg(fileName),
+    int r = KMessageBox::warningContinueCancel(parentWdg, i18n("The file %1\nalready exists. Do you want to overwrite it?").arg(fileName),
 					       i18n("Overwrite File"), i18n("Overwrite"));
     if (r == KMessageBox::Cancel)
       return;
@@ -345,7 +345,7 @@ void DjVuMultiPage::slotSave()
   /*
   if (!djvuRenderer.save(fileName) == false)
     KMessageBox::error( parentWdg,
-			i18n("<qt><strong>File error.</strong> Unable to write to the specified file '%1'. The document is <strong>not</strong> saved.</qt>").tqarg(fileName),
+			i18n("<qt><strong>File error.</strong> Unable to write to the specified file '%1'. The document is <strong>not</strong> saved.</qt>").arg(fileName),
 			i18n("File Error"));
   */
   
diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp
index b5aabcd1..ae0b0454 100644
--- a/kviewshell/plugins/djvu/djvurenderer.cpp
+++ b/kviewshell/plugins/djvu/djvurenderer.cpp
@@ -271,7 +271,7 @@ bool DjVuRenderer::setFile(const TQString &fname, const KURL &)
   TQString   filename = fi.absFilePath();
   if (!fi.exists() || fi.isDir()) {
     KMessageBox::error( parentWidget,
-			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
+			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").arg(filename),
 			i18n("File Error"));
     // the return value 'false' indicates that this operation was not successful.
     return false;
@@ -293,7 +293,7 @@ bool DjVuRenderer::setFile(const TQString &fname, const KURL &)
   if (!document)
   {
     KMessageBox::error( parentWidget,
-      i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
+      i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
       i18n("File Error"));
 
     clear();
@@ -348,7 +348,7 @@ void DjVuRenderer::getAnnotations(RenderedDocumentPage* page, GP<DjVuImage> djvu
     for (GPosition pos = map; pos; ++pos)
     {
       // Currently we only support rectangular links
-      if (!map[pos]->get_tqshape_type() == GMapArea::RECT)
+      if (!map[pos]->get_shape_type() == GMapArea::RECT)
         continue;
 
       GRect rect = map[pos]->get_bound_rect();
@@ -461,7 +461,7 @@ GP<DjVuTXT> DjVuRenderer::getText(PageNumber pageNumber)
 
 void DjVuRenderer::fillInText(RenderedDocumentPage* page, const GP<DjVuTXT>& text, DjVuTXT::Zone& zone, TQSize& djvuPageSize)
 {
-  if (zone.tqchildren.isempty())
+  if (zone.children.isempty())
   {
     int pageWidth = page->width();
     int pageHeight = page->height();
@@ -481,9 +481,9 @@ void DjVuRenderer::fillInText(RenderedDocumentPage* page, const GP<DjVuTXT>& tex
   }
   else
   {
-    for (GPosition pos=zone.tqchildren; pos; ++pos)
+    for (GPosition pos=zone.children; pos; ++pos)
     {
-      fillInText(page, text, zone.tqchildren[pos], djvuPageSize);
+      fillInText(page, text, zone.children[pos], djvuPageSize);
     }
   }
 }
@@ -657,7 +657,7 @@ void DjVuRenderer::deletePages(TQ_UINT16 from, TQ_UINT16 to)
     for(TQ_UINT16 i=from; i<=to; i++) {
       document_new->remove_page(from-1); 
       pdialog->progressBar()->setProgress(i-from);
-      pdialog->progressBar()->setFormat(i18n("deleting page %1").tqarg(i));
+      pdialog->progressBar()->setFormat(i18n("deleting page %1").arg(i));
       kapp->processEvents();
     }
     delete pdialog;
@@ -705,7 +705,7 @@ void DjVuRenderer::printerInfoCallBack(int page_num, int page_count, int, DjVuTo
   KProgressDialog *pdialog = (KProgressDialog *)pd;
   
   pdialog->progressBar()->setProgress(page_count);
-  pdialog->progressBar()->setFormat(i18n("processing page %1").tqarg(page_num+1));
+  pdialog->progressBar()->setFormat(i18n("processing page %1").arg(page_num+1));
   pdialog->show();
   
   if (pdialog->wasCancelled())
diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
index 2fe05a8b..be3bbe2f 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqtooltip.h>
@@ -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_DJVUconversionoptions_basewidget.ui b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui
index bfaf546c..8a533ab6 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui
@@ -132,7 +132,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
index 4b5e633a..d20c3702 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <kdebug.h>
@@ -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;
   }
 
@@ -70,7 +70,7 @@ KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *pa
 
   kprintDialogPage_pageoptions_baseLayout->addStretch();
 
-  resize( TQSize(319, 166).expandedTo(tqminimumSizeHint()) );
+  resize( TQSize(319, 166).expandedTo(minimumSizeHint()) );
   clearWState( WState_Polished );
 }
 
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp
index d6f5555c..9e8b5fd7 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVmNav.cpp
@@ -147,13 +147,13 @@ DjVmNav::DjVuBookMark::encode(const GP<ByteStream> &gstr)
   ByteStream &bs=*gstr;
 #ifdef DJVMNAV_WITH_256LIMIT
   if (count>255)
-    G_THROW("Excessive number of tqchildren in bookmark tree");
+    G_THROW("Excessive number of children in bookmark tree");
   bs.write8(count);
   textsize = displayname.length();
   bs.write24( textsize );
 #else
   if (count>65535)
-    G_THROW("Excessive number of tqchildren in bookmark tree");
+    G_THROW("Excessive number of children in bookmark tree");
   bs.write8( count & 0xff );
   bs.write8( (count>>8) & 0xff );
   textsize = displayname.length();
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmNav.h b/kviewshell/plugins/djvu/libdjvu/DjVmNav.h
index 612cd100..46c5d57f 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVmNav.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVmNav.h
@@ -115,7 +115,7 @@ private:
 
 /** The DjVuBookMark.
     Each entry in the Navigation chunk (NAVM) is a bookmark.  A bookmark
-    contains a count of immediate tqchildren, a display string and a url.
+    contains a count of immediate children, a display string and a url.
 **/
 
 class DjVmNav::DjVuBookMark : public GPEnabled
@@ -131,7 +131,7 @@ public:
   void encode(const GP<ByteStream> &stream);
   void dump(const GP<ByteStream> &stream);
   void decode(const GP<ByteStream> &stream);
-  int count;	           // count of immediate tqchildren.
+  int count;	           // count of immediate children.
   GUTF8String displayname; // example:  "Section 3.5 - Encryption"
   GUTF8String url;	   // url, may be blank or relative.
 };
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp
index f3a53bf7..7cece60b 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.cpp
@@ -978,16 +978,16 @@ DjVuANT::get_mode(GLParser & parser)
   return retval;
 }
 
-static inline DjVuANT::tqalignment
+static inline DjVuANT::alignment
 legal_halign(const int i)
 {
-  DjVuANT::tqalignment retval;
-  switch((DjVuANT::tqalignment)i)
+  DjVuANT::alignment retval;
+  switch((DjVuANT::alignment)i)
   {
   case DjVuANT::ALIGN_LEFT:
   case DjVuANT::ALIGN_CENTER:
   case DjVuANT::ALIGN_RIGHT:
-    retval=(DjVuANT::tqalignment)i;
+    retval=(DjVuANT::alignment)i;
     break;
   default:
     retval=DjVuANT::ALIGN_UNSPEC;
@@ -996,16 +996,16 @@ legal_halign(const int i)
   return retval;
 }
 
-static inline DjVuANT::tqalignment
+static inline DjVuANT::alignment
 legal_valign(const int i)
 {
-  DjVuANT::tqalignment retval;
-  switch((DjVuANT::tqalignment)i)
+  DjVuANT::alignment retval;
+  switch((DjVuANT::alignment)i)
   {
   case DjVuANT::ALIGN_CENTER:
   case DjVuANT::ALIGN_TOP:
   case DjVuANT::ALIGN_BOTTOM:
-    retval=(DjVuANT::tqalignment)i;
+    retval=(DjVuANT::alignment)i;
     break;
   default:
     retval=DjVuANT::ALIGN_UNSPEC;
@@ -1014,12 +1014,12 @@ legal_valign(const int i)
   return retval;
 }
 
-DjVuANT::tqalignment
+DjVuANT::alignment
 DjVuANT::get_hor_align(GLParser & parser)
 {
   DEBUG_MSG("DjVuAnt::get_hor_align(): getting hor page alignemnt ...\n");
   DEBUG_MAKE_INDENT(3);
-  tqalignment retval=ALIGN_UNSPEC;
+  alignment retval=ALIGN_UNSPEC;
   G_TRY
   {
     GP<GLObject> obj=parser.get_object(ALIGN_TAG);
@@ -1030,7 +1030,7 @@ DjVuANT::get_hor_align(GLParser & parser)
       
       for(int i=(int)ALIGN_UNSPEC;(i<align_strings_size);++i)
       {
-        const tqalignment j=legal_halign(i);
+        const alignment j=legal_halign(i);
         if((i == (int)j)&&(align == align_strings[i]))
         {
           retval=j;
@@ -1048,18 +1048,18 @@ DjVuANT::get_hor_align(GLParser & parser)
 #ifndef NDEBUG
   if(retval == ALIGN_UNSPEC)
   {
-    DEBUG_MSG("resetting tqalignment to ALIGN_UNSPEC\n");
+    DEBUG_MSG("resetting alignment to ALIGN_UNSPEC\n");
   }
 #endif // NDEBUG
   return retval;
 }
 
-DjVuANT::tqalignment
+DjVuANT::alignment
 DjVuANT::get_ver_align(GLParser & parser)
 {
   DEBUG_MSG("DjVuAnt::get_ver_align(): getting vert page alignemnt ...\n");
   DEBUG_MAKE_INDENT(3);
-  tqalignment retval=ALIGN_UNSPEC;
+  alignment retval=ALIGN_UNSPEC;
   G_TRY
   {
     GP<GLObject> obj=parser.get_object(ALIGN_TAG);
@@ -1069,7 +1069,7 @@ DjVuANT::get_ver_align(GLParser & parser)
       DEBUG_MSG("ver_align='" << align << "'\n");
       for(int i=(int)ALIGN_UNSPEC;(i<align_strings_size);++i)
       {
-        const tqalignment j=legal_valign(i);
+        const alignment j=legal_valign(i);
         if((i == (int)j)&&(align == align_strings[i]))
         {
           retval=j;
@@ -1087,7 +1087,7 @@ DjVuANT::get_ver_align(GLParser & parser)
 #ifndef NDEBUG
   if(retval == ALIGN_UNSPEC)
   {
-    DEBUG_MSG("resetting tqalignment to ALIGN_UNSPEC\n");
+    DEBUG_MSG("resetting alignment to ALIGN_UNSPEC\n");
   }
 #endif // NDEBUG
   return retval;
@@ -1166,38 +1166,38 @@ DjVuANT::get_map_areas(GLParser & parser)
           DEBUG_MSG("found maparea '" << comment << "' (" <<
             url << ":" << target << ")\n");
         
-          GLObject * tqshape=obj[2];
+          GLObject * shape=obj[2];
           GP<GMapArea> map_area;
-          if (tqshape->get_type()==GLObject::LIST)
+          if (shape->get_type()==GLObject::LIST)
           {
-            if (tqshape->get_name()==GMapArea::RECT_TAG)
+            if (shape->get_name()==GMapArea::RECT_TAG)
             {
               DEBUG_MSG("it's a rectangle.\n");
-              GRect grect((*tqshape)[0]->get_number(),
-                          (*tqshape)[1]->get_number(),
-                          (*tqshape)[2]->get_number(),
-                          (*tqshape)[3]->get_number());
+              GRect grect((*shape)[0]->get_number(),
+                          (*shape)[1]->get_number(),
+                          (*shape)[2]->get_number(),
+                          (*shape)[3]->get_number());
               GP<GMapRect> map_rect=GMapRect::create(grect);
               map_area=(GMapRect *)map_rect;
-            } else if (tqshape->get_name()==GMapArea::POLY_TAG)
+            } else if (shape->get_name()==GMapArea::POLY_TAG)
             {
               DEBUG_MSG("it's a polygon.\n");
-              int points=tqshape->get_list().size()/2;
+              int points=shape->get_list().size()/2;
               GTArray<int> xx(points-1), yy(points-1);
               for(int i=0;i<points;i++)
               {
-                xx[i]=(*tqshape)[2*i]->get_number();
-                yy[i]=(*tqshape)[2*i+1]->get_number();
+                xx[i]=(*shape)[2*i]->get_number();
+                yy[i]=(*shape)[2*i+1]->get_number();
               }
               GP<GMapPoly> map_poly=GMapPoly::create(xx,yy,points);
               map_area=(GMapPoly *)map_poly;
-            } else if (tqshape->get_name()==GMapArea::OVAL_TAG)
+            } else if (shape->get_name()==GMapArea::OVAL_TAG)
             {
               DEBUG_MSG("it's an ellipse.\n");
-              GRect grect((*tqshape)[0]->get_number(),
-                          (*tqshape)[1]->get_number(),
-                          (*tqshape)[2]->get_number(),
-                          (*tqshape)[3]->get_number());
+              GRect grect((*shape)[0]->get_number(),
+                          (*shape)[1]->get_number(),
+                          (*shape)[2]->get_number(),
+                          (*shape)[3]->get_number());
               GP<GMapOval> map_oval=GMapOval::create(grect);
               map_area=(GMapOval *)map_oval;
             }
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h
index b59fe37d..ed82f933 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuAnno.h
@@ -104,7 +104,7 @@ class ByteStream;
 // -------- DJVUANT --------
 
 /** This class contains some trivial annotations of the page or of the
-    document such as page border color, page tqalignment, initial zoom and
+    document such as page border color, page alignment, initial zoom and
     display mode, hyperlinks and highlighted areas.  All this information is
     put inside a textual chunk #ANTa# in pseudo-lisp format. Decoding and
     encoding are normally done by \Ref{DjVuANT::decode}() and
@@ -120,7 +120,7 @@ public:
    enum { MODE_UNSPEC=0, MODE_COLOR, MODE_FORE, MODE_BACK, MODE_BW };
    enum { ZOOM_STRETCH=-4, ZOOM_ONE2ONE=-3, ZOOM_WIDTH=-2,
 	  ZOOM_PAGE=-1, ZOOM_UNSPEC=0 };
-   enum tqalignment { ALIGN_UNSPEC=0, ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT,
+   enum alignment { ALIGN_UNSPEC=0, ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT,
 	  ALIGN_TOP, ALIGN_BOTTOM };
 
       /// Creates an empty annotation object.
@@ -152,12 +152,12 @@ public:
                    special cases.
           \end{description} */
    int		mode;
-      /**Qt::Horizontal page tqalignment. Possible values are #ALIGN_LEFT#,
+      /**Qt::Horizontal page alignment. Possible values are #ALIGN_LEFT#,
 	  #ALIGN_CENTER#, #ALIGN_RIGHT# and #ALIGN_UNSPEC#. */
-   tqalignment hor_align;
-      /**Qt::Vertical page tqalignment. Possible values are #ALIGN_TOP#,
+   alignment hor_align;
+      /**Qt::Vertical page alignment. Possible values are #ALIGN_TOP#,
 	  #ALIGN_CENTER#, #ALIGN_BOTTOM# and #ALIGN_UNSPEC#. */
-   tqalignment ver_align;
+   alignment ver_align;
       /** List of defined map areas. They may be just areas of highlighting
 	  or hyperlink. Please refer to \Ref{GMapArea}, \Ref{GMapRect},
 	  \Ref{GMapPoly} and \Ref{GMapOval} for details. */
@@ -213,8 +213,8 @@ private:
    static unsigned long int get_bg_color(class GLParser & parser);
    static int get_zoom(class GLParser & parser);
    static int get_mode(class GLParser & parser);
-   static tqalignment get_hor_align(class GLParser & parser);
-   static tqalignment get_ver_align(class GLParser & parser);
+   static alignment get_hor_align(class GLParser & parser);
+   static alignment get_ver_align(class GLParser & parser);
    static GPList<GMapArea> get_map_areas(class GLParser & parser);
 #ifndef NO_METADATA_IN_ANT_CHUNK
    static GMap<GUTF8String, GUTF8String>get_metadata(GLParser & parser);
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
index 67223e1f..542faa7a 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
@@ -651,7 +651,7 @@ DjVuDocEditor::insert_file(const GP<DataPool> &file_pool,
 
          // Good. Before we continue with the included files we want to
          // complete insertion of this one. Notice, that insertion of
-         // tqchildren may fail, in which case we will have to modify
+         // children may fail, in which case we will have to modify
          // data for this file to get rid of invalid INCL
 
          // Create a file record with the chosen ID
@@ -994,7 +994,7 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref,
       // We will accumulate errors here.
    GUTF8String errors;
 
-      // Now modify the ref_map and process tqchildren if necessary
+      // Now modify the ref_map and process children if necessary
    GP<DjVuFile> file=get_djvu_file(id);
    if (file)
    {
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp
index c765fdd0..e7c74b84 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.cpp
@@ -102,7 +102,7 @@ DjVuErrorList::notify_error(const DjVuPort * source, const GUTF8String & msg)
 bool
 DjVuErrorList::notify_status(const DjVuPort * source, const GUTF8String &msg)
 {
-  tqStatus.append(msg);
+  Status.append(msg);
   return 1;
 }  
 
@@ -120,16 +120,16 @@ DjVuErrorList::GetError(void)
 }
 
 GUTF8String
-DjVuErrorList::GettqStatus(void)
+DjVuErrorList::GetStatus(void)
 {
-  GUTF8String PrevtqStatus;
+  GUTF8String PrevStatus;
   GPosition pos;
-  if((pos=tqStatus))
+  if((pos=Status))
   {
-    PrevtqStatus=tqStatus[pos];
-    tqStatus.del(pos);
+    PrevStatus=Status[pos];
+    Status.del(pos);
   }
-  return PrevtqStatus;
+  return PrevStatus;
 }
 
 GP<DataPool>
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h
index c42e96e2..885e76aa 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuErrorList.h
@@ -126,13 +126,13 @@ public:
   inline GList<GUTF8String> GetStatusList(void);
 
      /// Just clear the list.
-  inline void CleartqStatus(void);
+  inline void ClearStatus(void);
 
      /// Get one status message and clear that message from the list.
-  GUTF8String GettqStatus(void);
+  GUTF8String GetStatus(void);
 
      /// Check if there are any more status messages.
-  inline bool HastqStatus(void) const;
+  inline bool HasStatus(void) const;
 
      /** This gets the data.  We can't use the simple port's request
        data since we want to allow the user to specify the ByteStream. */
@@ -143,7 +143,7 @@ private:
   GURL pool_url;
   GP<DataPool> pool;
   GList<GUTF8String> Errors;
-  GList<GUTF8String> tqStatus;
+  GList<GUTF8String> Status;
 private: //dummy stuff
   static GURL set_stream(ByteStream *);
 };
@@ -167,22 +167,22 @@ DjVuErrorList::ClearError(void)
 inline GList<GUTF8String>
 DjVuErrorList::GetStatusList(void)
 {
-  GList<GUTF8String> retval=(const GList<GUTF8String>)tqStatus;
-  tqStatus.empty();
+  GList<GUTF8String> retval=(const GList<GUTF8String>)Status;
+  Status.empty();
   return retval;
 }
 
 inline void
-DjVuErrorList::CleartqStatus(void)
-{ tqStatus.empty(); }
+DjVuErrorList::ClearStatus(void)
+{ Status.empty(); }
 
 inline bool
 DjVuErrorList::HasError(void) const
 { return !Errors.isempty(); }
 
 inline bool
-DjVuErrorList::HastqStatus(void) const
-{ return !tqStatus.isempty(); }
+DjVuErrorList::HasStatus(void) const
+{ return !Status.isempty(); }
 
 
 #ifdef HAVE_NAMESPACES
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp
index 862c5fd0..73e3a9c2 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp
@@ -419,7 +419,7 @@ DjVuFile::notify_file_flags_changed(const DjVuFile * src,
   {
     if (src!=this && are_incl_files_created() && is_data_present())
     {
-      // Check if all tqchildren have data
+      // Check if all children have data
       bool all=true;
       {
         GCriticalSectionLock lock(&inc_files_lock);
@@ -488,7 +488,7 @@ DjVuFile::decode_func(void)
     while(wait_for_finish(0))
     	continue;
     
-    DEBUG_MSG("waiting for tqchildren termination\n");
+    DEBUG_MSG("waiting for children termination\n");
     // Check for termination status
     GCriticalSectionLock lock(&inc_files_lock);
     for(GPosition pos=inc_files_list;pos;++pos)
@@ -928,7 +928,7 @@ DjVuFile::decode_chunk( const GUTF8String &id, const GP<ByteStream> &gbs,
     GP<JB2Dict> fgjd = JB2Dict::create();
     fgjd->decode(gbs);
     this->fgjd = fgjd;
-    desc.format( ERR_MSG("DjVuFile.tqshape_dict") "\t%d", fgjd->get_tqshape_count() );
+    desc.format( ERR_MSG("DjVuFile.shape_dict") "\t%d", fgjd->get_shape_count() );
   } 
   
   // Sjbz (JB2 encoded mask)
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h
index e81ef2d5..ea0e6db3 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h
@@ -134,7 +134,7 @@ class DjVuNavDir;
     {\bf Inclusion} is also a new feature specifically designed for a
     multipage document. Indeed, inside a given document there can be a lot
     of things shared between its pages. Examples can be the document
-    annotation (\Ref{DjVuAnno}) and other things like shared tqshapes and
+    annotation (\Ref{DjVuAnno}) and other things like shared shapes and
     dictionary (to be implemented). To avoid putting these chunks into
     every page, we have invented new chunk called #INCL# which purpose is
     to make the decoder open the specified file and decode it.
@@ -217,7 +217,7 @@ public:
    GP<GPixmap>		bgpm;
       /// Pointer to the mask of foreground component of DjVu image (JB2 encoded).
    GP<JB2Image>		fgjb;
-      /// Pointer to the optional tqshape dictionary for the mask (JB2 encoded).
+      /// Pointer to the optional shape dictionary for the mask (JB2 encoded).
    GP<JB2Dict>		fgjd;
       /// Pointer to a colors layer for the foreground component of DjVu image.
    GP<GPixmap>		fgpm;
@@ -648,7 +648,7 @@ private:
      const GP<ByteStream> &str, bool djvi, bool djvu, bool iw44);
    int		get_dpi(int w, int h);
 
-      // Functions dealing with the tqshape directory (fgjd)
+      // Functions dealing with the shape directory (fgjd)
    static GP<JB2Dict> static_get_fgjd(void *);
    GP<JB2Dict> get_fgjd(int block=0);
 
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
index 54f24f1e..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 
@@ -848,17 +848,17 @@ DjVuImage::stencil(GPixmap *pm, const GRect &rect,
       for (int blitno = 0; blitno < jimg->get_blit_count(); blitno++)
         {
           const JB2Blit *pblit = jimg->get_blit(blitno);
-          const JB2Shape  &ptqshape = jimg->get_tqshape(pblit->tqshapeno);
-          if (ptqshape.bits &&
+          const JB2Shape  &pshape = jimg->get_shape(pblit->shapeno);
+          if (pshape.bits &&
               pblit->left <= rect.xmax * subsample &&
               pblit->bottom <= rect.ymax * subsample &&
-              pblit->left + (int)ptqshape.bits->columns() >= rect.xmin * subsample &&
-              pblit->bottom + (int)ptqshape.bits->rows() >= rect.ymin * subsample )
+              pblit->left + (int)pshape.bits->columns() >= rect.xmin * subsample &&
+              pblit->bottom + (int)pshape.bits->rows() >= rect.ymin * subsample )
             {
               // Record component list
               if (fgbc) components.append(blitno);
               // Blit
-              bm->blit(ptqshape.bits, 
+              bm->blit(pshape.bits, 
                        pblit->left - rxmin, pblit->bottom - rymin, 
                        subsample);
             }
@@ -902,9 +902,9 @@ DjVuImage::stencil(GPixmap *pm, const GRect &rect,
               lastx = pblit->left;
               if (fg->colordata[blitno] == colorindex)
                 {
-                  const JB2Shape  &ptqshape = jimg->get_tqshape(pblit->tqshapeno);
+                  const JB2Shape  &pshape = jimg->get_shape(pblit->shapeno);
                   GRect rect(pblit->left, pblit->bottom, 
-                             ptqshape.bits->columns(), ptqshape.bits->rows());
+                             pshape.bits->columns(), pshape.bits->rows());
                   comprect.recthull(comprect, rect);
                   compset.insert_before(nullpos, components, pos);
                   continue;
@@ -927,8 +927,8 @@ DjVuImage::stencil(GPixmap *pm, const GRect &rect,
             {
               int blitno = compset[pos];
               const JB2Blit *pblit = jimg->get_blit(blitno);
-              const JB2Shape  &ptqshape = jimg->get_tqshape(pblit->tqshapeno);
-              bm->blit(ptqshape.bits, 
+              const JB2Shape  &pshape = jimg->get_shape(pblit->shapeno);
+              bm->blit(pshape.bits, 
                        pblit->left - rxmin, pblit->bottom - rymin, 
                        subsample);
             }
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
index 84c9165d..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;
 };
 
@@ -353,7 +353,7 @@ public:
   GP<GPixmap>  get_pixmap(const GRect &rect, const GRect &all, double gamma=0) const;
   /** Renders the mask of the foreground layer of the DjVu image.  This
       functions is a wrapper for \Ref{JB2Image::get_bitmap}.  Argument #align#
-      specified the tqalignment of the rows of the returned images.  Setting
+      specified the alignment of the rows of the returned images.  Setting
       #align# to #4#, for instance, will adjust the bitmap border in order to
       make sure that each row of the returned image starts on a word (four
       byte) boundary.  This function returns a null pointer if there is not
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 3e63c901..99c165fb 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h
@@ -213,10 +213,10 @@ public:
 	  @param source The sender of the request */
    virtual void		notify_redisplay(const class DjVuImage * source);
 
-      /** This notification is sent by \ref{DjVuImage} when its tqgeometry
+      /** 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/plugins/djvu/libdjvu/DjVuText.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
index 6b460864..5be8cbe7 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
@@ -108,8 +108,8 @@ DjVuTXT::Zone::append_child()
   empty.text_start = 0;
   empty.text_length = 0;
   empty.zone_parent=this;
-  tqchildren.append(empty);
-  return & tqchildren[tqchildren.lastpos()];
+  children.append(empty);
+  return & children[children.lastpos()];
 }
 
 void
@@ -117,8 +117,8 @@ DjVuTXT::Zone::cleartext()
 {
   text_start = 0;
   text_length = 0;
-  for (GPosition i=tqchildren; i; ++i)
-    tqchildren[i].cleartext();
+  for (GPosition i=children; i; ++i)
+    children[i].cleartext();
 }
 
 void
@@ -128,8 +128,8 @@ DjVuTXT::Zone::normtext(const char *instr, GUTF8String &outstr)
     {
       // Descend collecting text below
       text_start = outstr.length();
-      for (GPosition i=tqchildren; i; ++i)
-        tqchildren[i].normtext(instr, outstr);
+      for (GPosition i=children; i; ++i)
+        children[i].normtext(instr, outstr);
       text_length = outstr.length() - text_start;
       // Ignore empty zones
       if (text_length == 0)
@@ -142,8 +142,8 @@ DjVuTXT::Zone::normtext(const char *instr, GUTF8String &outstr)
       outstr = outstr + GUTF8String(instr+text_start, text_length);
       text_start = new_start;
       // Clear textual information on lower level nodes
-      for (GPosition i=tqchildren; i; ++i)
-        tqchildren[i].cleartext();
+      for (GPosition i=children; i; ++i)
+        children[i].cleartext();
     }
   // Determine standard separator
   char sep;
@@ -174,8 +174,8 @@ unsigned int
 DjVuTXT::Zone::memuse() const
 {
   int memuse = sizeof(*this);
-  for (GPosition i=tqchildren; i; ++i)
-    memuse += tqchildren[i].memuse();
+  for (GPosition i=children; i; ++i)
+    memuse += children[i].memuse();
   return memuse;
 }
 
@@ -228,15 +228,15 @@ DjVuTXT::Zone::encode(
   // Encode text info
   bs.write16(0x8000+start);
   bs.write24(text_length);
-  // Encode number of tqchildren
-  bs.write24(tqchildren.size());
+  // Encode number of children
+  bs.write24(children.size());
   
   const Zone * prev_child=0;
-  // Encode all tqchildren
-  for (GPosition i=tqchildren; i; ++i)
+  // Encode all children
+  for (GPosition i=children; i; ++i)
   {
-    tqchildren[i].encode(gbs, this, prev_child);
-    prev_child=&tqchildren[i];
+    children[i].encode(gbs, this, prev_child);
+    prev_child=&children[i];
   }
 }
 #endif
@@ -280,16 +280,16 @@ DjVuTXT::Zone::decode(const GP<ByteStream> &gbs, int maxtext,
     text_start+=parent->text_start;
   }
   rect=GRect(x, y, width, height);
-  // Get tqchildren size
+  // Get children size
   int size = bs.read24();
 
   // Checks
   if (rect.isempty() || text_start<0 || text_start+text_length>maxtext )
     G_THROW( ERR_MSG("DjVuText.corrupt_text") );
 
-  // Process tqchildren
+  // Process children
   const Zone * prev_child=0;
-  tqchildren.empty();
+  children.empty();
   while (size-- > 0) 
   {
     Zone *z = append_child();
@@ -311,7 +311,7 @@ DjVuTXT::has_valid_zones() const
 {
   if (!textUTF8)
     return false;
-  if (page_zone.tqchildren.isempty() || page_zone.rect.isempty()) 
+  if (page_zone.children.isempty() || page_zone.rect.isempty()) 
     return false;
   return true;
 }
@@ -382,7 +382,7 @@ void
 DjVuTXT::Zone::get_text_with_rect(const GRect &box, 
                                   int &string_start, int &string_end) const
 {
-  GPosition pos=tqchildren;
+  GPosition pos=children;
   if(pos?box.contains(rect):intersects_zone(box,rect))
   {
     const int text_end=text_start+text_length;
@@ -401,7 +401,7 @@ DjVuTXT::Zone::get_text_with_rect(const GRect &box,
   {
     do
     {
-      tqchildren[pos].get_text_with_rect(box,string_start,string_end);
+      children[pos].get_text_with_rect(box,string_start,string_end);
     } while(++pos);
   }
 }
@@ -419,18 +419,18 @@ DjVuTXT::Zone::find_zones(GList<Zone *> &list,
         }
       else if(text_start < string_end)
         {
-          if (tqchildren.size())
-            for (GPosition pos=tqchildren; pos; ++pos)
-              tqchildren[pos].find_zones(list,string_start,string_end);
+          if (children.size())
+            for (GPosition pos=children; pos; ++pos)
+              children[pos].find_zones(list,string_start,string_end);
           else
             list.append(const_cast<Zone *>(this));
         }
     }
   else if( text_end > string_start)
     {
-      if (tqchildren.size())
-        for (GPosition pos=tqchildren; pos; ++pos)
-          tqchildren[pos].find_zones(list,string_start,string_end);
+      if (children.size())
+        for (GPosition pos=children; pos; ++pos)
+          children[pos].find_zones(list,string_start,string_end);
       else
         list.append(const_cast<Zone *>(this));
     }
@@ -439,11 +439,11 @@ DjVuTXT::Zone::find_zones(GList<Zone *> &list,
 void
 DjVuTXT::Zone::get_smallest(GList<GRect> &list) const
 {
-  GPosition pos=tqchildren;
+  GPosition pos=children;
   if(pos)
     {
       do {
-        tqchildren[pos].get_smallest(list);
+        children[pos].get_smallest(list);
       } while (++pos);
     }
   else
@@ -455,11 +455,11 @@ DjVuTXT::Zone::get_smallest(GList<GRect> &list) const
 void
 DjVuTXT::Zone::get_smallest(GList<GRect> &list, const int padding) const
 {
-  GPosition pos=tqchildren;
+  GPosition pos=children;
   if(pos)
     {
       do {
-        tqchildren[pos].get_smallest(list,padding);
+        children[pos].get_smallest(list,padding);
       } while (++pos);
     }
   else if(zone_parent && zone_parent->ztype >= PARAGRAPH)
@@ -493,17 +493,17 @@ DjVuTXT::get_zones(int zone_type, const Zone *parent,
    for( int cur_ztype=zone->ztype; cur_ztype<zone_type; ++cur_ztype )
    {
       GPosition pos;
-      for(pos=zone->tqchildren; pos; ++pos)
+      for(pos=zone->children; pos; ++pos)
       {
-	 Zone *zcur=(Zone *)&zone->tqchildren[pos];
+	 Zone *zcur=(Zone *)&zone->children[pos];
 	 if ( zcur->ztype == zone_type )
 	 {
 	    GPosition zpos=zone_list;
 	    if ( !zone_list.search(zcur,zpos) )
 	       zone_list.append(zcur);
 	 }
-	 else if ( zone->tqchildren[pos].ztype < zone_type )
-	    get_zones(zone_type, &zone->tqchildren[pos], zone_list);
+	 else if ( zone->children[pos].ztype < zone_type )
+	    get_zones(zone_type, &zone->children[pos], zone_list);
       }
    }
 }
@@ -864,7 +864,7 @@ static void
 writeText( ByteStream & str_out,
            const GUTF8String &textUTF8,
            const DjVuTXT::ZoneType zlayer,
-           const GList<DjVuTXT::Zone> &tqchildren,
+           const GList<DjVuTXT::Zone> &children,
            const int WindowHeight )
 {
 //  assert( txt->has_valid_zones() );
@@ -873,12 +873,12 @@ writeText( ByteStream & str_out,
   //  Beginning tags for missing layers
   int layer=(int)zlayer;
   //  Output the next layer
-  for(GPosition pos=tqchildren ; pos ; ++pos )
+  for(GPosition pos=children ; pos ; ++pos )
   {
-    str_out.writestring(tolayer(layer,tqchildren[pos].ztype));
+    str_out.writestring(tolayer(layer,children[pos].ztype));
     writeText( str_out,
                 textUTF8,
-                tqchildren[pos],
+                children[pos],
                 WindowHeight );
   }
   str_out.writestring(tolayer(layer,zlayer));
@@ -893,7 +893,7 @@ writeText( ByteStream & str_out,
 //  DEBUG_MSG( "--zonetype=" << zone.ztype << "\n" );
 
   const GUTF8String xindent(indent( 2 * zone.ztype + 2 ));
-  GPosition pos=zone.tqchildren;
+  GPosition pos=zone.children;
   // Build attribute string
   if( ! pos )
   {
@@ -908,7 +908,7 @@ writeText( ByteStream & str_out,
     str_out.writestring(end_tag(zone.ztype));
   } else
   {
-    writeText(str_out,textUTF8,zone.ztype,zone.tqchildren,WindowHeight);
+    writeText(str_out,textUTF8,zone.ztype,zone.children,WindowHeight);
   }
 }
 
@@ -917,7 +917,7 @@ DjVuTXT::writeText(ByteStream &str_out,const int height) const
 {
   if(has_valid_zones())
   {
-    ::writeText(str_out,textUTF8,DjVuTXT::PAGE,page_zone.tqchildren,height);
+    ::writeText(str_out,textUTF8,DjVuTXT::PAGE,page_zone.children,height);
   }else
   {
     str_out.writestring(start_tag(DjVuTXT::PAGE));
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.h b/kviewshell/plugins/djvu/libdjvu/DjVuText.h
index 54708324..b06536c7 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuText.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.h
@@ -133,8 +133,8 @@ public:
     int text_start;
     /** Length of the zone text in string #textUTF8#. */
     int text_length;
-    /** List of tqchildren zone. */
-    GList<Zone> tqchildren;
+    /** List of children zone. */
+    GList<Zone> children;
     /** Appends another subzone inside this zone.  The new zone is initialized
         with an empty rectangle, empty text, and has the same type as this
         zone. */
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp
index 618cb108..d18c7801 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp
@@ -953,14 +953,14 @@ print_fg_2layer(ByteStream &str,
               if (options.get_color())
                 {
                   write(str,"/%d %d %d %f %f %f c\n",
-                        blit->tqshapeno, 
+                        blit->shapeno, 
                         blit->left-currentx, blit->bottom-currenty,
                         ramp[p.r]/255.0, ramp[p.g]/255.0, ramp[p.b]/255.0);
                 } 
               else
                 {
                   write(str,"/%d %d %d %f c\n",
-                        blit->tqshapeno, 
+                        blit->shapeno, 
                         blit->left-currentx, blit->bottom-currenty,
                         ramp[GRAY(p.r, p.g, p.b)]/255.0);
                 }
@@ -968,7 +968,7 @@ print_fg_2layer(ByteStream &str,
           else
             {
               write(str,"/%d %d %d s\n", 
-                    blit->tqshapeno, 
+                    blit->shapeno, 
                     blit->left-currentx, blit->bottom-currenty);
             }
           currentx = blit->left;
@@ -1047,8 +1047,8 @@ print_fg_3layer(ByteStream &str,
                 {
                   JB2Blit *blit = jb2->get_blit(current_blit);
                   GRect rect2(blit->left, blit->bottom,
-                              jb2->get_tqshape(blit->tqshapeno).bits->columns(),
-                              jb2->get_tqshape(blit->tqshapeno).bits->rows());
+                              jb2->get_shape(blit->shapeno).bits->columns(),
+                              jb2->get_shape(blit->shapeno).bits->rows());
                   if (rect2.intersect(rect1,rect2)) 
                     break;
                 }
@@ -1087,12 +1087,12 @@ print_fg_3layer(ByteStream &str,
                 {
                   JB2Blit *blit = jb2->get_blit(current_blit);
                   GRect rect2(blit->left, blit->bottom,
-                              jb2->get_tqshape(blit->tqshapeno).bits->columns(),
-                              jb2->get_tqshape(blit->tqshapeno).bits->rows()); 
+                              jb2->get_shape(blit->shapeno).bits->columns(),
+                              jb2->get_shape(blit->shapeno).bits->rows()); 
                   if (rect2.intersect(rect1,rect2)) 
                     {   
                       write(str,"/%d %d %d s\n",
-                            blit->tqshapeno, 
+                            blit->shapeno, 
                             blit->left-currentx, blit->bottom-currenty);
                       currentx = blit->left;
                       currenty = blit->bottom;
@@ -1113,27 +1113,27 @@ print_fg(ByteStream &str,
   GP<JB2Image> jb2=dimg->get_fgjb();
   if (! jb2) return;
   int num_blits = jb2->get_blit_count();
-  int num_tqshapes = jb2->get_tqshape_count();
-  unsigned char *dict_tqshapes = 0;
+  int num_shapes = jb2->get_shape_count();
+  unsigned char *dict_shapes = 0;
   unsigned char *blit_list = 0;
-  GPBuffer<unsigned char> gdict_tqshapes(dict_tqshapes,num_tqshapes);
+  GPBuffer<unsigned char> gdict_shapes(dict_shapes,num_shapes);
   GPBuffer<unsigned char> gblit_list(blit_list,num_blits);
-  for(int i=0; i<num_tqshapes; i++)
+  for(int i=0; i<num_shapes; i++)
   {
-    dict_tqshapes[i]=0;
+    dict_shapes[i]=0;
   }
   for(int current_blit=0; current_blit<num_blits; current_blit++)
   {
     JB2Blit *blit = jb2->get_blit(current_blit);
-    JB2Shape *tqshape = & jb2->get_tqshape(blit->tqshapeno);
+    JB2Shape *shape = & jb2->get_shape(blit->shapeno);
     blit_list[current_blit] = 0;
-    if (! tqshape->bits) 
+    if (! shape->bits) 
       continue;
     GRect rect2(blit->left, blit->bottom, 
-      tqshape->bits->columns(), tqshape->bits->rows());
+      shape->bits->columns(), shape->bits->rows());
     if (rect2.intersect(rect2, prn_rect))
     {
-      dict_tqshapes[blit->tqshapeno] = 1;
+      dict_shapes[blit->shapeno] = 1;
       blit_list[current_blit] = 1;
     }
   }
@@ -1152,13 +1152,13 @@ print_fg(ByteStream &str,
     "0 1 1 {Encoding exch /.notdef put} for \n"
     "CharStrings begin\n"
     "/.notdef {} def\n",
-    num_tqshapes+1);
-  for(int current_tqshape=0; current_tqshape<num_tqshapes; current_tqshape++)
+    num_shapes+1);
+  for(int current_shape=0; current_shape<num_shapes; current_shape++)
   {
-    if (dict_tqshapes[current_tqshape])
+    if (dict_shapes[current_shape])
     {
-      JB2Shape *tqshape = & jb2->get_tqshape(current_tqshape);
-      GP<GBitmap> bitmap = tqshape->bits;
+      JB2Shape *shape = & jb2->get_shape(current_shape);
+      GP<GBitmap> bitmap = shape->bits;
       int rows = bitmap->rows();
       int columns = bitmap->columns();
       int nbytes = (columns+7)/8*rows+1;
@@ -1173,7 +1173,7 @@ print_fg(ByteStream &str,
       GPBuffer<unsigned char> gs_start(s_start,nbytes);
       unsigned char *s_ascii;
       GPBuffer<unsigned char> gs_ascii(s_ascii,nbytes*2);
-      write(str,"/%d {",current_tqshape);
+      write(str,"/%d {",current_shape);
 
       unsigned char *s = s_start;
       for(int current_row=0; current_row<rows; current_row++)
@@ -1942,8 +1942,8 @@ print_txt_sub(DjVuTXT &txt, DjVuTXT::Zone &zone,
     default:
       separator = 0; break;
     }
-  // Zone tqchildren
-  if (zone.tqchildren.isempty()) 
+  // Zone children
+  if (zone.children.isempty()) 
     {
       const char *data = (const char*)txt.textUTF8 + zone.text_start;
       int length = zone.text_length;
@@ -1968,8 +1968,8 @@ print_txt_sub(DjVuTXT &txt, DjVuTXT::Zone &zone,
           message.format("%d F\n",zone.rect.ymax-zone.rect.ymin);
           out.write((const char*)message,message.length());
         }
-      for (GPosition pos=zone.tqchildren; pos; ++pos)
-        print_txt_sub(txt, zone.tqchildren[pos], out,lastx,lasty);
+      for (GPosition pos=zone.children; pos; ++pos)
+        print_txt_sub(txt, zone.children[pos], out,lastx,lasty);
     }
 }
 
diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.h b/kviewshell/plugins/djvu/libdjvu/GBitmap.h
index 4eef4e2a..74669c05 100644
--- a/kviewshell/plugins/djvu/libdjvu/GBitmap.h
+++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.h
@@ -365,7 +365,7 @@ public:
       discussion, the position is (#x/subsample#,#y/subsample#).  In other
       words, you can position the blit with a sub-pixel resolution.  The
       resulting anti-aliasing changes are paramount to the image quality. */
-  void blit(const GBitmap *tqshape, int x, int y, int subsample);
+  void blit(const GBitmap *shape, int x, int y, int subsample);
   //@}
   
   /** @name Saving images.  
diff --git a/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp b/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp
index ef364e79..5a85e1fc 100644
--- a/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GMapAreas.cpp
@@ -953,7 +953,7 @@ static GUTF8String
 GMapArea2xmltag(const GMapArea &area,const GUTF8String &coords)
 {
   GUTF8String retval("<AREA coords=\""
-    +coords+"\" tqshape=\""+area.get_tqshape_name()+"\" "
+    +coords+"\" shape=\""+area.get_shape_name()+"\" "
     +"alt=\""+area.comment.toEscaped()+"\" ");
   if(area.url.length())
   {
diff --git a/kviewshell/plugins/djvu/libdjvu/GMapAreas.h b/kviewshell/plugins/djvu/libdjvu/GMapAreas.h
index f96c0695..251427ed 100644
--- a/kviewshell/plugins/djvu/libdjvu/GMapAreas.h
+++ b/kviewshell/plugins/djvu/libdjvu/GMapAreas.h
@@ -86,12 +86,12 @@ namespace DJVU {
 
     The currently supported areas can be rectangular (\Ref{GMapRect}),
     elliptical (\Ref{GMapOval}) and polygonal (\Ref{GMapPoly}). Every
-    map area besides the definition of its tqshape contains information
+    map area besides the definition of its shape contains information
     about display style and optional {\bf URL}, which it may refer to.
     If this {\bf URL} is not empty then the map area will work like a
     hyperlink.
 
-    The classes also implement some useful functions to ease tqgeometry
+    The classes also implement some useful functions to ease geometry
     manipulations
 
     @memo Definition of base map area classes
@@ -247,10 +247,10 @@ public:
 
    virtual GUTF8String get_xmltag(const int height) const=0;
 
-      /// Virtual function returning the tqshape type.
-   virtual MapAreaType const get_tqshape_type( void ) const { return UNKNOWN; };
-      /// Virtual function returning the tqshape name.
-   virtual char const * const	get_tqshape_name(void) const=0;
+      /// Virtual function returning the shape type.
+   virtual MapAreaType const get_shape_type( void ) const { return UNKNOWN; };
+      /// Virtual function returning the shape name.
+   virtual char const * const	get_shape_name(void) const=0;
       /// Virtual function generating a copy of this object
    virtual GP<GMapArea>	get_copy(void) const=0;
       /// Virtual function generating a list of defining coordinates
@@ -305,7 +305,7 @@ public:
       /// Returns the height of the rectangle
    int		get_height(void) const { return ymax-ymin; }
 
-      /// Changes the #GMapRect#'s tqgeometry
+      /// Changes the #GMapRect#'s geometry
    GMapRect & operator=(const GRect & rect);
 
       /// Returns \Ref{GRect} describing the map area's rectangle
@@ -313,9 +313,9 @@ public:
    
    virtual GUTF8String get_xmltag(const int height) const;
       /// Returns MapRect
-   virtual MapAreaType const get_tqshape_type( void ) const { return RECT; };
+   virtual MapAreaType const get_shape_type( void ) const { return RECT; };
       /// Returns #"rect"#
-   virtual char const * const	get_tqshape_name(void) const;
+   virtual char const * const	get_shape_name(void) const;
       /// Returns a copy of the rectangle
    virtual GP<GMapArea>	get_copy(void) const;
       /// Virtual function maps rectangle from one area to another using mapper
@@ -392,9 +392,9 @@ public:
 
    virtual GUTF8String get_xmltag(const int height) const;
       /// Returns MapPoly
-   virtual MapAreaType const get_tqshape_type( void ) const { return POLY; };
+   virtual MapAreaType const get_shape_type( void ) const { return POLY; };
       /// Returns #"poly"# all the time
-   virtual char const * const 	get_tqshape_name(void) const;
+   virtual char const * const 	get_shape_name(void) const;
       /// Returns a copy of the polygon
    virtual GP<GMapArea>	get_copy(void) const;
       /// Virtual function generating a list of defining coordinates
@@ -458,9 +458,9 @@ public:
 
    virtual GUTF8String get_xmltag(const int height) const;
       /// Returns MapOval
-   virtual MapAreaType const get_tqshape_type( void ) const { return OVAL; };
+   virtual MapAreaType const get_shape_type( void ) const { return OVAL; };
       /// Returns #"oval"#
-   virtual char const * const get_tqshape_name(void) const;
+   virtual char const * const get_shape_name(void) const;
       /// Returns a copy of the oval
    virtual GP<GMapArea>	get_copy(void) const;
       /// Virtual function maps oval from one area to another using mapper
@@ -509,7 +509,7 @@ inline char const * const
 GMapRect::gma_check_object(void)  const{ return ""; }
 
 inline char const * const 
-GMapRect::get_tqshape_name(void) const { return RECT_TAG; }
+GMapRect::get_shape_name(void) const { return RECT_TAG; }
 
 inline int
 GMapPoly::get_points_num(void) const { return points; }
@@ -524,7 +524,7 @@ inline int
 GMapPoly::get_y(int i) const { return yy[i]; }
 
 inline char const * const
-GMapPoly::get_tqshape_name(void) const { return POLY_TAG; }
+GMapPoly::get_shape_name(void) const { return POLY_TAG; }
 
 inline int
 GMapOval::get_a(void) const { return a; }
@@ -551,7 +551,7 @@ inline int
 GMapOval::gma_get_ymax(void) const { return ymax; }
 
 inline char const * const
-GMapOval::get_tqshape_name(void) const { return OVAL_TAG; }
+GMapOval::get_shape_name(void) const { return OVAL_TAG; }
 
 //@}
 
diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp b/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp
index 4ddc297e..2cadf4f9 100644
--- a/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp
@@ -638,7 +638,7 @@ IW44Image::Map::alloc(int n)
 short **
 IW44Image::Map::allocp(int n)
 {
-  // Allocate enough room for pointers plus tqalignment
+  // Allocate enough room for pointers plus alignment
   short *p = alloc( (n+1) * sizeof(short*) / sizeof(short) );
   // Align on pointer size
   while ( ((long)p) & (sizeof(short*)-1) )
diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.h b/kviewshell/plugins/djvu/libdjvu/IW44Image.h
index 43c14be9..56cf00fa 100644
--- a/kviewshell/plugins/djvu/libdjvu/IW44Image.h
+++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.h
@@ -618,7 +618,7 @@ public:
              int pixsep=1, int fast=0);
   // array of blocks
   IW44Image::Block *blocks;
-  // tqgeometry
+  // geometry
   int iw, ih;
   int bw, bh;
   int nb;
diff --git a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
index 8abefffe..054d4e09 100644
--- a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
@@ -104,13 +104,13 @@ public:
 
 protected:
   void CodeNum(const int num, const int lo, const int hi, NumContext &ctx);
-  void encode_libonly_tqshape(const GP<JB2Image> &jim, int tqshapeno);
+  void encode_libonly_shape(const GP<JB2Image> &jim, int shapeno);
 // virtual
   bool CodeBit(const bool bit, BitContext &ctx);
   void code_comment(GUTF8String &comment);
   void code_record_type(int &rectype);
   int code_match_index(int &index, JB2Dict &jim);
-  void code_inherited_tqshape_count(JB2Dict &jim);
+  void code_inherited_shape_count(JB2Dict &jim);
   void code_image_size(JB2Dict &jim);
   void code_image_size(JB2Image &jim);
   void code_absolute_location(JB2Blit *jblt,  int rows, int columns);
@@ -228,18 +228,18 @@ JB2Dict::JB2Codec::Encode::code_record_type(int &rectype)
 int 
 JB2Dict::JB2Codec::Encode::code_match_index(int &index, JB2Dict &jim)
 {
-    int match=tqshape2lib[index];
-    CodeNum(match, 0, lib2tqshape.hbound(), dist_match_index);
+    int match=shape2lib[index];
+    CodeNum(match, 0, lib2shape.hbound(), dist_match_index);
     return match;
 }
 
 // CODE PAIRS
 
 void
-JB2Dict::JB2Codec::Encode::code_inherited_tqshape_count(JB2Dict &jim)
+JB2Dict::JB2Codec::Encode::code_inherited_shape_count(JB2Dict &jim)
 {
-  CodeNum(jim.get_inherited_tqshape_count(),
-    0, BIGPOSITIVE, inherited_tqshape_count_dist);
+  CodeNum(jim.get_inherited_shape_count(),
+    0, BIGPOSITIVE, inherited_shape_count_dist);
 }
 
 void 
@@ -360,12 +360,12 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Dict> &gjim)
       // -------------------------
       // THIS IS THE ENCODING PART
       // -------------------------
-      int firsttqshape = jim.get_inherited_tqshape_count();
-      int ntqshape = jim.get_tqshape_count();
+      int firstshape = jim.get_inherited_shape_count();
+      int nshape = jim.get_shape_count();
       init_library(jim);
       // Code headers.
       int rectype = RETQUIRED_DICT_OR_RESET;
-      if (jim.get_inherited_tqshape_count() > 0)
+      if (jim.get_inherited_shape_count() > 0)
         code_record(rectype, gjim, 0);
       rectype = START_OF_DATA;
       code_record(rectype, gjim, 0);
@@ -373,18 +373,18 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Dict> &gjim)
       rectype = PRESERVED_COMMENT;
       if (!! jim.comment)
         code_record(rectype, gjim, 0);
-      // Encode every tqshape
-      int tqshapeno;
-      DJVU_PROGRESS_TASK(jb2code,"jb2 encode", ntqshape-firsttqshape);
-      for (tqshapeno=firsttqshape; tqshapeno<ntqshape; tqshapeno++)
+      // Encode every shape
+      int shapeno;
+      DJVU_PROGRESS_TASK(jb2code,"jb2 encode", nshape-firstshape);
+      for (shapeno=firstshape; shapeno<nshape; shapeno++)
         {
-          DJVU_PROGRESS_RUN(jb2code, (tqshapeno-firsttqshape)|0xff);
-          // Code tqshape
-          JB2Shape &jshp = jim.get_tqshape(tqshapeno);
+          DJVU_PROGRESS_RUN(jb2code, (shapeno-firstshape)|0xff);
+          // Code shape
+          JB2Shape &jshp = jim.get_shape(shapeno);
           rectype=(jshp.parent >= 0)
             ?MATCHED_REFINE_LIBRARY_ONLY:NEW_MARK_LIBRARY_ONLY;
           code_record(rectype, gjim, &jshp);
-          add_library(tqshapeno, jshp);
+          add_library(shapeno, jshp);
 	  // Check numcoder status
 	  if (cur_ncell > CELLCHUNK) 
 	    {
@@ -413,35 +413,35 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim)
       // -------------------------
       int i;
       init_library(jim);
-      int firsttqshape = jim.get_inherited_tqshape_count();
-      int ntqshape = jim.get_tqshape_count();
+      int firstshape = jim.get_inherited_shape_count();
+      int nshape = jim.get_shape_count();
       int nblit = jim.get_blit_count();
-      // Initialize tqshape2lib 
-      tqshape2lib.resize(0,ntqshape-1);
-      for (i=firsttqshape; i<ntqshape; i++)
-        tqshape2lib[i] = -1;
-      // Determine tqshapes that go into library (tqshapeno>=firsttqshape)
-      //  tqshape2lib is -2 if used by one blit
-      //  tqshape2lib is -3 if used by more than one blit
-      //  tqshape2lib is -4 if used as a parent
+      // Initialize shape2lib 
+      shape2lib.resize(0,nshape-1);
+      for (i=firstshape; i<nshape; i++)
+        shape2lib[i] = -1;
+      // Determine shapes that go into library (shapeno>=firstshape)
+      //  shape2lib is -2 if used by one blit
+      //  shape2lib is -3 if used by more than one blit
+      //  shape2lib is -4 if used as a parent
       for (i=0; i<nblit; i++)
         {
           JB2Blit *jblt = jim.get_blit(i);
-          int tqshapeno = jblt->tqshapeno;
-          if (tqshapeno < firsttqshape)
+          int shapeno = jblt->shapeno;
+          if (shapeno < firstshape)
             continue;
-          if (tqshape2lib[tqshapeno] >= -2) 
-            tqshape2lib[tqshapeno] -= 1;
-          tqshapeno = jim.get_tqshape(tqshapeno).parent;
-          while (tqshapeno>=firsttqshape && tqshape2lib[tqshapeno]>=-3)
+          if (shape2lib[shapeno] >= -2) 
+            shape2lib[shapeno] -= 1;
+          shapeno = jim.get_shape(shapeno).parent;
+          while (shapeno>=firstshape && shape2lib[shapeno]>=-3)
             {
-              tqshape2lib[tqshapeno] = -4;
-              tqshapeno = jim.get_tqshape(tqshapeno).parent;
+              shape2lib[shapeno] = -4;
+              shapeno = jim.get_shape(shapeno).parent;
             }
         }
       // Code headers.
       int rectype = RETQUIRED_DICT_OR_RESET;
-      if (jim.get_inherited_tqshape_count() > 0)
+      if (jim.get_inherited_shape_count() > 0)
         code_record(rectype, gjim, 0, 0);
       rectype = START_OF_DATA;
       code_record(rectype, gjim, 0, 0);
@@ -456,20 +456,20 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim)
         {
           DJVU_PROGRESS_RUN(jb2code, blitno|0xff);
           JB2Blit *jblt = jim.get_blit(blitno);
-          int tqshapeno = jblt->tqshapeno;
-          JB2Shape &jshp = jim.get_tqshape(tqshapeno);
-          // Tests if tqshape exists in library
-          if (tqshape2lib[tqshapeno] >= 0)
+          int shapeno = jblt->shapeno;
+          JB2Shape &jshp = jim.get_shape(shapeno);
+          // Tests if shape exists in library
+          if (shape2lib[shapeno] >= 0)
             {
               int rectype = MATCHED_COPY;
               code_record(rectype, gjim, 0, jblt);
             }
-          // Avoid coding null tqshapes/blits
+          // Avoid coding null shapes/blits
           else if (jshp.bits) 
             {
               // Make sure all parents have been coded
-              if (jshp.parent>=0 && tqshape2lib[jshp.parent]<0)
-                encode_libonly_tqshape(gjim, jshp.parent);
+              if (jshp.parent>=0 && shape2lib[jshp.parent]<0)
+                encode_libonly_shape(gjim, jshp.parent);
               // Allocate library entry when needed
 #define LIBRARY_CONTAINS_ALL
               int libraryp = 0;
@@ -478,7 +478,7 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim)
                 libraryp = 1;
 #endif
 #ifdef LIBRARY_CONTAINS_SHARED // worse             
-              if (tqshape2lib[tqshapeno] <= -3)
+              if (shape2lib[shapeno] <= -3)
                 libraryp = 1;
 #endif
 #ifdef LIBRARY_CONTAINS_ALL // better
@@ -500,9 +500,9 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim)
                   int rectype = (libraryp ? MATCHED_REFINE : MATCHED_REFINE_IMAGE_ONLY);
                   code_record(rectype, gjim, &jshp, jblt);
                 }
-              // Add tqshape to library
+              // Add shape to library
               if (libraryp) 
-                add_library(tqshapeno, jshp);
+                add_library(shapeno, jshp);
             }
 	  // Check numcoder status
 	  if (cur_ncell > CELLCHUNK) 
@@ -522,27 +522,27 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim)
 ////////////////////////////////////////
 
 void 
-JB2Dict::JB2Codec::Encode::encode_libonly_tqshape(
-  const GP<JB2Image> &gjim, int tqshapeno )
+JB2Dict::JB2Codec::Encode::encode_libonly_shape(
+  const GP<JB2Image> &gjim, int shapeno )
 {
   if(!gjim)
   {
     G_THROW( ERR_MSG("JB2Image.bad_number") );
   }
   JB2Image &jim=*gjim;
-  // Recursively encode parent tqshape
-  JB2Shape &jshp = jim.get_tqshape(tqshapeno);
-  if (jshp.parent>=0 && tqshape2lib[jshp.parent]<0)
-    encode_libonly_tqshape(gjim, jshp.parent);
-  // Test that library tqshape must be encoded
-  if (tqshape2lib[tqshapeno] < 0)
+  // Recursively encode parent shape
+  JB2Shape &jshp = jim.get_shape(shapeno);
+  if (jshp.parent>=0 && shape2lib[jshp.parent]<0)
+    encode_libonly_shape(gjim, jshp.parent);
+  // Test that library shape must be encoded
+  if (shape2lib[shapeno] < 0)
     {
       // Code library entry
       int rectype=(jshp.parent >= 0)
             ?NEW_MARK_LIBRARY_ONLY:MATCHED_REFINE_LIBRARY_ONLY;
       code_record(rectype, gjim, &jshp, 0);      
-      // Add tqshape to library
-      add_library(tqshapeno, jshp);
+      // Add shape to library
+      add_library(shapeno, jshp);
       // Check numcoder status
       if (cur_ncell > CELLCHUNK) 
 	{
diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp
index 7cd8a46e..bbc06623 100644
--- a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp
@@ -110,7 +110,7 @@ protected:
   void code_comment(GUTF8String &comment);
   void code_record_type(int &rectype);
   int code_match_index(int &index, JB2Dict &jim);
-  void code_inherited_tqshape_count(JB2Dict &jim);
+  void code_inherited_shape_count(JB2Dict &jim);
   void code_image_size(JB2Dict &jim);
   void code_image_size(JB2Image &jim);
   void code_absolute_location(JB2Blit *jblt,  int rows, int columns);
@@ -136,28 +136,28 @@ private:
 
 
 JB2Dict::JB2Dict()
-  : inherited_tqshapes(0)
+  : inherited_shapes(0)
 {
 }
 
 void
 JB2Dict::init()
 {
-  inherited_tqshapes = 0;
+  inherited_shapes = 0;
   inherited_dict = 0;
-  tqshapes.empty();
+  shapes.empty();
 }
 
 JB2Shape &
-JB2Dict::get_tqshape(const int tqshapeno)
+JB2Dict::get_shape(const int shapeno)
 {
   JB2Shape *retval;
-  if(tqshapeno >= inherited_tqshapes)
+  if(shapeno >= inherited_shapes)
   {
-    retval=&tqshapes[tqshapeno - inherited_tqshapes];
+    retval=&shapes[shapeno - inherited_shapes];
   }else if(inherited_dict)
   {
-    retval=&(inherited_dict->get_tqshape(tqshapeno));
+    retval=&(inherited_dict->get_shape(shapeno));
   }else
   {
     G_THROW( ERR_MSG("JB2Image.bad_number") );
@@ -166,15 +166,15 @@ JB2Dict::get_tqshape(const int tqshapeno)
 }
 
 const JB2Shape &
-JB2Dict::get_tqshape(const int tqshapeno) const
+JB2Dict::get_shape(const int shapeno) const
 {
   const JB2Shape *retval;
-  if(tqshapeno >= inherited_tqshapes)
+  if(shapeno >= inherited_shapes)
   {
-    retval=&tqshapes[tqshapeno - inherited_tqshapes];
+    retval=&shapes[shapeno - inherited_shapes];
   }else if(inherited_dict)
   {
-    retval=&(inherited_dict->get_tqshape(tqshapeno));
+    retval=&(inherited_dict->get_shape(shapeno));
   }else
   {
     G_THROW( ERR_MSG("JB2Image.bad_number") );
@@ -185,16 +185,16 @@ JB2Dict::get_tqshape(const int tqshapeno) const
 void 
 JB2Dict::set_inherited_dict(const GP<JB2Dict> &dict)
 {
-  if (tqshapes.size() > 0)
+  if (shapes.size() > 0)
     G_THROW( ERR_MSG("JB2Image.cant_set") );
   if (inherited_dict)
     G_THROW( ERR_MSG("JB2Image.cant_change") );
   inherited_dict = dict; 
-  inherited_tqshapes = dict->get_tqshape_count();
+  inherited_shapes = dict->get_shape_count();
   // Make sure that inherited bitmaps are marked as shared
-  for (int i=0; i<inherited_tqshapes; i++)
+  for (int i=0; i<inherited_shapes; i++)
     {
-      JB2Shape &jshp = dict->get_tqshape(i);
+      JB2Shape &jshp = dict->get_shape(i);
       if (jshp.bits) jshp.bits->share();
     }
 }
@@ -202,30 +202,30 @@ JB2Dict::set_inherited_dict(const GP<JB2Dict> &dict)
 void
 JB2Dict::compress()
 {
-  for (int i=tqshapes.lbound(); i<=tqshapes.hbound(); i++)
-    tqshapes[i].bits->compress();
+  for (int i=shapes.lbound(); i<=shapes.hbound(); i++)
+    shapes[i].bits->compress();
 }
 
 unsigned int
 JB2Dict::get_memory_usage() const
 {
   unsigned int usage = sizeof(JB2Dict);
-  usage += sizeof(JB2Shape) * tqshapes.size();
-  for (int i=tqshapes.lbound(); i<=tqshapes.hbound(); i++)
-    if (tqshapes[i].bits)
-      usage += tqshapes[i].bits->get_memory_usage();
+  usage += sizeof(JB2Shape) * shapes.size();
+  for (int i=shapes.lbound(); i<=shapes.hbound(); i++)
+    if (shapes[i].bits)
+      usage += shapes[i].bits->get_memory_usage();
   return usage;
 }
 
 int  
-JB2Dict::add_tqshape(const JB2Shape &tqshape)
+JB2Dict::add_shape(const JB2Shape &shape)
 {
-  if (tqshape.parent >= get_tqshape_count())
-    G_THROW( ERR_MSG("JB2Image.bad_parent_tqshape") );
-  int index = tqshapes.size();
-  tqshapes.touch(index);
-  tqshapes[index] = tqshape;
-  return index + inherited_tqshapes;
+  if (shape.parent >= get_shape_count())
+    G_THROW( ERR_MSG("JB2Image.bad_parent_shape") );
+  int index = shapes.size();
+  shapes.touch(index);
+  shapes[index] = shape;
+  return index + inherited_shapes;
 }
 
 void 
@@ -277,8 +277,8 @@ JB2Image::set_dimension(int awidth, int aheight)
 int  
 JB2Image::add_blit(const JB2Blit &blit)
 {
-  if (blit.tqshapeno >= (unsigned int)get_tqshape_count())
-    G_THROW( ERR_MSG("JB2Image.bad_tqshape") );
+  if (blit.shapeno >= (unsigned int)get_shape_count())
+    G_THROW( ERR_MSG("JB2Image.bad_shape") );
   int index = blits.size();
   blits.touch(index);
   blits[index] = blit;
@@ -298,9 +298,9 @@ JB2Image::get_bitmap(int subsample, int align) const
   for (int blitno = 0; blitno < get_blit_count(); blitno++)
     {
       const JB2Blit *pblit = get_blit(blitno);
-      const JB2Shape  &ptqshape = get_tqshape(pblit->tqshapeno);
-      if (ptqshape.bits)
-        bm->blit(ptqshape.bits, pblit->left, pblit->bottom, subsample);
+      const JB2Shape  &pshape = get_shape(pblit->shapeno);
+      if (pshape.bits)
+        bm->blit(pshape.bits, pblit->left, pblit->bottom, subsample);
     }
   return bm;
 }
@@ -320,9 +320,9 @@ JB2Image::get_bitmap(const GRect &rect, int subsample, int align, int dispy) con
   for (int blitno = 0; blitno < get_blit_count(); blitno++)
     {
       const JB2Blit *pblit = get_blit(blitno);
-      const JB2Shape  &ptqshape = get_tqshape(pblit->tqshapeno);
-      if (ptqshape.bits)
-        bm->blit(ptqshape.bits, pblit->left-rxmin, pblit->bottom-rymin+dispy, subsample);
+      const JB2Shape  &pshape = get_shape(pblit->shapeno);
+      if (pshape.bits)
+        bm->blit(pshape.bits, pblit->left-rxmin, pblit->bottom-rymin+dispy, subsample);
     }
   return bm;
 }
@@ -397,7 +397,7 @@ JB2Dict::JB2Codec::JB2Codec(const bool xencoding)
     abs_size_x(0),
     abs_size_y(0),
     image_size_dist(0),
-    inherited_tqshape_count_dist(0),
+    inherited_shape_count_dist(0),
     offset_type_dist(0),
     rel_loc_x_current(0),
     rel_loc_x_last(0),
@@ -428,7 +428,7 @@ JB2Dict::JB2Codec::reset_numcoder()
   abs_size_x = 0;
   abs_size_y = 0;
   image_size_dist = 0;
-  inherited_tqshape_count_dist = 0;
+  inherited_shape_count_dist = 0;
   rel_loc_x_current = 0;
   rel_loc_x_last = 0;
   rel_loc_y_current = 0;
@@ -573,27 +573,27 @@ JB2Dict::JB2Codec::Decode::code_comment(GUTF8String &comment)
 void
 JB2Dict::JB2Codec::init_library(JB2Dict &jim)
 {
-  int ntqshape = jim.get_inherited_tqshape_count();
-  tqshape2lib.resize(0,ntqshape-1);
-  lib2tqshape.resize(0,ntqshape-1);
-  libinfo.resize(0,ntqshape-1);
-  for (int i=0; i<ntqshape; i++)
+  int nshape = jim.get_inherited_shape_count();
+  shape2lib.resize(0,nshape-1);
+  lib2shape.resize(0,nshape-1);
+  libinfo.resize(0,nshape-1);
+  for (int i=0; i<nshape; i++)
     {
-      tqshape2lib[i] = i;
-      lib2tqshape[i] = i;
-      JB2Shape &jshp = jim.get_tqshape(i);
+      shape2lib[i] = i;
+      lib2shape[i] = i;
+      JB2Shape &jshp = jim.get_shape(i);
       libinfo[i].compute_bounding_box(*(jshp.bits));
     }
 }
 
 int 
-JB2Dict::JB2Codec::add_library(const int tqshapeno, JB2Shape &jshp)
+JB2Dict::JB2Codec::add_library(const int shapeno, JB2Shape &jshp)
 {
-  const int libno = lib2tqshape.hbound() + 1;
-  lib2tqshape.touch(libno);
-  lib2tqshape[libno] = tqshapeno;
-  tqshape2lib.touch(tqshapeno);
-  tqshape2lib[tqshapeno] = libno;
+  const int libno = lib2shape.hbound() + 1;
+  lib2shape.touch(libno);
+  lib2shape[libno] = shapeno;
+  shape2lib.touch(shapeno);
+  shape2lib[shapeno] = libno;
   libinfo.touch(libno);
   libinfo[libno].compute_bounding_box(*(jshp.bits));
   return libno;
@@ -611,8 +611,8 @@ JB2Dict::JB2Codec::Decode::code_record_type(int &rectype)
 int 
 JB2Dict::JB2Codec::Decode::code_match_index(int &index, JB2Dict &)
 {
-    int match=CodeNum(0, lib2tqshape.hbound(), dist_match_index);
-    index = lib2tqshape[match];
+    int match=CodeNum(0, lib2shape.hbound(), dist_match_index);
+    index = lib2shape[match];
     return match;
 }
 
@@ -638,9 +638,9 @@ JB2Dict::JB2Codec::update_short_list(const int v)
 
 
 void
-JB2Dict::JB2Codec::Decode::code_inherited_tqshape_count(JB2Dict &jim)
+JB2Dict::JB2Codec::Decode::code_inherited_shape_count(JB2Dict &jim)
 {
-  int size=CodeNum(0, BIGPOSITIVE, inherited_tqshape_count_dist);
+  int size=CodeNum(0, BIGPOSITIVE, inherited_shape_count_dist);
     {
       GP<JB2Dict> dict = jim.get_inherited_dict();
       if (!dict && size>0)
@@ -653,7 +653,7 @@ JB2Dict::JB2Codec::Decode::code_inherited_tqshape_count(JB2Dict &jim)
         }
       if (!dict && size>0)
         G_THROW( ERR_MSG("JB2Image.need_dict") );
-      if (dict && size!=dict->get_tqshape_count())
+      if (dict && size!=dict->get_shape_count())
         G_THROW( ERR_MSG("JB2Image.bad_dict") );
     }
 }
@@ -927,7 +927,7 @@ JB2Dict::JB2Codec::code_record(
 {
   GP<GBitmap> cbm;
   GP<GBitmap> bm;
-  int tqshapeno = -1;
+  int shapeno = -1;
 
   // Code record type
   code_record_type(rectype);
@@ -983,7 +983,7 @@ JB2Dict::JB2Codec::code_record(
         JB2Dict &jim=*gjim;
         JB2Shape &jshp=*xjshp;
         int match = code_match_index (jshp.parent, jim);
-        cbm = jim.get_tqshape(jshp.parent).bits;
+        cbm = jim.get_shape(jshp.parent).bits;
         LibRect &l = libinfo[match];
         code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4);
         code_bitmap_by_cross_coding (*bm, cbm, jshp.parent);
@@ -1003,12 +1003,12 @@ JB2Dict::JB2Codec::code_record(
       {
         if (! gotstartrecordp)
         {
-	  // Indicates need for a tqshape dictionary
+	  // Indicates need for a shape dictionary
           if(!gjim)
           {
              G_THROW( ERR_MSG("JB2Image.bad_number") );
           }
-	  code_inherited_tqshape_count(*gjim);
+	  code_inherited_shape_count(*gjim);
         }else
 	  // Reset all numerical contexts to zero
 	  reset_numcoder();
@@ -1026,7 +1026,7 @@ JB2Dict::JB2Codec::code_record(
   // Post-coding action
   if (!encoding)
     {
-      // add tqshape to dictionary
+      // add shape to dictionary
       switch(rectype)
         {
         case NEW_MARK_LIBRARY_ONLY:
@@ -1037,8 +1037,8 @@ JB2Dict::JB2Codec::code_record(
                G_THROW( ERR_MSG("JB2Image.bad_number") );
             }
             JB2Shape &jshp=*xjshp;
-            tqshapeno = gjim->add_tqshape(jshp);
-            add_library(tqshapeno, jshp);
+            shapeno = gjim->add_shape(jshp);
+            add_library(shapeno, jshp);
             break;
           }
         }
@@ -1064,10 +1064,10 @@ JB2Dict::JB2Codec::Decode::code(const GP<JB2Dict> &gjim)
       // THIS IS THE DECODING PART
       // -------------------------
       int rectype;
-      JB2Shape tmptqshape;
+      JB2Shape tmpshape;
       do
         {
-          code_record(rectype, gjim, &tmptqshape);        
+          code_record(rectype, gjim, &tmpshape);        
         } 
       while(rectype != END_OF_DATA);
       if (!gotstartrecordp)
@@ -1085,7 +1085,7 @@ JB2Dict::JB2Codec::code_record(
 {
   GP<GBitmap> bm;
   GP<GBitmap> cbm;
-  int tqshapeno = -1;
+  int shapeno = -1;
   int match;
 
   // Code record type
@@ -1163,7 +1163,7 @@ JB2Dict::JB2Codec::code_record(
         JB2Shape &jshp=*xjshp;
         JB2Image &jim=*gjim;
         match = code_match_index (jshp.parent, jim);
-        cbm = jim.get_tqshape(jshp.parent).bits;
+        cbm = jim.get_shape(jshp.parent).bits;
         LibRect &l = libinfo[match];
         code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4); 
         code_bitmap_by_cross_coding (*bm, cbm, match);
@@ -1179,7 +1179,7 @@ JB2Dict::JB2Codec::code_record(
         JB2Image &jim=*gjim;
         JB2Shape &jshp=*xjshp;
         match = code_match_index (jshp.parent, jim);
-        cbm = jim.get_tqshape(jshp.parent).bits;
+        cbm = jim.get_shape(jshp.parent).bits;
         LibRect &l = libinfo[match];
         code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4);
         break;
@@ -1193,7 +1193,7 @@ JB2Dict::JB2Codec::code_record(
         JB2Image &jim=*gjim;
         JB2Shape &jshp=*xjshp;
         match = code_match_index (jshp.parent, jim);
-        cbm = jim.get_tqshape(jshp.parent).bits;
+        cbm = jim.get_shape(jshp.parent).bits;
         LibRect &l = libinfo[match];
         code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4);
         code_bitmap_by_cross_coding (*bm, cbm, match);
@@ -1203,15 +1203,15 @@ JB2Dict::JB2Codec::code_record(
     case MATCHED_COPY:
       {
         int temp;
-        if (encoding) temp = jblt->tqshapeno;
+        if (encoding) temp = jblt->shapeno;
         if(!gjim)
         {
            G_THROW( ERR_MSG("JB2Image.bad_number") );
         }
         JB2Image &jim=*gjim;
         match = code_match_index (temp, jim);
-        if (!encoding) jblt->tqshapeno = temp;
-        bm = jim.get_tqshape(jblt->tqshapeno).bits;
+        if (!encoding) jblt->shapeno = temp;
+        bm = jim.get_shape(jblt->shapeno).bits;
         LibRect &l = libinfo[match];
         jblt->left += l.left;
         jblt->bottom += l.bottom;
@@ -1248,8 +1248,8 @@ JB2Dict::JB2Codec::code_record(
         }
         JB2Image &jim=*gjim;
         if (! gotstartrecordp)
-	  // Indicates need for a tqshape dictionary
-	  code_inherited_tqshape_count(jim);
+	  // Indicates need for a shape dictionary
+	  code_inherited_shape_count(jim);
 	else
 	  // Reset all numerical contexts to zero
 	  reset_numcoder();
@@ -1268,7 +1268,7 @@ JB2Dict::JB2Codec::code_record(
   // Post-coding action
   if (!encoding)
     {
-      // add tqshape to image
+      // add shape to image
       switch(rectype)
         {
         case NEW_MARK:
@@ -1284,13 +1284,13 @@ JB2Dict::JB2Codec::code_record(
               G_THROW( ERR_MSG("JB2Image.bad_number") );
             }
             JB2Shape &jshp=*xjshp;
-            tqshapeno = gjim->add_tqshape(jshp);
-            tqshape2lib.touch(tqshapeno);
-            tqshape2lib[tqshapeno] = -1;
+            shapeno = gjim->add_shape(jshp);
+            shape2lib.touch(shapeno);
+            shape2lib[shapeno] = -1;
             break;
           }
         }
-      // add tqshape to library
+      // add shape to library
       switch(rectype)
         {
         case NEW_MARK:
@@ -1301,7 +1301,7 @@ JB2Dict::JB2Codec::code_record(
           {
             G_THROW( ERR_MSG("JB2Image.bad_number") );
           }
-          add_library(tqshapeno, *xjshp);
+          add_library(shapeno, *xjshp);
           break;
         }
       // make sure everything is compacted
@@ -1316,7 +1316,7 @@ JB2Dict::JB2Codec::code_record(
         case MATCHED_REFINE:
         case MATCHED_REFINE_IMAGE_ONLY:
         case NON_MARK_DATA:
-          jblt->tqshapeno = tqshapeno;
+          jblt->shapeno = shapeno;
         case MATCHED_COPY:
           if(!gjim)
           {
@@ -1344,10 +1344,10 @@ JB2Dict::JB2Codec::Decode::code(const GP<JB2Image> &gjim)
       // -------------------------
       int rectype;
       JB2Blit tmpblit;
-      JB2Shape tmptqshape;
+      JB2Shape tmpshape;
       do
         {
-          code_record(rectype, gjim, &tmptqshape, &tmpblit);        
+          code_record(rectype, gjim, &tmpshape, &tmpblit);        
         } 
       while(rectype!=END_OF_DATA);
       if (!gotstartrecordp)
diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.h b/kviewshell/plugins/djvu/libdjvu/JB2Image.h
index 0cf9da47..6733e9f5 100644
--- a/kviewshell/plugins/djvu/libdjvu/JB2Image.h
+++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.h
@@ -83,47 +83,47 @@
     be implemented in the future.
 
     {\bf JB2 Images} --- Class \Ref{JB2Image} is the central data structure
-    implemented here.  A #JB2Image# is composed of an array of tqshapes
-    and an array of blits.  Each tqshape contains a small bitmap representing an
+    implemented here.  A #JB2Image# is composed of an array of shapes
+    and an array of blits.  Each shape contains a small bitmap representing an
     elementary blob of ink, such as a character or a segment of line art.
-    Each blit instructs the decoder to render a particular tqshape at a
+    Each blit instructs the decoder to render a particular shape at a
     specified position in the image.  Some compression is already achieved
-    because several blits can refer to the same tqshape.  A tqshape can also
-    contain a pointer to a parent tqshape.  Additional compression is achieved
-    when both tqshapes are similar because each tqshape is encoded using the
-    parent tqshape as a model.  A #"O"# tqshape for instance could be a parent for
-    both a #"C"# tqshape and a #"Q"# tqshape.
+    because several blits can refer to the same shape.  A shape can also
+    contain a pointer to a parent shape.  Additional compression is achieved
+    when both shapes are similar because each shape is encoded using the
+    parent shape as a model.  A #"O"# shape for instance could be a parent for
+    both a #"C"# shape and a #"Q"# shape.
 
     {\bf JB2 Dictionary} --- Class \Ref{JB2Dict} is a peculiar kind of
-    JB2Image which only contains an array of tqshapes.  These tqshapes can be
+    JB2Image which only contains an array of shapes.  These shapes can be
     referenced from another JB2Dict/JB2Image.  This is arranged by setting the
     ``inherited dictionary'' of a JB2Dict/JB2Image using function
-    \Ref{JB2Dict::set_inherited_dict}. Several JB2Images can use tqshapes from a
+    \Ref{JB2Dict::set_inherited_dict}. Several JB2Images can use shapes from a
     same JB2Dict encoded separately.  This is how several pages of a same
     document can share information.
     
     {\bf Decoding JB2 data} --- The first step for decoding JB2 data consists of 
     creating an empty #JB2Image# object.  Function \Ref{JB2Image::decode} then
-    reads the data and populates the #JB2Image# with the tqshapes and the blits.
+    reads the data and populates the #JB2Image# with the shapes and the blits.
     Function \Ref{JB2Image::get_bitmap} finally produces an anti-aliased image.
 
     {\bf Encoding JB2 data} --- The first step for decoding JB2 data also
     consists of creating an empty #JB2Image# object.  You must then use
-    functions \Ref{JB2Image::add_tqshape} and \Ref{JB2Image::add_blit} to
+    functions \Ref{JB2Image::add_shape} and \Ref{JB2Image::add_blit} to
     populate the #JB2Image# object.  Function \Ref{JB2Image::encode} finally
     produces the JB2 data.  Function #encode# sequentially encodes the blits
-    and the necessary tqshapes.  The compression ratio depends on several
+    and the necessary shapes.  The compression ratio depends on several
     factors:
     \begin{itemize}
-    \item Blits should reuse tqshapes as often as possible.
+    \item Blits should reuse shapes as often as possible.
     \item Blits should be sorted in reading order because this facilitates
           the prediction of the blit coordinates.
     \item Shapes should be sorted according to the order of first appearance
           in the sequence of blits because this facilitates the prediction of the
-          tqshape indices.
-    \item Shapes should be compared to all previous tqshapes in the tqshape array.
-          The tqshape parent pointer should be set to a suitable parent tqshape if
-          such a parent tqshape exists.  The parent tqshape should have almost the
+          shape indices.
+    \item Shapes should be compared to all previous shapes in the shape array.
+          The shape parent pointer should be set to a suitable parent shape if
+          such a parent shape exists.  The parent shape should have almost the
           same size and the same pixels.
     \end{itemize}
     All this is quite easy to achieve in the case of an electronically
@@ -131,16 +131,16 @@
     characters are and where they are located.  If you only have a scanned
     image however you must first locate the characters (connected component
     analysis) and cut the remaining pieces of ink into smaller blobs.
-    Ordering the blits and matching the tqshapes is then an essentially
+    Ordering the blits and matching the shapes is then an essentially
     heuristic process.  Although the quality of the heuristics substantially
-    effects the file size, misordering blits or mismatching tqshapes never
+    effects the file size, misordering blits or mismatching shapes never
     effects the quality of the image.  The last refinement consists in
-    smoothing the tqshapes in order to reduce the noise and maximize the
-    similarities between tqshapes.
+    smoothing the shapes in order to reduce the noise and maximize the
+    similarities between shapes.
     
     {\bf JB2 extensions} --- Two extensions of the JB2
     encoding format have been introduced with DjVu files version 21. The first
-    extension addresses the shared tqshape dictionaries. The second extension
+    extension addresses the shared shape dictionaries. The second extension
     bounds the number of probability contexts used for coding numbers.
     Both extensions maintain backward compatibility with JB2 as 
     described in the ICFDD proposal. A more complete discussion
@@ -190,10 +190,10 @@ class ByteStream;
 
 /** Blit data structure.  A #JB2Image# contains an array of #JB2Blit# data
     structures.  Each array entry instructs the decoder to render a particular
-    tqshape at a particular location.  Members #left# and #bottom# specify the
-    coordinates of the bottom left corner of the tqshape bitmap.  All
+    shape at a particular location.  Members #left# and #bottom# specify the
+    coordinates of the bottom left corner of the shape bitmap.  All
     coordinates are relative to the bottom left corner of the image.  Member
-    #tqshapeno# is the subscript of the tqshape to be rendered.  */
+    #shapeno# is the subscript of the shape to be rendered.  */
 
 class JB2Blit {
 public:
@@ -201,31 +201,31 @@ public:
   unsigned short left;
   /**Qt::Vertical coordinate of the blit. */
   unsigned short bottom;
-  /** Index of the tqshape to blit. */
-  unsigned int tqshapeno;
+  /** Index of the shape to blit. */
+  unsigned int shapeno;
 };
 
 
 /** Shape data structure.  A #JB2Image# contains an array of #JB2Shape# data
     structures.  Each array entry represents an elementary blob of ink such as
     a character or a segment of line art.  Member #bits# points to a bilevel
-    image representing the tqshape pixels.  Member #parent# is the subscript of
-    the parent tqshape.  */
+    image representing the shape pixels.  Member #parent# is the subscript of
+    the parent shape.  */
 
 class JB2Shape
 { 
 public: 
-  /** Subscript of the parent tqshape.  The parent tqshape must always be located
-      before the current tqshape in the tqshape array.  A negative value indicates
+  /** Subscript of the parent shape.  The parent shape must always be located
+      before the current shape in the shape array.  A negative value indicates
       that this shape.has no parent.  Any negative values smaller than #-1#
-      further indicates that this tqshape does not look like a character.  This
+      further indicates that this shape does not look like a character.  This
       is used to enable a few internal optimizations.  This information is
       saved into the JB2 file, but the actual value of the #parent# variable
       is not. */
   int parent; 
-  /** Bilevel image of the tqshape pixels.  This must be a pointer to a bilevel
+  /** Bilevel image of the shape pixels.  This must be a pointer to a bilevel
       #GBitmap# image.  This pointer can also be null. The encoder will just
-      silently discard all blits referring to a tqshape containing a null
+      silently discard all blits referring to a shape containing a null
       bitmap. */
   GP<GBitmap> bits;
   /** Private user data. This long word is provided as a convenience for users
@@ -238,14 +238,14 @@ public:
 
 /** JB2 Dictionary callback.
     The decoding function call this callback function when they discover that
-    the current JB2Image or JB2Dict needs a pre-existing tqshape dictionary. 
+    the current JB2Image or JB2Dict needs a pre-existing shape dictionary. 
     The callback function must return a pointer to the dictionary or NULL
     if none is found. */
 
 typedef GP<JB2Dict> JB2DecoderCallback ( void* );
 
 
-/** Dictionary of JB2 tqshapes. */
+/** Dictionary of JB2 shapes. */
 
 class JB2Dict : public GPEnabled
 {
@@ -257,43 +257,43 @@ public:
   // CONSTRUCTION
   /** Default creator.  Constructs an empty #JB2Dict# object.  You can then
       call the decoding function #decode#.  You can also manually set the
-      image size using #add_tqshape#. */
+      image size using #add_shape#. */
   static GP<JB2Dict> create(void);
 
   // INITIALIZATION
-  /** Resets the #JB2Image# object.  This function reinitializes both the tqshape
+  /** Resets the #JB2Image# object.  This function reinitializes both the shape
      and the blit arrays.  All allocated memory is freed. */
   void init(void);
 
   // INHERITED
   /** Returns the inherited dictionary. */
   GP<JB2Dict> get_inherited_dict(void) const;
-  /** Returns the number of inherited tqshapes. */
-  int get_inherited_tqshape_count(void) const;
+  /** Returns the number of inherited shapes. */
+  int get_inherited_shape_count(void) const;
   /** Sets the inherited dictionary. */
   void set_inherited_dict(const GP<JB2Dict> &dict);
 
   // ACCESSING THE SHAPE LIBRARY
-  /** Returns the total number of tqshapes.
-      Shape indices range from #0# to #get_tqshape_count()-1#. */
-  int get_tqshape_count(void) const;
-  /** Returns a pointer to tqshape #tqshapeno#.
-      The returned pointer directly points into the tqshape array.
-      This pointer can be used for reading or writing the tqshape data. */
-  JB2Shape &get_tqshape(const int tqshapeno);
-  /** Returns a constant pointer to tqshape #tqshapeno#.
-      The returned pointer directly points into the tqshape array.
-      This pointer can only be used for reading the tqshape data. */
-  const JB2Shape &get_tqshape(const int tqshapeno) const;
-  /** Appends a tqshape to the tqshape array.  This function appends a copy of
-      tqshape #tqshape# to the tqshape array and returns the subscript of the new
-      tqshape.  The subscript of the parent tqshape #tqshape.parent# must 
-      actually designate an already existing tqshape. */
-  int  add_tqshape(const JB2Shape &tqshape);
+  /** Returns the total number of shapes.
+      Shape indices range from #0# to #get_shape_count()-1#. */
+  int get_shape_count(void) const;
+  /** Returns a pointer to shape #shapeno#.
+      The returned pointer directly points into the shape array.
+      This pointer can be used for reading or writing the shape data. */
+  JB2Shape &get_shape(const int shapeno);
+  /** Returns a constant pointer to shape #shapeno#.
+      The returned pointer directly points into the shape array.
+      This pointer can only be used for reading the shape data. */
+  const JB2Shape &get_shape(const int shapeno) const;
+  /** Appends a shape to the shape array.  This function appends a copy of
+      shape #shape# to the shape array and returns the subscript of the new
+      shape.  The subscript of the parent shape #shape.parent# must 
+      actually designate an already existing shape. */
+  int  add_shape(const JB2Shape &shape);
 
   // MEMORY OPTIMIZATION
-  /** Compresses all tqshape bitmaps.  This function reduces the memory required
-      by the #JB2Image# by calling \Ref{GBitmap::compress} on all tqshapes
+  /** Compresses all shape bitmaps.  This function reduces the memory required
+      by the #JB2Image# by calling \Ref{GBitmap::compress} on all shapes
       bitmaps.  This function is best called after decoding a #JB2Image#,
       because function \Ref{get_bitmap} can directly use the compressed
       bitmaps.  */
@@ -307,9 +307,9 @@ public:
       This function generates the JB2 data stream without any header.   */
   void encode(const GP<ByteStream> &gbs) const;
   /** Decodes JB2 data from ByteStream #bs#. This function decodes the image
-      size and populates the tqshape and blit arrays.  The callback function
+      size and populates the shape and blit arrays.  The callback function
       #cb# is called when the decoder determines that the ByteStream data
-      requires a tqshape dictionary which has not been set with
+      requires a shape dictionary which has not been set with
       \Ref{JB2Dict::set_inherited_dict}. The callback receives argument #arg#
       and must return a suitable dictionary which will be installed as the
       inherited dictionary.  The callback should return null if no such
@@ -322,15 +322,15 @@ public:
   GUTF8String comment;
 
 private:
-  int inherited_tqshapes;
+  int inherited_shapes;
   GP<JB2Dict> inherited_dict;
-  GArray<JB2Shape> tqshapes;
+  GArray<JB2Shape> shapes;
   
 };
 
-/** Main JB2 data structure.  Each #JB2Image# consists of an array of tqshapes
+/** Main JB2 data structure.  Each #JB2Image# consists of an array of shapes
     and an array of blits.  These arrays can be populated by hand using
-    functions \Ref{add_tqshape} and \Ref{add_blit}, or by decoding JB2 data
+    functions \Ref{add_shape} and \Ref{add_blit}, or by decoding JB2 data
     using function \Ref{decode}.  You can then use function \Ref{get_bitmap}
     to render anti-aliased images, or use function \Ref{encode} to generate
     JB2 data. */
@@ -343,12 +343,12 @@ public:
 
   /** Creates an empty #JB2Image# object.  You can then
       call the decoding function #decode#.  You can also manually set the
-      image size using #set_dimension# and populate the tqshape and blit arrays
-      using #add_tqshape# and #add_blit#. */
+      image size using #set_dimension# and populate the shape and blit arrays
+      using #add_shape# and #add_blit#. */
   static GP<JB2Image> create(void) { return new JB2Image(); }
 
   // INITIALIZATION
-  /** Resets the #JB2Image# object.  This function reinitializes both the tqshape
+  /** Resets the #JB2Image# object.  This function reinitializes both the shape
      and the blit arrays.  All allocated memory is freed. */
   void init(void);
 
@@ -370,7 +370,7 @@ public:
       JB2Image as a bilevel or gray level image.  Argument #subsample#
       specifies the desired subsampling ratio in range #1# to #15#.  The
       returned image uses #1+subsample^2# gray levels for representing
-      anti-aliased edges.  Argument #align# specified the tqalignment of the
+      anti-aliased edges.  Argument #align# specified the alignment of the
       rows of the returned images.  Setting #align# to #4#, for instance, will
       adjust the bitmap border in order to make sure that each row of the
       returned image starts on a word (four byte) boundary. */
@@ -380,7 +380,7 @@ public:
       this function first renders the full JB2Image with subsampling ratio
       #subsample# and then extracts rectangle #rect# in the subsampled image.
       Both operations of course are efficiently performed simultaneously.
-      Argument #align# specified the tqalignment of the rows of the returned
+      Argument #align# specified the alignment of the rows of the returned
       images, as explained above.  Argument #dispy# should remain null. */
   GP<GBitmap> get_bitmap(const GRect &rect, int subsample=1, int align=1, int dispy=0) const;
 
@@ -393,13 +393,13 @@ public:
       This pointer can be used for reading or writing the blit data. */
   JB2Blit *get_blit(int blitno);
   /** Returns a constant pointer to blit #blitno#.
-      The returned pointer directly points into the tqshape array.
-      This pointer can only be used for reading the tqshape data. */
+      The returned pointer directly points into the shape array.
+      This pointer can only be used for reading the shape data. */
   const JB2Blit *get_blit(int blitno) const;
   /** Appends a blit to the blit array.  This function appends a copy of blit
       #blit# to the blit array and returns the subscript of the new blit.  The
-      tqshape subscript #blit.tqshapeno# must actually designate an already
-      existing tqshape. */
+      shape subscript #blit.shapeno# must actually designate an already
+      existing shape. */
   int  add_blit(const JB2Blit &blit);
 
   // MEMORY OPTIMIZATION
@@ -412,9 +412,9 @@ public:
       This function generates the JB2 data stream without any header. */
   void encode(const GP<ByteStream> &gbs) const;
   /** Decodes JB2 data from ByteStream #bs#. This function decodes the image
-      size and populates the tqshape and blit arrays.  The callback function
+      size and populates the shape and blit arrays.  The callback function
       #cb# is called when the decoder determines that the ByteStream data
-      requires a tqshape dictionary which has not been set with
+      requires a shape dictionary which has not been set with
       \Ref{JB2Dict::set_inherited_dict}. The callback receives argument #arg#
       and must return a suitable dictionary which will be installed as the
       inherited dictionary.  The callback should return null if no such
@@ -438,15 +438,15 @@ public:
 // JB2DICT INLINE FUNCTIONS
 
 inline int
-JB2Dict::get_tqshape_count(void) const
+JB2Dict::get_shape_count(void) const
 {
-  return inherited_tqshapes + tqshapes.size();
+  return inherited_shapes + shapes.size();
 }
 
 inline int
-JB2Dict::get_inherited_tqshape_count(void) const
+JB2Dict::get_inherited_shape_count(void) const
 {
-  return inherited_tqshapes;
+  return inherited_shapes;
 }
 
 inline GP<JB2Dict>
@@ -612,7 +612,7 @@ protected:
   void reset_numcoder(void);
   inline void code_eventual_lossless_refinement(void);
   void init_library(JB2Dict &jim);
-  int add_library(const int tqshapeno, JB2Shape &jshp);
+  int add_library(const int shapeno, JB2Shape &jshp);
   void code_relative_location(JB2Blit *jblt, int rows, int columns);
   void code_bitmap_directly (GBitmap &bm);
   void code_bitmap_by_cross_coding (GBitmap &bm, GP<GBitmap> &cbm, const int libno);
@@ -640,7 +640,7 @@ protected:
   virtual void code_comment(GUTF8String &comment) = 0;
   virtual void code_record_type(int &rectype) = 0;
   virtual int code_match_index(int &index, JB2Dict &jim)=0;
-  virtual void code_inherited_tqshape_count(JB2Dict &jim)=0;
+  virtual void code_inherited_shape_count(JB2Dict &jim)=0;
   virtual void code_image_size(JB2Dict &jim);
   virtual void code_image_size(JB2Image &jim);
   virtual void code_absolute_location(JB2Blit *jblt,  int rows, int columns)=0;
@@ -678,8 +678,8 @@ protected:
   NumContext dist_match_index;
   BitContext dist_refinement_flag;
   // Library
-  GTArray<int> tqshape2lib;
-  GTArray<int> lib2tqshape;
+  GTArray<int> shape2lib;
+  GTArray<int> lib2shape;
   GTArray<LibRect> libinfo;
   // Code pairs
   NumContext abs_loc_x;
@@ -687,7 +687,7 @@ protected:
   NumContext abs_size_x;
   NumContext abs_size_y;
   NumContext image_size_dist;
-  NumContext inherited_tqshape_count_dist;
+  NumContext inherited_shape_count_dist;
   BitContext offset_type_dist;
   NumContext rel_loc_x_current;
   NumContext rel_loc_x_last;
diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp
index 5d3d62ef..f0185bc8 100644
--- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp
@@ -933,16 +933,16 @@ MMRDecoder::decode(GP<ByteStream> gbs)
       // Insert blocks into JB2Image
       for (int b=0; b<blocksperline; b++)
 	{
-	  JB2Shape tqshape;
-	  tqshape.bits = blocks[b];
-	  if (tqshape.bits) 
+	  JB2Shape shape;
+	  shape.bits = blocks[b];
+	  if (shape.bits) 
 	    {
-	      tqshape.parent = -1;
-	      tqshape.bits->compress();
+	      shape.parent = -1;
+	      shape.bits->compress();
 	      JB2Blit blit;
 	      blit.left = b*blocksize;
 	      blit.bottom = line+1;
-	      blit.tqshapeno = jimg->add_tqshape(tqshape);
+	      blit.shapeno = jimg->add_shape(shape);
 	      jimg->add_blit(blit);
 	    }
 	}
diff --git a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp
index 0c39a745..b1d9f469 100644
--- a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp
@@ -373,20 +373,20 @@ lt_XMLParser::Impl::ChangeAnno(
             }
           }
         }
-        GUTF8String tqshape;
+        GUTF8String shape;
         {
-          GPosition tqshape_pos=args.contains("tqshape");
-          if(tqshape_pos)
+          GPosition shape_pos=args.contains("shape");
+          if(shape_pos)
           {
-            tqshape=args[tqshape_pos];
+            shape=args[shape_pos];
           }
         }
         GP<GMapArea> a;
-        if(tqshape == "default")
+        if(shape == "default")
         {
           GRect rect(0,0,w,h);
           a=GMapRect::create(rect);
-        }else if(!tqshape.length() || tqshape == "rect")
+        }else if(!shape.length() || shape == "rect")
         {
           int xx[4];
           int i=0;
@@ -420,7 +420,7 @@ lt_XMLParser::Impl::ChangeAnno(
           }
           GRect rect(xmin,ymin,xmax-xmin,ymax-ymin);
           a=GMapRect::create(rect);
-        }else if(tqshape == "circle")
+        }else if(shape == "circle")
         {
           int xx[4];
           int i=0;
@@ -440,7 +440,7 @@ lt_XMLParser::Impl::ChangeAnno(
           int x=xx[0],y=xx[1],rx=xx[2],ry=(h-xx[3])-1;
           GRect rect(x-rx,y-ry,2*rx,2*ry);
           a=GMapOval::create(rect);
-        }else if(tqshape == "oval")
+        }else if(shape == "oval")
         {
           int xx[4];
           int i=0;
@@ -474,7 +474,7 @@ lt_XMLParser::Impl::ChangeAnno(
           }
           GRect rect(xmin,ymin,xmax-xmin,ymax-ymin);
           a=GMapOval::create(rect);
-        }else if(tqshape == "poly")
+        }else if(shape == "poly")
         {
           GP<GMapPoly> p=GMapPoly::create();
           for(GPosition poly_pos=coords;poly_pos;++poly_pos)
@@ -489,7 +489,7 @@ lt_XMLParser::Impl::ChangeAnno(
           a=p;
         }else
         {
-          G_THROW( ( ERR_MSG("XMLAnno.unknown_tqshape") "\t")+tqshape );
+          G_THROW( ( ERR_MSG("XMLAnno.unknown_shape") "\t")+shape );
         }
         if(a)
         {
diff --git a/kviewshell/renderedDocumentPagePixmap.cpp b/kviewshell/renderedDocumentPagePixmap.cpp
index fc8edade..1632cbd9 100644
--- a/kviewshell/renderedDocumentPagePixmap.cpp
+++ b/kviewshell/renderedDocumentPagePixmap.cpp
@@ -71,7 +71,7 @@ TQPixmap RenderedDocumentPagePixmap::accessiblePixmap()
     {
       case KVSPrefs::EnumRenderMode::Inverted:
         // Invert image pixels using TQImage internal function
-        backImage.tqinvertPixels(false);
+        backImage.invertPixels(false);
         break;
       case KVSPrefs::EnumRenderMode::Recolor:
         // Recolor image using KImageEffect::flatten with dither:0
diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp
index d467249d..b9befc8c 100644
--- a/kviewshell/searchWidget.cpp
+++ b/kviewshell/searchWidget.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
@@ -41,36 +41,36 @@ SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl)
 {
   setName("SearchWidget");
 
-  tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
+  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..205240ff 100644
--- a/kviewshell/selection.cpp
+++ b/kviewshell/selection.cpp
@@ -9,7 +9,7 @@
 #include <config.h>
 
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include "selection.h"
 
@@ -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/kviewshell/sizePreview.cpp b/kviewshell/sizePreview.cpp
index 0acd8843..07211819 100644
--- a/kviewshell/sizePreview.cpp
+++ b/kviewshell/sizePreview.cpp
@@ -74,7 +74,7 @@ void SizePreview::paintEvent( TQPaintEvent * )
   pixmap.resize(width(), height());
 
   TQPainter p(&pixmap);
-  p.fillRect(rect(), tqcolorGroup().background());
+  p.fillRect(rect(), colorGroup().background());
   p.setPen(TQt::black);
   p.setBrush(TQt::white);
   p.drawRect(hOffset, vOffset, displayedWidth, displayedHeight);
diff --git a/kviewshell/zoom.cpp b/kviewshell/zoom.cpp
index 595f4982..1c3ee6f6 100644
--- a/kviewshell/zoom.cpp
+++ b/kviewshell/zoom.cpp
@@ -28,7 +28,7 @@ Zoom::Zoom()
   _zoomValue = 1.0;
   valNo      = 6; // 1.0 is 6rd entry in the list
   for(int i=0; zoomVals[i] != 0; i++) 
-    valueNames << TQString("%1%").tqarg(zoomVals[i]);
+    valueNames << TQString("%1%").arg(zoomVals[i]);
 }
 
 
@@ -49,7 +49,7 @@ void Zoom::setZoomValue(const TQString &cval)
   else {
     emit(zoomNamesChanged(valueNames));
     emit(valNoChanged(valNo));
-    emit(zoomNameChanged(TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5))));
+    emit(zoomNameChanged(TQString("%1%").arg((int)(_zoomValue*100.0+0.5))));
   }
 }
 
@@ -64,7 +64,7 @@ void Zoom::setZoomFitWidth(float zoom)
 
   valNo = 0;
   emit(valNoChanged(valNo));
-  emit(zoomNameChanged(TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5))));
+  emit(zoomNameChanged(TQString("%1%").arg((int)(_zoomValue*100.0+0.5))));
 }
 
 void Zoom::setZoomFitHeight(float zoom)
@@ -78,7 +78,7 @@ void Zoom::setZoomFitHeight(float zoom)
 
   valNo = 1;
   emit(valNoChanged(valNo));
-  emit(zoomNameChanged(TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5))));
+  emit(zoomNameChanged(TQString("%1%").arg((int)(_zoomValue*100.0+0.5))));
 }
 
 void Zoom::setZoomFitPage(float zoom)
@@ -92,7 +92,7 @@ void Zoom::setZoomFitPage(float zoom)
 
   valNo = 2;
   emit(valNoChanged(valNo));
-  emit(zoomNameChanged(TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5))));
+  emit(zoomNameChanged(TQString("%1%").arg((int)(_zoomValue*100.0+0.5))));
 }
 
 void Zoom::setZoomValue(float f)
@@ -117,19 +117,19 @@ void Zoom::setZoomValue(float f)
       flag  = true;
       valNo = i + 3;
       if (fabs(_zoomValue-zoomVals[i]) > 0.01)
-        valueNames << TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5));
+        valueNames << TQString("%1%").arg((int)(_zoomValue*100.0+0.5));
     }
-    valueNames << TQString("%1%").tqarg((int)(zoomVals[i]*100.0+0.5));
+    valueNames << TQString("%1%").arg((int)(zoomVals[i]*100.0+0.5));
   }
 
   if (flag == false) {
     valNo = valueNames.size();
-    valueNames << TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5));
+    valueNames << TQString("%1%").arg((int)(_zoomValue*100.0+0.5));
   }
 
   emit(zoomNamesChanged(valueNames));
   emit(valNoChanged(valNo));
-  emit(zoomNameChanged(TQString("%1%").tqarg((int)(_zoomValue*100.0+0.5))));
+  emit(zoomNameChanged(TQString("%1%").arg((int)(_zoomValue*100.0+0.5))));
 }
 
 float Zoom::zoomIn()
diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp
index 97b06e54..a8f067bb 100644
--- a/libkscan/devselector.cpp
+++ b/libkscan/devselector.cpp
@@ -22,7 +22,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqcstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqfile.h>
 #include <tqpushbutton.h>
@@ -70,7 +70,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList,
 				 page, "CBOX_SKIP_ON_START" );
 
    KConfig *gcfg = KGlobal::config();
-   gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
+   gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false );
    cbSkipDialog->setChecked( skipDialog );
 
@@ -81,7 +81,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList,
 TQCString DeviceSelector::getDeviceFromConfig( void ) const
 {
    KConfig *gcfg = KGlobal::config();
-   gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
+   gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false );
    
    TQCString result;
@@ -126,7 +126,7 @@ TQCString DeviceSelector::getSelectedDevice( void ) const
 
    /* Store scanner selection settings */
    KConfig *c = KGlobal::config();
-   c->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
+   c->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    /* Write both the scan device and the skip-start-dialog flag global. */
    c->writeEntry( STARTUP_SCANDEV, dev, true, true );
    c->writeEntry( STARTUP_SKIP_ASK, getShouldSkip(), true, true );
@@ -141,7 +141,7 @@ void DeviceSelector::setScanSources( const TQStrList& sources,
 {
    bool default_ok = false;
    KConfig *gcfg = KGlobal::config();
-   gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
+   gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    TQCString defstr = gcfg->readEntry( STARTUP_SCANDEV, "" ).local8Bit();
 
    /* Selector-Stuff*/
@@ -152,7 +152,7 @@ void DeviceSelector::setScanSources( const TQStrList& sources,
    TQStringList::ConstIterator it2 = hrSources.begin();
    for ( ; it.current(); ++it, ++it2 )
    {
-      TQString text = TQString::tqfromLatin1("&%1. %2\n%3").tqarg(1+nr).tqarg( TQString::fromLocal8Bit(*it) ).tqarg( *it2 );
+      TQString text = TQString::fromLatin1("&%1. %2\n%3").arg(1+nr).arg( TQString::fromLocal8Bit(*it) ).arg( *it2 );
       TQRadioButton *rb = new TQRadioButton( text, selectBox );
       selectBox->insert( rb );
 
diff --git a/libkscan/dispgamma.cpp b/libkscan/dispgamma.cpp
index bb10e8b5..478096e9 100644
--- a/libkscan/dispgamma.cpp
+++ b/libkscan/dispgamma.cpp
@@ -35,7 +35,7 @@ DispGamma::~DispGamma()
 
 void DispGamma::resizeEvent (TQResizeEvent* )
 {
-    tqrepaint();
+    repaint();
 }
 
 void DispGamma::paintEvent( TQPaintEvent *ev )
@@ -49,11 +49,11 @@ void DispGamma::paintEvent( TQPaintEvent *ev )
 
     p.setClipRect( ev->rect());
 
-    p.setPen( tqcolorGroup().highlight() );
-    p.setBrush( tqcolorGroup().base() );
+    p.setPen( colorGroup().highlight() );
+    p.setBrush( colorGroup().base() );
     // Backgrond
     p.drawRect( 0,0, w, 256 );
-    p.setPen( TQPen(tqcolorGroup().midlight(), 1, DotLine));
+    p.setPen( TQPen(colorGroup().midlight(), 1, DotLine));
     // horizontal Grid
     for( int l = 1; l < 5; l++ )
             p.drawLine( 1, l*51, 255, l*51 );
@@ -63,7 +63,7 @@ void DispGamma::paintEvent( TQPaintEvent *ev )
             p.drawLine( l*51, 2, l*51, 255 );
 
     // draw gamma-Line
-    p.setPen( tqcolorGroup().highlight() );
+    p.setPen( colorGroup().highlight() );
     p.moveTo( 1, vals->at(1) );
     for( int i = 2; i < w-1; i++ )
     {
@@ -73,7 +73,7 @@ void DispGamma::paintEvent( TQPaintEvent *ev )
 }
 
 
-TQSize DispGamma::tqsizeHint( void )
+TQSize DispGamma::sizeHint( void )
 {
     return TQSize( 256 + 2*margin,256 + 2 * margin );
 }
diff --git a/libkscan/dispgamma.h b/libkscan/dispgamma.h
index 4b8fff45..5d6bd790 100644
--- a/libkscan/dispgamma.h
+++ b/libkscan/dispgamma.h
@@ -40,7 +40,7 @@ public:
     DispGamma( TQWidget *parent );
     ~DispGamma();
 
-    TQSize tqsizeHint( void );
+    TQSize sizeHint( void );
     TQSizePolicy sizePolicy( void );
 
     void setValueRef( TQMemArray<SANE_Word> *newVals )
diff --git a/libkscan/gammadialog.cpp b/libkscan/gammadialog.cpp
index e1147b10..ef8a87a2 100644
--- a/libkscan/gammadialog.cpp
+++ b/libkscan/gammadialog.cpp
@@ -47,7 +47,7 @@ GammaDialog::GammaDialog( TQWidget *parent ) :
     gtDisp->setValueRef( gt->getArrayPtr() );
     gtDisp->resize( 280, 280 );
 
-    connect( gt, TQT_SIGNAL(tableChanged()), gtDisp, TQT_SLOT( tqrepaint()));
+    connect( gt, TQT_SIGNAL(tableChanged()), gtDisp, TQT_SLOT( repaint()));
 
     // setCaption( i18n( "Gamma Table" ));
 
diff --git a/libkscan/gammadialog.h b/libkscan/gammadialog.h
index 619e103b..b0eb016f 100644
--- a/libkscan/gammadialog.h
+++ b/libkscan/gammadialog.h
@@ -21,7 +21,7 @@
 #define GAMMADIALOG_H
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kgammatable.h>
 #include <kdialogbase.h>
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index b510f55d..b807af2f 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -226,12 +226,12 @@ void ImageCanvas::newImage( TQImage *new_image )
    }
 
 
-   kdDebug(29000) << "going to tqrepaint!" << endl;
-   tqrepaint( true );
-   kdDebug(29000) << "tqrepaint ok" << endl;
+   kdDebug(29000) << "going to repaint!" << endl;
+   repaint( true );
+   kdDebug(29000) << "repaint ok" << endl;
 }
 
-TQSize ImageCanvas::tqsizeHint() const
+TQSize ImageCanvas::sizeHint() const
 {
    return( TQSize( 2, 2 ));
 }
@@ -295,7 +295,7 @@ void ImageCanvas::handle_popup( int item )
       default: break;
    }
    update_scaled_pixmap();
-   tqrepaint();
+   repaint();
 }
 
 
@@ -379,7 +379,7 @@ void ImageCanvas::drawContents( TQPainter * p, int clipx, int clipy, int clipw,
     // p->scale( used_xscaler, used_yscaler );
     // p->scale( used_xscaler, used_yscaler );
     if ( x2 >= x1 && y2 >= y1 ) {
-    	p->tqdrawPixmap( x1, y1, *pmScaled, x1, y1 ); //, clipw, cliph);
+    	p->drawPixmap( x1, y1, *pmScaled, x1, y1 ); //, clipw, cliph);
         // p->setBrush( red );
         // p->drawRect( x1, y1, clipw, cliph );
     }
@@ -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().tqpixelMetric( TQStyle::PM_ScrollBarExtent );
+    const int sbWidth = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent );
 
     // if( verticalScrollBar()->visible() ) noSBSize.width()+=sbWidth;
     // if( horizontalScrollBar()->visible() ) noSBSize.height()+=sbWidth;
@@ -1022,7 +1022,7 @@ const TQString ImageCanvas::imageInfoString( int w, int h, int d )
         else
             return TQString("-");
     }
-    return i18n("%1x%2 pixel, %3 bit").tqarg(w).tqarg(h).tqarg(d);
+    return i18n("%1x%2 pixel, %3 bit").arg(w).arg(h).arg(d);
 }
 
 
@@ -1043,7 +1043,7 @@ const TQString ImageCanvas::scaleKindString()
         return i18n("Fit Height");
         break;
     case ZOOM:
-        return i18n("Zoom to %1 %%").tqarg( TQString::number(getScaleFactor()));
+        return i18n("Zoom to %1 %%").arg( TQString::number(getScaleFactor()));
         break;
     default:
         return i18n("Unknown scaling!");
diff --git a/libkscan/img_canvas.h b/libkscan/img_canvas.h
index eac68e75..b1d87c76 100644
--- a/libkscan/img_canvas.h
+++ b/libkscan/img_canvas.h
@@ -121,9 +121,9 @@ public slots:
     void toggleAspect( int aspect_in_mind )
         {
             maintain_aspect = aspect_in_mind;
-            tqrepaint();
+            repaint();
         }
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     void newImage( TQImage* );
     void newImageHoldZoom( TQImage* );
     void deleteView( TQImage *);
diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp
index a00abd4b..acd8f92e 100644
--- a/libkscan/kscandevice.cpp
+++ b/libkscan/kscandevice.cpp
@@ -26,7 +26,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqimage.h>
 #include <tqfileinfo.h>
@@ -175,7 +175,7 @@ KScanDevice::KScanDevice( TQObject *parent )
     gui_elements.setAutoDelete( true );
 
     scanner_initialised = false;  /* stays false until openDevice. */
-    scantqStatus = SSTAT_SILENT;
+    scanStatus = SSTAT_SILENT;
 
     data         = 0; /* temporary image data buffer while scanning */
     sn           = 0; /* socket notifier for async scanning         */
@@ -282,7 +282,7 @@ void KScanDevice::slCloseDevice( )
    scanner_name = UNDEF_SCANNERNAME;
    if( scanner_handle )
    {
-      if( scantqStatus != SSTAT_SILENT )
+      if( scanStatus != SSTAT_SILENT )
       {
          kdDebug(29000) << "Scanner is still active, calling cancel !" << endl;
          sane_cancel( scanner_handle );
@@ -659,11 +659,11 @@ void KScanDevice::slReloadAll( )
 void KScanDevice::slStopScanning( void )
 {
     kdDebug(29000) << "Attempt to stop scanning" << endl;
-    if( scantqStatus == SSTAT_IN_PROGRESS )
+    if( scanStatus == SSTAT_IN_PROGRESS )
     {
 	emit( sigScanFinished( KSCAN_CANCELLED ));
     }
-    scantqStatus = SSTAT_STOP_NOW;
+    scanStatus = SSTAT_STOP_NOW;
 }
 
 
@@ -673,7 +673,7 @@ const TQString KScanDevice::previewFile()
    if( !dir.endsWith("/") )
       dir += "/";
 
-   TQString fname = dir + TQString::tqfromLatin1(".previews/");
+   TQString fname = dir + TQString::fromLatin1(".previews/");
    TQString sname( getScannerName(shortScannerName()) );
    sname.replace( '/', "_");
 
@@ -1090,7 +1090,7 @@ KScanStat KScanDevice::acquire_data( bool isPreview )
    if( stat == KSCAN_OK )
    {
       overall_bytes 	= 0;
-      scantqStatus = SSTAT_IN_PROGRESS;
+      scanStatus = SSTAT_IN_PROGRESS;
       pixel_x 		    = 0;
       pixel_y 		    = 0;
       overall_bytes         = 0;
@@ -1115,7 +1115,7 @@ KScanStat KScanDevice::acquire_data( bool isPreview )
 	 do
 	 {
 	    doProcessABlock();
-	    if( scantqStatus != SSTAT_SILENT )
+	    if( scanStatus != SSTAT_SILENT )
 	    {
 	       sane_stat = sane_get_parameters( scanner_handle, &sane_scan_param );
 	       kdDebug(29000) << "--ProcessABlock-Loop" << endl;
@@ -1126,7 +1126,7 @@ KScanStat KScanDevice::acquire_data( bool isPreview )
 	       kdDebug(29000) << "pixels_per_line : " << sane_scan_param.pixels_per_line << endl;
 	       kdDebug(29000) << "bytes_per_line : " << sane_scan_param.bytes_per_line << endl;
 	    }
-	 } while ( scantqStatus != SSTAT_SILENT );
+	 } while ( scanStatus != SSTAT_SILENT );
       }
    }
 
@@ -1410,9 +1410,9 @@ void KScanDevice::doProcessABlock( void )
 	}
      }
 
-     if( goOn && scantqStatus == SSTAT_STOP_NOW )
+     if( goOn && scanStatus == SSTAT_STOP_NOW )
      {
-	/* scantqStatus is set to SSTAT_STOP_NOW due to hitting slStopScanning   */
+	/* scanStatus is set to SSTAT_STOP_NOW due to hitting slStopScanning   */
 	/* Mostly that one is fired by the STOP-Button in the progress dialog. */
 
 	/* This is also hit after the normal finish of the scan. Most probably,
@@ -1421,7 +1421,7 @@ void KScanDevice::doProcessABlock( void )
 	 */
 	kdDebug(29000) << "Stopping the scan progress !" << endl;
 	goOn = false;
-	scantqStatus = SSTAT_SILENT;
+	scanStatus = SSTAT_SILENT;
 	emit( sigScanFinished( KSCAN_OK ));
      }
 
@@ -1435,13 +1435,13 @@ void KScanDevice::doProcessABlock( void )
      {
 	/** Everythings okay, the picture is ready **/
 	kdDebug(29000) << "last frame reached - scan successful" << endl;
-	scantqStatus = SSTAT_SILENT;
+	scanStatus = SSTAT_SILENT;
 	emit( sigScanFinished( KSCAN_OK ));
      }
      else
      {
 	/** EOF und nicht letzter Frame -> Parameter neu belegen und neu starten **/
-	scantqStatus = SSTAT_NEXT_FRAME;
+	scanStatus = SSTAT_NEXT_FRAME;
 	kdDebug(29000) << "EOF, but another frame to scan" << endl;
 
      }
@@ -1449,7 +1449,7 @@ void KScanDevice::doProcessABlock( void )
 
   if( sane_stat == SANE_STATUS_CANCELLED )
   {
-     scantqStatus = SSTAT_STOP_NOW;
+     scanStatus = SSTAT_STOP_NOW;
      kdDebug(29000) << "Scan was cancelled" << endl;
 
      // stat = KSCAN_CANCELLED;
diff --git a/libkscan/kscandevice.h b/libkscan/kscandevice.h
index 894fa388..e5dd5100 100644
--- a/libkscan/kscandevice.h
+++ b/libkscan/kscandevice.h
@@ -438,7 +438,7 @@ private:
 
     TQSocketNotifier     *sn;
 
-    SCANSTATUS          scantqStatus;
+    SCANSTATUS          scanStatus;
 
     /* Data for the scan process */
     /* This could/should go to  a small help object */
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/kscanoption.cpp b/libkscan/kscanoption.cpp
index 43b35d0b..f79af026 100644
--- a/libkscan/kscanoption.cpp
+++ b/libkscan/kscanoption.cpp
@@ -26,7 +26,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqimage.h>
 #include <tqregexp.h>
diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp
index 742a0bb6..c53d9017 100644
--- a/libkscan/kscanslider.cpp
+++ b/libkscan/kscanslider.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 #include <tqtooltip.h>
@@ -53,7 +53,7 @@ KScanSlider::KScanSlider( TQWidget *parent, const TQString& text,
 		this, TQT_SLOT(slRevertValue()));
 
        TQToolTip::add( m_stdButt,
-		      i18n( "Revert value back to its standard value %1" ).tqarg( stdValue ));
+		      i18n( "Revert value back to its standard value %1" ).arg( stdValue ));
        hb->addWidget( m_stdButt, 0 );
        hb->addSpacing( 4 );
     }
@@ -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/massscandialog.cpp b/libkscan/massscandialog.cpp
index 9d4a5f91..3d789b82 100644
--- a/libkscan/massscandialog.cpp
+++ b/libkscan/massscandialog.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqprogressbar.h>
 #include <tqgroupbox.h>
diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp
index 0e6c8804..aca235ae 100644
--- a/libkscan/previewer.cpp
+++ b/libkscan/previewer.cpp
@@ -24,11 +24,11 @@
 #include <tqtooltip.h>
 #include <tqpopupmenu.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcombobox.h>
 #include <tqradiobutton.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -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();
@@ -141,8 +141,8 @@ Previewer::Previewer(TQWidget *parent, const char *name )
 
     img_canvas->setDefaultScaleKind( ImageCanvas::DYNAMIC );
     img_canvas->enableContextMenu(true);
-    img_canvas->tqrepaint();
-    tqlayout->addWidget( img_canvas, 6 );
+    img_canvas->repaint();
+    layout->addWidget( img_canvas, 6 );
 
     /* Actions for the previewer zoom */
     KAction *act;
@@ -477,11 +477,11 @@ void Previewer::slNewDimen(TQRect r)
         selectionHeightMm = (overallHeight / 1000 * r.height());
 
    TQString s;
-   s = i18n("width %1 mm").tqarg( int(selectionWidthMm));
+   s = i18n("width %1 mm").arg( int(selectionWidthMm));
    emit(setScanWidth(s));
 
    kdDebug(29000) << "Setting new Dimension " << s << endl;
-   s = i18n("height %1 mm").tqarg(int(selectionHeightMm));
+   s = i18n("height %1 mm").arg(int(selectionHeightMm));
    emit(setScanHeight(s));
 
    recalcFileSize( );
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/scandialog.cpp b/libkscan/scandialog.cpp
index 8d762272..2f8e73fd 100644
--- a/libkscan/scandialog.cpp
+++ b/libkscan/scandialog.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstringlist.h>
 #include <tqstrlist.h>
 #include <tqtooltip.h>
@@ -55,7 +55,7 @@ ScanDialogFactory::ScanDialogFactory( TQObject *parent, const char *name )
     : KScanDialogFactory( parent, name )
 {
     setName( "ScanDialogFactory" );
-    KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkscan") );
+    KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkscan") );
 }
 
 KScanDialog * ScanDialogFactory::createDialog( TQWidget *parent,
@@ -113,7 +113,7 @@ void ScanDialog::createOptionsTab( void )
    TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Startup Options"), page, "GB_STARTUP" );
    TQLabel *label = new TQLabel( i18n( "Note: changing these options will affect the scan plugin on next start." ),
 			       gb );
-   label->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+   label->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
 
    /* Checkbox for asking for scanner on startup */
    cb_askOnStart = new TQCheckBox( i18n( "&Ask for the scan device on plugin startup"), gb );
@@ -130,7 +130,7 @@ void ScanDialog::createOptionsTab( void )
 
    /* Read settings for startup behavior */
    KConfig *gcfg = KGlobal::config();
-   gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
+   gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    bool skipDialog  = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false );
    bool onlyLocal   = gcfg->readBoolEntry( STARTUP_ONLY_LOCAL, false );
 
@@ -144,7 +144,7 @@ void ScanDialog::createOptionsTab( void )
 
    TQWidget *spaceEater = new TQWidget( page );
    Q_CHECK_PTR( spaceEater );
-   spaceEater->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding) );
+   spaceEater->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding) );
 
 }
 
@@ -154,7 +154,7 @@ void ScanDialog::slotNetworkToggle( bool state)
 
    kdDebug(29000) << "slotNetworkToggle: Writing state " << writestate << endl;
    KConfig *c = KGlobal::config();
-   c->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
+   c->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    c->writeEntry( STARTUP_ONLY_LOCAL, writestate, true, true );
 }
 
@@ -164,7 +164,7 @@ void ScanDialog::slotAskOnStartToggle(bool state)
 
    kdDebug(29000) << "slotAskOnStartToggle: Writing state " << writestate << endl;
    KConfig *c = KGlobal::config();
-   c->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
+   c->setGroup(TQString::fromLatin1(GROUP_STARTUP));
    c->writeEntry( STARTUP_SKIP_ASK, writestate, true, true );
 }
 
@@ -314,7 +314,7 @@ bool ScanDialog::setup()
 
        kfg->setGroup( GROUP_STARTUP );
        /* Since this is a vertical splitter, only the width is important */
-       TQString key = TQString::tqfromLatin1( SCANDIA_SPLITTER_SIZES ).tqarg( r.width());
+       TQString key = TQString::fromLatin1( SCANDIA_SPLITTER_SIZES ).arg( r.width());
        kdDebug(29000) << "Read Splitter-Sizes " << key  << endl;
        splitter->setSizes( kfg->readIntListEntry( key ));
     }
@@ -336,7 +336,7 @@ void ScanDialog::slotClose()
 
 	 kfg->setGroup( GROUP_STARTUP );
 	 /* Since this is a vertical splitter, only the width is important */
-	 TQString key = TQString::tqfromLatin1( SCANDIA_SPLITTER_SIZES ).tqarg( r.width());
+	 TQString key = TQString::fromLatin1( SCANDIA_SPLITTER_SIZES ).arg( r.width());
 	 kfg->writeEntry( key, splitter->sizes(), true, true);
       }
    }
diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp
index ec9e77fe..25ef9879 100644
--- a/libkscan/scanparams.cpp
+++ b/libkscan/scanparams.cpp
@@ -27,7 +27,7 @@
 #include <tqimage.h>
 #include <tqtooltip.h>
 #include <tqmessagebox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdict.h>
 #include <tqprogressdialog.h>
 #include <tqscrollview.h>
@@ -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() );
@@ -120,7 +120,7 @@ bool ScanParams::connectDevice( KScanDevice *newScanDevice )
    (void ) new TQLabel( cap, hb );
    m_led = new KLed( hb );
    m_led->setState( KLed::Off );
-   m_led->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
+   m_led->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
 
 
    (void) new KSeparator( KSeparator::HLine, this);
@@ -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"),
@@ -501,9 +501,9 @@ TQScrollView *ScanParams::scannerParams( )
    }
 
    TQWidget *spacer = new TQWidget( pbox );
-   spacer->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding);
+   spacer->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding);
 
-   pbox->setMinimumWidth( pbox->tqsizeHint().width() );
+   pbox->setMinimumWidth( pbox->sizeHint().width() );
    sv->setMinimumWidth( pbox->minimumWidth() );
    sv->addChild( pbox );
 
@@ -591,7 +591,7 @@ void ScanParams::slFileSelect( void )
 	   fi_item = filterList.next() )
       {
 
-	 filter.append( TQString::tqfromLatin1( prefix + fi_item.lower()) );
+	 filter.append( TQString::fromLatin1( prefix + fi_item.lower()) );
       }
    }
    else
@@ -638,7 +638,7 @@ void ScanParams::slVirtScanModeSelect( int id )
 	 kdDebug(29000) << "Found File in Filename-Option: " << vf << endl;
 
 	 TQFileInfo fi( vf );
-	 if( fi.extension() != TQString::tqfromLatin1("pnm") )
+	 if( fi.extension() != TQString::fromLatin1("pnm") )
 	    virt_filename->set(TQCString(""));
       }
    } else {
@@ -695,7 +695,7 @@ void ScanParams::virtualScannerParams( void )
       TQHBoxLayout *hb = new TQHBoxLayout();
       top->addLayout( hb );
       w = virt_filename->widget();
-      w->setMinimumHeight( (w->tqsizeHint()).height());
+      w->setMinimumHeight( (w->sizeHint()).height());
       connect( w, TQT_SIGNAL(returnPressed()), this,
 	       TQT_SLOT( slCheckGlob()));
 
diff --git a/libkscan/scanparams.h b/libkscan/scanparams.h
index a9f29d0e..de69b0c9 100644
--- a/libkscan/scanparams.h
+++ b/libkscan/scanparams.h
@@ -52,7 +52,7 @@ public:
    ScanParams( TQWidget *parent, const char *name = 0);
    ~ScanParams();
 #if 0
-   TQSize tqsizeHint( );
+   TQSize sizeHint( );
 #endif
    bool connectDevice( KScanDevice* );
 
diff --git a/libkscan/scansourcedialog.cpp b/libkscan/scansourcedialog.cpp
index fcb3fc25..012c2e22 100644
--- a/libkscan/scansourcedialog.cpp
+++ b/libkscan/scansourcedialog.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqradiobutton.h>
diff --git a/libkscan/sizeindicator.cpp b/libkscan/sizeindicator.cpp
index 582f2330..e0884e08 100644
--- a/libkscan/sizeindicator.cpp
+++ b/libkscan/sizeindicator.cpp
@@ -19,7 +19,7 @@
 
 #include "sizeindicator.h"
 
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqimage.h>
 
 #include <kimageeffect.h>
@@ -34,7 +34,7 @@ SizeIndicator::SizeIndicator( TQWidget *parent, long  thres, long crit )
 {
    sizeInByte = -1;
    setFrameStyle( TQFrame::Box | TQFrame::Sunken );
-   setMinimumWidth( fontMetrics().width( TQString::tqfromLatin1("MMM.MM MB") ));
+   setMinimumWidth( fontMetrics().width( TQString::fromLatin1("MMM.MM MB") ));
    setCritical( crit );
    threshold = thres;
 
@@ -79,7 +79,7 @@ void SizeIndicator::setSizeInByte( long newSize )
       fwidth = 2;
    }
 
-   t = unit.tqarg( sizer, fwidth, 'f', precision);
+   t = unit.arg( sizer, fwidth, 'f', precision);
    setText(t);
 
 }
@@ -100,7 +100,7 @@ void SizeIndicator::drawContents( TQPainter *p )
       warnColor.setHsv( 0, c, c );
 
       p->drawImage( 0,0,
-		    KImageEffect::unbalancedGradient( s, tqcolorGroup().background(),
+		    KImageEffect::unbalancedGradient( s, colorGroup().background(),
 						      warnColor, KImageEffect::CrossDiagonalGradient, 200,200 ));
    }
    /* Displaying the text */