diff --git a/src/electronics/components/ecpotentiometer.cpp b/src/electronics/components/ecpotentiometer.cpp
index e989c7c..460ac4e 100644
--- a/src/electronics/components/ecpotentiometer.cpp
+++ b/src/electronics/components/ecpotentiometer.cpp
@@ -98,7 +98,7 @@ void ECPotentiometer::drawShape( TQPainter &p )
 	pa[1] = TQPoint( 4, -3 );
 	pa[2] = TQPoint( 4, 3 );
 	
-	int space = m_pSlider->tqstyle().pixelMetric( TQStyle::PM_SliderSpaceAvailable, m_pSlider );
+	int space = m_pSlider->style().pixelMetric( TQStyle::PM_SliderSpaceAvailable, m_pSlider );
 	int base_y = _y + (( angleDegrees() == 0 || angleDegrees() == 270 ) ? 1 : -1) * int( space * m_sliderProp );
 	
 	pa.translate( _x+16, base_y );
diff --git a/src/gui/contexthelp.cpp b/src/gui/contexthelp.cpp
index 41b975e..c19105e 100644
--- a/src/gui/contexthelp.cpp
+++ b/src/gui/contexthelp.cpp
@@ -42,18 +42,18 @@ ContextHelp::ContextHelp( KateMDI::ToolView * parent )
 {
 	TQWhatsThis::add( this, i18n("Provides context-sensitive help relevant to the current editing being performed.") );
 	
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 );
+	TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 );
 
 	m_nameLbl = new TQLabel( this, "" );
-	vtqlayout->addWidget(m_nameLbl);
-	vtqlayout->addSpacing(8);
+	vlayout->addWidget(m_nameLbl);
+	vlayout->addSpacing(8);
 	
 	m_info = new TQTextBrowser( this, "" );
-	vtqlayout->addWidget(m_info);
+	vlayout->addWidget(m_info);
 	m_info->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
 	
 	TQSpacerItem *spacer3 = new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Preferred );
-	vtqlayout->addItem(spacer3);
+	vlayout->addItem(spacer3);
 	
 	slotClear();
 } 
diff --git a/src/gui/generaloptionswidget.ui b/src/gui/generaloptionswidget.ui
index 08c1de2..729861b 100644
--- a/src/gui/generaloptionswidget.ui
+++ b/src/gui/generaloptionswidget.ui
@@ -152,7 +152,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8_2</cstring>
+                        <cstring>layout8_2</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp
index 58b0661..f82f46e 100644
--- a/src/gui/itemeditor.cpp
+++ b/src/gui/itemeditor.cpp
@@ -42,17 +42,17 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent )
 {
 	TQWhatsThis::add( this, i18n("This allows editing of advanced properties of the selected item(s). Right click on the picture of the item to set the orientation.") );
 	
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 );
+	TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 );
 
 	m_nameLbl = new TQLabel( this, "" );
-	vtqlayout->addWidget(m_nameLbl);
-	vtqlayout->addSpacing(8);
+	vlayout->addWidget(m_nameLbl);
+	vlayout->addSpacing(8);
 
 	propList = new PropertiesListView(this);
-	vtqlayout->addWidget(propList);
+	vlayout->addWidget(propList);
 	TQWhatsThis::add(propList,i18n("<qt>Shows properties associated with the currently selected item(s).<p>Select a property to change its value. If multiple items are selected with different values then the property will appear greyed out, use ""Merge Properties"" to make them the same.<p>Select ""Defaults to set all properties to their default values""")); 
 	
-	TQHBoxLayout *h1Layout = new TQHBoxLayout( vtqlayout, 4 );
+	TQHBoxLayout *h1Layout = new TQHBoxLayout( vlayout, 4 );
 	TQSpacerItem *spacer1 = new TQSpacerItem( 1, 1 );
 	h1Layout->addItem(spacer1);
 	
@@ -67,7 +67,7 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent )
 	h1Layout->addWidget(m_mergeBtn);
 	
 	// Qt::Orientation widget stuff
-	TQHBoxLayout *h2Layout = new TQHBoxLayout( vtqlayout, 6 );
+	TQHBoxLayout *h2Layout = new TQHBoxLayout( vlayout, 6 );
 	TQSpacerItem *spacer2 = new TQSpacerItem( 1, 1 );
 	h2Layout->addItem(spacer2);
 	m_orientationWidget = new OrientationWidget(this);
diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp
index 318c3ea..e551ebd 100644
--- a/src/gui/microsettingsdlg.cpp
+++ b/src/gui/microsettingsdlg.cpp
@@ -69,9 +69,9 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par
 		TQGroupBox * groupBox = new TQGroupBox( *it, m_pWidget->portsGroupBox );
 		
 		groupBox->setColumnLayout(0, Qt::Vertical );
-		groupBox->tqlayout()->setSpacing( 6 );
-		groupBox->tqlayout()->setMargin( 11 );
-		TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() );
+		groupBox->layout()->setSpacing( 6 );
+		groupBox->layout()->setMargin( 11 );
+		TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() );
 		groupBoxLayout->setAlignment( TQt::AlignTop );
 		
 		// TODO: replace this with i18n( "the type", "Type (TRIS register):" );
@@ -84,8 +84,8 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par
 		m_portStateEdit[row] = new KLineEdit( portState, groupBox );
 		groupBoxLayout->addWidget( m_portStateEdit[row], 1, 1 );
 
-// 		(dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->tqlayout()))->insertWidget( row, groupBox );
-		(dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->tqlayout()))->addWidget( groupBox );
+// 		(dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->layout()))->insertWidget( row, groupBox );
+		(dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->layout()))->addWidget( groupBox );
 	}
 	//END Initialize initial port settings
 	
diff --git a/src/gui/orientationwidget.cpp b/src/gui/orientationwidget.cpp
index 19f88c3..3fa9f9e 100644
--- a/src/gui/orientationwidget.cpp
+++ b/src/gui/orientationwidget.cpp
@@ -30,7 +30,7 @@ const int _size = 44;
 OrientationWidget::OrientationWidget(TQWidget *parent, const char *name)
 	: TQWidget(parent, name)
 {
-	TQGridLayout *tqlayout = new TQGridLayout( this, 2, 4, 0, 4 );
+	TQGridLayout *layout = new TQGridLayout( this, 2, 4, 0, 4 );
 	p_activeFlowPart = 0l;
 	
 	for ( int row=0; row<2; ++row )
@@ -39,7 +39,7 @@ OrientationWidget::OrientationWidget(TQWidget *parent, const char *name)
 		{
 			TQPushButton *btn = new TQPushButton(this);
 			m_toolBtn[row][col] = btn;
-			tqlayout->addWidget( btn, row, col );
+			layout->addWidget( btn, row, col );
 			btn->setFixedSize( _size+6, _size+6 );
 // 			btn->setFlat(true);
 			btn->setEnabled(false);
diff --git a/src/gui/oscilloscopewidget.ui b/src/gui/oscilloscopewidget.ui
index d422136..79a98d0 100644
--- a/src/gui/oscilloscopewidget.ui
+++ b/src/gui/oscilloscopewidget.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="3" rowspan="2" colspan="1">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -92,7 +92,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/src/gui/picprogrammerconfigwidget.ui b/src/gui/picprogrammerconfigwidget.ui
index 70f18f3..60654f9 100644
--- a/src/gui/picprogrammerconfigwidget.ui
+++ b/src/gui/picprogrammerconfigwidget.ui
@@ -215,7 +215,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/src/gui/pieditor.cpp b/src/gui/pieditor.cpp
index 5adce57..3b9505b 100644
--- a/src/gui/pieditor.cpp
+++ b/src/gui/pieditor.cpp
@@ -46,8 +46,8 @@ void PIEditor::valueChanged( TQVariant /*variant*/ )
 PIBool::PIBool(TQString id, Variant *data, TQWidget *parent, const char *name )
 	: PIEditor( id, data, parent, name )
 {
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-	tqlayout->setAutoAdd(true);
+	TQHBoxLayout *layout = new TQHBoxLayout(this);
+	layout->setAutoAdd(true);
 	
 	m_comboBox = new KComboBox(this);
 	m_comboBox->insertItem( i18n("True"), 0 );
@@ -82,8 +82,8 @@ void PIBool::valueChanged( TQVariant /*variant*/ )
 PIColor::PIColor(TQString id, Variant *data, TQWidget *parent, const char *name )
 	: PIEditor(id,data,parent, name)
 {
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-	tqlayout->setAutoAdd(true);
+	TQHBoxLayout *layout = new TQHBoxLayout(this);
+	layout->setAutoAdd(true);
 	
 	m_combo = new ColorCombo( (ColorCombo::ColorScheme)m_data->colorScheme(), this );
 	m_combo->setColor(m_data->value().toColor());
@@ -117,8 +117,8 @@ void PIColor::valueChanged( TQVariant /*variant*/ )
 PIDouble::PIDouble(TQString id, Variant *data, TQWidget *parent, const char *name )
 	: PIEditor(id,data,parent, name)
 {
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-	tqlayout->setAutoAdd(true);
+	TQHBoxLayout *layout = new TQHBoxLayout(this);
+	layout->setAutoAdd(true);
 	
 	spin = new DoubleSpinBox(m_data->minValue(),m_data->maxValue(),m_data->minAbsValue(),m_data->value().toDouble(),m_data->unit(),this);
 	
@@ -145,8 +145,8 @@ void PIDouble::valueChanged( TQVariant /*variant*/ )
 PIFilename::PIFilename(TQString id, Variant *data, TQWidget *parent, const char *name )
 	: PIEditor(id,data,parent, name)
 {
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-	tqlayout->setAutoAdd(true);
+	TQHBoxLayout *layout = new TQHBoxLayout(this);
+	layout->setAutoAdd(true);
 	
 	m_combo = 0L;
 	if( m_data->allowed().count() == 0 )
@@ -196,8 +196,8 @@ void PIFilename::valueChanged( TQVariant /*variant*/ )
 PIInt::PIInt( const TQString &id, Variant *data, TQWidget *parent, const char *name )
 	: PIEditor( id, data, parent, name )
 {
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-	tqlayout->setAutoAdd(true);
+	TQHBoxLayout *layout = new TQHBoxLayout(this);
+	layout->setAutoAdd(true);
 	
 	spin = new KIntSpinBox( (int)m_data->minValue(), (int)m_data->maxValue(), 1, m_data->value().toInt(), 10, this );
 	
@@ -224,8 +224,8 @@ void PIInt::valueChanged( TQVariant /*variant*/ )
 PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *parent, const char *name)
 	: PIEditor( id, data, parent, name)
 {
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-	tqlayout->setAutoAdd(true);
+	TQHBoxLayout *layout = new TQHBoxLayout(this);
+	layout->setAutoAdd(true);
 	m_edit = new KLineEdit( m_data->value().toString() , this );
 	connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotEditTextChanged()));
 }
@@ -251,8 +251,8 @@ void PILineEdit::valueChanged( TQVariant /*variant*/ )
 PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name)
 	: PIEditor( id, data, parent, name)
 {
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-	tqlayout->setAutoAdd(true);
+	TQHBoxLayout *layout = new TQHBoxLayout(this);
+	layout->setAutoAdd(true);
 	
 	m_combo = new KComboBox( this );
 	m_combo->insertStringList(m_data->allowed());
diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp
index 0f3ed9d..972fbe4 100644
--- a/src/gui/projectdlgs.cpp
+++ b/src/gui/projectdlgs.cpp
@@ -165,8 +165,8 @@ LinkerOptionsDlg::LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *pa
 	
 	delete m_pWidget->m_pExternalLibraries;
 	m_pWidget->m_pExternalLibraries = new KEditListBox( i18n("Link libraries outside project"), m_pExternalLibraryRequester->customEditor(), m_pWidget );
-	m_pWidget->m_pExternalLibraries->tqlayout()->setMargin(11);
-	(dynamic_cast<TQGridLayout*>(m_pWidget->tqlayout()))->addMultiCellWidget( m_pWidget->m_pExternalLibraries, 7, 7, 0, 1 );
+	m_pWidget->m_pExternalLibraries->layout()->setMargin(11);
+	(dynamic_cast<TQGridLayout*>(m_pWidget->layout()))->addMultiCellWidget( m_pWidget->m_pExternalLibraries, 7, 7, 0, 1 );
 	
 #if defined(KDE_MAKE_VERSION)
 # if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
diff --git a/src/icndocument.cpp b/src/icndocument.cpp
index 9509d25..26da11f 100644
--- a/src/icndocument.cpp
+++ b/src/icndocument.cpp
@@ -1030,7 +1030,7 @@ void ICNDocument::copy()
 	data.addNodes( nodeList );
 	data.addConnectors( connectorList );
 	
-	KApplication::tqclipboard()->setText( data.toXML(), TQClipboard::Clipboard );
+	KApplication::clipboard()->setText( data.toXML(), TQClipboard::Clipboard );
 }
 
 void ICNDocument::selectAll()
diff --git a/src/item.cpp b/src/item.cpp
index 2a59719..d887a50 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -313,11 +313,11 @@ bool Item::mouseDoubleClickEvent( const EventInfo &eventInfo )
 
 	KDialogBase *dlg = new KDialogBase( 0l, "", true, v->editorCaption(), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Ok, false, KStdGuiItem::clear() );
 	TQFrame *frame = dlg->makeMainWidget();
-	TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, dlg->spacingHint() );
+	TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, dlg->spacingHint() );
 	KTextEdit *textEdit = new KTextEdit( frame );
 	textEdit->setTextFormat( PlainText );
 	textEdit->setText( v->value().toString() );
-	tqlayout->addWidget( textEdit, 10 );
+	layout->addWidget( textEdit, 10 );
 	textEdit->setFocus();
 	connect( dlg, TQT_SIGNAL( user1Clicked() ), textEdit, TQT_SLOT( clear() ) );
 	dlg->setMinimumWidth( 600 );
diff --git a/src/itemdocument.cpp b/src/itemdocument.cpp
index ec20d43..cbe531b 100644
--- a/src/itemdocument.cpp
+++ b/src/itemdocument.cpp
@@ -406,7 +406,7 @@ void ItemDocument::cut()
 
 void ItemDocument::paste()
 {
-	TQString xml = KApplication::tqclipboard()->text( TQClipboard::Clipboard );
+	TQString xml = KApplication::clipboard()->text( TQClipboard::Clipboard );
 	if ( xml.isEmpty() )
 		return;
 	
diff --git a/src/katemdi.cpp b/src/katemdi.cpp
index 5f62d95..4c817ea 100644
--- a/src/katemdi.cpp
+++ b/src/katemdi.cpp
@@ -508,7 +508,7 @@ void Sidebar::restoreSession (KConfig *config)
         }
 
     // then: remove this items from the button bar
-    // do this backwards, to minimize the retqlayout efforts
+    // do this backwards, to minimize the relayout efforts
     for (int i=m_toolviews.size()-1; i >= (int)firstWrong; --i)
     {
       removeTab (m_widgetToId[m_toolviews[i]]);
diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp
index 35635d2..c1cb36c 100644
--- a/src/viewcontainer.cpp
+++ b/src/viewcontainer.cpp
@@ -29,11 +29,11 @@ ViewContainer::ViewContainer( const TQString & caption, KTechlab * ktechlab, TQW
 	if (ktechlab)
 		connect( ktechlab, TQT_SIGNAL(needUpdateCaptions()), this, TQT_SLOT(updateCaption()) );
 	
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+	TQHBoxLayout *layout = new TQHBoxLayout(this);
 	m_baseViewArea = new ViewArea( this, this, 0, "viewarea_0" );
 	connect( m_baseViewArea, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(baseViewAreaDestroyed(TQObject* )) );
 	
-	tqlayout->addWidget(m_baseViewArea);
+	layout->addWidget(m_baseViewArea);
 	
 	m_activeViewArea = 0;
 	b_focused = false;
diff --git a/src/viewcontainer.h b/src/viewcontainer.h
index 1d09db1..94a71e6 100644
--- a/src/viewcontainer.h
+++ b/src/viewcontainer.h
@@ -68,7 +68,7 @@ public:
 	 */
 	ViewArea *createViewArea( Position position, uint id );
 	/**
-	 * Adds the given View to the main part of the tqlayout
+	 * Adds the given View to the main part of the layout
 	 */
 	void setView( View *view );
 	/**
@@ -197,7 +197,7 @@ public:
 	 */
 	void setIdUsed( int id );
 	/**
-	 * Writes the state of the View Container (tqlayout of views and view URLs)
+	 * Writes the state of the View Container (layout of views and view URLs)
 	 * to the given KConfig. Doesn't change the group - so preset it if
 	 * needed!
 	 */