diff --git a/systemsettings/kcmultiwidget.cpp b/systemsettings/kcmultiwidget.cpp
index da4484f..5805a3a 100644
--- a/systemsettings/kcmultiwidget.cpp
+++ b/systemsettings/kcmultiwidget.cpp
@@ -23,7 +23,7 @@
 
 #include <tqcursor.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 #include <kaboutdata.h>
diff --git a/systemsettings/kcscrollview.cpp b/systemsettings/kcscrollview.cpp
index a543ac7..4566337 100644
--- a/systemsettings/kcscrollview.cpp
+++ b/systemsettings/kcscrollview.cpp
@@ -25,8 +25,8 @@ KCScrollView::KCScrollView( TQWidget * parent, const char * name, WFlags f) : TQ
 	mainChild = 0;
 }
 
-TQSize KCScrollView::tqsizeHint() const {
-	TQSize vphint = mainChild->tqsizeHint();
+TQSize KCScrollView::sizeHint() const {
+	TQSize vphint = mainChild->sizeHint();
 	vphint.setWidth(vphint.width()+2*frameWidth());
 	vphint.setHeight(vphint.height()+2*frameWidth());
 	return vphint;
diff --git a/systemsettings/kcscrollview.h b/systemsettings/kcscrollview.h
index dc9fbeb..e023899 100644
--- a/systemsettings/kcscrollview.h
+++ b/systemsettings/kcscrollview.h
@@ -26,7 +26,7 @@ class KCScrollView : public TQScrollView {
 public:
 	KCScrollView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
 
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 	virtual void addChild(TQWidget *child, int x=0, int y=0);
 private:
 	TQWidget *mainChild;
diff --git a/systemsettings/mainwindow.cpp b/systemsettings/mainwindow.cpp
index 0c21736..1852b0c 100644
--- a/systemsettings/mainwindow.cpp
+++ b/systemsettings/mainwindow.cpp
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <klocale.h>
 #include <kservicegroup.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidgetstack.h>
 #include <tqtimer.h>
 #include <kiconloader.h>
@@ -289,7 +289,7 @@ void MainWindow::slotItemSelected( TQIconViewItem *item ){
 
 void MainWindow::timerResize() {
 	TQSize currentSize = size();
-	TQSize newSize = currentSize.expandedTo(tqsizeHint());
+	TQSize newSize = currentSize.expandedTo(sizeHint());
 	// Avoid resizing if possible.
 	if(newSize!=currentSize) {
 		resize(newSize);
@@ -298,7 +298,7 @@ void MainWindow::timerResize() {
 
 void MainWindow::updateModuleHelp( KCModuleProxy *currentModule ) {
 	if ( currentModule->aboutData() ) {
-		aboutModuleAction->setText(i18n("Help menu->about <modulename>", "About %1").tqarg(
+		aboutModuleAction->setText(i18n("Help menu->about <modulename>", "About %1").arg(
 				                             currentModule->moduleInfo().moduleName().replace("&","&&")));
 		aboutModuleAction->setIcon(currentModule->moduleInfo().icon());
 		aboutModuleAction->setEnabled(true);
@@ -349,11 +349,11 @@ void MainWindow::slotSearchHits(const TQString &query, int *hitList, int length)
 	} else {
 		
 		if(length>=1) {
-			generalHitLabel->setText(i18n("%1 hit in General","%1 hits in General",hitList[0]).tqarg(hitList[0]));
+			generalHitLabel->setText(i18n("%1 hit in General","%1 hits in General",hitList[0]).arg(hitList[0]));
 		}
 	
 		if(length>=2) {
-			advancedHitLabel->setText(i18n("%1 hit in Advanced","%1 hits in Advanced",hitList[1]).tqarg(hitList[1]));
+			advancedHitLabel->setText(i18n("%1 hit in Advanced","%1 hits in Advanced",hitList[1]).arg(hitList[1]));
 		}
 
 	}
diff --git a/systemsettings/modulesview.cpp b/systemsettings/modulesview.cpp
index ef920f1..a963058 100644
--- a/systemsettings/modulesview.cpp
+++ b/systemsettings/modulesview.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kservicegroup.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kiconloader.h>
 #include <kcmultidialog.h>
 #include <kdialogbase.h>
@@ -43,7 +43,7 @@ ModulesView::ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWi
 	this->rootMenu = rootMenu;	
 	this->menuPath = menuPath;
 
-	TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout" );
+	TQVBoxLayout *layout = new TQVBoxLayout( this, 11, 6, "layout" );
 
 	displayName = this->rootMenu->caption;
 
@@ -58,13 +58,13 @@ ModulesView::ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWi
 			TQFrame *line = new TQFrame( this, "line");
 			line->setFrameShadow( TQFrame::Sunken );
 			line->setFrameShape( TQFrame::HLine );
-			tqlayout->addWidget( line );
+			layout->addWidget( line );
 		}
 
 		// Build the row of modules/icons
-		createRow( (*it).subMenu, tqlayout );
+		createRow( (*it).subMenu, layout );
 	}
-	tqlayout->addStretch(1);
+	layout->addStretch(1);
 
 	// Make empty iconView for the search widget
 	if( groups.count()==0 ) {
@@ -112,14 +112,14 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout
 	// Heaer Icon
 	TQLabel *icon = new TQLabel( this, "groupicon" );
 	icon->setPixmap( SmallIcon( group->icon() ) );
-	icon->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1,
+	icon->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1,
 		(TQSizePolicy::SizeType)5, 0, 0, icon->sizePolicy().hasHeightForWidth() ) );
 	rowLayout->addWidget( icon );
 
 	// Header Name
 	TQLabel *textLabel = new TQLabel( this, "groupcaption" );
 	textLabel->setText( group->caption() );
-	textLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
+	textLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
 		(TQSizePolicy::SizeType)5, 0, 0, textLabel->sizePolicy().hasHeightForWidth()));
 	TQFont textLabel_font(  textLabel->font() );
 	textLabel_font.setBold( true );
@@ -160,7 +160,7 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout
 	}
 
 	// Force the height for those items that have two words.
-	iconView->setMinimumHeight( iconView->tqminimumSizeHint().height() );
+	iconView->setMinimumHeight( iconView->minimumSizeHint().height() );
 }
 
 void ModulesView::clearSelection() {
diff --git a/systemsettings/modulesview.h b/systemsettings/modulesview.h
index a334d75..49a9d07 100644
--- a/systemsettings/modulesview.h
+++ b/systemsettings/modulesview.h
@@ -34,7 +34,7 @@ public:
 					: KIconView( parent, name ){ };
 		
 	// Figure out the hight/width to have only one row
-	TQSize tqminimumSizeHint() const {
+	TQSize minimumSizeHint() const {
 		int width = 0;
 		/*
 		for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() )
@@ -94,7 +94,7 @@ private:
 	KCModuleMenu *rootMenu;
 	TQString menuPath;
 
-	void createRow( const TQString &parentPath, TQBoxLayout *tqlayout );
+	void createRow( const TQString &parentPath, TQBoxLayout *layout );
 };
 
 #endif // MODULESVIEW_H