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

87 files changed, 690 insertions, 690 deletions

diff --git a/src/kile/cleandialog.cpp b/src/kile/cleandialog.cpp
index b0d5680..13179c7 100644
--- a/src/kile/cleandialog.cpp
+++ b/src/kile/cleandialog.cpp
@@ -21,7 +21,7 @@
 #include <kpushbutton.h>
 #include <klistview.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
 #include <tqfileinfo.h>
@@ -39,15 +39,15 @@ namespace KileDialog
 		
 		// label widgets
 		TQWidget *labelwidget = new TQWidget(plainPage());
-		TQHBoxLayout *labeltqlayout = new TQHBoxLayout(labelwidget);
+		TQHBoxLayout *labellayout = new TQHBoxLayout(labelwidget);
 		
 		// line 1: picture and label
 		TQLabel *picture =  new TQLabel("", labelwidget);
 		picture->setPixmap( KGlobal::instance()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium) );
 		TQLabel *label =  new TQLabel(i18n( "Do you really want to delete these files?" ), labelwidget);
-		labeltqlayout->addWidget(picture);
-		labeltqlayout->addSpacing(20);
-		labeltqlayout->addWidget(label);
+		labellayout->addWidget(picture);
+		labellayout->addSpacing(20);
+		labellayout->addWidget(label);
 		
 		// line 2: listview
 		listview = new KListView(plainPage());
diff --git a/src/kile/codecompletion.cpp b/src/kile/codecompletion.cpp
index f8225f2..792d905 100644
--- a/src/kile/codecompletion.cpp
+++ b/src/kile/codecompletion.cpp
@@ -852,7 +852,7 @@ namespace KileDocument
 	TQString CodeCompletion::stripParameter( const TQString &text )
 	{
 		TQString s = "";
-		const TQChar *ch = text.tqunicode();
+		const TQChar *ch = text.unicode();
 		bool ignore = false;
 
 
diff --git a/src/kile/configcheckerdlg.cpp b/src/kile/configcheckerdlg.cpp
index a9b0d83..fe1cd22 100644
--- a/src/kile/configcheckerdlg.cpp
+++ b/src/kile/configcheckerdlg.cpp
@@ -16,7 +16,7 @@
 #include "configcheckerdlg.h"
 
 #include <tqfileinfo.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 
@@ -42,7 +42,7 @@ ResultItem::ResultItem(KListBox *lb, const TQString &tool, int status, const TQV
 		TQString itemcolor = "black";
 		if ( tests[i].status() == ConfigTest::Failure ) itemcolor = "#FFA201";
 		else if ( tests[i].status() == ConfigTest::Critical ) itemcolor = "#AA0000";
-		rt += TQString("<li><b><font color=\"%1\">%2</font></b>: &nbsp;%3</li>").tqarg(itemcolor).tqarg(tests[i].name()).tqarg(tests[i].resultText());
+		rt += TQString("<li><b><font color=\"%1\">%2</font></b>: &nbsp;%3</li>").arg(itemcolor).arg(tests[i].name()).arg(tests[i].resultText());
 	}
 	rt += "</ul>";
 
@@ -58,7 +58,7 @@ ResultItem::ResultItem(KListBox *lb, const TQString &tool, int status, const TQV
 		statustr = i18n("Critical failure, Kile will not function properly");
 	}
 
-	m_richText = new TQSimpleRichText(rt.tqarg(color).tqarg(tool).tqarg(statustr), listBox()->font());
+	m_richText = new TQSimpleRichText(rt.arg(color).arg(tool).arg(statustr), listBox()->font());
 	m_richText->setWidth(listBox()->width());
 
 	//this is for sorting only
@@ -67,16 +67,16 @@ ResultItem::ResultItem(KListBox *lb, const TQString &tool, int status, const TQV
 
 void ResultItem::paint(TQPainter *p)
 {
-	m_richText->draw(p, 0, 0, TQRect(), listBox()->tqcolorGroup());
+	m_richText->draw(p, 0, 0, TQRect(), listBox()->colorGroup());
 }
 
 ConfigChecker::ConfigChecker(TQWidget* parent) :
 	KDialogBase( Plain, i18n("System Check"), Ok|Cancel|User1, Ok, parent, 0, true, true, KGuiItem("&Save Results...")),
 	m_tester(0L)
 {
-	TQGridLayout *tqlayout = new TQGridLayout(plainPage(), 1, 1);
+	TQGridLayout *layout = new TQGridLayout(plainPage(), 1, 1);
 	m_widget = new ConfigCheckerWidget(plainPage());
-	tqlayout->addWidget(m_widget, 1, 1);
+	layout->addWidget(m_widget, 1, 1);
 
 	enableButton(Ok, false);
 	enableButton(User1, false);
@@ -157,9 +157,9 @@ void ConfigChecker::finished(bool ok)
 
 		TQString cap = i18n("Test Results");
 		if ( critical.count() > 0 )
-			KMessageBox::error(this, i18n("<qt>The following tools did not pass all <b>critical</b> tests:<br>%1<br>Your system is not ready to use. Please consult the results to find out what to fix.</qt>").tqarg(critical.join(", ")), cap);
+			KMessageBox::error(this, i18n("<qt>The following tools did not pass all <b>critical</b> tests:<br>%1<br>Your system is not ready to use. Please consult the results to find out what to fix.</qt>").arg(critical.join(", ")), cap);
 		else if ( failure.count() > 0 )
-			KMessageBox::information(this, i18n("The following tools did not pass all tests:\n %1\nYou will still be able to use Kile; however, not all features are guaranteed to work.").tqarg(failure.join(", ")), cap);
+			KMessageBox::information(this, i18n("The following tools did not pass all tests:\n %1\nYou will still be able to use Kile; however, not all features are guaranteed to work.").arg(failure.join(", ")), cap);
 		else
 			KMessageBox::information(this, i18n("No problems detected, your system is ready to use."), cap);
 	}
diff --git a/src/kile/configcheckerwidget.ui b/src/kile/configcheckerwidget.ui
index 72f5bf3..91842f3 100644
--- a/src/kile/configcheckerwidget.ui
+++ b/src/kile/configcheckerwidget.ui
@@ -20,7 +20,7 @@
             <verstretch>1</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>580</width>
             <height>480</height>
@@ -85,7 +85,7 @@
                             <verstretch>1</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>480</width>
                             <height>0</height>
diff --git a/src/kile/configcodecompletion.cpp b/src/kile/configcodecompletion.cpp
index 0bfd1db..12bb2a7 100644
--- a/src/kile/configcodecompletion.cpp
+++ b/src/kile/configcodecompletion.cpp
@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqgroupbox.h>
 #include <tqvgroupbox.h>
@@ -70,10 +70,10 @@ ConfigCodeCompletion::ConfigCodeCompletion(KConfig *config, KileWidget::LogMsg *
 	// below: OptionBox
 	TQButtonGroup *bg_options = new TQButtonGroup( this, "bgOptions" );
 	bg_options->setColumnLayout(0, Qt::Vertical );
-	bg_options->tqlayout()->setSpacing( 6 );
-	bg_options->tqlayout()->setMargin( 11 );
-	TQGridLayout *bg_optionsLayout = new TQGridLayout( bg_options->tqlayout() );
-	bg_optionsLayout->tqsetAlignment( TQt::AlignTop );
+	bg_options->layout()->setSpacing( 6 );
+	bg_options->layout()->setMargin( 11 );
+	TQGridLayout *bg_optionsLayout = new TQGridLayout( bg_options->layout() );
+	bg_optionsLayout->setAlignment( TQt::AlignTop );
 
 	cb_setcursor = new TQCheckBox(i18n("Place cursor"),bg_options);
 	cb_setbullets = new TQCheckBox(i18n("Insert bullets"),bg_options);
@@ -107,7 +107,7 @@ ConfigCodeCompletion::ConfigCodeCompletion(KConfig *config, KileWidget::LogMsg *
 	bg_optionsLayout->addWidget(cb_autocompleteabbrev,3,2);
 	bg_optionsLayout->addMultiCellWidget(cb_citeoutofbraces,4,4,0,7);
 
-	// tune tqlayout
+	// tune layout
 	bg_optionsLayout->setColSpacing(1,20);
 	bg_optionsLayout->setColSpacing(3,12);
 	bg_optionsLayout->setColSpacing(5,8);
@@ -126,7 +126,7 @@ ConfigCodeCompletion::ConfigCodeCompletion(KConfig *config, KileWidget::LogMsg *
 	// bottom: warning
 	TQLabel *lb_automodes = new TQLabel(i18n("Warning: all autocompletion modes will be disabled, if you enable KTextEditor plugin word completion."),this);
 	
-	// add OptionBox and TabDialog into the tqlayout
+	// add OptionBox and TabDialog into the layout
 	vbox->addWidget(gb_tab);
 	vbox->addWidget(bg_options);
 	vbox->addWidget(lb_automodes);
@@ -474,7 +474,7 @@ void ConfigCodeCompletion::addClicked()
 					// check if this entry already exists
 					if ( isListviewEntry(listview,basename) )
 					{
-						m_logwidget->printMsg(KileTool::Info,i18n("Wordlist '%1' is already used.").tqarg(basename),i18n("Complete"));
+						m_logwidget->printMsg(KileTool::Info,i18n("Wordlist '%1' is already used.").arg(basename),i18n("Complete"));
 						continue;
 					}
 
diff --git a/src/kile/configstructure.cpp b/src/kile/configstructure.cpp
index 39376e0..a1e34f6 100644
--- a/src/kile/configstructure.cpp
+++ b/src/kile/configstructure.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqgroupbox.h>
 #include <tqvgroupbox.h>
@@ -167,11 +167,11 @@ ConfigStructure::ConfigStructure(TQWidget *parent, const char *name )
    hbox4->addWidget(add);
    hbox4->addWidget(remove);
 
-   // add widgets to the left vertical tqlayout
+   // add widgets to the left vertical layout
    vbox1->addWidget(m_entriestable);
    vbox1->addStretch();
 
-   // add widgets to the right vertical tqlayout
+   // add widgets to the right vertical layout
    vbox2->addWidget(widget3);
    vbox2->addSpacing(10);
    vbox2->addWidget(m_sectioningtable);
@@ -180,7 +180,7 @@ ConfigStructure::ConfigStructure(TQWidget *parent, const char *name )
    vbox2->addWidget(classGroup);
    vbox2->addStretch();
 
-   // add both groupboxes to horizontal tqlayout
+   // add both groupboxes to horizontal layout
    hbox->addWidget(gb_entries);
    hbox->addWidget(gb_sectioning);
    hbox->setStretchFactor(gb_entries,3);
@@ -212,13 +212,13 @@ void ConfigStructure::polish()
 {
  //  TQWidget::polish();
 
-   uint w = m_entriestable->tqsizeHint().width();
+   uint w = m_entriestable->sizeHint().width();
    m_entriestable->setColumnWidth(0,3*w/7);
    m_entriestable->setColumnWidth(1,2*w/7);
    m_entriestable->setColumnWidth(2,2*w/7+1);
    m_entriestable->setColumnStretchable(2,true);
 
-   w = m_sectioningtable->tqsizeHint().width();
+   w = m_sectioningtable->sizeHint().width();
    m_sectioningtable->setColumnWidth(0,w/6);
    m_sectioningtable->setColumnWidth(1,3*w/6);
    m_sectioningtable->setColumnWidth(2,2*w/6+1);
@@ -271,7 +271,7 @@ void ConfigStructure::showSectioning(const TQStringList *list)
    TQString label1,label2,label3;
    for (uint i=0; i<5; ++i) {
       if ( i < list->count() ) {
-         label1 = TQString("%1").tqarg(i+1);
+         label1 = TQString("%1").arg(i+1);
          label2 = (*list)[i];
          label3 =  ( i < (uint)m_structurelevel->value() ) ? "open" : "close";
       } else {
diff --git a/src/kile/configstructure.h b/src/kile/configstructure.h
index 4531afd..5c1ad58 100644
--- a/src/kile/configstructure.h
+++ b/src/kile/configstructure.h
@@ -45,7 +45,7 @@ class KileCenteredTableItem : public TQTableItem
 public:
    KileCenteredTableItem(TQTable *table,EditType et,const TQString& text) : TQTableItem(table,et,text) {}
    void paint(TQPainter* p,const TQColorGroup& cg,const TQRect& cr,bool selected);  
-   int tqalignment() const { return TQt::AlignHCenter; } 
+   int alignment() const { return TQt::AlignHCenter; } 
 };
 
 class KileTable : public TQTable
diff --git a/src/kile/configtester.cpp b/src/kile/configtester.cpp
index fa5d6c5..6319964 100644
--- a/src/kile/configtester.cpp
+++ b/src/kile/configtester.cpp
@@ -77,7 +77,7 @@ TQString ConfigTest::resultText() const
 	{
 		str += " (" + m_altArg + " => " + m_arg + ')';
 		if ( status()==Failure && s_msgFailure.contains(m_altArg) ) 
-			str += TQString("<br>(%1)").tqarg( s_msgFailure[m_altArg] );
+			str += TQString("<br>(%1)").arg( s_msgFailure[m_altArg] );
 		return str;
 	}
 	else if ( m_name == "version" )
diff --git a/src/kile/configtester.h b/src/kile/configtester.h
index 471fcc4..919c7e4 100644
--- a/src/kile/configtester.h
+++ b/src/kile/configtester.h
@@ -30,7 +30,7 @@ class KURL;
 class ConfigTest
 {
 	public:
-		enum tqStatus { Success = 3, Failure = 2, Critical = 1 };
+		enum Status { Success = 3, Failure = 2, Critical = 1 };
 
 		ConfigTest();
 		ConfigTest(const TQString &name, bool mustpass, const TQString &arg, const TQString &altarg = TQString());
diff --git a/src/kile/convert.cpp b/src/kile/convert.cpp
index c40cdb2..426dabd 100644
--- a/src/kile/convert.cpp
+++ b/src/kile/convert.cpp
@@ -16,7 +16,7 @@
 #include "convert.h"
 
 #include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqfile.h>
 
 #include <kmessagebox.h>
diff --git a/src/kile/docpart.cpp b/src/kile/docpart.cpp
index 25ca1e9..5ef5f1a 100644
--- a/src/kile/docpart.cpp
+++ b/src/kile/docpart.cpp
@@ -78,7 +78,7 @@ void DocumentationViewer::forward()
 	{
 		++m_hpos;
 		openURL( KURL( m_history[m_hpos]) );
-		emit updatetqStatus( backEnable() , forwardEnable() );
+		emit updateStatus( backEnable() , forwardEnable() );
 	}
 }
 
@@ -88,7 +88,7 @@ void DocumentationViewer::back()
 	if ( backEnable() ) {
 		--m_hpos;
 		openURL( KURL(m_history[m_hpos]) );
-		emit updatetqStatus( backEnable() , forwardEnable() );
+		emit updateStatus( backEnable() , forwardEnable() );
 	}
 }
 
@@ -106,7 +106,7 @@ void DocumentationViewer::addToHistory( const TQString & url )
 	m_history.append(url);
 	
 	m_hpos = m_history.count()-1;
-	emit updatetqStatus( backEnable() , forwardEnable() );
+	emit updateStatus( backEnable() , forwardEnable() );
 }
 
 
diff --git a/src/kile/docpart.h b/src/kile/docpart.h
index 045e35f..8835f55 100644
--- a/src/kile/docpart.h
+++ b/src/kile/docpart.h
@@ -37,7 +37,7 @@ public slots:
 	void addToHistory( const TQString & url );
 
 signals:
-	void updatetqStatus( bool back, bool forward );
+	void updateStatus( bool back, bool forward );
 
 protected:
 	virtual void urlSelected( const TQString &url, int button=0, int state=0,const TQString &_target= TQString(), KParts::URLArgs args = KParts::URLArgs());
diff --git a/src/kile/editorkeysequencemanager.cpp b/src/kile/editorkeysequencemanager.cpp
index 10005b4..7d5340e 100644
--- a/src/kile/editorkeysequencemanager.cpp
+++ b/src/kile/editorkeysequencemanager.cpp
@@ -222,7 +222,7 @@ bool Recorder::eventFilter(TQObject* /* o */, TQEvent *e) {
 	}
 
 	TQString ExecuteJScriptAction::getDescription() const {
-		return i18n("Script execution of %1").tqarg(m_jScript->getFileName());
+		return i18n("Script execution of %1").arg(m_jScript->getFileName());
 	}
 
 
diff --git a/src/kile/envconfigwidget.ui b/src/kile/envconfigwidget.ui
index c04e09b..588cfcd 100644
--- a/src/kile/envconfigwidget.ui
+++ b/src/kile/envconfigwidget.ui
@@ -83,7 +83,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -110,7 +110,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -129,7 +129,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -155,7 +155,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>300</width>
                                     <height>20</height>
diff --git a/src/kile/floatdialog.cpp b/src/kile/floatdialog.cpp
index 318b990..8ad48e8 100644
--- a/src/kile/floatdialog.cpp
+++ b/src/kile/floatdialog.cpp
@@ -16,7 +16,7 @@
 
 #include "floatdialog.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqbuttongroup.h>
 #include <tqregexp.h>
 
@@ -39,24 +39,24 @@ FloatEnvironmentDialog::FloatEnvironmentDialog(KConfig *config, KileInfo *ki, TQ
 	// environment groupbox
 	TQButtonGroup *egroup = new TQButtonGroup( i18n("Environment"),page);
 	egroup->setColumnLayout(0, Qt::Vertical );
-	egroup->tqlayout()->setSpacing( 6 );
-	egroup->tqlayout()->setMargin( 11 );
-	TQGridLayout *egrouptqlayout = new TQGridLayout( egroup->tqlayout() );
-	egrouptqlayout->tqsetAlignment( TQt::AlignTop );
+	egroup->layout()->setSpacing( 6 );
+	egroup->layout()->setMargin( 11 );
+	TQGridLayout *egrouplayout = new TQGridLayout( egroup->layout() );
+	egrouplayout->setAlignment( TQt::AlignTop );
 
 	m_rbFigure = new TQRadioButton(i18n("&Figure"), egroup);
 	m_rbTable = new TQRadioButton(i18n("T&able"), egroup);
 	
-	egrouptqlayout->addWidget( m_rbFigure, 0,0 );
-	egrouptqlayout->addWidget( m_rbTable, 0,1 );
+	egrouplayout->addWidget( m_rbFigure, 0,0 );
+	egrouplayout->addWidget( m_rbTable, 0,1 );
 
 	// position groupbox
 	TQButtonGroup *pgroup = new TQButtonGroup( i18n("Position"),page);
 	pgroup->setColumnLayout(0, Qt::Vertical );
-	pgroup->tqlayout()->setSpacing( 6 );
-	pgroup->tqlayout()->setMargin( 11 );
-	TQGridLayout *pgrouptqlayout = new TQGridLayout( pgroup->tqlayout() );
-	pgrouptqlayout->tqsetAlignment( TQt::AlignTop );
+	pgroup->layout()->setSpacing( 6 );
+	pgroup->layout()->setMargin( 11 );
+	TQGridLayout *pgrouplayout = new TQGridLayout( pgroup->layout() );
+	pgrouplayout->setAlignment( TQt::AlignTop );
 
 	TQLabel *label1 = new TQLabel(i18n("Here exact:"), pgroup);
 	TQLabel *label2 = new TQLabel(i18n("Top of page:"), pgroup);
@@ -67,14 +67,14 @@ FloatEnvironmentDialog::FloatEnvironmentDialog(KConfig *config, KileInfo *ki, TQ
 	m_cbBottom = new TQCheckBox(pgroup);
 	m_cbPage = new TQCheckBox(pgroup);
 	
-	pgrouptqlayout->addWidget( label1, 0,0 );
-	pgrouptqlayout->addWidget( label2, 1,0 );
-	pgrouptqlayout->addWidget( label3, 0,2 );
-	pgrouptqlayout->addWidget( label4, 1,2 );
-	pgrouptqlayout->addWidget( m_cbHere, 0,1 );
-	pgrouptqlayout->addWidget( m_cbTop, 1,1 );
-	pgrouptqlayout->addWidget( m_cbBottom, 0,3 );
-	pgrouptqlayout->addWidget( m_cbPage, 1,3 );
+	pgrouplayout->addWidget( label1, 0,0 );
+	pgrouplayout->addWidget( label2, 1,0 );
+	pgrouplayout->addWidget( label3, 0,2 );
+	pgrouplayout->addWidget( label4, 1,2 );
+	pgrouplayout->addWidget( m_cbHere, 0,1 );
+	pgrouplayout->addWidget( m_cbTop, 1,1 );
+	pgrouplayout->addWidget( m_cbBottom, 0,3 );
+	pgrouplayout->addWidget( m_cbPage, 1,3 );
 	
 	// center environment
 	TQLabel *label5 = new TQLabel(i18n("Center:"),page);
diff --git a/src/kile/generalconfigwidget.ui b/src/kile/generalconfigwidget.ui
index 1d74db9..9ffb0ea 100644
--- a/src/kile/generalconfigwidget.ui
+++ b/src/kile/generalconfigwidget.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -99,7 +99,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/src/kile/includegraphicsdialog.cpp b/src/kile/includegraphicsdialog.cpp
index e30e7ad..1472c40 100644
--- a/src/kile/includegraphicsdialog.cpp
+++ b/src/kile/includegraphicsdialog.cpp
@@ -20,7 +20,7 @@
 #include <tqfileinfo.h>
 #include <tqgroupbox.h>
 #include <tqvgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
@@ -74,8 +74,8 @@ IncludeGraphics::IncludeGraphics(TQWidget *parent, const TQString &startdir, Kil
    KPushButton *pb_choose = new KPushButton("", widget, "filechooser_button" );
    pb_choose->setPixmap( SmallIcon("fileopen") );
 
-   pb_choose->setFixedWidth(pb_choose->tqsizeHint().width());      // set width
-   grid->addRowSpacing( 0, pb_choose->tqsizeHint().height()+5 );   // update height of line
+   pb_choose->setFixedWidth(pb_choose->sizeHint().width());      // set width
+   grid->addRowSpacing( 0, pb_choose->sizeHint().height()+5 );   // update height of line
    grid->addWidget(pb_choose,0,2);
 
    // line 2: some (more or less useful) information
@@ -148,7 +148,7 @@ IncludeGraphics::IncludeGraphics(TQWidget *parent, const TQString &startdir, Kil
    grid_fig->addWidget( lb_caption,2,0);
    grid_fig->addWidget( edit_caption, 2,1);
 
-   // add to tqlayout
+   // add to layout
    vbox->addWidget(group);
    vbox->addWidget(gb_opt);
    vbox->addWidget(gb_fig);
@@ -313,7 +313,7 @@ TQString IncludeGraphics::getInfo()
 		TQFileInfo fi( edit_file->text() );
 
 		return "% " + fi.baseName() + '.' + fi.extension(true)
-		            + TQString(": %1x%2 pixel").tqarg(wpx).tqarg(hpx)
+		            + TQString(": %1x%2 pixel").arg(wpx).arg(hpx)
 		            + ", " + dpi + "dpi"
 		            + ", " + wcm + 'x' + hcm + " cm"
 		            + ", bb=" + edit_bb->text();
@@ -328,7 +328,7 @@ void IncludeGraphics::setInfo()
 
 	if ( !edit_file->text().isEmpty() && getPictureSize(wpx,hpx,dpi,wcm,hcm) ) 
 	{
-		text = TQString("%1x%2 pixel").tqarg(wpx).tqarg(hpx)
+		text = TQString("%1x%2 pixel").arg(wpx).arg(hpx)
 			       + " / " + wcm + 'x' + hcm + " cm"
 			       + "  (" + dpi + "dpi)";
 	} 
@@ -344,7 +344,7 @@ bool IncludeGraphics::getPictureSize(int &wpx, int &hpx, TQString &dpi, TQString
 	wpx = m_width;
 	hpx = m_height;
 
-	dpi = TQString("%1").tqarg((int)(m_resolution+0.5));
+	dpi = TQString("%1").arg((int)(m_resolution+0.5));
 
 	// convert from inch to cm
 	float w = (float)m_width / m_resolution * 2.54;
@@ -484,9 +484,9 @@ void IncludeGraphics::slotProcessExited(KProcess* proc)
 	int bbh = (int)( (float)m_height*72.0/m_resolution + 0.5 );
 
 	// take width and height as parameters for the bounding box
-	 edit_bb->setText( TQString("0 0 ") + TQString("%1").tqarg(bbw)
+	 edit_bb->setText( TQString("0 0 ") + TQString("%1").arg(bbw)
 	                                   + ' '
-	                                   + TQString("%1").tqarg(bbh)
+	                                   + TQString("%1").arg(bbh)
 	                  );
 
          // show information
diff --git a/src/kile/kile.cpp b/src/kile/kile.cpp
index 0149cb6..27db743 100644
--- a/src/kile/kile.cpp
+++ b/src/kile/kile.cpp
@@ -90,7 +90,7 @@ Kile::Kile( bool allowRestore, TQWidget *parent, const char *name ) :
 	KileInfo(this),
 	m_paPrint(0L)
 {
-    m_tqfocusWidget = this;
+    m_focusWidget = this;
 
 	m_config = KGlobal::config();
 	readUserSettings();
@@ -187,7 +187,7 @@ Kile::Kile( bool allowRestore, TQWidget *parent, const char *name ) :
 	m_manager->setFactory(m_toolFactory);
 	m_help->setUserhelp(m_manager,menuBar());     // kile user help (dani)
 
-	connect(docManager(), TQT_SIGNAL(updateModetqStatus()), TQT_TQOBJECT(this), TQT_SLOT(updateModetqStatus()));
+	connect(docManager(), TQT_SIGNAL(updateModeStatus()), TQT_TQOBJECT(this), TQT_SLOT(updateModeStatus()));
 	connect(docManager(), TQT_SIGNAL(updateStructure(bool, KileDocument::Info*)), viewManager(), TQT_SLOT(updateStructure(bool, KileDocument::Info*)));
 	connect(docManager(), TQT_SIGNAL(closingDocument(KileDocument::Info* )), m_kwStructure, TQT_SLOT(closeDocumentInfo(KileDocument::Info *)));
 	connect(docManager(), TQT_SIGNAL(documentInfoCreated(KileDocument::Info* )), m_kwStructure, TQT_SLOT(addDocumentInfo(KileDocument::Info* )));
@@ -210,7 +210,7 @@ Kile::Kile( bool allowRestore, TQWidget *parent, const char *name ) :
 
 	restoreFilesAndProjects(allowRestore);
 	initMenu();
-	updateModetqStatus();
+	updateModeStatus();
 
 actionCollection()->readShortcutSettings("Shortcuts", m_config);
 }
@@ -232,12 +232,12 @@ Kile::~Kile()
 
 void Kile::showEvent(TQShowEvent *)
 {
-	m_tqfocusWidget->setFocus();
+	m_focusWidget->setFocus();
 }
 
 void Kile::hideEvent(TQHideEvent *)
 {
-	m_tqfocusWidget = tqfocusWidget();
+	m_focusWidget = focusWidget();
 }
 
 void Kile::setupStatusBar()
@@ -801,7 +801,7 @@ void Kile::restoreFilesAndProjects(bool allowRestore)
 	}
 
 	if (ModeAction) ModeAction->setChecked(!m_singlemode);
-	updateModetqStatus();
+	updateModeStatus();
 
 	m_listProjectsOpenOnStart.clear();
 	m_listDocsOpenOnStart.clear();
@@ -836,7 +836,7 @@ void Kile::setLine( const TQString &line )
 		view->gotoLineNumber(l-1);
 
 		showEditorWidget();
-		newtqStatus();
+		newStatus();
   	}
 }
 
@@ -907,7 +907,7 @@ void Kile::activateView(TQWidget* w, bool updateStruct /* = true */ )  //Needs t
 	if (updateStruct) viewManager()->updateStructure();
 }
 
-void Kile::updateModetqStatus()
+void Kile::updateModeStatus()
 {
 	KILE_DEBUG() << "==Kile::updateModeStatus()==========" << endl;
 	KileProject *project = docManager()->activeProject();
@@ -918,16 +918,16 @@ void Kile::updateModetqStatus()
 	if (project)
 	{
 		if (m_singlemode)
-			statusBar()->changeItem(i18n("Project: %1").tqarg(project->name()), ID_HINTTEXT);
+			statusBar()->changeItem(i18n("Project: %1").arg(project->name()), ID_HINTTEXT);
 		else
-			statusBar()->changeItem(i18n("Project: %1 (Master document: %2)").tqarg(project->name()).tqarg(shortName), ID_HINTTEXT);
+			statusBar()->changeItem(i18n("Project: %1 (Master document: %2)").arg(project->name()).arg(shortName), ID_HINTTEXT);
 	}
 	else
 	{
 		if (m_singlemode)
 			statusBar()->changeItem(i18n("Normal mode"), ID_HINTTEXT);
 		else
-			statusBar()->changeItem(i18n("Master document: %1").tqarg(shortName), ID_HINTTEXT);
+			statusBar()->changeItem(i18n("Master document: %1").arg(shortName), ID_HINTTEXT);
 	}
 
 	if (m_singlemode)
@@ -937,7 +937,7 @@ void Kile::updateModetqStatus()
 	}
 	else
 	{
-		ModeAction->setText(i18n("Normal mode (current master document: %1)").tqarg(shortName));
+		ModeAction->setText(i18n("Normal mode (current master document: %1)").arg(shortName));
 		ModeAction->setChecked(true);
 	}
 
@@ -1118,7 +1118,7 @@ void Kile::convertToEnc(Kate::Document *doc)
 }
 
 ////////////////// GENERAL SLOTS //////////////
-void Kile::newtqStatus(const TQString & msg)
+void Kile::newStatus(const TQString & msg)
 {
 	statusBar()->changeItem(msg,ID_LINE_COLUMN);
 }
@@ -1212,7 +1212,7 @@ void Kile::showEditorWidget()
 	if (view) view->setFocus();
 
     setupStatusBar();
-	updateModetqStatus();
+	updateModeStatus();
 	newCaption();
 }
 
@@ -1238,7 +1238,7 @@ bool Kile::resetPart()
 	}
 
     setupStatusBar();
-    updateModetqStatus();
+    updateModeStatus();
     newCaption();
 
 	m_currentState = "Editor";
@@ -1266,7 +1266,7 @@ void Kile::activePartGUI(KParts::Part * part)
 	//kghostview (which has the print action defined in
 	//a KParts::BrowserExtension)
 	KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part);
-	if (ext && ext->tqmetaObject()->slotNames().contains( "print()" ) ) //part is a BrowserExtension, connect printAction()
+	if (ext && ext->metaObject()->slotNames().contains( "print()" ) ) //part is a BrowserExtension, connect printAction()
 	{
 		connect(m_paPrint, TQT_SIGNAL(activated()), ext, TQT_SLOT(print()));
 		m_paPrint->plug(toolBar("mainToolBar"),3); //plug this action into its default location
@@ -1453,8 +1453,8 @@ void Kile::initMenu()
 	   << "tag_textit" << "tag_textsl" << "tag_textbf" << "tag_underline"
 	   << "tag_texttt" << "tag_textsc" << "tag_emph" << "tag_strong"
 	   << "tag_rmfamily" << "tag_sffamily" << "tag_ttfamily"
-	   << "tag_mdseries" << "tag_bfseries" << "tag_uptqshape"
-	   << "tag_ittqshape" << "tag_sltqshape" << "tag_sctqshape"
+	   << "tag_mdseries" << "tag_bfseries" << "tag_upshape"
+	   << "tag_itshape" << "tag_slshape" << "tag_scshape"
 	   << "tag_newline" << "tag_newpage" << "tag_linebreak" << "tag_pagebreak"
 	   << "tag_bigskip" << "tag_medskip" << "tag_smallskip"
 	   << "tag_hspace" << "tag_hspace*" << "tag_vspace" << "tag_vspace*"
@@ -1654,10 +1654,10 @@ void Kile::insertTag(const KileAction::TagData& data,const TQStringList &pkgs)
 		if( warnPkgs.count() > 0 )
 		{
 			if( warnPkgs.count() == 1 )
-				 m_logWidget->printMsg(KileTool::Error, i18n("You have to include the package %1.").tqarg(warnPkgs.join(",")),
+				 m_logWidget->printMsg(KileTool::Error, i18n("You have to include the package %1.").arg(warnPkgs.join(",")),
 					       i18n("Insert text"));
 			else
-				m_logWidget->printMsg(KileTool::Error, i18n("You have to include the packages %1.").tqarg(warnPkgs.join(",")),
+				m_logWidget->printMsg(KileTool::Error, i18n("You have to include the packages %1.").arg(warnPkgs.join(",")),
 					i18n("Insert text"));
 		}
 	}
@@ -2026,14 +2026,14 @@ void Kile::toggleMode()
 		while ( (pos = (int)shortName.find('/')) != -1 )
 			shortName.remove(0,pos+1);
 
-		ModeAction->setText(i18n("Normal mode (current master document: %1)").tqarg(shortName));
+		ModeAction->setText(i18n("Normal mode (current master document: %1)").arg(shortName));
 		ModeAction->setChecked(true);
 		m_singlemode=false;
 	}
 	else
 		ModeAction->setChecked(false);
 
-	updateModetqStatus();
+	updateModeStatus();
 	KILE_DEBUG() << "SETTING master to " << m_masterName << " singlemode = " << m_singlemode << endl;
 }
 
diff --git a/src/kile/kile.h b/src/kile/kile.h
index 69da596..7445d2d 100644
--- a/src/kile/kile.h
+++ b/src/kile/kile.h
@@ -121,7 +121,7 @@ public slots:
 private:
     void showEvent(TQShowEvent *e);
     void hideEvent(TQHideEvent *e);
-    TQWidget *m_tqfocusWidget;
+    TQWidget *m_focusWidget;
 
 	void setupStatusBar();
 	void setupSideBar();
@@ -243,8 +243,8 @@ public slots:
 
 	void changeInputEncoding();
 
-	void newtqStatus(const TQString& = TQString());
-	void updateModetqStatus();
+	void newStatus(const TQString& = TQString());
+	void updateModeStatus();
 	void newCaption();
 	void citeViewBib();
 
diff --git a/src/kile/kile.kcfg b/src/kile/kile.kcfg
index 7a8519b..5b5e61a 100644
--- a/src/kile/kile.kcfg
+++ b/src/kile/kile.kcfg
@@ -5,7 +5,7 @@
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
 	<include>tqapplication.h</include>
 	<include>tqstring.h</include>
-	<include>tqtextcodec.h</include>
+	<include>textcodec.h</include>
 	<include>tqdir.h</include>
 
 	<kcfgfile name="kilerc"/>
diff --git a/src/kile/kileabbrevview.cpp b/src/kile/kileabbrevview.cpp
index 49880a6..671868f 100644
--- a/src/kile/kileabbrevview.cpp
+++ b/src/kile/kileabbrevview.cpp
@@ -21,7 +21,7 @@
 #include "kiledebug.h"
 
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqregexp.h>
 #include <tqvalidator.h>
 #include <tqfile.h>
@@ -193,7 +193,7 @@ void KileAbbrevView::changeAbbreviation(KListViewItem *item, const TQString &abb
 void KileAbbrevView::deleteAbbreviation(KListViewItem *item)
 {
 	TQString abbrev = item->text(ALVabbrev);
-	TQString message = i18n("Delete the abbreviation '%1'?").tqarg(abbrev);
+	TQString message = i18n("Delete the abbreviation '%1'?").arg(abbrev);
 	if ( KMessageBox::questionYesNo( this,
 		       "<center>" + message + "</center>",
 		       i18n("Delete Abbreviation") ) == KMessageBox::Yes ) 
diff --git a/src/kile/kileactions.cpp b/src/kile/kileactions.cpp
index 02a1a82..adf33eb 100644
--- a/src/kile/kileactions.cpp
+++ b/src/kile/kileactions.cpp
@@ -24,7 +24,7 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqfileinfo.h>
@@ -272,7 +272,7 @@ InputDialog::InputDialog(const TQString &caption, uint options, const TQStringLi
 		pbutton->setPixmap( SmallIcon("fileopen") );
 		gbox->addWidget(pbutton,1,2);
 		gbox->setColSpacing(1,8);	
-		gbox->setColSpacing(2, pbutton->tqsizeHint().width()+5 ); 
+		gbox->setColSpacing(2, pbutton->sizeHint().width()+5 ); 
 		connect(pbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowse()));
 	}
 
diff --git a/src/kile/kileconfigdialog.cpp b/src/kile/kileconfigdialog.cpp
index 49c745f..cd73237 100644
--- a/src/kile/kileconfigdialog.cpp
+++ b/src/kile/kileconfigdialog.cpp
@@ -20,7 +20,7 @@
 //  - items are shown as a tree list
 //  - encoding config page and spelling page are removed, 
 //    because settings are also avaiblable with Kate
-//  - tqgeometry of the dialog are saved and restored, because
+//  - geometry of the dialog are saved and restored, because
 //    the initial values may be bad in some languages
 
 // 2007-03-17 dani
@@ -30,8 +30,8 @@
 #include "kileconfigdialog.h"
 
 #include <tqvbox.h>
-#include <tqlayout.h>
-#include <tqtextcodec.h>
+#include <layout.h>
+#include <textcodec.h>
 
 #include <tdeversion.h>
 #include <klocale.h>
@@ -300,7 +300,7 @@ namespace KileDialog
 	{
 		TQString enc = readKateEncoding();
 		if ( enc.isEmpty() )
-				enc = TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name());
+				enc = TQString::fromLatin1(TQTextCodec::codecForLocale()->name());
 		KileConfig::setDefaultEncoding( enc );
 	}
 	//////////////////// slots ////////////////////
diff --git a/src/kile/kiledocmanager.cpp b/src/kile/kiledocmanager.cpp
index 4a59e5c..ce7623a 100644
--- a/src/kile/kiledocmanager.cpp
+++ b/src/kile/kiledocmanager.cpp
@@ -22,7 +22,7 @@
 
 #include "kiledocmanager.h"
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqfile.h>
 #include <tqdir.h>
 
@@ -84,7 +84,7 @@ Manager::Manager(KileInfo *info, TQObject *parent, const char *name) :
 	Kate::Document::setFileChangedDialogsActivated (true);
 
 	if ( KileConfig::defaultEncoding() == "invalid" )
-		KileConfig::setDefaultEncoding(TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name()));
+		KileConfig::setDefaultEncoding(TQString::fromLatin1(TQTextCodec::codecForLocale()->name()));
 
 	TQWidget *par = m_ki ? m_ki->parentWidget() : 0;
 	m_kpd = new KProgressDialog(par, 0, i18n("Open Project..."), TQString(), true);
@@ -485,7 +485,7 @@ Kate::Document* Manager::createDocument(const TQString& name, const KURL& url, T
 	//handle changes of the document
 	connect(doc, TQT_SIGNAL(nameChanged(Kate::Document *)), m_ki->parentWidget(), TQT_SLOT(newCaption()));
 	connect(doc, TQT_SIGNAL(fileNameChanged()), m_ki->parentWidget(), TQT_SLOT(newCaption()));
-	connect(doc, TQT_SIGNAL(modStateChanged(Kate::Document*)), this, TQT_SLOT(newDocumenttqStatus(Kate::Document*)));
+	connect(doc, TQT_SIGNAL(modStateChanged(Kate::Document*)), this, TQT_SLOT(newDocumentStatus(Kate::Document*)));
 	connect(doc, TQT_SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, TQT_SIGNAL(documentStatusChanged(Kate::Document*, bool, unsigned char)));
 
 	docinfo->setDoc(doc);
@@ -569,7 +569,7 @@ Kate::View* Manager::loadTemplate(TemplateItem *sel)
 
 		if (!tempdoc->openURL(KURL(sel->path())))
 		{
-			KMessageBox::error(m_ki->parentWidget(), i18n("Could not find template: %1").tqarg(sel->name()),i18n("File Not Found"));
+			KMessageBox::error(m_ki->parentWidget(), i18n("Could not find template: %1").arg(sel->name()),i18n("File Not Found"));
 		}
 		else
 		{
@@ -592,7 +592,7 @@ Kate::View* Manager::createDocumentWithText(const TQString& text, KileDocument::
 	{
 		//FIXME this shouldn't be necessary!!!
 		view->getDoc()->setModified(true);
-		newDocumenttqStatus(view->getDoc());
+		newDocumentStatus(view->getDoc());
 	}
 
 	return view;
@@ -602,7 +602,7 @@ Kate::View* Manager::createNewJScript()
 {
 	Kate::View *view = createDocumentWithText(TQString(), Script, "js", m_ki->scriptManager()->getLocalJScriptDirectory());
 	emit(updateStructure(false, 0L));
-	emit(updateModetqStatus());
+	emit(updateModeStatus());
 	return view;
 }
 
@@ -610,7 +610,7 @@ Kate::View* Manager::createNewLaTeXDocument()
 {
 	Kate::View *view = createDocumentWithText(TQString(), LaTeX);
 	emit(updateStructure(false, 0L));
-	emit(updateModetqStatus());
+	emit(updateModeStatus());
 	return view;
 }
 
@@ -666,7 +666,7 @@ void Manager::fileNew()
 		loadTemplate(nfw->getSelection());
 		if ( nfw->useWizard() ) emit ( startWizard() );
 		emit(updateStructure(false, 0L));
-		emit(updateModetqStatus());
+		emit(updateModeStatus());
 	}
 	delete nfw;
 }
@@ -730,7 +730,7 @@ void Manager::saveURL(const KURL & url)
 	if (doc) doc->save();
 }
 
-void Manager::newDocumenttqStatus(Kate::Document *doc)
+void Manager::newDocumentStatus(Kate::Document *doc)
 {
 	KILE_DEBUG() << "void Manager::newDocumentStatus(Kate::Document)" << endl; 
 	if (doc == 0L) return;
@@ -818,7 +818,7 @@ void Manager::fileSaveAll(bool amAutoSaving, bool disUntitled )
 					else
 					{
 						KILE_DEBUG()<<"backing up failed ("<<url.prettyURL()<<" -> "<<backupUrl.prettyURL()<<")"<<endl;
-						emit printMsg(KileTool::Error,i18n("The file %1 could not be saved, check the permissions and the free disk space!").tqarg(backupUrl.prettyURL()),i18n("Autosave"));
+						emit printMsg(KileTool::Error,i18n("The file %1 could not be saved, check the permissions and the free disk space!").arg(backupUrl.prettyURL()),i18n("Autosave"));
 					}
 				}
 				
@@ -827,7 +827,7 @@ void Manager::fileSaveAll(bool amAutoSaving, bool disUntitled )
 				fi.refresh();
 			
 				if(saveResult == Kate::View::SAVE_ERROR && fi.size() == 0 && !url.isEmpty()) // we probably hit bug #125809, inform the user of the possible consequences
-					emit printMsg(KileTool::Error,i18n("Kile encountered problems while saving the file %1. Do you have enough free disk space left?").tqarg(url.url()),i18n("Saving"));
+					emit printMsg(KileTool::Error,i18n("Kile encountered problems while saving the file %1. Do you have enough free disk space left?").arg(url.url()),i18n("Saving"));
 			}
 		}
 	}
@@ -864,7 +864,7 @@ void Manager::fileOpen(const KURL & url, const TQString & encoding, int index)
 	}
 
 	emit(updateStructure(true, 0L));
-	emit(updateModetqStatus());
+	emit(updateModeStatus());
 	// update undefined references in this file
 	emit(updateReferences(textInfoFor(realurl.path())) );
 	m_ki->fileSelector()->blockSignals(false);
@@ -934,7 +934,7 @@ void Manager::fileSaveAs(Kate::View* view)
 		}
 		if(KIO::NetAccess::exists(saveURL, true, kapp->mainWidget())) // check for writing possibility
 		{
-			int r =  KMessageBox::warningContinueCancel(m_ki->parentWidget(), i18n("A file with the name \"%1\" exists already. Do you want to overwrite it ?").tqarg(saveURL.fileName()), i18n("Overwrite File ?"), KGuiItem(i18n("&Overwrite")), TQString());
+			int r =  KMessageBox::warningContinueCancel(m_ki->parentWidget(), i18n("A file with the name \"%1\" exists already. Do you want to overwrite it ?").arg(saveURL.fileName()), i18n("Overwrite File ?"), KGuiItem(i18n("&Overwrite")), TQString());
 			if(r != KMessageBox::Continue)
 			{
 				continue;
@@ -1077,7 +1077,7 @@ bool Manager::fileClose(Kate::Document *doc /* = 0L*/, bool closingproject /*= f
  			removeTextDocumentInfo(docinfo, closingproject);
 
 			emit removeFromProjectView(url);
-            		emit updateModetqStatus();
+            		emit updateModeStatus();
 		}
 		else
 			return false;
@@ -1160,7 +1160,7 @@ void Manager::projectNew()
 		project->buildProjectTree();
 		//project->save();
 		addProject(project);
-		emit(updateModetqStatus());
+		emit(updateModeStatus());
 		emit(addToRecentProjects(project->url()));
 	}
 }
@@ -1224,12 +1224,12 @@ void Manager::addToProject(KileProject* project, const KURL & url)
 
 	if (project->contains(realurl))
 	{
-		emit printMsg(KileTool::Info,i18n("The file %1 is already member of the project %2").tqarg(realurl.filename()).tqarg(project->name()),i18n("Add to Project"));
+		emit printMsg(KileTool::Info,i18n("The file %1 is already member of the project %2").arg(realurl.filename()).arg(project->name()),i18n("Add to Project"));
 		return;
 	}
 	else if(!fi.exists() || !fi.isReadable())
 	{
-		emit printMsg( KileTool::Info,i18n("The file %1 can not be added because it does not exist or is not readable").tqarg(realurl.filename()),i18n("Add to Project"));
+		emit printMsg( KileTool::Info,i18n("The file %1 can not be added because it does not exist or is not readable").arg(realurl.filename()),i18n("Add to Project"));
 		return;
 	}
 	
@@ -1376,7 +1376,7 @@ KileProject* Manager::projectOpen(const KURL & url, int step, int max, bool open
 	addProject(kp);
 
 	emit(updateStructure(false, 0L));
-	emit(updateModetqStatus());
+	emit(updateModeStatus());
 	// update undefined references in all project files
 	updateProjectReferences(kp);
 
@@ -1640,7 +1640,7 @@ bool Manager::projectClose(const KURL & url)
 			m_projects.remove(project);
 			emit removeFromProjectView(project);
 			delete project;
-			emit(updateModetqStatus());
+			emit(updateModeStatus());
 			return true;
 		}
 		else
@@ -1713,7 +1713,7 @@ void Manager::cleanUpTempFiles(const KURL &url, bool silent)
 	}
 
 	if ( extlist.count() == 0 )
-		emit printMsg(KileTool::Warning, i18n("Nothing to clean for %1").tqarg(fileName), i18n("Clean"));
+		emit printMsg(KileTool::Warning, i18n("Nothing to clean for %1").arg(fileName), i18n("Clean"));
 	else
 	{
 		for ( uint i = 0 ; i < extlist.count() ; ++i )
@@ -1722,7 +1722,7 @@ void Manager::cleanUpTempFiles(const KURL &url, bool silent)
 			KILE_DEBUG() << "About to remove file = " << file.name() << endl;
 			file.remove();
 		}
-		emit printMsg(KileTool::Info, i18n("Cleaning %1 : %2").tqarg(fileName).tqarg(extlist.join(" ")), i18n("Clean"));
+		emit printMsg(KileTool::Info, i18n("Cleaning %1 : %2").arg(fileName).arg(extlist.join(" ")), i18n("Clean"));
 	}
 }
 
@@ -1895,7 +1895,7 @@ TQStringList Manager::getProjectFiles()
 
 void Manager::dontOpenWarning(KileProjectItem *item, const TQString &action, const TQString &filetype)
 {
-	emit printMsg(KileTool::Info, i18n("not opened: %1 (%2)").tqarg(item->url().path()).tqarg(filetype), action);
+	emit printMsg(KileTool::Info, i18n("not opened: %1 (%2)").arg(item->url().path()).arg(filetype), action);
 }
 
 KileProjectItem* Manager::selectProjectFileItem(const TQString &label)
diff --git a/src/kile/kiledocmanager.h b/src/kile/kiledocmanager.h
index bd6cb4b..877c3b9 100644
--- a/src/kile/kiledocmanager.h
+++ b/src/kile/kiledocmanager.h
@@ -59,7 +59,7 @@ public slots:
 	Kate::View* createNewLaTeXDocument();
 
 //files
-	void newDocumenttqStatus(Kate::Document *doc);
+	void newDocumentStatus(Kate::Document *doc);
 
 	/**
 	 * Creates a new file on disk.
@@ -145,7 +145,7 @@ signals:
 	void documentInfoCreated(KileDocument::Info *);
 
 	void updateStructure(bool needToParse, KileDocument::Info*);
-	void updateModetqStatus();
+	void updateModeStatus();
 	void updateReferences(KileDocument::Info *);
 
 	void documentStatusChanged(Kate::Document *, bool, unsigned char reason);
diff --git a/src/kile/kiledocumentinfo.cpp b/src/kile/kiledocumentinfo.cpp
index d3e2e71..46a3f33 100644
--- a/src/kile/kiledocumentinfo.cpp
+++ b/src/kile/kiledocumentinfo.cpp
@@ -64,7 +64,7 @@
 
 #include <tqfileinfo.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqregexp.h>
 #include <tqdatetime.h>
 
@@ -118,7 +118,7 @@ KURL Info::renameIfExist(const KURL& url)
 		TQString newURL = KInputDialog::getText(
 			i18n("File Already Exists"),
 			i18n("A file with filename '%1' already exists.<br>Please provide \
-				another one, or click \"Cancel\" to overwrite it.").tqarg(ret.fileName()),
+				another one, or click \"Cancel\" to overwrite it.").arg(ret.fileName()),
 			ret.filename(),
 			&isOK);
 		if(!isOK)
@@ -484,7 +484,7 @@ const long* TextInfo::getStatistics()
 	return m_arStatistics;
 }
 
-// FIXME for KDE 4.0, rearrange the hole docinfo tqlayout to get rid of this hack
+// FIXME for KDE 4.0, rearrange the hole docinfo layout to get rid of this hack
 KURL TextInfo::url()
 {
 	KURL url;
@@ -1158,7 +1158,7 @@ void LaTeXInfo::updateStruct()
 							{
 								if( (*it).type == KileStruct::NewEnvironment)
 								{
-									m_newCommands.append(TQString("\\begin{%1}%2%3").tqarg(m).tqarg(optArg).tqarg(mandArgs));
+									m_newCommands.append(TQString("\\begin{%1}%2%3").arg(m).arg(optArg).arg(mandArgs));
 								}
 								else
 									m_newCommands.append(m + optArg + mandArgs);
@@ -1166,8 +1166,8 @@ void LaTeXInfo::updateStruct()
 						}
 						if( (*it).type == KileStruct::NewEnvironment)
 						{
-							m_newCommands.append(TQString("\\begin{%1}%3").tqarg(m).tqarg(mandArgs));
-							m_newCommands.append(TQString("\\end{%1}").tqarg(m));
+							m_newCommands.append(TQString("\\begin{%1}%3").arg(m).arg(mandArgs));
+							m_newCommands.append(TQString("\\end{%1}").arg(m));
 						}
 						else
 							m_newCommands.append(m + mandArgs);
diff --git a/src/kile/kileedit.cpp b/src/kile/kileedit.cpp
index a9203d3..6c23f46 100644
--- a/src/kile/kileedit.cpp
+++ b/src/kile/kileedit.cpp
@@ -18,7 +18,7 @@
 
 #include <tqfileinfo.h>
 #include <tqvaluestack.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqapplication.h>
 
 #include <kate/view.h>
@@ -1025,7 +1025,7 @@ TQStringList EditorExtension::findOpenedEnvironmentList(Kate::View *view, bool p
 			col = env.col;
 
 			if ( position )
-				envlist << env.name + TQString(",%1,%2").tqarg(row).tqarg(col);
+				envlist << env.name + TQString(",%1,%2").arg(row).arg(col);
 			else
 				envlist << env.name;
 
@@ -2662,14 +2662,14 @@ void EditorExtension::sectioningCommand(KileListViewItem *item, int id)
 	switch ( id )
 	{
 		case KileWidget::Structure::SectioningCut:
-			TQApplication::tqclipboard()->setText( doc->text(row1,col1,row2,col2) );  // copy -> clipboard
+			TQApplication::clipboard()->setText( doc->text(row1,col1,row2,col2) );  // copy -> clipboard
 			doc->removeText(row1,col1,row2,col2);                                  // delete
 			break;
 		case KileWidget::Structure::SectioningCopy:
-			TQApplication::tqclipboard()->setText( doc->text(row1,col1,row2,col2) );  // copy -> clipboard
+			TQApplication::clipboard()->setText( doc->text(row1,col1,row2,col2) );  // copy -> clipboard
 			break;
 		case KileWidget::Structure::SectioningPaste: 
-			text = TQApplication::tqclipboard()->text();                              // clipboard -> text
+			text = TQApplication::clipboard()->text();                              // clipboard -> text
 			if ( ! text.isEmpty() )
 			{
 				view->setCursorPositionReal(row2,col2);                             // insert
diff --git a/src/kile/kileerrorhandler.cpp b/src/kile/kileerrorhandler.cpp
index f1dde52..c435f05 100644
--- a/src/kile/kileerrorhandler.cpp
+++ b/src/kile/kileerrorhandler.cpp
@@ -117,7 +117,7 @@ void KileErrorHandler::showLogResults(const TQString &src)
 	m_ki->outputFilter()->setSource(src);
 	TQFileInfo fi(src);
 	TQString lf = fi.dirPath(true) + '/' + fi.baseName(true) + ".log";
-	m_ki->logWidget()->printMsg(KileTool::Info, i18n("Detecting errors (%1), please wait ...").tqarg(lf), i18n("Log") );
+	m_ki->logWidget()->printMsg(KileTool::Info, i18n("Detecting errors (%1), please wait ...").arg(lf), i18n("Log") );
 	if ( ! m_ki->outputFilter()->Run( lf ) )
 	{
 		
diff --git a/src/kile/kilefileselect.cpp b/src/kile/kilefileselect.cpp
index 42f8df1..0af7cd6 100644
--- a/src/kile/kilefileselect.cpp
+++ b/src/kile/kilefileselect.cpp
@@ -21,7 +21,7 @@ from Kate (C) 2001 by Matt Newell
 
 #include "kilefileselect.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqstrlist.h>
 #include <tqtooltip.h>
@@ -46,7 +46,7 @@ KileFileSelect::KileFileSelect(KileDocument::Extensions *extensions, TQWidget *p
   lo->addWidget(toolbar);
 
   cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
-  cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
   cmbPath->setCompletionObject( cmpl );
   lo->addWidget(cmbPath);
diff --git a/src/kile/kilegrepdialog.cpp b/src/kile/kilegrepdialog.cpp
index 7f5c89f..6b1d1ec 100644
--- a/src/kile/kilegrepdialog.cpp
+++ b/src/kile/kilegrepdialog.cpp
@@ -44,7 +44,7 @@
 #include "kilegrepdialog.h"
 
 #include <tqobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
@@ -88,48 +88,48 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo
 	// project groupbox
 	TQGroupBox *projectgroup = new TQGroupBox( i18n("Project"),page); 
 	projectgroup->setColumnLayout(0, Qt::Vertical );
-	projectgroup->tqlayout()->setSpacing( 6 );
-	projectgroup->tqlayout()->setMargin( 11 );
-	TQGridLayout *projectgrouptqlayout = new TQGridLayout( projectgroup->tqlayout() );
-	projectgrouptqlayout->tqsetAlignment( TQt::AlignTop );
+	projectgroup->layout()->setSpacing( 6 );
+	projectgroup->layout()->setMargin( 11 );
+	TQGridLayout *projectgrouplayout = new TQGridLayout( projectgroup->layout() );
+	projectgrouplayout->setAlignment( TQt::AlignTop );
 
 	TQLabel *project_label = new TQLabel(i18n("Name:"), projectgroup);
-	int labelwidth = project_label->tqsizeHint().width();
+	int labelwidth = project_label->sizeHint().width();
 
 	TQLabel *projectdir_label = new TQLabel(i18n("Directory:"), projectgroup);
-	if ( projectdir_label->tqsizeHint().width() > labelwidth )
-		labelwidth = projectdir_label->tqsizeHint().width();
+	if ( projectdir_label->sizeHint().width() > labelwidth )
+		labelwidth = projectdir_label->sizeHint().width();
 
 	projectname_label = new TQLabel(projectgroup);
 	projectdirname_label = new TQLabel(projectgroup);
 
-	projectgrouptqlayout->addWidget(project_label, 0,0, AlignLeft | AlignVCenter);
-	projectgrouptqlayout->addWidget(projectname_label, 0,1, AlignLeft | AlignVCenter);
-	projectgrouptqlayout->addWidget(projectdir_label, 1,0, AlignLeft | AlignVCenter);
-	projectgrouptqlayout->addWidget(projectdirname_label, 1,1, AlignLeft | AlignVCenter);
-	projectgrouptqlayout->setColStretch(1,1);
+	projectgrouplayout->addWidget(project_label, 0,0, AlignLeft | AlignVCenter);
+	projectgrouplayout->addWidget(projectname_label, 0,1, AlignLeft | AlignVCenter);
+	projectgrouplayout->addWidget(projectdir_label, 1,0, AlignLeft | AlignVCenter);
+	projectgrouplayout->addWidget(projectdirname_label, 1,1, AlignLeft | AlignVCenter);
+	projectgrouplayout->setColStretch(1,1);
 
 	// search groupbox
 	TQGroupBox *searchgroup = new TQGroupBox( i18n("Search"),page); 
 	searchgroup->setColumnLayout(0, Qt::Vertical );
-	searchgroup->tqlayout()->setSpacing( 6 );
-	searchgroup->tqlayout()->setMargin( 11 );
-	TQGridLayout *searchgrouptqlayout = new TQGridLayout( searchgroup->tqlayout() );
-	searchgrouptqlayout->tqsetAlignment( TQt::AlignTop );
+	searchgroup->layout()->setSpacing( 6 );
+	searchgroup->layout()->setMargin( 11 );
+	TQGridLayout *searchgrouplayout = new TQGridLayout( searchgroup->layout() );
+	searchgrouplayout->setAlignment( TQt::AlignTop );
 
 	TQLabel *pattern_label = new TQLabel(i18n("Pattern:"), searchgroup);
-	if ( pattern_label->tqsizeHint().width() > labelwidth )
-		labelwidth = pattern_label->tqsizeHint().width();
+	if ( pattern_label->sizeHint().width() > labelwidth )
+		labelwidth = pattern_label->sizeHint().width();
 
 	pattern_combo = new KComboBox(true, searchgroup);
 	pattern_combo->setInsertionPolicy(KComboBox::NoInsertion);
 	pattern_combo->setFocus();
-	pattern_combo->setMinimumSize(pattern_combo->tqsizeHint());
+	pattern_combo->setMinimumSize(pattern_combo->sizeHint());
 	pattern_label->setBuddy(pattern_combo);
 
 	TQLabel *template_label = new TQLabel(i18n("Template:"), searchgroup);
-	if ( template_label->tqsizeHint().width() > labelwidth )
-		labelwidth = template_label->tqsizeHint().width();
+	if ( template_label->sizeHint().width() > labelwidth )
+		labelwidth = template_label->sizeHint().width();
 
 	TQStringList templatemode_list;
 	templatemode_list << i18n("Normal") 
@@ -152,34 +152,34 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo
 
 	template_edit = new KLineEdit(searchgroup);
 	template_edit->setText("%s");
-	template_edit->setMinimumSize(template_edit->tqsizeHint());
+	template_edit->setMinimumSize(template_edit->sizeHint());
 	template_label->setBuddy(template_edit);
 	template_layout->addWidget(template_edit);
 
-	searchgrouptqlayout->addWidget(pattern_label, 0,0, AlignLeft | AlignVCenter);
-	searchgrouptqlayout->addWidget(pattern_combo, 0,1);
-	searchgrouptqlayout->addWidget(template_label, 1,0, AlignLeft | AlignVCenter);
-	searchgrouptqlayout->addLayout(template_layout, 1,1);
+	searchgrouplayout->addWidget(pattern_label, 0,0, AlignLeft | AlignVCenter);
+	searchgrouplayout->addWidget(pattern_combo, 0,1);
+	searchgrouplayout->addWidget(template_label, 1,0, AlignLeft | AlignVCenter);
+	searchgrouplayout->addLayout(template_layout, 1,1);
 
 	// filter groupbox
 	TQGroupBox *filtergroup = new TQGroupBox( i18n("Directory Options"),page); 
 	filtergroup->setColumnLayout(0, Qt::Vertical );
-	filtergroup->tqlayout()->setSpacing( 6 );
-	filtergroup->tqlayout()->setMargin( 11 );
-	TQGridLayout *filtergrouptqlayout = new TQGridLayout( filtergroup->tqlayout() );
-	filtergrouptqlayout->tqsetAlignment( TQt::AlignTop );
+	filtergroup->layout()->setSpacing( 6 );
+	filtergroup->layout()->setMargin( 11 );
+	TQGridLayout *filtergrouplayout = new TQGridLayout( filtergroup->layout() );
+	filtergrouplayout->setAlignment( TQt::AlignTop );
 
 	TQLabel *files_label = new TQLabel(i18n("Filter:"), filtergroup);
-	if ( files_label->tqsizeHint().width() > labelwidth )
-		labelwidth = files_label->tqsizeHint().width();
+	if ( files_label->sizeHint().width() > labelwidth )
+		labelwidth = files_label->sizeHint().width();
 
 	filter_combo = new KComboBox(true, filtergroup);
-	filter_combo->setMinimumSize(filter_combo->tqsizeHint());
+	filter_combo->setMinimumSize(filter_combo->sizeHint());
 	files_label->setBuddy(TQT_TQWIDGET(filter_combo->focusProxy()));
 
 	TQLabel *dir_label = new TQLabel(i18n("Directory:"), filtergroup);
-	if ( dir_label->tqsizeHint().width() > labelwidth )
-		labelwidth = dir_label->tqsizeHint().width();
+	if ( dir_label->sizeHint().width() > labelwidth )
+		labelwidth = dir_label->sizeHint().width();
 
 	TQBoxLayout *dir_layout = new TQHBoxLayout(3);
 	dir_combo = new KURLRequester( new KComboBox(true, filtergroup), filtergroup, "dir combo" );
@@ -189,14 +189,14 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo
 	dir_layout->addWidget(dir_combo);
 
 	recursive_box = new TQCheckBox(i18n("Scan directories recursively"), filtergroup);
-	recursive_box->setMinimumWidth(recursive_box->tqsizeHint().width());
+	recursive_box->setMinimumWidth(recursive_box->sizeHint().width());
 
-	filtergrouptqlayout->addWidget(files_label, 2,0, AlignLeft | AlignVCenter);
-	filtergrouptqlayout->addWidget(filter_combo, 2, 1);
-	filtergrouptqlayout->addWidget(dir_label, 3,0, AlignLeft | AlignVCenter);
-	filtergrouptqlayout->addLayout(dir_layout, 3,1);
-	filtergrouptqlayout->addMultiCellWidget(recursive_box, 4,4, 1,2);
-	filtergrouptqlayout->setColStretch(1,1);
+	filtergrouplayout->addWidget(files_label, 2,0, AlignLeft | AlignVCenter);
+	filtergrouplayout->addWidget(filter_combo, 2, 1);
+	filtergrouplayout->addWidget(dir_label, 3,0, AlignLeft | AlignVCenter);
+	filtergrouplayout->addLayout(dir_layout, 3,1);
+	filtergrouplayout->addMultiCellWidget(recursive_box, 4,4, 1,2);
+	filtergrouplayout->setColStretch(1,1);
 
 	// result box
 	resultbox = new KListBox(page);
@@ -215,7 +215,7 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo
 #else
         close_button = actionbox->addButton(i18n("Cl&ose"));
 #endif
-	actionbox->tqlayout();
+	actionbox->layout();
 
 	// adjust labels
 	project_label->setFixedWidth(labelwidth);
@@ -326,7 +326,7 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo
 	connect( this, TQT_SIGNAL(closeClicked()), TQT_SLOT(slotClose()) );
 	connect( this, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished()) );
 
-	resize(450,tqsizeHint().height());
+	resize(450,sizeHint().height());
 	KILE_DEBUG() << "==KileGrepDialog (create dialog)=============================" << endl;
 }
 
@@ -684,7 +684,7 @@ void KileGrepDialog::slotSearch()
 	TQRegExp re( getPattern() );
 	if ( ! re.isValid() )
 	{
-		KMessageBox::error( 0, i18n("Invalid regular expression: %1").tqarg(re.errorString()), i18n("Grep Tool Error") );
+		KMessageBox::error( 0, i18n("Invalid regular expression: %1").arg(re.errorString()), i18n("Grep Tool Error") );
 		return;
 	}
 
diff --git a/src/kile/kilehelp.cpp b/src/kile/kilehelp.cpp
index 127fbff..f6fdb53 100644
--- a/src/kile/kilehelp.cpp
+++ b/src/kile/kilehelp.cpp
@@ -18,7 +18,7 @@
 
 #include <tqdir.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <tqfileinfo.h>
 
@@ -39,7 +39,7 @@
 
 
 // tbraun 27.06.2007
-// it _looks_ like texlive 2007 has the same tqlayout than texlive 2005 so don't get confused about the variable names :)
+// it _looks_ like texlive 2007 has the same layout than texlive 2005 so don't get confused about the variable names :)
 
 namespace KileHelp
 {
@@ -298,7 +298,7 @@ namespace KileHelp
 
 	void Help::noHelpAvailableFor(const TQString &word)
 	{
-		m_manager->info()->logWidget()->printMsg(KileTool::Error, i18n("Sorry, no help available for %1.").tqarg(word), i18n("Help"));
+		m_manager->info()->logWidget()->printMsg(KileTool::Error, i18n("Sorry, no help available for %1.").arg(word), i18n("Help"));
 	}
 	
 	TQString Help::getKeyword(Kate::View *view)         
diff --git a/src/kile/kileinfo.cpp b/src/kile/kileinfo.cpp
index 13e0c13..bb0c7a2 100644
--- a/src/kile/kileinfo.cpp
+++ b/src/kile/kileinfo.cpp
@@ -54,7 +54,7 @@ KileInfo::KileInfo(TQWidget *parent) :
 	m_viewManager= new KileView::Manager(this, TQT_TQOBJECT(parent), "KileView::Manager");
 	m_templateManager = new KileTemplate::Manager(this, TQT_TQOBJECT(parent), "KileTemplate::Manager");
 	m_editorKeySequenceManager = new KileEditorKeySequence::Manager(this, TQT_TQOBJECT(parent), "KileEditorKeySequence::Manager");
-	TQObject::connect(m_docManager, TQT_SIGNAL(documentStatusChanged(Kate::Document*, bool, unsigned char)), m_viewManager, TQT_SLOT(reflectDocumenttqStatus(Kate::Document*, bool, unsigned char)));
+	TQObject::connect(m_docManager, TQT_SIGNAL(documentStatusChanged(Kate::Document*, bool, unsigned char)), m_viewManager, TQT_SLOT(reflectDocumentStatus(Kate::Document*, bool, unsigned char)));
 }
 
 KileInfo::~KileInfo()
@@ -198,16 +198,16 @@ const TQStringList* KileInfo::retrieveList(const TQStringList* (KileDocument::In
 		{
 			KILE_DEBUG() << "\tusing root item " << root->url().fileName() << endl;
 
-			TQPtrList<KileProjectItem> tqchildren;
-			tqchildren.append(root);
-			root->allChildren(&tqchildren);
+			TQPtrList<KileProjectItem> children;
+			children.append(root);
+			root->allChildren(&children);
 
 			const TQStringList *list;
 
-			for (uint i=0; i < tqchildren.count(); ++i)
+			for (uint i=0; i < children.count(); ++i)
 			{
-				KILE_DEBUG() << "\t" << tqchildren.at(i)->url().fileName() << endl;
-				list = (tqchildren.at(i)->getInfo()->*getit)();
+				KILE_DEBUG() << "\t" << children.at(i)->url().fileName() << endl;
+				list = (children.at(i)->getInfo()->*getit)();
 				if (list)
 				{
 					for (uint i=0; i < list->count(); ++i)
diff --git a/src/kile/kilejscript.cpp b/src/kile/kilejscript.cpp
index 70dafa2..d391c40 100644
--- a/src/kile/kilejscript.cpp
+++ b/src/kile/kilejscript.cpp
@@ -32,7 +32,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqvaluelist.h>
 
 #include "kileconfig.h"
@@ -93,7 +93,7 @@ namespace KJS {
 	UString::UString(const TQString &d) {
 		unsigned int len = d.length();
 		UChar *dat = new UChar[len];
-		memcpy(dat, d.tqunicode(), len * sizeof(UChar));
+		memcpy(dat, d.unicode(), len * sizeof(UChar));
 		rep = UString::Rep::create(dat, len);
 	}
 	
@@ -497,12 +497,12 @@ namespace KileJScript {
 				if(o.isValid()) {
 					Value lineValue = o.get(m_interpreter->globalExec(), "line");
 					if(lineValue.type() == NumberType) {
-						KMessageBox::sorry(0L, i18n("The following exception has occurred at line %1 during execution of the script:\n%2").tqarg(lineValue.toInt32(m_interpreter->globalExec())).tqarg(value.toString(m_interpreter->globalExec()).qstring()), i18n("Exception"));
+						KMessageBox::sorry(0L, i18n("The following exception has occurred at line %1 during execution of the script:\n%2").arg(lineValue.toInt32(m_interpreter->globalExec())).arg(value.toString(m_interpreter->globalExec()).qstring()), i18n("Exception"));
 						return;
 					}
 				}
 			}
-			KMessageBox::sorry(0L, i18n("The following exception has occurred during execution of the script:\n%1").tqarg(value.toString(m_interpreter->globalExec()).qstring()), i18n("Exception"));
+			KMessageBox::sorry(0L, i18n("The following exception has occurred during execution of the script:\n%1").arg(value.toString(m_interpreter->globalExec()).qstring()), i18n("Exception"));
 		}
 	}
 
@@ -544,7 +544,7 @@ m_kileInfo->viewManager()->currentView()->down();*/
 		if(requiredVersionTagExp.search(firstLine) != -1) {
 			TQString requiredKileVersion = requiredVersionTagExp.cap(2);
 			if(compareVersionStrings(requiredKileVersion, kileFullVersion) > 0) {
-				KMessageBox::sorry(0L, i18n("Version %1 of Kile is at least required to execute the script \"%2\". The execution has been aborted.").tqarg(requiredKileVersion).tqarg(script->getName()), i18n("Version Error"));
+				KMessageBox::sorry(0L, i18n("Version %1 of Kile is at least required to execute the script \"%2\". The execution has been aborted.").arg(requiredKileVersion).arg(script->getName()), i18n("Version Error"));
 				return;
 			}
 		}
@@ -779,7 +779,7 @@ m_kileInfo->viewManager()->currentView()->down();*/
 	ScriptExecutionAction::ScriptExecutionAction(unsigned int id, KileJScript::Manager *manager, KActionCollection* parent) : KAction(TQString(), KShortcut(), NULL, NULL,  parent, TQString("script_execution_" + TQString::number(id)).ascii()), m_manager(manager), m_id(id) {
 		const KileJScript::JScript *script = m_manager->getScript(m_id);
 		Q_ASSERT(script);
-		setText(i18n("Execution of %1").tqarg(script->getName())); 
+		setText(i18n("Execution of %1").arg(script->getName())); 
 		connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(executeScript()));
 	}
 
diff --git a/src/kile/kilelauncher.cpp b/src/kile/kilelauncher.cpp
index fec6c92..1899e06 100644
--- a/src/kile/kilelauncher.cpp
+++ b/src/kile/kilelauncher.cpp
@@ -172,7 +172,7 @@
 
 		if ( path.isNull() )
 		{
-			emit(message(Error, i18n("There is no executable named \"%1\" in your path.").tqarg(exe)));
+			emit(message(Error, i18n("There is no executable named \"%1\" in your path.").arg(exe)));
 			return false;
 		}
 		else
@@ -180,7 +180,7 @@
 			TQFileInfo fi(path);
 			if ( ! fi.isExecutable() )
 			{
-				emit(message(Error, i18n("You do not have permission to run %1.").tqarg(path)));
+				emit(message(Error, i18n("You do not have permission to run %1.").arg(path)));
 				return false;
 			}
 		}
@@ -208,7 +208,7 @@
 				if (m_proc->exitStatus() != 0) 
 				{
 					type = Error;
-					emit(message(type,i18n("finished with exit status %1").tqarg(m_proc->exitStatus())));
+					emit(message(type,i18n("finished with exit status %1").arg(m_proc->exitStatus())));
 				}
 
 				if (type == Info)
@@ -282,7 +282,7 @@
 		KLibFactory *factory = KLibLoader::self()->factory(m_libName);
 		if (factory == 0)
 		{
-			emit(message(Error, i18n("Could not find the %1 library.").tqarg(m_libName)));
+			emit(message(Error, i18n("Could not find the %1 library.").arg(m_libName)));
 			return false;
 		}
 
@@ -293,7 +293,7 @@
 
 		if (m_part == 0)
 		{
-			emit(message(Error, i18n("Could not create component %1 from the library %2.").tqarg(m_className).tqarg(m_libName)));
+			emit(message(Error, i18n("Could not create component %1 from the library %2.").arg(m_className).arg(m_libName)));
 			emit(done(Failed));
 			return false;
 		}
@@ -348,7 +348,7 @@
 		DocumentationViewer *htmlpart = new DocumentationViewer(stack,"help");
 		m_part = static_cast<KParts::ReadOnlyPart*>(htmlpart);
 
-		connect(htmlpart, TQT_SIGNAL(updatetqStatus(bool, bool)), tool(), TQT_SIGNAL(updatetqStatus(bool, bool)));
+		connect(htmlpart, TQT_SIGNAL(updateStatus(bool, bool)), tool(), TQT_SIGNAL(updateStatus(bool, bool)));
 
 		tool()->manager()->wantGUIState(m_state);
 
diff --git a/src/kile/kilelistselector.cpp b/src/kile/kilelistselector.cpp
index 3e1c149..54eb5e6 100644
--- a/src/kile/kilelistselector.cpp
+++ b/src/kile/kilelistselector.cpp
@@ -19,7 +19,7 @@
 
 #include <tqstringlist.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 
 #include <kapplication.h>
@@ -31,10 +31,10 @@
 KileListSelectorBase::KileListSelectorBase(const TQStringList &list, const TQString &caption, const TQString &select, TQWidget *parent, const char *name) :
 	KDialogBase( KDialogBase::Plain, caption, Ok|Cancel,Ok, parent, name, true, true )
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(plainPage());
+	TQVBoxLayout *layout = new TQVBoxLayout(plainPage());
 
-	tqlayout->addWidget(new TQLabel(select, plainPage()));
-	tqlayout->addSpacing(8);
+	layout->addWidget(new TQLabel(select, plainPage()));
+	layout->addSpacing(8);
 
 	m_listview = new KListView(plainPage());
 	m_listview->addColumn(i18n("Files"));
@@ -50,7 +50,7 @@ KileListSelectorBase::KileListSelectorBase(const TQStringList &list, const TQStr
 #if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
 	m_listview->setShadeSortColumn(false);
 #endif
-	tqlayout->addWidget(m_listview);
+	layout->addWidget(m_listview);
 
 	insertStringList(list);
 
@@ -59,7 +59,7 @@ KileListSelectorBase::KileListSelectorBase(const TQStringList &list, const TQStr
 	int h = ( list.count() > 0 ) ? m_listview->header()->height()+12*m_listview->firstChild()->height() : 224;
 	m_listview->setMinimumSize(w,h);
 
-	resize(tqsizeHint().width(),tqsizeHint().height()+4);
+	resize(sizeHint().width(),sizeHint().height()+4);
 	connect(m_listview, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)), this, TQT_SLOT(accept()));
 }
 
diff --git a/src/kile/kilemultitabbar.cpp b/src/kile/kilemultitabbar.cpp
index 6e435bb..33e904b 100644
--- a/src/kile/kilemultitabbar.cpp
+++ b/src/kile/kilemultitabbar.cpp
@@ -32,7 +32,7 @@
 #include "kilemultitabbar_p.moc"
 #include <tqbutton.h>
 #include <tqpopupmenu.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqtooltip.h>
 #include <tqfontmetrics.h>
@@ -115,7 +115,7 @@ void KileMultiTabBarInternal::setStyle(enum KileMultiTabBar::KileMultiTabBarStyl
 		mainLayout->setAutoAdd(true);
 
 	}
-        viewport()->tqrepaint();
+        viewport()->repaint();
 }
 
 void KileMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph )
@@ -125,9 +125,9 @@ void KileMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int c
 	if (m_position==KileMultiTabBar::Right)
 	{
 
-                paint->setPen(tqcolorGroup().shadow());
+                paint->setPen(colorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());
-                paint->setPen(tqcolorGroup().background().dark(120));
+                paint->setPen(colorGroup().background().dark(120));
                 paint->drawLine(1,0,1,viewport()->height());
 
 
@@ -135,28 +135,28 @@ void KileMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int c
 	else
 	if (m_position==KileMultiTabBar::Left)
 	{
-                paint->setPen(tqcolorGroup().light());
+                paint->setPen(colorGroup().light());
 		paint->drawLine(23,0,23,viewport()->height());
                 paint->drawLine(22,0,22,viewport()->height());
 
-                paint->setPen(tqcolorGroup().shadow());
+                paint->setPen(colorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());
 	}
 	else
 	if (m_position==KileMultiTabBar::Bottom)
 	{
-		paint->setPen(tqcolorGroup().shadow());
+		paint->setPen(colorGroup().shadow());
 		paint->drawLine(0,0,viewport()->width(),0);
-                paint->setPen(tqcolorGroup().background().dark(120));
+                paint->setPen(colorGroup().background().dark(120));
                 paint->drawLine(0,1,viewport()->width(),1);
 	}
 	else
 	{
-	        paint->setPen(tqcolorGroup().light());
+	        paint->setPen(colorGroup().light());
 		paint->drawLine(0,23,viewport()->width(),23);
                 paint->drawLine(0,22,viewport()->width(),22);
 
-/*                paint->setPen(tqcolorGroup().shadow());
+/*                paint->setPen(colorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());*/
 
 	}
@@ -193,8 +193,8 @@ void KileMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev)
 
 void KileMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) {
 /*	KILE_DEBUG()<<"KileMultiTabBarInternal::resizeEvent"<<endl;
-	KILE_DEBUG()<<"KileMultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl;
-	KILE_DEBUG()<<"KileMultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/
+	KILE_DEBUG()<<"KileMultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl;
+	KILE_DEBUG()<<"KileMultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/
 	if (ev) TQScrollView::resizeEvent(ev);
 	TQValueList<KileMultiTabBarTab*> visibleTabList;
 	for(KileMultiTabBarTab *tab = m_tabs.first(); tab; tab = m_tabs.next()) {
@@ -392,7 +392,7 @@ void KileMultiTabBarInternal::setPosition(enum KileMultiTabBar::KileMultiTabBarP
 	m_position=pos;
 	for (uint i=0;i<m_tabs.count();i++)
 		m_tabs.at(i)->setTabsPosition(m_position);
-	viewport()->tqrepaint();
+	viewport()->repaint();
 }
 
 KileMultiTabBarButton::KileMultiTabBarButton(const TQPixmap& pic,const TQString& text, TQPopupMenu *popup,
@@ -453,13 +453,13 @@ void KileMultiTabBarButton::slotClicked()
 void KileMultiTabBarButton::setPosition(KileMultiTabBar::KileMultiTabBarPosition pos)
 {
 	m_position=pos;
-	tqrepaint();
+	repaint();
 }
 
 void KileMultiTabBarButton::setStyle(KileMultiTabBar::KileMultiTabBarStyle style)
 {
 	m_style=style;
-	tqrepaint();
+	repaint();
 }
 
 void KileMultiTabBarButton::hideEvent( TQHideEvent* he) {
@@ -475,7 +475,7 @@ void KileMultiTabBarButton::showEvent( TQShowEvent* he) {
 }
 
 
-TQSize KileMultiTabBarButton::tqsizeHint() const
+TQSize KileMultiTabBarButton::sizeHint() const
 {
     constPolish();
 
@@ -491,7 +491,7 @@ TQSize KileMultiTabBarButton::tqsizeHint() const
     }
 #endif
     if ( isMenuButton() )
-        w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
 
     if ( pixmap() ) {
         TQPixmap *pm = (TQPixmap *)pixmap();
@@ -501,7 +501,7 @@ TQSize KileMultiTabBarButton::tqsizeHint() const
         TQString s( text() );
         bool empty = s.isEmpty();
         if ( empty )
-            s = TQString::tqfromLatin1("XXXX");
+            s = TQString::fromLatin1("XXXX");
         TQFontMetrics fm = fontMetrics();
         TQSize sz = fm.size( ShowPrefix, s );
         if(!empty || !w)
@@ -544,7 +544,7 @@ void KileMultiTabBarTab::setTabsPosition(KileMultiTabBar::KileMultiTabBarPositio
 	}
 
 	setPosition(pos);
-//	tqrepaint();
+//	repaint();
 }
 
 void KileMultiTabBarTab::setIcon(const TQString& icon)
@@ -595,12 +595,12 @@ void KileMultiTabBarTab::updateState()
 		if ((m_position==KileMultiTabBar::Right || m_position==KileMultiTabBar::Left)) {
 			setFixedWidth(24);
 			if ((m_style==KileMultiTabBar::KDEV3)  || (m_style==KileMultiTabBar::KDEV3ICON) || (isOn())) {
-				setFixedHeight(KileMultiTabBarButton::tqsizeHint().width());
+				setFixedHeight(KileMultiTabBarButton::sizeHint().width());
 			} else setFixedHeight(36);
 		} else {
 			setFixedHeight(24);
 			if ((m_style==KileMultiTabBar::KDEV3)  || (m_style==KileMultiTabBar::KDEV3ICON) || (isOn())) {
-				setFixedWidth(KileMultiTabBarButton::tqsizeHint().width());
+				setFixedWidth(KileMultiTabBarButton::sizeHint().width());
 			} else setFixedWidth(36);
 		}
 	} else {
@@ -655,7 +655,7 @@ void KileMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 	const int height = 24;
 	if ((m_style==KileMultiTabBar::KDEV3) || (m_style==KileMultiTabBar::KDEV3ICON) || (isOn())) {
 		 if ((m_position==KileMultiTabBar::Left) || (m_position==KileMultiTabBar::Right))
-			sh=TQSize(this->height(),this->width());//KileMultiTabBarButton::tqsizeHint();
+			sh=TQSize(this->height(),this->width());//KileMultiTabBarButton::sizeHint();
 			else sh=TQSize(this->width(),this->height());
 	}
 	else
@@ -672,8 +672,8 @@ void KileMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 
 	if (isOn()) st|=TQStyle::Style_On;
 
-	tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
-	tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
+	tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
 
 	switch (m_position) {
 		case KileMultiTabBar::Left:
@@ -689,8 +689,8 @@ void KileMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 			paint->drawPixmap(0,0,pixmap);
 			break;
 	}
-//	tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
-//		tqcolorGroup(),TQStyle::Style_Enabled);
+//	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+//		colorGroup(),TQStyle::Style_Enabled);
 
 
 }
@@ -700,58 +700,58 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint)
         TQPixmap pixmap;
 	if ( iconSet())
         	pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal );
-	paint->fillRect(0, 0, 24, 24, tqcolorGroup().background());
+	paint->fillRect(0, 0, 24, 24, colorGroup().background());
 
 	if (!isOn())
 	{
 
 		if (m_position==KileMultiTabBar::Right)
 		{
-			paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background()));
+			paint->fillRect(0,0,21,21,TQBrush(colorGroup().background()));
 
-			paint->setPen(tqcolorGroup().background().dark(150));
+			paint->setPen(colorGroup().background().dark(150));
 			paint->drawLine(0,22,23,22);
 
 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,0,0,23);
-			paint->setPen(tqcolorGroup().background().dark(120));
+			paint->setPen(colorGroup().background().dark(120));
 			paint->drawLine(1,0,1,23);
 
 		}
 		else
 		if ((m_position==KileMultiTabBar::Bottom) || (m_position==KileMultiTabBar::Top))
 		{
-                        paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background()));
+                        paint->fillRect(0,1,23,22,TQBrush(colorGroup().background()));
 
                         paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-                        paint->setPen(tqcolorGroup().background().dark(120));
+                        paint->setPen(colorGroup().background().dark(120));
                         paint->drawLine(23,0,23,23);
 
 
-                        paint->setPen(tqcolorGroup().light());
+                        paint->setPen(colorGroup().light());
                         paint->drawLine(0,22,23,22);
                         paint->drawLine(0,23,23,23);
-                	paint->setPen(tqcolorGroup().shadow());
+                	paint->setPen(colorGroup().shadow());
                 	paint->drawLine(0,0,23,0);
-                        paint->setPen(tqcolorGroup().background().dark(120));
+                        paint->setPen(colorGroup().background().dark(120));
                         paint->drawLine(0,1,23,1);
 
 		}
 		else
 		{
-			paint->setPen(tqcolorGroup().background().dark(120));
+			paint->setPen(colorGroup().background().dark(120));
 			paint->drawLine(0,23,23,23);
-			paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background()));
+			paint->fillRect(0,0,23,21,TQBrush(colorGroup().background()));
 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-			paint->setPen(tqcolorGroup().light());
+			paint->setPen(colorGroup().light());
 			paint->drawLine(23,0,23,23);
 			paint->drawLine(22,0,22,23);
 
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,0,0,23);
 
 		}
@@ -762,12 +762,12 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 	{
 		if (m_position==KileMultiTabBar::Right)
 		{
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,height()-1,23,height()-1);
 			paint->drawLine(0,height()-2,23,height()-2);
 			paint->drawLine(23,0,23,height()-1);
 			paint->drawLine(22,0,22,height()-1);
-			paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light()));
+			paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 
 			if (m_showActiveTabText)
@@ -777,9 +777,9 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 				TQPixmap tpixmap(height()-25-3, width()-2);
 				TQPainter painter(&tpixmap);
 
-				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
+				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
 
-				painter.setPen(tqcolorGroup().text());
+				painter.setPen(colorGroup().text());
 				painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 
 				paint->rotate(90);
@@ -791,25 +791,25 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 		else
 		if (m_position==KileMultiTabBar::Top)
 		{
-			paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light()));
+			paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
-				paint->setPen(tqcolorGroup().text());
+				paint->setPen(colorGroup().text());
 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 			}
 		}
 		else
 		if (m_position==KileMultiTabBar::Bottom)
 		{
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,23,width()-1,23);
 			paint->drawLine(0,22,width()-1,22);
-			paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light()));
+			paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
-				paint->setPen(tqcolorGroup().text());
+				paint->setPen(colorGroup().text());
 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 			}
 
@@ -818,10 +818,10 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 		{
 
 
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,height()-1,23,height()-1);
 			paint->drawLine(0,height()-2,23,height()-2);
-			paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light()));
+			paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
@@ -831,9 +831,9 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint)
                                 TQPixmap tpixmap(height()-25-3, width()-2);
                                 TQPainter painter(&tpixmap);
 
-                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
+                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
 
-                                painter.setPen(tqcolorGroup().text());
+                                painter.setPen(colorGroup().text());
                                 painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 
                                 paint->rotate(-90);
@@ -860,13 +860,13 @@ KileMultiTabBar::KileMultiTabBar(KileMultiTabBarMode bm, TQWidget *parent,const
 	if (bm==Vertical)
 	{
 		m_l=new TQVBoxLayout(this);
-		tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
+		setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
 //		setFixedWidth(24);
 	}
 	else
 	{
 		m_l=new TQHBoxLayout(this);
-		tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
+		setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
 //		setFixedHeight(24);
 	}
 	m_l->setMargin(0);
@@ -1011,7 +1011,7 @@ void KileMultiTabBar::fontChange(const TQFont& /* oldFont */)
 {
 	for (uint i=0;i<tabs()->count();i++)
 		tabs()->at(i)->resize();
-	tqrepaint();
+	repaint();
 }
 
 TQPtrList<KileMultiTabBarTab>* KileMultiTabBar::tabs() {return m_internal->tabs();}
diff --git a/src/kile/kilemultitabbar.h b/src/kile/kilemultitabbar.h
index e023364..42bd83b 100644
--- a/src/kile/kilemultitabbar.h
+++ b/src/kile/kilemultitabbar.h
@@ -30,7 +30,7 @@
 #include <tqscrollview.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqpushbutton.h>
@@ -241,7 +241,7 @@ public slots:
          */
 	void setText(const TQString &);
 
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 
 protected:
 	KileMultiTabBar::KileMultiTabBarPosition m_position;
diff --git a/src/kile/kileproject.cpp b/src/kile/kileproject.cpp
index 64b864e..f4bbd26 100644
--- a/src/kile/kileproject.cpp
+++ b/src/kile/kileproject.cpp
@@ -368,7 +368,7 @@ bool KileProject::load()
 	{
 		if(KMessageBox::warningYesNo(0L,i18n("The project file of %1 was created by a newer version of kile.\
 				Opening it can lead to unexpected results.\n\
-				Do you really want to continue (not recommended)?").tqarg(m_name),
+				Do you really want to continue (not recommended)?").arg(m_name),
 				 TQString(), KStdGuiItem::yes(), KStdGuiItem::no(),TQString(),KMessageBox::Dangerous) == KMessageBox::No)
 		{
 			m_invalid=true;
diff --git a/src/kile/kileprojectdlgs.cpp b/src/kile/kileprojectdlgs.cpp
index e21ae76..49178d3 100644
--- a/src/kile/kileprojectdlgs.cpp
+++ b/src/kile/kileprojectdlgs.cpp
@@ -62,10 +62,10 @@ KileProjectDlgBase::KileProjectDlgBase(const TQString &caption, KileDocument::Ex
 	// properties groupbox
 	m_pgroup = new TQVGroupBox(i18n("Project"), plainPage());
 	m_pgroup->setColumnLayout(0, Qt::Vertical );
-	m_pgroup->tqlayout()->setSpacing( 6 );
-	m_pgroup->tqlayout()->setMargin( 11 );
-	m_pgrid = new TQGridLayout( m_pgroup->tqlayout() );
-	m_pgrid->tqsetAlignment( TQt::AlignTop );
+	m_pgroup->layout()->setSpacing( 6 );
+	m_pgroup->layout()->setMargin( 11 );
+	m_pgrid = new TQGridLayout( m_pgroup->layout() );
+	m_pgrid->setAlignment( TQt::AlignTop );
 
 	m_title = new KLineEdit(m_pgroup, "le_projectname");
 	TQWhatsThis::add(m_title, whatsthisName);
@@ -76,10 +76,10 @@ KileProjectDlgBase::KileProjectDlgBase(const TQString &caption, KileDocument::Ex
 	// extensions groupbox
 	m_egroup= new TQVGroupBox(i18n("Extensions"), plainPage());
 	m_egroup->setColumnLayout(0, Qt::Vertical );
-	m_egroup->tqlayout()->setSpacing( 6 );
-	m_egroup->tqlayout()->setMargin( 11 );
-	m_egrid = new TQGridLayout( m_egroup->tqlayout() );
-	m_egrid->tqsetAlignment( TQt::AlignTop );
+	m_egroup->layout()->setSpacing( 6 );
+	m_egroup->layout()->setMargin( 11 );
+	m_egrid = new TQGridLayout( m_egroup->layout() );
+	m_egrid->setAlignment( TQt::AlignTop );
 
 	m_extensions = new KLineEdit(m_egroup, "le_ext");
 	TQRegExp reg("[\\. a-zA-Z0-9]+");
@@ -262,7 +262,7 @@ KileNewProjectDlg::KileNewProjectDlg(KileTemplate::Manager *templateManager, Kil
 	m_egrid->addWidget(m_lbPredefinedExtensions, 7,0);
 	m_egrid->addMultiCellWidget(m_lbStandardExtensions, 7,7, 1,3);
 
-	// add to tqlayout
+	// add to layout
 	vbox->addWidget(m_pgroup);
 	vbox->addWidget(group2);
 	vbox->addWidget(m_egroup);
@@ -435,7 +435,7 @@ void KileNewProjectDlg::slotOk()
 
 		if ( TQFileInfo( TQDir(fi.dirPath()) , file().stripWhiteSpace()).exists() )
 		{
-			if (KMessageBox::warningYesNo(this, i18n("The file \"%1\" already exists, overwrite it?").tqarg(file()),
+			if (KMessageBox::warningYesNo(this, i18n("The file \"%1\" already exists, overwrite it?").arg(file()),
 				i18n("File Already Exists")) == KMessageBox::No)
 				return;
 		}
@@ -492,16 +492,16 @@ KileProjectOptionsDlg::KileProjectOptionsDlg(KileProject *project, KileDocument:
 	// third groupbox
 	TQVGroupBox* group3 = new TQVGroupBox(i18n("Properties"), plainPage());
 	group3->setColumnLayout(0, Qt::Vertical );
-	group3->tqlayout()->setSpacing( 6 );
-	group3->tqlayout()->setMargin( 11 );
-	TQGridLayout *grid3 = new TQGridLayout( group3->tqlayout() );
-	grid3->tqsetAlignment( TQt::AlignTop );
+	group3->layout()->setSpacing( 6 );
+	group3->layout()->setMargin( 11 );
+	TQGridLayout *grid3 = new TQGridLayout( group3->layout() );
+	grid3->setAlignment( TQt::AlignTop );
 
 	m_master = new KComboBox(false, group3, "master");
 	//m_master->setDisabled(true);
 	TQLabel *lb1 = new TQLabel(i18n("&Master document:"), group3);
 	lb1->setBuddy(m_master);
-	lb1->setMinimumWidth( m_sel_extensions->tqsizeHint().width() );
+	lb1->setMinimumWidth( m_sel_extensions->sizeHint().width() );
 	TQWhatsThis::add(m_master, whatsthisMaster);
 	TQWhatsThis::add(lb1,whatsthisMaster);
 
@@ -547,7 +547,7 @@ KileProjectOptionsDlg::KileProjectOptionsDlg(KileProject *project, KileDocument:
 	grid3->addMultiCellWidget(m_leMakeIndex,2,2,1,2);
 	grid3->setColStretch(2,1);
 
-	// add to tqlayout
+	// add to layout
 	vbox->addWidget(m_pgroup);
 	vbox->addWidget(m_egroup);
 	vbox->addWidget(group3);
diff --git a/src/kile/kileprojectdlgs.h b/src/kile/kileprojectdlgs.h
index 1137e7d..9ab6abf 100644
--- a/src/kile/kileprojectdlgs.h
+++ b/src/kile/kileprojectdlgs.h
@@ -17,7 +17,7 @@
 #define KILEPROJECTDLGS_H
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvgroupbox.h>
 
 #include <kdialogbase.h>
diff --git a/src/kile/kileprojectview.cpp b/src/kile/kileprojectview.cpp
index 0bae84b..0e9c7fe 100644
--- a/src/kile/kileprojectview.cpp
+++ b/src/kile/kileprojectview.cpp
@@ -370,7 +370,7 @@ KileProjectViewItem* KileProjectView::folder(const KileProjectItem *pi, KileProj
 	if ( parent->type() == KileType::Folder )
 		return parent;
 
-	// we are looking at the tqchildren, if there is an existing folder for this type
+	// we are looking at the children, if there is an existing folder for this type
 	KileProjectViewItem *folder;
 
 	// determine the foldername for this type
diff --git a/src/kile/kilesidebar.cpp b/src/kile/kilesidebar.cpp
index a2774d6..5561164 100644
--- a/src/kile/kilesidebar.cpp
+++ b/src/kile/kilesidebar.cpp
@@ -18,7 +18,7 @@
 #include "kilesidebar.h"
 
 #include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <tdeversion.h>
 #include "kiledebug.h"
@@ -36,24 +36,24 @@ KileSideBar::KileSideBar(int size, TQWidget *parent, const char *name, Qt::Orien
 	m_nSize(size)
 {
 	setLineWidth(0);
-	tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
+	setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
  
-	TQLayout *tqlayout;
+	TQLayout *layout;
 
 	m_tabStack = new TQWidgetStack(this);
-	m_tabStack->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
+	m_tabStack->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
 
 	KileMultiTabBar::KileMultiTabBarMode tabbarori = KileMultiTabBar::Horizontal;
 	KileMultiTabBar::KileMultiTabBarPosition tabbarpos = KileMultiTabBar::Top;
 	if ( orientation == Qt::Horizontal ) 
 	{
-		tqlayout = new TQVBoxLayout(this);
+		layout = new TQVBoxLayout(this);
 		tabbarori = KileMultiTabBar::Horizontal;
 		tabbarpos = KileMultiTabBar::Top;
 	}
 	else if ( orientation == Qt::Vertical ) 
 	{
-		tqlayout = new TQHBoxLayout(this);
+		layout = new TQHBoxLayout(this);
 		tabbarori = KileMultiTabBar::Vertical;
 		tabbarpos = KileMultiTabBar::Right;
 	}
@@ -72,16 +72,16 @@ KileSideBar::KileSideBar(int size, TQWidget *parent, const char *name, Qt::Orien
 		setMinimumHeight(m_tabBar->height());
 		m_nMinSize = m_tabBar->height();
 		m_nMaxSize = m_tabBar->maximumHeight();
-		tqlayout->add(m_tabBar);
-		tqlayout->add(m_tabStack);
+		layout->add(m_tabBar);
+		layout->add(m_tabStack);
 	}
 	else if ( orientation == Qt::Vertical )
 	{
 		setMinimumWidth(m_tabBar->width());
 		m_nMinSize = m_tabBar->width();
 		m_nMaxSize = m_tabBar->maximumWidth();
-		tqlayout->add(m_tabStack);
-		tqlayout->add(m_tabBar);
+		layout->add(m_tabStack);
+		layout->add(m_tabBar);
 	}
 }
 
diff --git a/src/kile/kilestatsdlg.cpp b/src/kile/kilestatsdlg.cpp
index 2585b59..3649dd6 100644
--- a/src/kile/kilestatsdlg.cpp
+++ b/src/kile/kilestatsdlg.cpp
@@ -51,13 +51,13 @@ KileStatsDlg::KileStatsDlg(KileProject *project, KileDocument::TextInfo* docinfo
 	
 	if(!m_project) // the active doc doesn't belong to a project
 	{	
-		setCaption(i18n("Statistics for %1").tqarg(m_docinfo->getDoc()->url().fileName()));
+		setCaption(i18n("Statistics for %1").arg(m_docinfo->getDoc()->url().fileName()));
 		stats = m_docinfo->getStatistics();
 		fillWidget(stats,summary);
 	}
 	else // active doc belongs to a project
 	{
-		setCaption(i18n("Statistics for the Project %1").tqarg(m_project->name()));
+		setCaption(i18n("Statistics for the Project %1").arg(m_project->name()));
 		KILE_DEBUG() << "Project file is " << project->baseURL() << endl;
 
 		KileProjectItemList *items = project->items();
@@ -141,7 +141,7 @@ void KileStatsDlg::slotUser1() // Copy
 	KILE_DEBUG() << "Copy Button was clicked" << endl;
 	KILE_DEBUG() << "Open tab is " << activePageIndex() << ' ' + ( m_pagetoname.contains(activePageIndex()) ?  m_pagetoname[activePageIndex()] : "No such entry" )<< endl;
 
-	TQClipboard *clip = KApplication::tqclipboard();
+	TQClipboard *clip = KApplication::clipboard();
 	TQString text;
 	convertText(&text,false);
 	clip->setText(text,TQClipboard::Selection); // the text will be available with the middle mouse button
@@ -152,7 +152,7 @@ void KileStatsDlg::slotUser2() // CopyAsLaTeX
 	KILE_DEBUG() << "CopyAsLateX Button was clicked" << endl;
 	KILE_DEBUG() << "Open tab is " << activePageIndex() << ' ' + ( m_pagetoname.contains(activePageIndex()) ?  m_pagetoname[activePageIndex()] : "No such entry" )<< endl;
 
-	TQClipboard *clip = KApplication::tqclipboard();
+	TQClipboard *clip = KApplication::clipboard();
 	TQString text;
 	convertText(&text,true);
 	clip->setText(text,TQClipboard::Selection);
@@ -169,11 +169,11 @@ void KileStatsDlg::convertText(TQString* text, bool forLaTeX) // the bool determ
 		text->append("\\begin{tabular}{ll}\n");
 
 if(m_project && activePageIndex())
-	text->append(i18n("Statistics for project %1, file %2").tqarg(m_project->name()).tqarg(name));
+	text->append(i18n("Statistics for project %1, file %2").arg(m_project->name()).arg(name));
 else if(m_project)
-	text->append(i18n("Statistics for project %1").tqarg(m_project->name()));
+	text->append(i18n("Statistics for project %1").arg(m_project->name()));
 else if(m_docinfo->getDoc()->url().isValid())
-	text->append(i18n("Statistics for %1").tqarg(m_docinfo->getDoc()->url().fileName()));
+	text->append(i18n("Statistics for %1").arg(m_docinfo->getDoc()->url().fileName()));
 else
 	text->append(i18n("Statistics for Untitled"));
 			
diff --git a/src/kile/kilestatsdlg.h b/src/kile/kilestatsdlg.h
index 178d3f9..fac3126 100644
--- a/src/kile/kilestatsdlg.h
+++ b/src/kile/kilestatsdlg.h
@@ -20,7 +20,7 @@
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqlabel.h>
 
 #include "kileproject.h"
diff --git a/src/kile/kilestatswidget.cpp b/src/kile/kilestatswidget.cpp
index 7d41987..5564e41 100644
--- a/src/kile/kilestatswidget.cpp
+++ b/src/kile/kilestatswidget.cpp
@@ -21,7 +21,7 @@
 #include <tqvariant.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include "kiledebug.h"
@@ -34,10 +34,10 @@ KileWidgetStatistics::KileWidgetStatistics( TQWidget* parent, const char* name,
 	// characters groupbox
 	TQGroupBox *chargroup = new TQGroupBox( i18n("Characters"),parent); 
 	chargroup->setColumnLayout(0, Qt::Vertical );
-	chargroup->tqlayout()->setSpacing( 6 );
-	chargroup->tqlayout()->setMargin( 11 );
-	chargrouptqlayout = new TQGridLayout( chargroup->tqlayout() );
-	chargrouptqlayout->tqsetAlignment( TQt::AlignTop );
+	chargroup->layout()->setSpacing( 6 );
+	chargroup->layout()->setMargin( 11 );
+	chargrouplayout = new TQGridLayout( chargroup->layout() );
+	chargrouplayout->setAlignment( TQt::AlignTop );
 
 	m_wordCharText = new TQLabel(i18n("Words and numbers:"), chargroup);
 	m_commandCharText = new TQLabel(i18n("LaTeX commands and environments:"), chargroup);
@@ -52,26 +52,26 @@ KileWidgetStatistics::KileWidgetStatistics( TQWidget* parent, const char* name,
 	charframe->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
 	charframe->setLineWidth(1);
 
-	chargrouptqlayout->addWidget( m_wordCharText, 0,0 );
-	chargrouptqlayout->addWidget( m_commandCharText, 1,0 );
-	chargrouptqlayout->addWidget( m_whitespaceCharText, 2,0 );
-	chargrouptqlayout->addWidget( m_totalCharText, 4,0 );
-	chargrouptqlayout->addWidget( m_wordChar, 0,2,TQt::AlignRight );
-	chargrouptqlayout->addWidget( m_commandChar, 1,2,TQt::AlignRight );
-	chargrouptqlayout->addWidget( m_whitespaceChar, 2,2,TQt::AlignRight );
-	chargrouptqlayout->addMultiCellWidget( charframe, 3,3,1,2 );
-	chargrouptqlayout->addWidget( m_totalChar, 4,2,TQt::AlignRight );
-	chargrouptqlayout->setColSpacing(1,16);
-	chargrouptqlayout->setColSpacing(3,1);
-	chargrouptqlayout->setColStretch(3,1);
+	chargrouplayout->addWidget( m_wordCharText, 0,0 );
+	chargrouplayout->addWidget( m_commandCharText, 1,0 );
+	chargrouplayout->addWidget( m_whitespaceCharText, 2,0 );
+	chargrouplayout->addWidget( m_totalCharText, 4,0 );
+	chargrouplayout->addWidget( m_wordChar, 0,2,TQt::AlignRight );
+	chargrouplayout->addWidget( m_commandChar, 1,2,TQt::AlignRight );
+	chargrouplayout->addWidget( m_whitespaceChar, 2,2,TQt::AlignRight );
+	chargrouplayout->addMultiCellWidget( charframe, 3,3,1,2 );
+	chargrouplayout->addWidget( m_totalChar, 4,2,TQt::AlignRight );
+	chargrouplayout->setColSpacing(1,16);
+	chargrouplayout->setColSpacing(3,1);
+	chargrouplayout->setColStretch(3,1);
 
 	// string groupbox
 	TQGroupBox *stringgroup = new TQGroupBox( i18n("Strings"),parent);
 	stringgroup->setColumnLayout(0, Qt::Vertical );
-	stringgroup->tqlayout()->setSpacing( 6 );
-	stringgroup->tqlayout()->setMargin( 11 );
-	stringgrouptqlayout = new TQGridLayout( stringgroup->tqlayout() );
-	stringgrouptqlayout->tqsetAlignment( TQt::AlignTop );
+	stringgroup->layout()->setSpacing( 6 );
+	stringgroup->layout()->setMargin( 11 );
+	stringgrouplayout = new TQGridLayout( stringgroup->layout() );
+	stringgrouplayout->setAlignment( TQt::AlignTop );
 
 	m_wordStringText = new TQLabel(i18n("Words:"), stringgroup);
 	m_commandStringText = new TQLabel(i18n("LaTeX commands:"), stringgroup);
@@ -86,18 +86,18 @@ KileWidgetStatistics::KileWidgetStatistics( TQWidget* parent, const char* name,
 	stringframe->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
 	stringframe->setLineWidth(1);
 
-	stringgrouptqlayout->addWidget( m_wordStringText, 0,0 );
-	stringgrouptqlayout->addWidget( m_commandStringText, 1,0 );
-	stringgrouptqlayout->addWidget( m_environmentStringText, 2,0 );
-	stringgrouptqlayout->addWidget( m_totalStringText, 4,0 );
-	stringgrouptqlayout->addWidget( m_wordString, 0,2,TQt::AlignRight );
-	stringgrouptqlayout->addWidget( m_commandString, 1,2,TQt::AlignRight );
-	stringgrouptqlayout->addWidget( m_environmentString, 2,2,TQt::AlignRight );
-	stringgrouptqlayout->addMultiCellWidget( stringframe, 3,3,1,2 );
-	stringgrouptqlayout->addWidget( m_totalString, 4,2,TQt::AlignRight );
-	stringgrouptqlayout->setColSpacing(1,16);
-	stringgrouptqlayout->setColSpacing(3,1);
-	stringgrouptqlayout->setColStretch(3,1);
+	stringgrouplayout->addWidget( m_wordStringText, 0,0 );
+	stringgrouplayout->addWidget( m_commandStringText, 1,0 );
+	stringgrouplayout->addWidget( m_environmentStringText, 2,0 );
+	stringgrouplayout->addWidget( m_totalStringText, 4,0 );
+	stringgrouplayout->addWidget( m_wordString, 0,2,TQt::AlignRight );
+	stringgrouplayout->addWidget( m_commandString, 1,2,TQt::AlignRight );
+	stringgrouplayout->addWidget( m_environmentString, 2,2,TQt::AlignRight );
+	stringgrouplayout->addMultiCellWidget( stringframe, 3,3,1,2 );
+	stringgrouplayout->addWidget( m_totalString, 4,2,TQt::AlignRight );
+	stringgrouplayout->setColSpacing(1,16);
+	stringgrouplayout->setColSpacing(3,1);
+	stringgrouplayout->setColStretch(3,1);
 
 	m_commentAboutHelp = new TQLabel(parent);
 	m_warning =  new TQLabel(parent);
@@ -109,10 +109,10 @@ KileWidgetStatistics::KileWidgetStatistics( TQWidget* parent, const char* name,
 	vbox->addWidget(m_warning);
 	vbox->addStretch(1);
 
-	int w = m_commandCharText->tqsizeHint().width();
-	if ( m_whitespaceCharText->tqsizeHint().width() > w )
-		w = m_whitespaceCharText->tqsizeHint().width();
-	stringgrouptqlayout->setColSpacing(0,w);
+	int w = m_commandCharText->sizeHint().width();
+	if ( m_whitespaceCharText->sizeHint().width() > w )
+		w = m_whitespaceCharText->sizeHint().width();
+	stringgrouplayout->setColSpacing(0,w);
 
 }
 
@@ -122,11 +122,11 @@ KileWidgetStatistics::~KileWidgetStatistics()
 
 void KileWidgetStatistics::updateColumns()
 {
-	int w = m_totalChar->tqsizeHint().width();
-	if ( m_totalString->tqsizeHint().width() > w )
-		w = m_totalString->tqsizeHint().width();
-	chargrouptqlayout->setColSpacing(2,w);
-	stringgrouptqlayout->setColSpacing(2,w);
+	int w = m_totalChar->sizeHint().width();
+	if ( m_totalString->sizeHint().width() > w )
+		w = m_totalString->sizeHint().width();
+	chargrouplayout->setColSpacing(2,w);
+	stringgrouplayout->setColSpacing(2,w);
 }
 
 
diff --git a/src/kile/kilestatswidget.h b/src/kile/kilestatswidget.h
index 93168c6..3057092 100644
--- a/src/kile/kilestatswidget.h
+++ b/src/kile/kilestatswidget.h
@@ -58,8 +58,8 @@ public:
 	void updateColumns();
 
 private:
-	TQGridLayout *chargrouptqlayout;
-	TQGridLayout *stringgrouptqlayout;
+	TQGridLayout *chargrouplayout;
+	TQGridLayout *stringgrouplayout;
 
 
 };
diff --git a/src/kile/kilestdactions.cpp b/src/kile/kilestdactions.cpp
index 6fb837e..6d3c99c 100644
--- a/src/kile/kilestdactions.cpp
+++ b/src/kile/kilestdactions.cpp
@@ -35,7 +35,7 @@ void setupStdTags(KileInfo *ki, KMainWindow *parent)
 	(void) new KileAction::Tag(i18n("Document Class Selection - \\documentclass{}"),0,TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(), "tag_documentclass",
   		"\\documentclass[10pt]{","}", 21,0,i18n("\\documentclass[options]{class}\nclass : article,report,book,letter\nsize options : 10pt, 11pt, 12pt\npaper size options: a4paper, a5paper, b5paper, letterpaper, legalpaper, executivepaper\n"
 		"other options: \nlandscape -- selects landscape format; default is portrait. \ntitlepage, notitlepage -- selects if there should be a separate title page.\nleqno -- display equation number on left side of equations; default is right side.\n"
-		"fleqn -- display formulae flush left; default is centered.\nonecolumn, twocolumn -- one or two columns; defaults to one column\noneside, twoside -- selects one- or two-sided tqlayout.\n" ));
+		"fleqn -- display formulae flush left; default is centered.\nonecolumn, twocolumn -- one or two columns; defaults to one column\noneside, twoside -- selects one- or two-sided layout.\n" ));
 
 	(void) new KileAction::Tag(i18n("Package Import - \\usepackage{}"),0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_usepackage",
 		"\\usepackage{","}",12,0,i18n("Any options given in the \\documentclass command that are unknown by the selected document class\n"
@@ -82,7 +82,7 @@ void setupStdTags(KileInfo *ki, KMainWindow *parent)
  	new KileAction::Tag("\\item","item",TQt::ALT+TQt::SHIFT+TQt::Key_H, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_item","\\item ",TQString(),6,0, i18n("\\item[label] Hello!"));
 
 	(void) new KileAction::Tag(i18n("Tabbing - \\begin{tabbing}"),"tabbing",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_env_tabbing" ,"\\begin{tabbing}\n","%E\n\\end{tabbing} ",0,1,i18n("The tabbing environment provides a way to align text in columns.\n\\begin{tabbing}\ntext \\= more text \\= still more text \\= last text \\\\\nsecond row \\>  \\> more \\\\\n\\end{tabbing}\nCommands :\n\\=  Sets a tab stop at the current position.\n\\>  Advances to the next tab stop.\n\\<  Allows you to put something to the left of the local margin without changing the margin. Can only be used at the start of the line.\n\\+  Moves the left margin of the next and all the following commands one tab stop to the right\n\\-  Moves the left margin of the next and all the following commands one tab stop to the left\n\\'  Moves everything that you have typed so far in the current column to the right of the previous column, flush against the current column's tab stop. \n\\`  Allows you to put text flush right against any tab stop, including tab stop 0\n\\kill  Sets tab stops without producing text.\n\\a  In a tabbing environment, the commands \\=, \\' and \\` do not produce accents as normal. Instead, the commands \\a=, \\a' and \\a` are used."));
-	(void) new KileAction::Tag("Tabular - \\begin{tabular}","tabular",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_env_tabular" ,"\\begin{tabular}{","}\n%E\n\\end{tabular} ",16,0,i18n("\\begin{tabular}[pos]{cols}\ncolumn 1 entry & column 2 entry ... & column n entry \\\\\n...\n\\end{tabular}\npos : Specifies the vertical position; default is tqalignment on the center of the environment.\n     t - align on top row\n     b - align on bottom row\ncols : Specifies the column formatting.\n     l - A column of left-aligned items.\n     r - A column of right-aligned items.\n     c - A column of centered items.\n     | - A vertical line the full height and depth of the environment.\n     @{text} - this inserts text in every row.\nThe \\hline command draws a horizontal line the width of the table.\nThe \\cline{i-j} command draws horizontal lines across the columns specified, beginning in column i and ending in column j,\nThe \\vline command draws a vertical line extending the full height and depth of its row."));
+	(void) new KileAction::Tag("Tabular - \\begin{tabular}","tabular",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_env_tabular" ,"\\begin{tabular}{","}\n%E\n\\end{tabular} ",16,0,i18n("\\begin{tabular}[pos]{cols}\ncolumn 1 entry & column 2 entry ... & column n entry \\\\\n...\n\\end{tabular}\npos : Specifies the vertical position; default is alignment on the center of the environment.\n     t - align on top row\n     b - align on bottom row\ncols : Specifies the column formatting.\n     l - A column of left-aligned items.\n     r - A column of right-aligned items.\n     c - A column of centered items.\n     | - A vertical line the full height and depth of the environment.\n     @{text} - this inserts text in every row.\nThe \\hline command draws a horizontal line the width of the table.\nThe \\cline{i-j} command draws horizontal lines across the columns specified, beginning in column i and ending in column j,\nThe \\vline command draws a vertical line extending the full height and depth of its row."));
 	(void) new KileAction::Tag("Multicolumn Cells - \\multicolumn","multicolumn",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)),parent->actionCollection(),"tag_multicolumn","\\multicolumn{","}{}{} ",13,0,i18n("\\multicolumn{cols}{pos}{text}\ncol, specifies the number of columns to span.\npos specifies the formatting of the entry: c for centered, l for flushleft, r for flushright.\ntext specifies what text is to make up the entry."));
 	(void) new KileAction::Tag(i18n("Horizontal Line - \\hline"),"hline",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_hline" ,"\\hline ",TQString(),7,0,i18n("The \\hline command draws a horizontal line the width of the table."));
 	(void) new KileAction::Tag(i18n("Vertical Line - \\vline"),"vline",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_vline" ,"\\vline ",TQString(),7,0,i18n("The \\vline command draws a vertical line extending the full height and depth of its row."));
@@ -209,10 +209,10 @@ void setupStdTags(KileInfo *ki, KMainWindow *parent)
 	(void) new KileAction::Tag("Medium - \\mdseries",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_mdseries", "\\mdseries", TQString(), 9);
 	(void) new KileAction::Tag("Bold - \\bfseries",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_bfseries", "\\bfseries", TQString(), 9);
 
-	(void) new KileAction::Tag("Upright - \\uptqshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_uptqshape", "\\uptqshape", TQString(), 8);
-	(void) new KileAction::Tag("Italic - \\ittqshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_ittqshape", "\\ittqshape", TQString(), 8);
-	(void) new KileAction::Tag("Slanted - \\sltqshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_sltqshape", "\\sltqshape", TQString(), 8);
-	(void) new KileAction::Tag("Smallcaps - \\sctqshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_sctqshape", "\\sctqshape", TQString(), 8);
+	(void) new KileAction::Tag("Upright - \\upshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_upshape", "\\upshape", TQString(), 8);
+	(void) new KileAction::Tag("Italic - \\itshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_itshape", "\\itshape", TQString(), 8);
+	(void) new KileAction::Tag("Slanted - \\slshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_slshape", "\\slshape", TQString(), 8);
+	(void) new KileAction::Tag("Smallcaps - \\scshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_scshape", "\\scshape", TQString(), 8);
 
 }
 
diff --git a/src/kile/kilestdtools.cpp b/src/kile/kilestdtools.cpp
index c4c9429..de9a94b 100644
--- a/src/kile/kilestdtools.cpp
+++ b/src/kile/kilestdtools.cpp
@@ -382,7 +382,7 @@ namespace KileTool
 
 				if ( !read1 && !read2 )
 				{
-					sendMessage(Error, i18n("Unable to find %1 or %2; if you are trying to view some other HTML file, go to Settings->Configure Kile->Tools->ViewHTML->Advanced.").tqarg(file1.absFilePath()).tqarg(file2.absFilePath()));
+					sendMessage(Error, i18n("Unable to find %1 or %2; if you are trying to view some other HTML file, go to Settings->Configure Kile->Tools->ViewHTML->Advanced.").arg(file1.absFilePath()).arg(file2.absFilePath()));
 					return false;
 				}
 
diff --git a/src/kile/kilestdtools.h b/src/kile/kilestdtools.h
index ca5e6b2..336a4f4 100644
--- a/src/kile/kilestdtools.h
+++ b/src/kile/kilestdtools.h
@@ -125,7 +125,7 @@ namespace KileTool
 		bool determineTarget();
 
 	signals:
-		void updatetqStatus(bool, bool);
+		void updateStatus(bool, bool);
 	};
 }
 
diff --git a/src/kile/kilestructurewidget.cpp b/src/kile/kilestructurewidget.cpp
index 2ff7212..2440ad9 100644
--- a/src/kile/kilestructurewidget.cpp
+++ b/src/kile/kilestructurewidget.cpp
@@ -62,7 +62,7 @@
 #include <tqfileinfo.h>
 #include <tqheader.h>
 #include <tqregexp.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
  
 #include <kapplication.h>
 #include "kiledebug.h"
@@ -125,7 +125,7 @@ void KileListViewToolTip::maybeTip(const TQPoint &p)
 	if ( !item )
 		return;
 	
-	const TQRect rect = m_listview->tqitemRect(item);
+	const TQRect rect = m_listview->itemRect(item);
 	if ( ! rect.isValid() )
 		return;
 	
@@ -154,7 +154,7 @@ namespace KileWidget
 		setSorting(-1,true);
 		setAllColumnsShowFocus(true);
 		setFullWidth(true);
-		tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
+		setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
 
 		TQToolTip::remove(this);
 		new KileListViewToolTip(this);
@@ -402,8 +402,8 @@ namespace KileWidget
 	/* some items have a special action:
 		- KileStruct::Sect: 
 		      The new item is saved in m_lastSectioning, so that all following entries 
-		      can be inserted as tqchildren. \part will drop back to level 0 of the Listview,
-		      all other sectioning commands will be tqchildren of the last sectioning item.
+		      can be inserted as children. \part will drop back to level 0 of the Listview,
+		      all other sectioning commands will be children of the last sectioning item.
 		      If a \label command follows in the same or the next line, it is assigned
 		      to this item.
 		- KileStruct::BeginFloat:
@@ -606,7 +606,7 @@ namespace KileWidget
 		setLineWidth(0);
 		setMidLineWidth(0);
 		setMargin(0);
-		tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
+		setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
 
 		m_default = new StructureList(this, 0L);
 		m_default->activate();
@@ -714,7 +714,7 @@ namespace KileWidget
 				}
 			}
 			else{
-				if ( KMessageBox::warningYesNo(this, i18n("Cannot find the included file. The file does not exist, is not readable or Kile is unable to determine the correct path to it. The filename causing this error was: %1.\nDo you want to create this file?").tqarg(fname), i18n("Cannot Find File"))
+				if ( KMessageBox::warningYesNo(this, i18n("Cannot find the included file. The file does not exist, is not readable or Kile is unable to determine the correct path to it. The filename causing this error was: %1.\nDo you want to create this file?").arg(fname), i18n("Cannot Find File"))
 			== KMessageBox::Yes)
 				{
 					emit(fileNew(url));
@@ -825,7 +825,7 @@ namespace KileWidget
 		if ( id <= 3 )
 			emit( sendText(s) );
 		else
-			TQApplication::tqclipboard()->setText(s);
+			TQApplication::clipboard()->setText(s);
  	}
 
 	// id's 10..16 (already checked)
diff --git a/src/kile/kiletool.cpp b/src/kile/kiletool.cpp
index c3d6551..65caa4f 100644
--- a/src/kile/kiletool.cpp
+++ b/src/kile/kiletool.cpp
@@ -211,7 +211,7 @@ namespace KileTool
 		//Is there an active document? Only check if the source file is not explicitly set.
 		if ( (m_source.isNull()) && (m_manager->info()->activeTextDocument() == 0L)  )
 		{ 
-			sendMessage(Error, msg(NeedActiveDoc).tqarg(name()));
+			sendMessage(Error, msg(NeedActiveDoc).arg(name()));
 			return false;
 		}
 
@@ -234,13 +234,13 @@ namespace KileTool
 		TQFileInfo fi(source());
 		if ( (flags() & NeedSourceExists) && !fi.exists() )
 		{
-			sendMessage(Error, msg(NeedSourceExists).tqarg(fi.absFilePath()));
+			sendMessage(Error, msg(NeedSourceExists).arg(fi.absFilePath()));
 			return false;
 		}
 		
 		if ( (flags() & NeedSourceRead) && !fi.isReadable() )
 		{
-			sendMessage(Error, msg(NeedSourceRead).tqarg(fi.absFilePath()));
+			sendMessage(Error, msg(NeedSourceRead).arg(fi.absFilePath()));
 			return false;
 		}
 
@@ -324,13 +324,13 @@ namespace KileTool
 		
 		if ( (flags() & NeedTargetDirExec ) && (! info.isExecutable()) )
 		{
-			sendMessage(Error, msg(NeedTargetDirExec).tqarg(m_targetdir));
+			sendMessage(Error, msg(NeedTargetDirExec).arg(m_targetdir));
 			return false;
 		}
 
 		if ((flags() & NeedTargetDirWrite) && (! info.isWritable()) )
 		{
-			sendMessage(Error, msg(NeedTargetDirWrite).tqarg(m_targetdir).tqarg(m_name));
+			sendMessage(Error, msg(NeedTargetDirWrite).arg(m_targetdir).arg(m_name));
 			return false;
 		}
 
@@ -338,13 +338,13 @@ namespace KileTool
 
 		if ( (flags() & NeedTargetExists) && ( ! info.exists() ))
 		{
-			sendMessage(Error, msg(NeedTargetExists).tqarg(m_targetdir).tqarg(m_target));
+			sendMessage(Error, msg(NeedTargetExists).arg(m_targetdir).arg(m_target));
 			return false;
 		}
 
 		if ( (flags() & NeedTargetRead) && ( ! info.isReadable() ))
 		{
-			sendMessage(Error, msg(NeedTargetRead).tqarg(m_targetdir).tqarg(m_target));
+			sendMessage(Error, msg(NeedTargetRead).arg(m_targetdir).arg(m_target));
 			return false;
 		}
 
@@ -492,7 +492,7 @@ namespace KileTool
 		KILE_DEBUG() << "==Base::needsUpdate(" << target << "," << source << endl;
 		TQFileInfo targetinfo(target);
 		TQFileInfo sourceinfo(source);
-		TQDateTime currDateTime = TQDateTime::tqcurrentDateTime();
+		TQDateTime currDateTime = TQDateTime::currentDateTime();
 
 		if ( !(sourceinfo.exists() && sourceinfo.isReadable()) )
 		{
@@ -543,7 +543,7 @@ namespace KileTool
 
 		if (!isRoot)
 		{
-			return  manager()->queryContinue(i18n("The document %1 is not a LaTeX root document; continue anyway?").tqarg(source()), i18n("Continue?"));
+			return  manager()->queryContinue(i18n("The document %1 is not a LaTeX root document; continue anyway?").arg(source()), i18n("Continue?"));
 		}
 
 		return true;
@@ -662,7 +662,7 @@ namespace KileTool
 			}
 			else
 			{
-				sendMessage(Error, i18n("Unknown tool %1.").tqarg(tools[i]));
+				sendMessage(Error, i18n("Unknown tool %1.").arg(tools[i]));
 				emit(done(this, Failed));
 				return ConfigureFailed;
 			}
diff --git a/src/kile/kiletoolconfigwidget.cpp b/src/kile/kiletoolconfigwidget.cpp
index 30064fb..3f539fb 100644
--- a/src/kile/kiletoolconfigwidget.cpp
+++ b/src/kile/kiletoolconfigwidget.cpp
@@ -15,7 +15,7 @@
 
 #include "kiletoolconfigwidget.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
@@ -226,17 +226,17 @@ namespace KileWidget
 
 		if ( m_configWidget->m_stackBasic->widget(basicPage) )
 		{
-			TQSize szHint = m_configWidget->m_stackBasic->widget(basicPage)->tqsizeHint();
+			TQSize szHint = m_configWidget->m_stackBasic->widget(basicPage)->sizeHint();
             if (szHint.height() > 0)
 			     m_configWidget->m_stackBasic->setMaximumHeight(szHint.height());
 		}
 		if ( m_configWidget->m_stackExtra->widget(extraPage) )
 		{
-			TQSize szHint = m_configWidget->m_stackExtra->widget(extraPage)->tqsizeHint();
+			TQSize szHint = m_configWidget->m_stackExtra->widget(extraPage)->sizeHint();
             if (szHint.height() > 0)
 			     m_configWidget->m_stackExtra->setMaximumHeight(szHint.height());
 		}
-		m_configWidget->tqlayout()->tqinvalidate();
+		m_configWidget->layout()->invalidate();
 	}
 
 	void ToolConfig::writeDefaults()
@@ -442,7 +442,7 @@ namespace KileWidget
 	void ToolConfig::removeTool()
 	{
 		//KILE_DEBUG() << "==ToolConfig::removeTool()=====================" << endl;
-		if ( KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove the tool %1?").tqarg(m_current)) == KMessageBox::Continue )
+		if ( KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove the tool %1?").arg(m_current)) == KMessageBox::Continue )
 		{
 			KConfig *config = m_config;
 			TQStringList cfgs = KileTool::configNames(m_current, config);
diff --git a/src/kile/kiletoolmanager.cpp b/src/kile/kiletoolmanager.cpp
index 089c06b..3f086bc 100644
--- a/src/kile/kiletoolmanager.cpp
+++ b/src/kile/kiletoolmanager.cpp
@@ -146,7 +146,7 @@ namespace KileTool
 		Base* pTool = m_factory->create(tool);
 		if (!pTool)
 		{
-			m_log->printMsg(Error, i18n("Unknown tool %1.").tqarg(tool));
+			m_log->printMsg(Error, i18n("Unknown tool %1.").arg(tool));
 			return ConfigureFailed;
 		}
 		
@@ -369,7 +369,7 @@ namespace KileTool
 
 		if ( ! retrieveEntryMap(tool->name(), map, true, true, cfg) )
 		{
-			m_log->printMsg(Error, i18n("Cannot find the tool %1 in the configuration database.").tqarg(tool->name()));
+			m_log->printMsg(Error, i18n("Cannot find the tool %1 in the configuration database.").arg(tool->name()));
 			return false;
 		}
 
diff --git a/src/kile/kileviewmanager.cpp b/src/kile/kileviewmanager.cpp
index 47634ac..fee09e8 100644
--- a/src/kile/kileviewmanager.cpp
+++ b/src/kile/kileviewmanager.cpp
@@ -21,7 +21,7 @@
 #include <tqpopupmenu.h>
 #include <tqtimer.h> //for TQTimer::singleShot trick
 #include <tqpixmap.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <tdeversion.h>
 #include <kglobal.h>
@@ -100,7 +100,7 @@ void Manager::createTabs(TQWidget *parent)
 	m_tabs->setFocus();
 	connect( m_tabs, TQT_SIGNAL( currentChanged( TQWidget * ) ), m_receiver, TQT_SLOT(newCaption()) );
 	connect( m_tabs, TQT_SIGNAL( currentChanged( TQWidget * ) ), m_receiver, TQT_SLOT(activateView( TQWidget * )) );
-	connect( m_tabs, TQT_SIGNAL( currentChanged( TQWidget * ) ), m_receiver, TQT_SLOT(updateModetqStatus()) );
+	connect( m_tabs, TQT_SIGNAL( currentChanged( TQWidget * ) ), m_receiver, TQT_SLOT(updateModeStatus()) );
 	connect( m_tabs, TQT_SIGNAL( closeRequest(TQWidget *) ), this, TQT_SLOT(closeWidget(TQWidget *)));
 	connect( m_tabs, TQT_SIGNAL( testCanDecode( const TQDragMoveEvent *,  bool & ) ), this, TQT_SLOT(testCanDecodeURLs( const TQDragMoveEvent *, bool & )) );
 	connect( m_tabs, TQT_SIGNAL( receivedDropEvent( TQDropEvent * ) ), m_ki->docManager(), TQT_SLOT(openDroppedURLs( TQDropEvent * )) );
@@ -142,8 +142,8 @@ Kate::View* Manager::createTextView(KileDocument::TextInfo *info, int index)
 	m_tabs->showPage( view );
 	m_textViewList.insert((index < 0 || (uint)index >= m_textViewList.count()) ? m_textViewList.count() : index, view);
 
-	connect(view, TQT_SIGNAL(viewStatusMsg(const TQString&)), m_receiver, TQT_SLOT(newtqStatus(const TQString&)));
-	connect(view, TQT_SIGNAL(newtqStatus()), m_receiver, TQT_SLOT(newCaption()));
+	connect(view, TQT_SIGNAL(viewStatusMsg(const TQString&)), m_receiver, TQT_SLOT(newStatus(const TQString&)));
+	connect(view, TQT_SIGNAL(newStatus()), m_receiver, TQT_SLOT(newCaption()));
 	connect(view, TQT_SIGNAL(dropEventPass(TQDropEvent *)), m_ki->docManager(), TQT_SLOT(openDroppedURLs(TQDropEvent *)));
 	connect(info, TQT_SIGNAL(urlChanged(KileDocument::Info*, const KURL&)), this, TQT_SLOT(urlChanged(KileDocument::Info*, const KURL&)));
 
@@ -163,7 +163,7 @@ Kate::View* Manager::createTextView(KileDocument::TextInfo *info, int index)
 	emit(activateView(view, false));
 	TQTimer::singleShot(0, m_receiver, TQT_SLOT(newCaption())); //make sure the caption gets updated
 	
-	reflectDocumenttqStatus(view->getDoc(), false, 0);
+	reflectDocumentStatus(view->getDoc(), false, 0);
 
 	view->setFocusPolicy(TQ_StrongFocus);
 	view->setFocus();
@@ -304,7 +304,7 @@ void Manager::gotoPrevView()
 		m_tabs->setCurrentPage( cPage );
 }
 
-void Manager::reflectDocumenttqStatus(Kate::Document *doc, bool isModified, unsigned char reason)
+void Manager::reflectDocumentStatus(Kate::Document *doc, bool isModified, unsigned char reason)
 {
 	TQPixmap icon;
 	if ( reason == 0 && isModified ) //nothing
@@ -361,7 +361,7 @@ void Manager::onKatePopupMenuRequest(void)
 		if(!pasteAsLaTeXAction->isPlugged())
 			pasteAsLaTeXAction->plug(viewPopupMenu);
 
-		TQClipboard *clip = KApplication::tqclipboard();
+		TQClipboard *clip = KApplication::clipboard();
 		if(NULL != clip)
 			pasteAsLaTeXAction->setEnabled(!clip->text().isNull());
 	}
@@ -464,7 +464,7 @@ void Manager::pasteAsLaTeX(void)
 		doc->removeSelectedText();
 
 	PlainToLaTeXConverter cvt;
-	TQString toPaste = cvt.ConvertToLaTeX(KApplication::tqclipboard()->text());
+	TQString toPaste = cvt.ConvertToLaTeX(KApplication::clipboard()->text());
 	doc->insertText(cursorLine, cursorCol, toPaste);
 
 	// End of the "atomic edit operation"
diff --git a/src/kile/kileviewmanager.h b/src/kile/kileviewmanager.h
index 2050a2c..2932ca4 100644
--- a/src/kile/kileviewmanager.h
+++ b/src/kile/kileviewmanager.h
@@ -91,7 +91,7 @@ public slots:
 	void gotoNextView();
 	void gotoPrevView();
 
-	void reflectDocumenttqStatus(Kate::Document*, bool, unsigned char);
+	void reflectDocumentStatus(Kate::Document*, bool, unsigned char);
 
 	void onKatePopupMenuRequest(void);
 	void convertSelectionToLaTeX(void);
diff --git a/src/kile/latexcmd.cpp b/src/kile/latexcmd.cpp
index aa01076..7bec0be 100644
--- a/src/kile/latexcmd.cpp
+++ b/src/kile/latexcmd.cpp
@@ -405,7 +405,7 @@ TQString LatexCommands::configString(LatexCmdAttributes &attr,bool env)
 	TQChar ch = getAttrChar( attr.type );
 	if ( ch == '?' )
 		return TQString();
-	TQString s = TQString("%1,").tqarg(ch);
+	TQString s = TQString("%1,").arg(ch);
 	
 	// all environments/commands have starred attribute 
 	if ( attr.starred )
diff --git a/src/kile/latexcmddialog.cpp b/src/kile/latexcmddialog.cpp
index f824d07..bc458d8 100644
--- a/src/kile/latexcmddialog.cpp
+++ b/src/kile/latexcmddialog.cpp
@@ -21,7 +21,7 @@
 #include "latexcmddialog.h"
 #include "latexcmd.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvgroupbox.h>
 #include <tqvalidator.h>
 #include <tqregexp.h>
@@ -66,7 +66,7 @@ NewLatexCommand::NewLatexCommand(TQWidget *parent, const TQString &caption,
 	TQWidget *page = new TQWidget( this );
 	setMainWidget(page);
 
-	// tqlayout
+	// layout
 	TQVBoxLayout *vbox = new TQVBoxLayout(page, 6,6 );
 	TQLabel *label1 = new TQLabel(page);
 
@@ -143,7 +143,7 @@ NewLatexCommand::NewLatexCommand(TQWidget *parent, const TQString &caption,
 		{
 			m_coOption->insertItem("[tcb]");
 			m_coOption->insertItem("[lcr]");
-			TQWhatsThis::add(m_coOption,i18n("Define an optional tqalignment parameter."));
+			TQWhatsThis::add(m_coOption,i18n("Define an optional alignment parameter."));
 		}
 		else
 		{
@@ -398,7 +398,7 @@ LatexCommandsDialog::LatexCommandsDialog(KConfig *config, KileDocument::LatexCom
 	resetListviews();
 	slotEnableButtons();
 
-	resize(tqsizeHint().width()+20,tqsizeHint().height()+50);
+	resize(sizeHint().width()+20,sizeHint().height()+50);
 }
 
 ////////////////////////////// listview //////////////////////////////
@@ -757,7 +757,7 @@ void LatexCommandsDialog::slotUserDefinedClicked()
 void LatexCommandsDialog::slotHelp()
 {
 	TQString mode = ( getListviewMode() == lvEnvMode ) ? i18n("'environment'") : i18n("'command'");
-	if ( KMessageBox::warningContinueCancel(this, i18n("All your %1 settings will be overwritten with the default settings, are you sure you want to continue?").tqarg(mode)) == KMessageBox::Continue )
+	if ( KMessageBox::warningContinueCancel(this, i18n("All your %1 settings will be overwritten with the default settings, are you sure you want to continue?").arg(mode)) == KMessageBox::Continue )
 	{
 		if ( getListviewMode() == lvEnvMode )
 			resetEnvironments();
@@ -820,7 +820,7 @@ void LatexCommandsDialog::writeConfig(KListView *listview, const TQString &group
 			continue;
 		}
 
-		// look for tqchildren
+		// look for children
 		for ( TQListViewItem *curchild=cur->firstChild(); curchild; curchild=curchild->nextSibling() )
 		{
 			TQString key = curchild->text(0);
diff --git a/src/kile/latexconfigwidget.ui b/src/kile/latexconfigwidget.ui
index a162c66..c409952 100644
--- a/src/kile/latexconfigwidget.ui
+++ b/src/kile/latexconfigwidget.ui
@@ -117,7 +117,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>280</width>
                             <height>20</height>
diff --git a/src/kile/latexconfigwidget.ui.h b/src/kile/latexconfigwidget.ui.h
index d152918..fcc8bf5 100644
--- a/src/kile/latexconfigwidget.ui.h
+++ b/src/kile/latexconfigwidget.ui.h
@@ -13,12 +13,12 @@
 
 void KileWidgetLatexConfig::init() 
 { 
-	int w = m_tlType->tqsizeHint().width();  
+	int w = m_tlType->sizeHint().width();  
 	
-	int wi = m_tlPath->tqsizeHint().width(); 
+	int wi = m_tlPath->sizeHint().width(); 
 	if ( wi > w ) w = wi;
 	
-	wi = m_pbCommands->tqsizeHint().width(); 
+	wi = m_pbCommands->sizeHint().width(); 
 	if ( wi > w ) w = wi;
 	
 	w += 8;
diff --git a/src/kile/latexoutputfilter.cpp b/src/kile/latexoutputfilter.cpp
index accbfa0..9f6ba1f 100644
--- a/src/kile/latexoutputfilter.cpp
+++ b/src/kile/latexoutputfilter.cpp
@@ -638,7 +638,7 @@ void LatexOutputFilter::sendProblems()
 
 	//print detailed error info
 	for(unsigned int i=0; i < m_InfoList->count(); ++i) {
-		Message = TQString("%1:%2:%3").tqarg((*m_InfoList)[i].source()).tqarg((*m_InfoList)[i].sourceLine()).tqarg((*m_InfoList)[i].message());
+		Message = TQString("%1:%2:%3").arg((*m_InfoList)[i].source()).arg((*m_InfoList)[i].sourceLine()).arg((*m_InfoList)[i].message());
 		switch ( (*m_InfoList)[i].type()  )
 		{
 			case LatexOutputInfo::itmBadBox	: type = KileTool::ProblemBadBox; break;
diff --git a/src/kile/librarytoolconfigwidget.ui b/src/kile/librarytoolconfigwidget.ui
index 8c5ba70..9605c6b 100644
--- a/src/kile/librarytoolconfigwidget.ui
+++ b/src/kile/librarytoolconfigwidget.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -91,7 +91,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/src/kile/managetemplatesdialog.cpp b/src/kile/managetemplatesdialog.cpp
index c049b59..7396756 100644
--- a/src/kile/managetemplatesdialog.cpp
+++ b/src/kile/managetemplatesdialog.cpp
@@ -15,7 +15,7 @@
 
 #include "managetemplatesdialog.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 
@@ -71,7 +71,7 @@ ManageTemplatesDialog::ManageTemplatesDialog(KileTemplate::Manager *templateMana
 	m_nameEdit = new KLineEdit(fileName, page);
 	nameLayout->addWidget(m_nameEdit);
 
-	nameLayout->addWidget(new TQLabel(i18n("Type: %1").tqarg(KileInfo::documentTypeToString(m_templateType)), page));
+	nameLayout->addWidget(new TQLabel(i18n("Type: %1").arg(KileInfo::documentTypeToString(m_templateType)), page));
 
 	TQHBoxLayout *iconLayout = new TQHBoxLayout(topLayout, spacingHint());
 	iconLayout->addWidget(new TQLabel(i18n("Icon:"), page));
@@ -210,19 +210,19 @@ void ManageTemplatesDialog::addTemplate() {
 	}
 
 	if (!KIO::NetAccess::exists(iconURL, true, kapp->mainWidget())) {
-		KMessageBox::error(this, i18n("Sorry, but the icon file: %1\ndoes not seem to exist. Please choose a new icon.").tqarg(icon));
+		KMessageBox::error(this, i18n("Sorry, but the icon file: %1\ndoes not seem to exist. Please choose a new icon.").arg(icon));
 		return;
 	}
 
 	if (!KIO::NetAccess::exists(m_sourceURL, true, kapp->mainWidget())) {
-		KMessageBox::error(this, i18n("Sorry, but the file: %1\ndoes not seem to exist. Maybe you forgot to save the file?").tqarg(m_sourceURL.prettyURL()));
+		KMessageBox::error(this, i18n("Sorry, but the file: %1\ndoes not seem to exist. Maybe you forgot to save the file?").arg(m_sourceURL.prettyURL()));
 		return;
 	}
 
 	TQListViewItem* item = m_templateList->selectedItem();
 
 	if(!item && m_templateManager->searchForTemplate(templateName, m_templateType)) {
-		KMessageBox::error(this, i18n("Sorry, but a template named \"%1\" already exists.\nPlease remove it first.").tqarg(templateName));
+		KMessageBox::error(this, i18n("Sorry, but a template named \"%1\" already exists.\nPlease remove it first.").arg(templateName));
 		return;
 	}
 
@@ -231,7 +231,7 @@ void ManageTemplatesDialog::addTemplate() {
 		TemplateListViewItem *templateItem = dynamic_cast<TemplateListViewItem*>(item);
 		Q_ASSERT(templateItem);
 		KileTemplate::Info templateInfo = templateItem->getTemplateInfo();
-		if (KMessageBox::warningYesNo(this, i18n("You are about to replace the template \"%1\"; are you sure?").tqarg(templateInfo.name)) == KMessageBox::No) {
+		if (KMessageBox::warningYesNo(this, i18n("You are about to replace the template \"%1\"; are you sure?").arg(templateInfo.name)) == KMessageBox::No) {
 			reject();
 			return;
 		}
@@ -266,7 +266,7 @@ bool ManageTemplatesDialog::removeTemplate()
 		return false;
 	}
 
-	if (KMessageBox::warningYesNo(this, i18n("You are about to remove the template \"%1\"; are you sure?").tqarg(templateInfo.name)) == KMessageBox::No) {
+	if (KMessageBox::warningYesNo(this, i18n("You are about to remove the template \"%1\"; are you sure?").arg(templateInfo.name)) == KMessageBox::No) {
 		return false;
 	}
 
diff --git a/src/kile/mathenvdialog.cpp b/src/kile/mathenvdialog.cpp
index e3b5dce..5a7f3a0 100644
--- a/src/kile/mathenvdialog.cpp
+++ b/src/kile/mathenvdialog.cpp
@@ -20,7 +20,7 @@
 #include "codecompletion.h"
 #include "kileedit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
 #include <tqwhatsthis.h>
@@ -43,8 +43,8 @@ MathEnvironmentDialog::MathEnvironmentDialog(TQWidget *parent, KConfig *config,
 	// environment groupbox
 	TQButtonGroup *envgroup = new TQButtonGroup( i18n("Environment"),page);
 	envgroup->setColumnLayout(0, Qt::Vertical );
-	envgroup->tqlayout()->setSpacing( 6 );
-	envgroup->tqlayout()->setMargin( 11 );
+	envgroup->layout()->setSpacing( 6 );
+	envgroup->layout()->setMargin( 11 );
 
 	m_lbEnvironment = new TQLabel(i18n("&Name:"),envgroup);
 	m_lbStarred = new TQLabel(i18n("Without n&umbering:"),envgroup);
@@ -70,28 +70,28 @@ MathEnvironmentDialog::MathEnvironmentDialog(TQWidget *parent, KConfig *config,
 	m_coDisplaymath = new TQComboBox(envgroup);	
 	m_cbBullets = new TQCheckBox(envgroup);
 	
-	TQGridLayout *envtqlayout = new TQGridLayout( envgroup->tqlayout() );
-	envtqlayout->tqsetAlignment( TQt::AlignTop );
-	envtqlayout->addWidget( m_lbEnvironment, 0,0 ); 
-	envtqlayout->addWidget( m_lbStarred, 1,0 );
-	envtqlayout->addWidget( m_lbRows, 2,0 );
-	envtqlayout->addWidget( m_lbCols, 3,0 );
-	envtqlayout->addWidget( m_lbTabulator, 5,0 ); 
-	envtqlayout->addWidget( m_lbDisplaymath, 6,0 ); 
-	envtqlayout->addWidget( m_coEnvironment, 0,1 );
-	envtqlayout->addWidget( m_cbStarred, 1,1 );
-	envtqlayout->addWidget( m_spRows, 2,1 );
-	envtqlayout->addWidget( m_spCols, 3,1 );
-	envtqlayout->addWidget( m_coTabulator, 5,1 );
-	envtqlayout->addWidget( m_coDisplaymath, 6,1 );
-	envtqlayout->addWidget( m_lbSpace, 3,3 );
-	envtqlayout->addWidget( m_lbBullets, 5,3 );
-	envtqlayout->addWidget( m_edSpace, 3,4 );
-	envtqlayout->addWidget( m_cbBullets, 5,4 );	
-	envtqlayout->addMultiCellWidget(frame,4,4,0,4);
-	envtqlayout->setRowSpacing(4,30);
-	envtqlayout->setColSpacing(2,20);
-	envtqlayout->setColStretch(4,1);
+	TQGridLayout *envlayout = new TQGridLayout( envgroup->layout() );
+	envlayout->setAlignment( TQt::AlignTop );
+	envlayout->addWidget( m_lbEnvironment, 0,0 ); 
+	envlayout->addWidget( m_lbStarred, 1,0 );
+	envlayout->addWidget( m_lbRows, 2,0 );
+	envlayout->addWidget( m_lbCols, 3,0 );
+	envlayout->addWidget( m_lbTabulator, 5,0 ); 
+	envlayout->addWidget( m_lbDisplaymath, 6,0 ); 
+	envlayout->addWidget( m_coEnvironment, 0,1 );
+	envlayout->addWidget( m_cbStarred, 1,1 );
+	envlayout->addWidget( m_spRows, 2,1 );
+	envlayout->addWidget( m_spCols, 3,1 );
+	envlayout->addWidget( m_coTabulator, 5,1 );
+	envlayout->addWidget( m_coDisplaymath, 6,1 );
+	envlayout->addWidget( m_lbSpace, 3,3 );
+	envlayout->addWidget( m_lbBullets, 5,3 );
+	envlayout->addWidget( m_edSpace, 3,4 );
+	envlayout->addWidget( m_cbBullets, 5,4 );	
+	envlayout->addMultiCellWidget(frame,4,4,0,4);
+	envlayout->setRowSpacing(4,30);
+	envlayout->setColSpacing(2,20);
+	envlayout->setColStretch(4,1);
 	
 	// add widgets
 	vbox->addWidget( envgroup);
@@ -125,8 +125,8 @@ MathEnvironmentDialog::MathEnvironmentDialog(TQWidget *parent, KConfig *config,
 	TQWhatsThis::add(m_coEnvironment,i18n("Choose an environment."));
 	TQWhatsThis::add(m_cbStarred,i18n("Use the starred version of this environment."));
 	TQWhatsThis::add(m_spRows,i18n("Choose the number of table rows."));
-	TQWhatsThis::add(m_spCols,i18n("Choose the number of table columns or tqalignment groups."));
-	TQWhatsThis::add(m_edSpace,i18n("Define an extra LaTeX command to separate tqalignment groups."));
+	TQWhatsThis::add(m_spCols,i18n("Choose the number of table columns or alignment groups."));
+	TQWhatsThis::add(m_edSpace,i18n("Define an extra LaTeX command to separate alignment groups."));
 	TQWhatsThis::add(m_coTabulator,i18n("Choose one of some predefined tabulators."));
 	TQWhatsThis::add(m_coDisplaymath,i18n("Some environments are only valid in math mode. You can surround them with one of these display math modes."));
 	TQWhatsThis::add(m_cbBullets,i18n("Insert bullets in each cell. Alt+Ctrl+Right and Alt+Ctrl+Left will move very quick from one cell to another."));
@@ -318,8 +318,8 @@ void MathEnvironmentDialog::slotOk()
 			} 
 			else 
 			{
-				displaymathbegin = TQString("\\begin{%1}\n").tqarg(mathmode);
-				displaymathend   = TQString("\\end{%1}\n").tqarg(mathmode);
+				displaymathbegin = TQString("\\begin{%1}\n").arg(mathmode);
+				displaymathend   = TQString("\\end{%1}\n").arg(mathmode);
 			}
 		}
 	}
@@ -329,12 +329,12 @@ void MathEnvironmentDialog::slotOk()
 	
 	TQString parameter;
 	if ( isGroupsParameterEnv() )
-		parameter = TQString("{%2}").tqarg(numgroups);
+		parameter = TQString("{%2}").arg(numgroups);
 	else if ( isParameterEnv() )
 		parameter = '{' + bullet + '}';
 
 	// open environment  
-	m_td.tagBegin += TQString("\\begin{%1}").tqarg(envname) + parameter + '\n';
+	m_td.tagBegin += TQString("\\begin{%1}").arg(envname) + parameter + '\n';
 	
 	for ( int row=0; row<numrows; ++row ) 
 	{
@@ -359,7 +359,7 @@ void MathEnvironmentDialog::slotOk()
 	}
 	
 	// close environment
-	m_td.tagEnd = TQString("\n\\end{%1}\n").tqarg(envname);
+	m_td.tagEnd = TQString("\n\\end{%1}\n").arg(envname);
 	m_td.tagEnd += displaymathend;
 	
 	m_td.dy = ( displaymathbegin.isEmpty() ) ? 1 : 2;
diff --git a/src/kile/newdocumentwidget.ui b/src/kile/newdocumentwidget.ui
index ce4cea1..5f91b38 100644
--- a/src/kile/newdocumentwidget.ui
+++ b/src/kile/newdocumentwidget.ui
@@ -37,7 +37,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -58,7 +58,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
diff --git a/src/kile/newfilewizard.cpp b/src/kile/newfilewizard.cpp
index 5398e70..6d68843 100644
--- a/src/kile/newfilewizard.cpp
+++ b/src/kile/newfilewizard.cpp
@@ -17,7 +17,7 @@
 #include "newfilewizard.h"
 
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
diff --git a/src/kile/newtoolwizard.ui b/src/kile/newtoolwizard.ui
index 52eb717..42cc560 100644
--- a/src/kile/newtoolwizard.ui
+++ b/src/kile/newtoolwizard.ui
@@ -49,7 +49,7 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="tqminimumSize">
+                <property name="minimumSize">
                     <size>
                         <width>100</width>
                         <height>0</height>
@@ -69,7 +69,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>20</width>
                         <height>70</height>
@@ -112,7 +112,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>20</width>
                         <height>111</height>
@@ -146,7 +146,7 @@ the standard "LaTeX" tool.</string>
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>20</width>
                         <height>71</height>
diff --git a/src/kile/postscriptdialog.cpp b/src/kile/postscriptdialog.cpp
index f5d39bc..2d3ff6e 100644
--- a/src/kile/postscriptdialog.cpp
+++ b/src/kile/postscriptdialog.cpp
@@ -25,7 +25,7 @@
 #include <tqpushbutton.h>
 #include <tqgroupbox.h>
 #include "tqvgroupbox.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqwhatsthis.h>
 #include <tqstringlist.h>
@@ -103,7 +103,7 @@ PostscriptDialog::PostscriptDialog(TQWidget *parent,
 	}
 	
 	TQLabel *label1 = new TQLabel(title,widget);
-	label1->tqsetAlignment(TQt::AlignHCenter);
+	label1->setAlignment(TQt::AlignHCenter);
 	grid->addMultiCellWidget( label1, 0,0, 0,2, TQt::AlignCenter );
 
 	// empty line
@@ -122,7 +122,7 @@ PostscriptDialog::PostscriptDialog(TQWidget *parent,
 	// line 1: Choose-Box
 	TQPushButton *choose_in = new TQPushButton("", widget, "infilechooser" );
 	choose_in->setPixmap( SmallIcon("fileopen") );
-	choose_in->setFixedWidth(choose_in->tqsizeHint().width());        
+	choose_in->setFixedWidth(choose_in->sizeHint().width());        
 	grid->addWidget(choose_in,2,2);
 
 	// line 2: TQLabel
@@ -137,7 +137,7 @@ PostscriptDialog::PostscriptDialog(TQWidget *parent,
 	// line 3: choose box
 	TQPushButton *choose_out = new TQPushButton("", widget, "outfilechooser" );
 	choose_out->setPixmap( SmallIcon("fileopen") );
-	choose_out->setFixedWidth(choose_out->tqsizeHint().width());  
+	choose_out->setFixedWidth(choose_out->sizeHint().width());  
 	grid->addWidget(choose_out,3,2);
 
 	// line 3: task selection
@@ -518,7 +518,7 @@ bool PostscriptDialog::checkParameter()
 		}
 	
 		if ( infile!=outfile && fo.exists() ) {
-			TQString s = i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").tqarg(fo.fileName());
+			TQString s = i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(fo.fileName());
 			if ( KMessageBox::questionYesNo( this,
 			       "<center>" + s + "</center>",
 			       "Postscript tools" ) == KMessageBox::No ) {
diff --git a/src/kile/previewconfigwidget.cpp b/src/kile/previewconfigwidget.cpp
index 3ad0e06..e7d836a 100644
--- a/src/kile/previewconfigwidget.cpp
+++ b/src/kile/previewconfigwidget.cpp
@@ -20,7 +20,7 @@
 #include <klocale.h>
 #include "kiledebug.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
@@ -37,12 +37,12 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic
 	TQVBoxLayout *vbox = new TQVBoxLayout(this, 5,5 );
 
 	TQGroupBox *groupbox = new TQGroupBox( i18n("Quick Preview in a separate window"), this, "groupbox" );
-	groupbox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, groupbox->sizePolicy().hasHeightForWidth() ) );
+	groupbox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, groupbox->sizePolicy().hasHeightForWidth() ) );
 	groupbox->setColumnLayout(0, Qt::Vertical ); 
-	groupbox->tqlayout()->setSpacing( 6 ); 
-	groupbox->tqlayout()->setMargin( 11 );
-	TQGridLayout *groupboxLayout = new TQGridLayout( groupbox->tqlayout() );
-	groupboxLayout->tqsetAlignment( TQt::AlignTop );
+	groupbox->layout()->setSpacing( 6 ); 
+	groupbox->layout()->setMargin( 11 );
+	TQGridLayout *groupboxLayout = new TQGridLayout( groupbox->layout() );
+	groupboxLayout->setAlignment( TQt::AlignTop );
    
 	TQLabel *label = new TQLabel( i18n("Select a configuration:"), groupbox, "label");
 	m_combobox = new KComboBox(false,groupbox,"combobox" );
@@ -54,10 +54,10 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic
 	
 	TQGroupBox *gbResolution = new TQGroupBox( i18n("Quick Preview in bottom bar"), this, "gbresolution" );
 	gbResolution->setColumnLayout(0, Qt::Vertical );
-	gbResolution->tqlayout()->setSpacing( 6 );
-	gbResolution->tqlayout()->setMargin( 11 );
-	TQGridLayout *resLayout = new TQGridLayout( gbResolution->tqlayout() );
-	resLayout->tqsetAlignment( TQt::AlignTop );
+	gbResolution->layout()->setSpacing( 6 );
+	gbResolution->layout()->setMargin( 11 );
+	TQGridLayout *resLayout = new TQGridLayout( gbResolution->layout() );
+	resLayout->setAlignment( TQt::AlignTop );
 
 	TQLabel *resLabel = new TQLabel( i18n("&Resolution:"), gbResolution );
 	m_leDvipngResolution = new KLineEdit( gbResolution, "DvipngResolution" );
@@ -74,7 +74,7 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic
 	TQString tool1 = i18n("dvi --> png") + sep + i18n("(uses dvipng)");
 	TQString tool2 = i18n("dvi --> ps --> png") + sep + i18n("(uses dvips/convert)");
 	TQString tool3 = i18n("pdf --> png") + sep + i18n("(uses convert)");
-	TQString description = TQString("%1:<ul><li>%2<li>%3<li>%4</ul>").tqarg(title).tqarg(tool1).tqarg(tool2).tqarg(tool3);
+	TQString description = TQString("%1:<ul><li>%2<li>%3<li>%4</ul>").arg(title).arg(tool1).arg(tool2).arg(tool3);
 
 	TQLabel *labelDescription = new TQLabel(description, gbResolution);
 	TQLabel *labelDvipng = new TQLabel(i18n("dvipng:"), gbResolution);
@@ -97,10 +97,10 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic
 
 	m_gbPreview = new TQGroupBox( i18n("Properties"), this, "gbpreview" );
 	m_gbPreview->setColumnLayout(0, Qt::Vertical );
-	m_gbPreview->tqlayout()->setSpacing( 6 );
-	m_gbPreview->tqlayout()->setMargin( 11 );
-	TQGridLayout *previewLayout = new TQGridLayout( m_gbPreview->tqlayout() );
-	previewLayout->tqsetAlignment( TQt::AlignTop );
+	m_gbPreview->layout()->setSpacing( 6 );
+	m_gbPreview->layout()->setMargin( 11 );
+	TQGridLayout *previewLayout = new TQGridLayout( m_gbPreview->layout() );
+	previewLayout->setAlignment( TQt::AlignTop );
 
 	TQLabel *labelPreviewWidget = new TQLabel(i18n("Show preview in bottom bar:"), m_gbPreview);
 	TQLabel *labelPreviewType = new TQLabel(i18n("Conversion to image:"), m_gbPreview);
@@ -129,8 +129,8 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic
 	previewLayout->addMultiCellWidget(m_lbMathgroup,3,3,4,5,TQt::AlignLeft);
 	previewLayout->addWidget(labelSubdocument1,4,0);
 	previewLayout->addMultiCellWidget(labelSubdocument2,4,4,2,5,TQt::AlignLeft);
-	previewLayout->setRowSpacing(0,3*labelPreviewWidget->tqsizeHint().height()/2);
-	previewLayout->setRowSpacing(3,m_coEnvironment->tqsizeHint().height());
+	previewLayout->setRowSpacing(0,3*labelPreviewWidget->sizeHint().height()/2);
+	previewLayout->setRowSpacing(3,m_coEnvironment->sizeHint().height());
 	previewLayout->setColSpacing(1,12);
 	previewLayout->setColSpacing(3,40);
 	previewLayout->setColStretch(5,1);
diff --git a/src/kile/previewwidget.cpp b/src/kile/previewwidget.cpp
index 0350261..c036d58 100644
--- a/src/kile/previewwidget.cpp
+++ b/src/kile/previewwidget.cpp
@@ -22,7 +22,7 @@
 
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqwidget.h>
 
 #include <klocale.h>
@@ -113,7 +113,7 @@ void PreviewWidget::showActivePreview(const TQString &text,const TQString &textf
 	KileTool::Base *pngConverter = m_info->toolFactory()->create(tool);
 	if ( ! pngConverter ) 
 	{
-		showError( TQString(i18n("Could not run '%1' for QuickPreview.").tqarg(tool)) );
+		showError( TQString(i18n("Could not run '%1' for QuickPreview.").arg(tool)) );
 		return;
 	}
 	pngConverter->setSource(m_info->quickPreview()->getPreviewFile(extension));
@@ -160,7 +160,7 @@ void PreviewWidget::drawImage()
 	m_previewImage = new TQImage (m_info->quickPreview()->getPreviewFile ("png"));
 	setFixedSize( m_previewImage->width()+6,m_previewImage->height()+6 );
 
-	tqrepaint ();
+	repaint ();
 }
 
 void PreviewWidget::toolDestroyed() 
diff --git a/src/kile/processtoolconfigwidget.ui b/src/kile/processtoolconfigwidget.ui
index 02595c7..261970f 100644
--- a/src/kile/processtoolconfigwidget.ui
+++ b/src/kile/processtoolconfigwidget.ui
@@ -85,7 +85,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/src/kile/quickdocumentdialog.cpp b/src/kile/quickdocumentdialog.cpp
index 763b8fe..7b3c8a8 100644
--- a/src/kile/quickdocumentdialog.cpp
+++ b/src/kile/quickdocumentdialog.cpp
@@ -20,13 +20,13 @@ email                : [email protected]
 
 #include <tqstringlist.h>
 #include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqstyle.h>
 #include <tqlistview.h>
 #include <tqwhatsthis.h>
@@ -102,7 +102,7 @@ public:
 	EditableCheckListItem(TQCheckListItem *parent, const TQString &text);
 
 	virtual void paintCell(TQPainter *p, const TQColorGroup &cg,
-                          int column, int width, int tqalignment );
+                          int column, int width, int alignment );
 };
 
 EditableCheckListItem::EditableCheckListItem(TQCheckListItem *parent, const TQString &text)
@@ -111,7 +111,7 @@ EditableCheckListItem::EditableCheckListItem(TQCheckListItem *parent, const TQSt
 }
 
 void EditableCheckListItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-                                       int column, int width, int tqalignment )
+                                       int column, int width, int alignment )
 {
 	if ( column == 1) {
 		TQColorGroup colorgroup( cg );
@@ -123,7 +123,7 @@ void EditableCheckListItem::paintCell( TQPainter *p, const TQColorGroup &cg,
 		}
 		TQCheckListItem::paintCell( p, colorgroup, column, width, TQt::AlignHCenter );
 	} else {
-		TQCheckListItem::paintCell( p, cg, column, width, tqalignment );
+		TQCheckListItem::paintCell( p, cg, column, width, alignment );
 	}
 }
 
@@ -160,7 +160,7 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab)
 
 	// Document classes
 	m_cbDocumentClass = new KComboBox(classOptions);
-	m_cbDocumentClass->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
+	m_cbDocumentClass->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
 	m_cbDocumentClass->setDuplicatesEnabled(false);
 //	m_cbDocumentClass->listBox()->setVariableHeight(true);
 	gl->addWidget(m_cbDocumentClass,0,1);
@@ -168,7 +168,7 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab)
 
 	label = new TQLabel(i18n("Doc&ument class:"), classOptions);
 	gl->addWidget(label,0,0);
-	label->setBuddy(m_cbDocumentClass);	label->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
+	label->setBuddy(m_cbDocumentClass);	label->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
 
 	m_btnDocumentClassAdd = new KPushButton(SmallIcon("edit_add"), "", classOptions);
 	TQWhatsThis::add(m_btnDocumentClassAdd, i18n("Add current text to this list"));
@@ -187,7 +187,7 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab)
 
 	label = new TQLabel(i18n("&Typeface size:"), classOptions);
 	label->setBuddy(m_cbTypefaceSize);
-	label->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
+	label->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
 	gl->addWidget(label,1,0);
 
 	m_btnTypefaceSizeAdd = new KPushButton(SmallIcon("edit_add"), "", classOptions);
@@ -202,13 +202,13 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab)
 
 	// Papersize
 	m_cbPaperSize = new KComboBox(classOptions);
-	m_cbPaperSize->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
+	m_cbPaperSize->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
 	m_cbPaperSize->setDuplicatesEnabled(false);
 	gl->addWidget(m_cbPaperSize,2,1);
 
 	m_lbPaperSize = new TQLabel(i18n("Paper si&ze:"), classOptions);
 	m_lbPaperSize->setBuddy(m_cbPaperSize);
-	m_lbPaperSize->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
+	m_lbPaperSize->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
 	gl->addWidget(m_lbPaperSize,2,0);
 
 	m_btnPaperSizeAdd = new KPushButton(SmallIcon("edit_add"), "", classOptions);
@@ -223,13 +223,13 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab)
 
 	// Encoding
 	m_cbEncoding = new KComboBox(classOptions);
-	m_cbEncoding->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
+	m_cbEncoding->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
 	m_cbEncoding->setDuplicatesEnabled(false);
 	gl->addWidget(m_cbEncoding,3,1);
 
 	label = new TQLabel(i18n("E&ncoding:"), classOptions);
 	label->setBuddy(m_cbEncoding);
-	label->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
+	label->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
 	gl->addWidget(label,3,0);
 
 	// Class Options
@@ -245,8 +245,8 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab)
 
 	label = new TQLabel(i18n("Cl&ass options:"), classOptions);
 	label->setBuddy(m_lvClassOptions);
-	label->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
-	label->tqsetAlignment(TQt::AlignTop);
+	label->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
+	label->setAlignment(TQt::AlignTop);
 	gl->addWidget(label,4,0);
 
 	// button
@@ -357,9 +357,9 @@ TQWidget *QuickDocument::setupProperties(TQTabWidget *tab)
 	label->setBuddy(m_leDate);
 
 	// set current date
-	m_leDate->setText( KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true) );
+	m_leDate->setText( KGlobal::locale()->formatDate(TQDate::currentDate(), true) );
 	// For KDE4:
-	//m_leDate->setText( KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), KLocale::ShortDate) );
+	//m_leDate->setText( KGlobal::locale()->formatDate(TQDate::currentDate(), KLocale::ShortDate) );
 
 	return personalInfo;
 }
@@ -971,7 +971,7 @@ bool QuickDocument::addComboboxEntries(KComboBox *combo, const TQString &title,c
 		TQString s = list[i].stripWhiteSpace();
 		// entries must match a regular expression
 		if ( combolist.findIndex(s) != -1 )
-			KMessageBox::error( this, i18n("%1 '%2' already exists.").tqarg(title).tqarg(s) );
+			KMessageBox::error( this, i18n("%1 '%2' already exists.").arg(title).arg(s) );
 		else {
 			combolist += s;
 			KILE_DEBUG() << "\tinsert new " << title << ": " << s << endl;
@@ -1258,7 +1258,7 @@ void QuickDocument::writePackagesConfig()
 		// write listview entry
 		m_config->writeEntry(cur->text(0),packageentry);
 
-		// look for tqchildren
+		// look for children
 		for (TQListViewItem *curchild=cur->firstChild(); curchild; curchild=curchild->nextSibling()) {
 			// add child to packages list
 			TQString option = cur->text(0) + '!' + curchild->text(0);
@@ -1374,7 +1374,7 @@ bool QuickDocument::isListviewChild(TQListView *listview,const TQString &entry,
 	for ( TQListViewItem *cur=listview->firstChild(); cur; cur=cur->nextSibling() ) {
 		// look for the main entry
 		if ( cur->text(0) == entry ) {
-			// look for tqchildren
+			// look for children
 			for (TQListViewItem *curchild=cur->firstChild(); curchild; curchild=curchild->nextSibling()) {
 				if ( option == curchild->text(0) )
 					return true;
@@ -1701,7 +1701,7 @@ void QuickDocument::slotDocumentClassDelete()
 	TQString documentclass = m_cbDocumentClass->currentText();
 
 	KILE_DEBUG() << "==QuickDocument::slotDocumentClassDelete()============" << endl;
-	if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the document class list?").tqarg(documentclass), i18n("Remove Document Class"))==KMessageBox::Continue)
+	if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the document class list?").arg(documentclass), i18n("Remove Document Class"))==KMessageBox::Continue)
 	{
 		KILE_DEBUG() << "\tlazy delete class: " << documentclass << endl;
 
@@ -1769,7 +1769,7 @@ void QuickDocument::slotTypefaceSizeAdd()
 
 void QuickDocument::slotTypefaceSizeDelete()
 {
-	if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the fontsize list?").tqarg(m_cbPaperSize->currentText()), i18n("Remove Fontsize"))==KMessageBox::Continue)
+	if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the fontsize list?").arg(m_cbPaperSize->currentText()), i18n("Remove Fontsize"))==KMessageBox::Continue)
 	{
 		int i=m_cbPaperSize->currentItem();
 		m_cbPaperSize->removeItem(i);
@@ -1800,7 +1800,7 @@ void QuickDocument::slotPaperSizeAdd()
 
 void QuickDocument::slotPaperSizeDelete()
 {
-	if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the papersize list?").tqarg(m_cbPaperSize->currentText()), i18n("Remove Papersize"))==KMessageBox::Continue)
+	if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the papersize list?").arg(m_cbPaperSize->currentText()), i18n("Remove Papersize"))==KMessageBox::Continue)
 	{
 		int i=m_cbPaperSize->currentItem();
 		m_cbPaperSize->removeItem(i);
@@ -2187,7 +2187,7 @@ QuickDocumentInputDialog::QuickDocumentInputDialog(const TQStringList &list,int
 			m_objectlist.append( new TQCheckBox(list[i+2],page) );
 		} else if ( m_description[i]=="combobox" ) {
 			KComboBox *combobox = new KComboBox(page);
-			combobox->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
+			combobox->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
 			combobox->setDuplicatesEnabled(false);
 			combobox->insertStringList( TQStringList::split(",",list[i+2],true) );
 			if ( i>0 && m_description[i-1]=="label" )
@@ -2203,7 +2203,7 @@ QuickDocumentInputDialog::QuickDocumentInputDialog(const TQStringList &list,int
 				((TQLabel *)m_objectlist[i-1])->setBuddy(m_objectlist[i]);
 		}
 
-		// insert the new object into the tqlayout
+		// insert the new object into the layout
 		vl->addWidget(m_objectlist[i]);
 	}
 
@@ -2249,7 +2249,7 @@ bool QuickDocumentInputDialog::checkListEntries(const TQString &title, const TQS
 		// entries must match a regular expression
 		TQRegExp reg(pattern);
 		if ( ! reg.exactMatch(s) ) {
-			KMessageBox::error( this, i18n("%1 '%2' is not allowed.").tqarg(title).tqarg(s) );
+			KMessageBox::error( this, i18n("%1 '%2' is not allowed.").arg(title).arg(s) );
 			return false;
 		}
 	}
diff --git a/src/kile/quickpreview.cpp b/src/kile/quickpreview.cpp
index 8152ee0..32ef364 100644
--- a/src/kile/quickpreview.cpp
+++ b/src/kile/quickpreview.cpp
@@ -19,8 +19,8 @@
 #include "kiledocmanager.h"
 #include "kilelogwidget.h"
 
-#include <tqtextstream.h>
-#include <tqtextcodec.h>
+#include <textstream.h>
+#include <textcodec.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
@@ -179,7 +179,7 @@ bool QuickPreview::run(const TQString &text,const TQString &textfilename,int sta
 	TQString previewtask = KileConfig::previewTask();
 	if ( ! map.contains(previewtask) ) 
 	{
-		showError(TQString(i18n("Could not run QuickPreview:\nunknown task '%1'").tqarg(previewtask)));
+		showError(TQString(i18n("Could not run QuickPreview:\nunknown task '%1'").arg(previewtask)));
 		return false;
 	}
 
@@ -226,7 +226,7 @@ bool QuickPreview::run(const TQString &text,const TQString &textfilename,int sta
 	KileTool::PreviewLaTeX *latex = (KileTool::PreviewLaTeX  *)m_ki->toolFactory()->create(previewlist[pvLatex],false);
 	if ( !latex ) 
 	{
-		showError(TQString(i18n("Could not run '%1' for QuickPreview.").tqarg("LaTeX")));
+		showError(TQString(i18n("Could not run '%1' for QuickPreview.").arg("LaTeX")));
 		return false;
 	}
 	
@@ -238,7 +238,7 @@ bool QuickPreview::run(const TQString &text,const TQString &textfilename,int sta
 		dvips = m_ki->toolFactory()->create(previewlist[pvDvips]);
 		if ( !dvips ) 
 		{
-			showError(TQString(i18n("Could not run '%1' for QuickPreview.").tqarg(dvipstool)));
+			showError(TQString(i18n("Could not run '%1' for QuickPreview.").arg(dvipstool)));
 			return false;
 		}
 	} 
@@ -251,7 +251,7 @@ bool QuickPreview::run(const TQString &text,const TQString &textfilename,int sta
 		viewer = m_ki->toolFactory()->create(previewlist[pvViewer],false);
 		if ( !viewer ) 
 		{
-			showError(TQString(i18n("Could not run '%1' for QuickPreview.").tqarg(viewertool)));
+			showError(TQString(i18n("Could not run '%1' for QuickPreview.").arg(viewertool)));
 			return false;
 		}
 	} 
diff --git a/src/kile/quicktoolconfigwidget.ui b/src/kile/quicktoolconfigwidget.ui
index a3de889..8bc276b 100644
--- a/src/kile/quicktoolconfigwidget.ui
+++ b/src/kile/quicktoolconfigwidget.ui
@@ -36,7 +36,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -71,7 +71,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>150</width>
                     <height>0</height>
@@ -152,7 +152,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/src/kile/scriptingconfigwidget.ui b/src/kile/scriptingconfigwidget.ui
index 70874c4..5a1ea43 100644
--- a/src/kile/scriptingconfigwidget.ui
+++ b/src/kile/scriptingconfigwidget.ui
@@ -90,7 +90,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -125,7 +125,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -158,7 +158,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -179,7 +179,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/src/kile/scriptsmanagementwidget.cpp b/src/kile/scriptsmanagementwidget.cpp
index 7d6bd0f..d4f24d8 100644
--- a/src/kile/scriptsmanagementwidget.cpp
+++ b/src/kile/scriptsmanagementwidget.cpp
@@ -13,7 +13,7 @@
 
 #include "scriptsmanagementwidget.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqvbox.h>
 
@@ -75,13 +75,13 @@ void JScriptListViewItem::setText(int column, const TQString & str) {
 			TQString description = (action == 0L) ? TQString() : action->getDescription();
 			switch(pair.first) {
 				case 1:
-					KMessageBox::sorry(0L, i18n("The sequence \"%1\" is already assigned to the action \"%2\"").tqarg(str).tqarg(description), i18n("Sequence Already Assigned"));
+					KMessageBox::sorry(0L, i18n("The sequence \"%1\" is already assigned to the action \"%2\"").arg(str).arg(description), i18n("Sequence Already Assigned"));
 					break;
 				case 2:
-					KMessageBox::sorry(0L, i18n("The sequence \"%1\" is a subsequence of \"%2\", which is already assigned to the action \"%3\"").tqarg(str).tqarg(pair.second).tqarg(description), i18n("Sequence Already Assigned"));
+					KMessageBox::sorry(0L, i18n("The sequence \"%1\" is a subsequence of \"%2\", which is already assigned to the action \"%3\"").arg(str).arg(pair.second).arg(description), i18n("Sequence Already Assigned"));
 					break;
 				case 3:
-					KMessageBox::sorry(0L, i18n("The shorter sequence \"%1\" is already assigned to the action \"%2\"").tqarg(pair.second).tqarg(description), i18n("Sequence Already Assigned"));
+					KMessageBox::sorry(0L, i18n("The shorter sequence \"%1\" is already assigned to the action \"%2\"").arg(pair.second).arg(description), i18n("Sequence Already Assigned"));
 					break;
 			}
 		}
diff --git a/src/kile/structureconfigwidget.ui b/src/kile/structureconfigwidget.ui
index a5d8474..d0fd69b 100644
--- a/src/kile/structureconfigwidget.ui
+++ b/src/kile/structureconfigwidget.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -87,7 +87,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>200</width>
                             <height>20</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>60</width>
                             <height>20</height>
diff --git a/src/kile/symbolview.cpp b/src/kile/symbolview.cpp
index 1df13fc..eee1e93 100644
--- a/src/kile/symbolview.cpp
+++ b/src/kile/symbolview.cpp
@@ -138,7 +138,7 @@ void SymbolView::showToolTip( TQIconViewItem *item )
 			  WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM );
      m_toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
      m_toolTip->setLineWidth( 1 );
-     m_toolTip->tqsetAlignment( AlignLeft | AlignTop );
+     m_toolTip->setAlignment( AlignLeft | AlignTop );
      m_toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) );
      m_toolTip->adjustSize();
      TQRect screen = TQApplication::desktop()->screenGeometry(
@@ -150,7 +150,7 @@ void SymbolView::showToolTip( TQIconViewItem *item )
 	     m_toolTip->move(m_toolTip->x(), screen.bottom()-m_toolTip->y()-m_toolTip->height()+m_toolTip->y());
      }
      m_toolTip->setFont( TQToolTip::font() );
-     m_toolTip->tqsetPalette( TQToolTip::palette(), true );
+     m_toolTip->setPalette( TQToolTip::palette(), true );
      m_toolTip->show();
 }
 
@@ -289,7 +289,7 @@ void SymbolView::fillWidget(const TQString& prefix)
 			item = new KIconViewItem(this);
 			item->setPixmap(image);
 			item->setKey( refCnts[i] + '%' + image.text("Command") + '%' + image.text("Packages") + '%' + paths[i] );
-			image = KImageEffect::blend(tqcolorGroup().text(), image, 1); // destroys our png comments, so we do it after reading the comments
+			image = KImageEffect::blend(colorGroup().text(), image, 1); // destroys our png comments, so we do it after reading the comments
 		}
 		else
 			KILE_DEBUG() << "Loading file " << paths[i] << " failed" << endl;
diff --git a/src/kile/symbolviewconfig.ui b/src/kile/symbolviewconfig.ui
index 4f785cd..afb1df7 100644
--- a/src/kile/symbolviewconfig.ui
+++ b/src/kile/symbolviewconfig.ui
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -40,7 +40,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="1">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -72,7 +72,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>40</width>
                                             <height>20</height>
diff --git a/src/kile/tabbingdialog.cpp b/src/kile/tabbingdialog.cpp
index b02bcdf..5ccec72 100644
--- a/src/kile/tabbingdialog.cpp
+++ b/src/kile/tabbingdialog.cpp
@@ -18,7 +18,7 @@
 
 #include <tqspinbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klineedit.h>
 #include <kpushbutton.h>
diff --git a/src/kile/tabulardialog.cpp b/src/kile/tabulardialog.cpp
index 4bb76c0..56c9870 100644
--- a/src/kile/tabulardialog.cpp
+++ b/src/kile/tabulardialog.cpp
@@ -19,7 +19,7 @@
 #include "tabulardialog.h"
 #include "codecompletion.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqstyle.h>
 #include <tqframe.h>
@@ -261,56 +261,56 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data,
 	// font group
 	TQGroupBox *fontgroup = new TQGroupBox( i18n("Font"),page);
 	fontgroup->setColumnLayout(0, Qt::Vertical );
-	fontgroup->tqlayout()->setSpacing( 6 );
-	fontgroup->tqlayout()->setMargin( 11 );
+	fontgroup->layout()->setSpacing( 6 );
+	fontgroup->layout()->setMargin( 11 );
 
 	m_cbBold = new TQCheckBox(i18n("Bold"),fontgroup);	
 	m_cbItalic = new TQCheckBox(i18n("Italic"),fontgroup);	
 	
-	TQVBoxLayout *fontgrouptqlayout = new TQVBoxLayout( fontgroup->tqlayout() );
-	fontgrouptqlayout->tqsetAlignment( TQt::AlignTop );
-	fontgrouptqlayout->addWidget( m_cbBold ); 
-	fontgrouptqlayout->addWidget( m_cbItalic );
+	TQVBoxLayout *fontgrouplayout = new TQVBoxLayout( fontgroup->layout() );
+	fontgrouplayout->setAlignment( TQt::AlignTop );
+	fontgrouplayout->addWidget( m_cbBold ); 
+	fontgrouplayout->addWidget( m_cbItalic );
 	
 	// color group
 	TQGroupBox *colorgroup = new TQGroupBox( i18n("Color"),page);
 	colorgroup->setColumnLayout(0, Qt::Vertical );
-	colorgroup->tqlayout()->setSpacing( 6 );
-	colorgroup->tqlayout()->setMargin( 11 );
+	colorgroup->layout()->setSpacing( 6 );
+	colorgroup->layout()->setMargin( 11 );
 
 	TQLabel *label1 = new TQLabel(i18n("Background:"),colorgroup);
 	TQLabel *label2 = new TQLabel(i18n("Textcolor:"),colorgroup);
 	m_ccBgcolor = new KColorCombo(colorgroup);	
 	m_ccTextcolor = new KColorCombo(colorgroup);	
 	
-	TQGridLayout *colorgrouptqlayout = new TQGridLayout( colorgroup->tqlayout() );
-	colorgrouptqlayout->tqsetAlignment( TQt::AlignTop );
-	colorgrouptqlayout->addWidget( label1,0,0 ); 
-	colorgrouptqlayout->addWidget( label2,1,0 ); 
-	colorgrouptqlayout->addWidget( m_ccBgcolor,0,1 ); 
-	colorgrouptqlayout->addWidget( m_ccTextcolor,1,1 );
+	TQGridLayout *colorgrouplayout = new TQGridLayout( colorgroup->layout() );
+	colorgrouplayout->setAlignment( TQt::AlignTop );
+	colorgrouplayout->addWidget( label1,0,0 ); 
+	colorgrouplayout->addWidget( label2,1,0 ); 
+	colorgrouplayout->addWidget( m_ccBgcolor,0,1 ); 
+	colorgrouplayout->addWidget( m_ccTextcolor,1,1 );
 	
-	// tqalignment group
+	// alignment group
 	TQButtonGroup *aligngroup = new TQButtonGroup( i18n("Alignment"),page);
 	aligngroup->setColumnLayout(0, Qt::Vertical );
-	aligngroup->tqlayout()->setSpacing( 6 );
-	aligngroup->tqlayout()->setMargin( 11 );
+	aligngroup->layout()->setSpacing( 6 );
+	aligngroup->layout()->setMargin( 11 );
 
 	m_rbAlignleft = new TQRadioButton(i18n("Left"),aligngroup);	
 	m_rbAligncenter = new TQRadioButton(i18n("Center"),aligngroup);	
 	m_rbAlignright = new TQRadioButton(i18n("Right"),aligngroup);	
 	
-	TQVBoxLayout *aligngrouptqlayout = new TQVBoxLayout( aligngroup->tqlayout() );
-	aligngrouptqlayout->tqsetAlignment( TQt::AlignTop );
-	aligngrouptqlayout->addWidget( m_rbAlignleft ); 
-	aligngrouptqlayout->addWidget( m_rbAligncenter );
-	aligngrouptqlayout->addWidget( m_rbAlignright );
+	TQVBoxLayout *aligngrouplayout = new TQVBoxLayout( aligngroup->layout() );
+	aligngrouplayout->setAlignment( TQt::AlignTop );
+	aligngrouplayout->addWidget( m_rbAlignleft ); 
+	aligngrouplayout->addWidget( m_rbAligncenter );
+	aligngrouplayout->addWidget( m_rbAlignright );
 	
 	// frame group
 	TQGroupBox *framegroup = new TQGroupBox( i18n("Frame"),page);
 	framegroup->setColumnLayout(0, Qt::Vertical );
-	framegroup->tqlayout()->setSpacing( 6 );
-	framegroup->tqlayout()->setMargin( 11 );
+	framegroup->layout()->setSpacing( 6 );
+	framegroup->layout()->setMargin( 11 );
 
 	TQLabel *label3 = new TQLabel(i18n("Standard:"),framegroup);
 	TQLabel *label4 = new TQLabel(i18n("User defined:"),framegroup);
@@ -339,45 +339,45 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data,
 	borderbox->addWidget(m_cellframe);
 	borderbox->addStretch(1);
 	
-	TQVBoxLayout *framegrouptqlayout = new TQVBoxLayout( framegroup->tqlayout() );
-	framegrouptqlayout->tqsetAlignment( TQt::AlignTop );
-	framegrouptqlayout->addWidget( label3 ); 
-	framegrouptqlayout->addWidget( lineframe );
-	framegrouptqlayout->addSpacing( 10 );
-	framegrouptqlayout->addWidget( label4 );
-	framegrouptqlayout->addWidget( borderframe );
+	TQVBoxLayout *framegrouplayout = new TQVBoxLayout( framegroup->layout() );
+	framegrouplayout->setAlignment( TQt::AlignTop );
+	framegrouplayout->addWidget( label3 ); 
+	framegrouplayout->addWidget( lineframe );
+	framegrouplayout->addSpacing( 10 );
+	framegrouplayout->addWidget( label4 );
+	framegrouplayout->addWidget( borderframe );
 	
 	// preamble group 
 	TQGroupBox *preamblegroup = new TQGroupBox( i18n("Preamble"),page);
 	preamblegroup->setColumnLayout(0, Qt::Vertical );
-	preamblegroup->tqlayout()->setSpacing( 6 );
-	preamblegroup->tqlayout()->setMargin( 11 );
+	preamblegroup->layout()->setSpacing( 6 );
+	preamblegroup->layout()->setMargin( 11 );
 
 	m_cbPre = new TQCheckBox(i18n(">{decl}: insert before"),preamblegroup,"cb_pre");
 	m_cbPost = new TQCheckBox(i18n("<{decl}: insert after"),preamblegroup,"cb_post");
 	m_cbAt = new TQCheckBox(i18n("@{decl}: suppress space"),preamblegroup,"cb_at");
 	m_cbSep = new TQCheckBox(i18n("!{decl}: do not suppress space"),preamblegroup,"cb_sep");
 	
-	TQVBoxLayout *preamblegrouptqlayout = new TQVBoxLayout( preamblegroup->tqlayout() );
-	preamblegrouptqlayout->tqsetAlignment( TQt::AlignTop );
-	preamblegrouptqlayout->addWidget( m_cbPre ); 
-	preamblegrouptqlayout->addWidget( m_cbPost );
-	preamblegrouptqlayout->addWidget( m_cbAt ); 
-	preamblegrouptqlayout->addWidget( m_cbSep );
+	TQVBoxLayout *preamblegrouplayout = new TQVBoxLayout( preamblegroup->layout() );
+	preamblegrouplayout->setAlignment( TQt::AlignTop );
+	preamblegrouplayout->addWidget( m_cbPre ); 
+	preamblegrouplayout->addWidget( m_cbPost );
+	preamblegrouplayout->addWidget( m_cbAt ); 
+	preamblegrouplayout->addWidget( m_cbSep );
 	
 	// header group
 	TQGroupBox *headergroup = new TQGroupBox( i18n("Alignment"),page);
 	headergroup->setColumnLayout(0, Qt::Vertical );
-	headergroup->tqlayout()->setSpacing( 6 );
-	headergroup->tqlayout()->setMargin( 11 );
+	headergroup->layout()->setSpacing( 6 );
+	headergroup->layout()->setMargin( 11 );
 
 	m_coHeader = new TQComboBox(headergroup);	
 	
-	TQVBoxLayout *headergrouptqlayout = new TQVBoxLayout( headergroup->tqlayout() );
-	headergrouptqlayout->tqsetAlignment( TQt::AlignTop );
-	headergrouptqlayout->addStretch(1); 
-	headergrouptqlayout->addWidget(m_coHeader); 
-	headergrouptqlayout->addStretch(1); 
+	TQVBoxLayout *headergrouplayout = new TQVBoxLayout( headergroup->layout() );
+	headergrouplayout->setAlignment( TQt::AlignTop );
+	headergrouplayout->addStretch(1); 
+	headergrouplayout->addWidget(m_coHeader); 
+	headergrouplayout->addStretch(1); 
 	
 	// add widgets
 	if ( m_header ) 
@@ -401,7 +401,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data,
 	grid->setRowStretch(3,1);
 		
 	// init some special widgets
-	int buttonheight = m_pbFrame1->tqsizeHint().height();
+	int buttonheight = m_pbFrame1->sizeHint().height();
 	m_pbFrame1->setFixedSize(buttonheight,buttonheight); 
 	m_pbFrame2->setFixedSize(buttonheight,buttonheight); 
 	m_pbFrame3->setFixedSize(buttonheight,buttonheight); 
@@ -412,7 +412,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data,
 	m_pbFrame3->setPixmap( TQPixmap(const_cast<const char**>(tb_border_xpm)) );
 	m_pbFrame4->setPixmap( TQPixmap(const_cast<const char**>(all_border_xpm)) );
 
-	borderframe->setFixedWidth(lineframe->tqsizeHint().width());
+	borderframe->setFixedWidth(lineframe->sizeHint().width());
 	setButtonText(User1,"Re&set");
 	
 	if ( m_header ) 
@@ -442,9 +442,9 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data,
 		connect(m_cbSep,TQT_SIGNAL(clicked()),this, TQT_SLOT(slotSeparatorClicked()));
 	}
 	
-	TQWhatsThis::add(m_coHeader,i18n("Column or cell tqalignment."));
+	TQWhatsThis::add(m_coHeader,i18n("Column or cell alignment."));
 	TQWhatsThis::add(m_cbBold,i18n("Set bold font series."));
-	TQWhatsThis::add(m_cbItalic,i18n("Set italic font tqshape."));
+	TQWhatsThis::add(m_cbItalic,i18n("Set italic font shape."));
 	TQWhatsThis::add(m_rbAlignleft,i18n("The text will be aligned at the left border of the cell."));
 	TQWhatsThis::add(m_rbAligncenter,i18n("The text will be centered."));
 	TQWhatsThis::add(m_rbAlignright,i18n("The text will be aligned at the right border of the cell."));
@@ -460,7 +460,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data,
 	TQWhatsThis::add(m_pbFrame4,i18n("Set all border lines."));
 	TQWhatsThis::add(m_cellframe,i18n("Set user defined border lines. A mouse click into one of the four border ranges will set or clear this special border line."));
 	
-	setButtonWhatsThis(User1,i18n("Reset all settings to standard cell attributes: left tqalignment, normal font series and tqshape, white background color, black text color, no border lines."));
+	setButtonWhatsThis(User1,i18n("Reset all settings to standard cell attributes: left alignment, normal font series and shape, white background color, black text color, no border lines."));
 }
 
 ////////////////////////////// read data //////////////////////////////
@@ -634,7 +634,7 @@ TabularItem::TabularItem(TQTable* table, const TabularCell::Data &data)
 	m_data = data;
 }
 
-int TabularItem::tqalignment() const  
+int TabularItem::alignment() const  
 {
 	return m_data.align | TQt::AlignVCenter;
 }
@@ -668,7 +668,7 @@ void TabularItem::paint(TQPainter *p,const TQColorGroup &cg,const TQRect &cr,boo
 		p->setFont(f);
 	}
 		
-	p->drawText( 2,0,w-4,h,tqalignment(), text() );
+	p->drawText( 2,0,w-4,h,alignment(), text() );
 }
 
 //END TabularItem
@@ -824,7 +824,7 @@ void TabularTable::setText(int row,int col,const TQString &text)
 		updateCell(row,col);
 }
 
-void TabularTable::tqsetAlignment(int row,int col,int align)
+void TabularTable::setAlignment(int row,int col,int align)
 {
 	TabularItem *cellitem = cellItem(row,col);
 	cellitem->m_data.align = align;
@@ -980,7 +980,7 @@ void TabularTable::setCellrangeAlignment(int x1,int y1,int x2,int y2,int align)
 		for (int row=y1; row<=y2; ++row ) 
 		{ 
 			if ( singlecell || !isMulticolumn(row,col) ) 
-				tqsetAlignment(row,col,align);
+				setAlignment(row,col,align);
 		}
 	}
 }
@@ -1045,11 +1045,11 @@ void TabularTable::paintCell( TQPainter *p, int row, int col,
 		TQPen pen( p->pen() );
 		
 		TQColor gridlinecolor;
-		int gridColor = tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, this );
+		int gridColor = tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, this );
 		if (gridColor != -1) 
 		{
 			const TQPalette &pal = palette();
-			if ( cg != tqcolorGroup() && cg != pal.disabled() && cg != pal.inactive() )
+			if ( cg != colorGroup() && cg != pal.disabled() && cg != pal.inactive() )
 				gridlinecolor = cg.mid();             // p->setPen(cg.mid());
 			else
 				gridlinecolor = (TQRgb)gridColor;      // p->setPen((TQRgb)gridColor);
@@ -1119,7 +1119,7 @@ TQPopupMenu *TabularTable::createPopupMenu()
 
 void TabularTable::insertPopupAlign(TQPopupMenu *popup,bool header)
 {
-	// tqalignment 
+	// alignment 
 	int align = 0;
 	
 	//calculate 
@@ -1850,8 +1850,8 @@ TabularDialog::TabularDialog(TQWidget *parent, KConfig *config, KileDocument::La
 	// environment group
 	TQButtonGroup *group = new TQButtonGroup( i18n("Environment"),page);
 	group->setColumnLayout(0, Qt::Vertical );
-	group->tqlayout()->setSpacing( 4 );
-	group->tqlayout()->setMargin( 11 );
+	group->layout()->setSpacing( 4 );
+	group->layout()->setMargin( 11 );
 
 	TQLabel *label1 = new TQLabel(i18n("&Name:"),group);
 	TQLabel *label2 = new TQLabel(i18n("&Parameter:"),group);
@@ -1867,26 +1867,26 @@ TabularDialog::TabularDialog(TQWidget *parent, KConfig *config, KileDocument::La
 	m_cbCenter = new TQCheckBox(i18n("C&enter"),group);
 	m_cbBullets = new TQCheckBox(i18n("Insert &bullets"),group);
 	
-	TQGridLayout *grouptqlayout = new TQGridLayout( group->tqlayout() );
-	grouptqlayout->tqsetAlignment( TQt::AlignTop );
-	grouptqlayout->setColStretch(5,1);
-	grouptqlayout->addWidget( label1, 0,0 ); 
-	grouptqlayout->addWidget( label2, 1,0 );
-	grouptqlayout->addWidget( m_coEnvironment, 0,1 );
-	grouptqlayout->addWidget( m_coParameter, 1,1 );
-	grouptqlayout->setColSpacing(2,24);
-	grouptqlayout->addWidget( label3, 0,3 );
-	grouptqlayout->addWidget( label4, 1,3 );
-	grouptqlayout->addWidget( m_spRows, 0,4 );
-	grouptqlayout->addWidget( m_spCols, 1,4 );
-	grouptqlayout->setRowSpacing(2,8);
-	
-	grouptqlayout->addMultiCellWidget( m_cbWarning, 3,3,0,4, TQt::AlignLeft );
-	
-	grouptqlayout->addMultiCellWidget( m_cbStarred, 4,4,0,1, TQt::AlignLeft );	
-	grouptqlayout->addMultiCellWidget( m_cbBooktabs, 5,5,0,1, TQt::AlignLeft );	
-	grouptqlayout->addMultiCellWidget( m_cbCenter, 4,4,3,4, TQt::AlignLeft );
-	grouptqlayout->addMultiCellWidget( m_cbBullets, 5,5,3,4, TQt::AlignLeft );
+	TQGridLayout *grouplayout = new TQGridLayout( group->layout() );
+	grouplayout->setAlignment( TQt::AlignTop );
+	grouplayout->setColStretch(5,1);
+	grouplayout->addWidget( label1, 0,0 ); 
+	grouplayout->addWidget( label2, 1,0 );
+	grouplayout->addWidget( m_coEnvironment, 0,1 );
+	grouplayout->addWidget( m_coParameter, 1,1 );
+	grouplayout->setColSpacing(2,24);
+	grouplayout->addWidget( label3, 0,3 );
+	grouplayout->addWidget( label4, 1,3 );
+	grouplayout->addWidget( m_spRows, 0,4 );
+	grouplayout->addWidget( m_spCols, 1,4 );
+	grouplayout->setRowSpacing(2,8);
+	
+	grouplayout->addMultiCellWidget( m_cbWarning, 3,3,0,4, TQt::AlignLeft );
+	
+	grouplayout->addMultiCellWidget( m_cbStarred, 4,4,0,1, TQt::AlignLeft );	
+	grouplayout->addMultiCellWidget( m_cbBooktabs, 5,5,0,1, TQt::AlignLeft );	
+	grouplayout->addMultiCellWidget( m_cbCenter, 4,4,3,4, TQt::AlignLeft );
+	grouplayout->addMultiCellWidget( m_cbBullets, 5,5,3,4, TQt::AlignLeft );
 	
 	// add widgets
 	vbox->addWidget( m_table);
@@ -1901,7 +1901,7 @@ TabularDialog::TabularDialog(TQWidget *parent, KConfig *config, KileDocument::La
 	label4->setBuddy(m_spCols);
 
 	// init widgets
-	m_table->setMinimumHeight( m_table->tqsizeHint().height()-3 );
+	m_table->setMinimumHeight( m_table->sizeHint().height()-3 );
 	m_spRows->setValue(3);
 	m_spCols->setValue(3);
 	m_cbCenter->setChecked(true);
@@ -1915,7 +1915,7 @@ TabularDialog::TabularDialog(TQWidget *parent, KConfig *config, KileDocument::La
 	m_cols = m_spCols->value();
 	
 	m_table->setFocus();
-	resize(tqsizeHint().width(),tqsizeHint().height()+50);
+	resize(sizeHint().width(),sizeHint().height()+50);
 	
 	// signals and slots
 	connect( m_coEnvironment, TQT_SIGNAL(activated(const TQString &)), 
@@ -1924,7 +1924,7 @@ TabularDialog::TabularDialog(TQWidget *parent, KConfig *config, KileDocument::La
 	connect( m_spCols, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotColValueChanged(int)));
 
 	TQWhatsThis::add(m_table,i18n("Input data. When you press Enter, the cursor will move to the cell right of the current cell. A click with the right mouse button on a cell or a range of cells will open a popup menu, where you can edit attributes, clear attributes, delete text or define multicolumn cells."));
-	TQWhatsThis::add(m_table->horizontalHeader(),i18n("Current tqlayout of the preamble. A click with the right mouse button will open a popup menu, where you can edit some attributes of all cells, which belong to the selected columns."));
+	TQWhatsThis::add(m_table->horizontalHeader(),i18n("Current layout of the preamble. A click with the right mouse button will open a popup menu, where you can edit some attributes of all cells, which belong to the selected columns."));
 	TQWhatsThis::add(m_table->verticalHeader(),i18n("A click with the right mouse button will open a popup menu, where you can edit some attributes of all cells, which belong to the selected rows."));
 	TQWhatsThis::add(m_coEnvironment,i18n("Choose an environment."));
 	TQWhatsThis::add(m_coParameter,i18n("Optional parameter for the chosen environment."));
@@ -2137,13 +2137,13 @@ TQStringList TabularDialog::sortColorTable(TQMap<TQString,char> &colors)
 			sred = convertColor(r);
 			sgreen = convertColor(g);
 			sblue = convertColor(b);
-			s = TQString("{rgb}{%1,%2,%3}").tqarg(sred).tqarg(sgreen).tqarg(sblue);
+			s = TQString("{rgb}{%1,%2,%3}").arg(sred).arg(sgreen).arg(sblue);
 		} 
 		else 
 		{
-			s = TQString("{gray}{%1}").tqarg(convertColor(r));
+			s = TQString("{gray}{%1}").arg(convertColor(r));
 		}
-		list << TQString("\\definecolor{tc%1}%2").tqarg(it.data()).tqarg(s);
+		list << TQString("\\definecolor{tc%1}%2").arg(it.data()).arg(s);
 	}
 	
 	list.sort();
@@ -2236,21 +2236,21 @@ void TabularDialog::slotOk()
 		if ( colinfo[col].bgcolor != whitename ) 
 		{
 			TQChar color = defineColor(colinfo[col].bgcolor,colortable,colorchar);
-			colorcommand += TQString("\\columncolor{tc%1}").tqarg(color);
+			colorcommand += TQString("\\columncolor{tc%1}").arg(color);
 			pkgColortbl = true;
 		}
 		if ( colinfo[col].textcolor != blackname ) 
 		{
 			TQChar color = defineColor(colinfo[col].textcolor,colortable,colorchar);
-			colorcommand += TQString("\\color{tc%1}").tqarg(color);
+			colorcommand += TQString("\\color{tc%1}").arg(color);
 			pkgColor = true;
 		}
 		if ( ! colorcommand.isEmpty() ) 
 		{
 			if ( s.find('>') >= 0 ) 
-				s = s.replace(">{}",TQString(">{%1}").tqarg(colorcommand));
+				s = s.replace(">{}",TQString(">{%1}").arg(colorcommand));
 			else  
-				preamble += TQString(">{%1}").tqarg(colorcommand); 
+				preamble += TQString(">{%1}").arg(colorcommand); 
 			pkgArray = true;
 		}
 		
@@ -2285,7 +2285,7 @@ void TabularDialog::slotOk()
 		if ( bgcolor != whitename ) 
 		{
 			TQChar color = defineColor(cnt.nameBgcolor,colortable,colorchar);
-			textline += TQString("\\rowcolor{tc%1}\n").tqarg(color); 
+			textline += TQString("\\rowcolor{tc%1}\n").arg(color); 
 			pkgColortbl = true;
 		}
 			
@@ -2297,11 +2297,11 @@ void TabularDialog::slotOk()
 			{
 				// check for multicolumn and initialize string parameter
 				int colspan = cellitem->colSpan();
-				s1 = ( colspan > 1 ) ? TQString("%1").tqarg(colspan) : TQString();
+				s1 = ( colspan > 1 ) ? TQString("%1").arg(colspan) : TQString();
 				s2 = s3 = TQString();
 				
 				// Now look, if this cell(s) must be defined as multicolumn, because 
-				// colspan is greater than 1, or the left vline, bgcolor or tqalignment 
+				// colspan is greater than 1, or the left vline, bgcolor or alignment 
 				// is different from the preamble
 				bool useMulticolumn = 
 					(	( colspan > 1                                               )  ||
@@ -2325,10 +2325,10 @@ void TabularDialog::slotOk()
 					if ( cellitem->m_data.bgcolor.name() != whitename ) 
 					{
 						TQChar color = defineColor(cellitem->m_data.bgcolor.name(),colortable,colorchar);
-						s2 += TQString(">{\\columncolor{tc%1}}").tqarg(color);
+						s2 += TQString(">{\\columncolor{tc%1}}").arg(color);
 						pkgColortbl = true;
 					}
-					// tqalignment
+					// alignment
 					//if ( cellitem->m_data.align!=colinfo[col].align ) {
 					switch ( cellitem->m_data.align ) 
 					{
@@ -2350,13 +2350,13 @@ void TabularDialog::slotOk()
 				}
 				if ( colinfo[col].italic != (cellitem->m_data.font & TabularCell::cfItalic) ) 
 				{
-					s3 += "\\ittqshape";
+					s3 += "\\itshape";
 				}
 				
 				if ( colinfo[col].textcolor != cellitem->m_data.textcolor.name() ) 
 				{
 					TQChar color = defineColor(cellitem->m_data.textcolor.name(),colortable,colorchar);
-					s3 += TQString("\\color{tc%1}").tqarg(color);
+					s3 += TQString("\\color{tc%1}").arg(color);
 					pkgColor = true;
 				}
 				if ( ! s3.isEmpty() )
@@ -2379,7 +2379,7 @@ void TabularDialog::slotOk()
 				// build the whole cell entry
 				if ( useMulticolumn ) 
 				{
-					textline += TQString("\\mc{%1}{%2}{%3}").tqarg(colspan).tqarg(s2).tqarg(s3);
+					textline += TQString("\\mc{%1}{%2}{%3}").arg(colspan).arg(s2).arg(s3);
 					multicolumn = true;
 				}
 				else 
@@ -2445,7 +2445,7 @@ void TabularDialog::slotOk()
 	
 	// build the tag to insert
 	if ( m_cbCenter->isChecked() )
-		m_td.tagBegin = TQString("\\begin{%1}\n").tqarg(centername);
+		m_td.tagBegin = TQString("\\begin{%1}\n").arg(centername);
 	else if ( group )
 		m_td.tagBegin = "{% \n";
 	else
@@ -2468,22 +2468,22 @@ void TabularDialog::slotOk()
 	}
 		
 	// add environment command 
-	m_td.tagBegin += TQString("\\begin{%1}").tqarg(envname);
+	m_td.tagBegin += TQString("\\begin{%1}").arg(envname);
 	// add width for starred versions
 	if ( m_cbStarred->isChecked() )
-		m_td.tagBegin += TQString("{%1}").tqarg(bullet);
-	// add optional tqalignment parameter
+		m_td.tagBegin += TQString("{%1}").arg(bullet);
+	// add optional alignment parameter
 	TQString envparameter = ( m_coParameter->isEnabled() ) ? m_coParameter->currentText() : TQString();
 	if ( ! envparameter.isEmpty() ) 
-		m_td.tagBegin += TQString("[%1]").tqarg(envparameter);
+		m_td.tagBegin += TQString("[%1]").arg(envparameter);
 	// add preamble
-	m_td.tagBegin += TQString("{%1}").tqarg(preamble);
+	m_td.tagBegin += TQString("{%1}").arg(preamble);
 	m_td.tagBegin += getEol(0,true) + '\n';
 	
 	// close environment
-	m_td.tagEnd += TQString("\\end{%1}\n").tqarg(envname);
+	m_td.tagEnd += TQString("\\end{%1}\n").arg(envname);
 	if ( m_cbCenter->isChecked() )
-		m_td.tagEnd += TQString("\\end{%1}\n").tqarg(centername);
+		m_td.tagEnd += TQString("\\end{%1}\n").arg(centername);
 	else if ( group )
 		m_td.tagEnd += "}\n";
 	
@@ -2543,7 +2543,7 @@ TQString TabularDialog::getEol(int row, bool top)
 	{
 		TQString cmd = ( booktabs ) ? "cmidrule" : "cline";
 		for ( uint i=0; i<lines.list.count(); i+=2 ) 
-			s += TQString("\\%1{%2-%3}").tqarg(cmd).tqarg(lines.list[i]+1).tqarg(lines.list[i+1]+1);
+			s += TQString("\\%1{%2-%3}").arg(cmd).arg(lines.list[i]+1).arg(lines.list[i+1]+1);
 	} 
 	
 	return s;
diff --git a/src/kile/tabulardialog.h b/src/kile/tabulardialog.h
index 2d1465e..d1d3cb2 100644
--- a/src/kile/tabulardialog.h
+++ b/src/kile/tabulardialog.h
@@ -149,7 +149,7 @@ public:
 	TabularItem(TQTable* table);
 	TabularItem(TQTable* table, const TabularCell::Data &data);
 
-	int tqalignment() const;
+	int alignment() const;
 	bool isDefault();
 	bool isMulticolumn();
 	
@@ -167,7 +167,7 @@ public:
 	TabularTable(int numRows,int numCols,TQWidget* parent, TabularDialog *tabdialog);
 
 	void setText(int row,int col,const TQString &text);	
-	void tqsetAlignment(int row,int col,int align);
+	void setAlignment(int row,int col,int align);
 	TabularCell::Data defaultAttributes();
 	
 	bool isMulticolumn(int row,int col);
diff --git a/src/kile/templates.cpp b/src/kile/templates.cpp
index 7cc7216..c0072aa 100644
--- a/src/kile/templates.cpp
+++ b/src/kile/templates.cpp
@@ -76,7 +76,7 @@ bool Manager::copyAppData(const KURL& src, const TQString& subdir, const TQStrin
 		return KIO::NetAccess::copy(src, targetURL, kapp->mainWidget());
 	}
 	else {
-		KMessageBox::error(0, i18n("Could not find a folder to save %1 to.\nCheck whether you have a .kde folder with write permissions in your home folder.").tqarg(fileName));
+		KMessageBox::error(0, i18n("Could not find a folder to save %1 to.\nCheck whether you have a .kde folder with write permissions in your home folder.").arg(fileName));
 		return false;
 	}
 }
diff --git a/src/kile/texdocdialog.cpp b/src/kile/texdocdialog.cpp
index 9f11293..ecd7380 100644
--- a/src/kile/texdocdialog.cpp
+++ b/src/kile/texdocdialog.cpp
@@ -18,11 +18,11 @@
  
 #include "texdocdialog.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstringlist.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqgroupbox.h>
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
@@ -69,12 +69,12 @@ TexDocDialog::TexDocDialog(TQWidget *parent, const char *name)
 
 	// groupbox	
 	TQGroupBox *groupbox = new TQGroupBox( i18n("Search"), page, "groupbox" );
-	groupbox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, groupbox->sizePolicy().hasHeightForWidth() ) );
+	groupbox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, groupbox->sizePolicy().hasHeightForWidth() ) );
 	groupbox->setColumnLayout(0, Qt::Vertical ); 
-	groupbox->tqlayout()->setSpacing( 6 ); 
-	groupbox->tqlayout()->setMargin( 11 );
-	TQGridLayout *groupboxLayout = new TQGridLayout( groupbox->tqlayout() );
-	groupboxLayout->tqsetAlignment( TQt::AlignTop );
+	groupbox->layout()->setSpacing( 6 ); 
+	groupbox->layout()->setMargin( 11 );
+	TQGridLayout *groupboxLayout = new TQGridLayout( groupbox->layout() );
+	groupboxLayout->setAlignment( TQt::AlignTop );
    
 	TQLabel *label = new TQLabel( i18n("&Keyword:"), groupbox, "label");
 	m_leKeywords = new KLineEdit("",groupbox);
@@ -451,7 +451,7 @@ void TexDocDialog::slotListViewDoubleClicked(TQListViewItem *item,const TQPoint
 		filename = searchFile(texdocfile,m_texmfPath,"tex");
 		if ( filename.isEmpty() ) 
 		{
-			KMessageBox::error(this,i18n("Could not find '%1'").tqarg(filename));
+			KMessageBox::error(this,i18n("Could not find '%1'").arg(filename));
 			return;
 		}
 	}
@@ -506,10 +506,10 @@ void TexDocDialog::slotSearchClicked()
 	if ( searchlist.count() > 0 ) 
 	{
 		m_texdocs->clear();
-		showToc(i18n("Search results for keyword '%1'").tqarg(keyword),searchlist,false);
+		showToc(i18n("Search results for keyword '%1'").arg(keyword),searchlist,false);
 	} 
 	else
-		KMessageBox::error(this,i18n("No documents found for keyword '%1'.").tqarg(keyword));
+		KMessageBox::error(this,i18n("No documents found for keyword '%1'.").arg(keyword));
 }
 
 void TexDocDialog::slotHelp()
diff --git a/src/kile/toolconfigwidget.ui b/src/kile/toolconfigwidget.ui
index 0bb1cf2..152ca8b 100644
--- a/src/kile/toolconfigwidget.ui
+++ b/src/kile/toolconfigwidget.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -81,7 +81,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
@@ -160,7 +160,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
@@ -214,7 +214,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>400</width>
                             <height>0</height>
@@ -283,7 +283,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>240</height>
@@ -471,7 +471,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -552,7 +552,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>100</height>
diff --git a/src/kile/userhelp.cpp b/src/kile/userhelp.cpp
index 69376b2..e022e28 100644
--- a/src/kile/userhelp.cpp
+++ b/src/kile/userhelp.cpp
@@ -59,9 +59,9 @@ void UserHelp::readConfig()
 	int entries = config->readNumEntry("entries");
 	for ( int i=0; i<entries; ++i ) 
 	{
-		menu << config->readEntry(TQString("menu%1").tqarg(i));
+		menu << config->readEntry(TQString("menu%1").arg(i));
 		if ( !menu[i].isEmpty() || menu[i]=="-" )
-			files <<  config->readEntry(TQString("file%1").tqarg(i));	
+			files <<  config->readEntry(TQString("file%1").arg(i));	
 		else
 			files << TQString();
 	}
@@ -84,9 +84,9 @@ void UserHelp::writeConfig()
 	config->writeEntry("entries",entries);
 	for ( int i=0; i<entries; ++i ) 
 	{
-		config->writeEntry(TQString("menu%1").tqarg(i), m_menuentries[i]);
+		config->writeEntry(TQString("menu%1").arg(i), m_menuentries[i]);
 		if ( m_menuentries[i] != "-" )
-			config->writeEntry(TQString("file%1").tqarg(i), m_helpfiles[i]);	
+			config->writeEntry(TQString("file%1").arg(i), m_helpfiles[i]);	
 	}
 }
 
@@ -249,7 +249,7 @@ void UserHelp::slotUserHelpActivated(int index)
 	bool http = ( filename.find("http://",0) == 0 );
 	if ( !http && !fi.exists() ) 
 	{
-		KMessageBox::error(0,TQString(i18n("File '%1' doesn't exist.")).tqarg(filename));
+		KMessageBox::error(0,TQString(i18n("File '%1' doesn't exist.")).arg(filename));
 		return;
 	}
 		
diff --git a/src/kile/userhelpdialog.cpp b/src/kile/userhelpdialog.cpp
index 4275f43..6ef54c9 100644
--- a/src/kile/userhelpdialog.cpp
+++ b/src/kile/userhelpdialog.cpp
@@ -18,7 +18,7 @@
 
 #include "userhelpdialog.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvgroupbox.h>
 #include <tqlabel.h>
 #include <tqinputdialog.h>
@@ -49,7 +49,7 @@ UserHelpDialog::UserHelpDialog(TQWidget *parent, const char *name)
 	TQWidget *page = new TQWidget(this);
 	setMainWidget(page);
 
-	// tqlayout
+	// layout
 	TQVBoxLayout *vbox = new TQVBoxLayout(page, 6,6 );
 	TQVGroupBox* group= new TQVGroupBox(i18n("User Help"),page );
 
@@ -77,14 +77,14 @@ UserHelpDialog::UserHelpDialog(TQWidget *parent, const char *name)
 	m_up = new KPushButton(i18n("Move &Up"),actionwidget);
 	m_down = new KPushButton(i18n("Move &Down"),actionwidget);
 
-	int wmax = m_add->tqsizeHint().width();
-	int w = m_remove->tqsizeHint().width();
+	int wmax = m_add->sizeHint().width();
+	int w = m_remove->sizeHint().width();
 	if ( w > wmax ) wmax = w;
-	w = m_addsep->tqsizeHint().width();
+	w = m_addsep->sizeHint().width();
 	if ( w > wmax ) wmax = w;
-	w = m_up->tqsizeHint().width();
+	w = m_up->sizeHint().width();
 	if ( w > wmax ) wmax = w;
-	w = m_down->tqsizeHint().width();
+	w = m_down->sizeHint().width();
 	if ( w > wmax ) wmax = w;
 
 	m_add->setFixedWidth(wmax);
@@ -123,7 +123,7 @@ UserHelpDialog::UserHelpDialog(TQWidget *parent, const char *name)
 	connect( m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp()) );
 	connect( m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown()) );
 
-	resize(400,tqsizeHint().height());
+	resize(400,sizeHint().height());
 	updateButton();
 }
 
@@ -349,7 +349,7 @@ UserHelpAddDialog::UserHelpAddDialog(KListBox *menulistbox, TQWidget *parent, co
 	TQWidget *page = new TQWidget(this);
 	setMainWidget(page);
 
-	// tqlayout
+	// layout
 	TQVBoxLayout *vbox = new TQVBoxLayout(page, 6,6 );
 	TQVGroupBox* group= new TQVGroupBox(i18n("User Help"),page );
 
@@ -373,13 +373,13 @@ UserHelpAddDialog::UserHelpAddDialog(KListBox *menulistbox, TQWidget *parent, co
 	grid->addWidget( m_leHelpFile, 1,1 );
 	m_pbChooseFile = new KPushButton("", widget, "filechooser_button" );
 	m_pbChooseFile->setPixmap( SmallIcon("fileopen") );
-	grid->addRowSpacing( 1, m_pbChooseFile->tqsizeHint().height()+5 );
+	grid->addRowSpacing( 1, m_pbChooseFile->sizeHint().height()+5 );
 	grid->addWidget(m_pbChooseFile,1,3);
 	m_pbChooseHtml = new KPushButton("", widget, "htmlchooser_button" );
 	m_pbChooseHtml->setPixmap( SmallIcon("viewhtml") );
 	grid->addWidget(m_pbChooseHtml,1,5);
-	grid->setColSpacing(3, m_pbChooseFile->tqsizeHint().width()+5 );
-	grid->setColSpacing(5, m_pbChooseHtml->tqsizeHint().width()+5 );
+	grid->setColSpacing(3, m_pbChooseFile->sizeHint().width()+5 );
+	grid->setColSpacing(5, m_pbChooseHtml->sizeHint().width()+5 );
 
 	label2->setBuddy(m_pbChooseFile);
 
@@ -396,7 +396,7 @@ UserHelpAddDialog::UserHelpAddDialog(KListBox *menulistbox, TQWidget *parent, co
 	connect( m_pbChooseHtml, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChooseHtml() ) );
 
 	setFocusProxy( m_leMenuEntry );
-	resize(500,tqsizeHint().height());
+	resize(500,sizeHint().height());
 }
 
 void UserHelpAddDialog::slotChooseFile()
@@ -411,7 +411,7 @@ void UserHelpAddDialog::slotChooseFile()
 	TQFileInfo fi(filename);
 	if ( ! fi.exists() )
 	{
-		KMessageBox::error(0,TQString(i18n("File '%1' does not exist.")).tqarg(filename));
+		KMessageBox::error(0,TQString(i18n("File '%1' does not exist.")).arg(filename));
 		return;
 	}
 
@@ -452,7 +452,7 @@ void UserHelpAddDialog::slotOk()
 	TQFileInfo fi(filename);
 	if ( filename.find("http://",0)!=0 && !fi.exists() )
 	{
-		KMessageBox::error(this,TQString(i18n("File '%1' doesn't exist.")).tqarg(filename));
+		KMessageBox::error(this,TQString(i18n("File '%1' doesn't exist.")).arg(filename));
 		return;
 	}
 
diff --git a/src/kile/usermenudialog.cpp b/src/kile/usermenudialog.cpp
index 2c079df..1ccaedc 100644
--- a/src/kile/usermenudialog.cpp
+++ b/src/kile/usermenudialog.cpp
@@ -16,7 +16,7 @@
 
 #include <tqlabel.h>
 #include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqregexp.h>
 #include <tqradiobutton.h>
@@ -80,7 +80,7 @@ UserTags::~UserTags()
 
 void UserTags::redraw()
 {
-	KILE_DEBUG() << TQString("usermenudialog redraw() m_prevIndex = %1, m_list.size() = %2").tqarg(m_prevIndex).tqarg(m_list.size()) << endl;
+	KILE_DEBUG() << TQString("usermenudialog redraw() m_prevIndex = %1, m_list.size() = %2").arg(m_prevIndex).arg(m_list.size()) << endl;
 	m_combo->clear();
 
 	if (m_list.size() > 0)
@@ -103,7 +103,7 @@ void UserTags::redraw()
 
 void UserTags::change(int index)
 {
-	KILE_DEBUG() << TQString("usermenudialog: change(%1) prev %2").tqarg(index).tqarg(m_prevIndex) << endl;
+	KILE_DEBUG() << TQString("usermenudialog: change(%1) prev %2").arg(index).arg(m_prevIndex) << endl;
 	m_list[m_prevIndex] = splitTag(m_editName->text(), m_editTag->text());
 
 	m_combo->changeItem(TQString::number(m_prevIndex+1)+": "+m_list[m_prevIndex].text, m_prevIndex);