Fix kdevelop Qt3 compilation

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1237312 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

79 files changed, 606 insertions, 607 deletions

diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp
index 516e5daa..fc0cb068 100644
--- a/buildtools/qmake/choosesubprojectdlg.cpp
+++ b/buildtools/qmake/choosesubprojectdlg.cpp
@@ -47,17 +47,17 @@ void ChooseSubprojectDlg::accept()
     TQDialog::accept();
 }
 
-ChooseItem::ChooseItem( TQMakeScopeItem * spitem, TQListViewItem * tqparent, TQString text )
+ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListViewItem * tqparent, TQString text )
     :KListViewItem(tqparent, text), m_spitem(spitem)
 {
 }
 
-ChooseItem::ChooseItem( TQMakeScopeItem * spitem, TQListView * tqparent, TQString text )
+ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListView * tqparent, TQString text )
     :KListViewItem(tqparent, text), m_spitem(spitem)
 {
 }
 
-TQMakeScopeItem * ChooseItem::subproject( )
+QMakeScopeItem * ChooseItem::subproject( )
 {
     return m_spitem;
 }
@@ -69,7 +69,7 @@ void ChooseSubprojectDlg::fillSubprojectsView( ChooseItem *item )
 
     TQListViewItem * sub_spitem = item->subproject()->firstChild();
     while( sub_spitem ) {
-        TQMakeScopeItem *spitem = dynamic_cast<TQMakeScopeItem *>(sub_spitem);
+        QMakeScopeItem *spitem = dynamic_cast<QMakeScopeItem *>(sub_spitem);
         if ( spitem && spitem->scope->scopeType() == Scope::ProjectScope )
         {
             ChooseItem *child_item = new ChooseItem(spitem, item, spitem->text(0));
@@ -95,7 +95,7 @@ void ChooseSubprojectDlg::itemSelected( TQListViewItem * it )
         buttonOk->setEnabled(true);
 }
 
-TQMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( )
+QMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( )
 {
     if (subprojects_view->currentItem())
     {
diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h
index 9ce31311..3d0ea08b 100644
--- a/buildtools/qmake/choosesubprojectdlg.h
+++ b/buildtools/qmake/choosesubprojectdlg.h
@@ -16,19 +16,19 @@
 
 #include "choosesubprojectdlgbase.h"
 
-class TQMakeScopeItem;
+class QMakeScopeItem;
 class TrollProjectWidget;
 
 class ChooseItem: public KListViewItem
 {
 public:
-    ChooseItem(TQMakeScopeItem *spitem, TQListViewItem *tqparent, TQString text);
-    ChooseItem(TQMakeScopeItem *spitem, TQListView *tqparent, TQString text);
+    ChooseItem(QMakeScopeItem *spitem, TQListViewItem *tqparent, TQString text);
+    ChooseItem(QMakeScopeItem *spitem, TQListView *tqparent, TQString text);
 
-    TQMakeScopeItem *subproject();
+    QMakeScopeItem *subproject();
 
 private:
-    TQMakeScopeItem *m_spitem;
+    QMakeScopeItem *m_spitem;
 };
 
 class ChooseSubprojectDlg : public ChooseSubprojectDlgBase
@@ -41,7 +41,7 @@ public:
   ~ChooseSubprojectDlg();
   /*$PUBLIC_FUNCTIONS$*/
 
-  TQMakeScopeItem *selectedSubproject();
+  QMakeScopeItem *selectedSubproject();
 
 public slots:
   /*$PUBLIC_SLOTS$*/
diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp
index a9234b58..c83e1b7b 100644
--- a/buildtools/qmake/createscopedlg.cpp
+++ b/buildtools/qmake/createscopedlg.cpp
@@ -26,7 +26,7 @@
 #include "scope.h"
 #include "trollprojectwidget.h"
 
-CreateScopeDlg::CreateScopeDlg( TQMakeScopeItem* item, TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+CreateScopeDlg::CreateScopeDlg( QMakeScopeItem* item, TQWidget* tqparent, const char* name, bool modal, WFlags fl )
         : CreateScopeDlgBase( tqparent, name, modal, fl ), m_item( item )
 {
     incUrl->setMode( KFile::File | KFile::LocalOnly );
@@ -75,13 +75,13 @@ void CreateScopeDlg::accept()
     if ( s )
     {
         if ( !m_item->firstChild() )
-            new TQMakeScopeItem( m_item, s->scopeName(), s );
+            new QMakeScopeItem( m_item, s->scopeName(), s );
         else
         {
             TQListViewItem* item = m_item->firstChild();
             while( item->nextSibling() )
                 item = item->nextSibling();
-            TQMakeScopeItem* newitem = new TQMakeScopeItem( m_item, s->scopeName(), s );
+            QMakeScopeItem* newitem = new QMakeScopeItem( m_item, s->scopeName(), s );
             newitem->moveItem( item );
         }
         TQDialog::accept();
diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h
index 412a5f2f..31195c87 100644
--- a/buildtools/qmake/createscopedlg.h
+++ b/buildtools/qmake/createscopedlg.h
@@ -14,7 +14,7 @@
 
 #include "createscopedlgbase.h"
 
-class TQMakeScopeItem;
+class QMakeScopeItem;
 class TrollProjectWigdet;
 
 class CreateScopeDlg : public CreateScopeDlgBase
@@ -23,7 +23,7 @@ class CreateScopeDlg : public CreateScopeDlgBase
   TQ_OBJECT
 
 public:
-        CreateScopeDlg( TQMakeScopeItem* item, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+        CreateScopeDlg( QMakeScopeItem* item, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~CreateScopeDlg();
     /*$PUBLIC_FUNCTIONS$*/
 
@@ -37,7 +37,7 @@ protected slots:
     /*$PROTECTED_SLOTS$*/
     virtual void accept();
 private:
-    TQMakeScopeItem* m_item;
+    QMakeScopeItem* m_item;
 };
 
 #endif
diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp
index 771a1f5f..0bb85870 100644
--- a/buildtools/qmake/projectconfigurationdlg.cpp
+++ b/buildtools/qmake/projectconfigurationdlg.cpp
@@ -51,14 +51,14 @@
 #include "scope.h"
 #include "urlutil.h"
 
-InsideCheckListItem::InsideCheckListItem( TQListView *tqparent, TQMakeScopeItem *item, ProjectConfigurationDlg *config ) :
+InsideCheckListItem::InsideCheckListItem( TQListView *tqparent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) :
         TQCheckListItem( tqparent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), TQCheckListItem::CheckBox )
 {
     prjItem = item;
     m_config = config;
 }
 
-InsideCheckListItem::InsideCheckListItem( TQListView *tqparent, TQListViewItem *after, TQMakeScopeItem *item, ProjectConfigurationDlg *config ) :
+InsideCheckListItem::InsideCheckListItem( TQListView *tqparent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ) :
         TQCheckListItem( tqparent,
                         after,
                         item->relativePath(), TQCheckListItem::CheckBox )
@@ -123,7 +123,7 @@ ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollPro
     m_targetPath->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
 }
 
-void ProjectConfigurationDlg::updateSubproject( TQMakeScopeItem* _item )
+void ProjectConfigurationDlg::updateSubproject( QMakeScopeItem* _item )
 {
     if ( myProjectItem && myProjectItem->scope )
     {
@@ -1023,10 +1023,10 @@ void ProjectConfigurationDlg::updateControls()
     groupTemplateChanged(0);
 }
 
-TQPtrList<TQMakeScopeItem> ProjectConfigurationDlg::getAllProjects()
+TQPtrList<QMakeScopeItem> ProjectConfigurationDlg::getAllProjects()
 {
-    TQPtrList <TQMakeScopeItem> tmpPrjList;
-    TQMakeScopeItem *item = static_cast<TQMakeScopeItem*>( prjList->firstChild() );
+    TQPtrList <QMakeScopeItem> tmpPrjList;
+    QMakeScopeItem *item = static_cast<QMakeScopeItem*>( prjList->firstChild() );
     while ( item )
     {
         if ( item->scope->scopeType() == Scope::ProjectScope )
@@ -1035,15 +1035,15 @@ TQPtrList<TQMakeScopeItem> ProjectConfigurationDlg::getAllProjects()
                 tmpPrjList.append( item );
             getAllSubProjects( item, &tmpPrjList );
         }
-        item = static_cast<TQMakeScopeItem*>( item->nextSibling() );
+        item = static_cast<QMakeScopeItem*>( item->nextSibling() );
     }
     return ( tmpPrjList );
 }
 
-void ProjectConfigurationDlg::getAllSubProjects( TQMakeScopeItem *item, TQPtrList <TQMakeScopeItem> *itemList )
+void ProjectConfigurationDlg::getAllSubProjects( QMakeScopeItem *item, TQPtrList <QMakeScopeItem> *itemList )
 {
 
-    TQMakeScopeItem * subItem = static_cast<TQMakeScopeItem*>( item->firstChild() );
+    QMakeScopeItem * subItem = static_cast<QMakeScopeItem*>( item->firstChild() );
     while ( subItem )
     {
         if ( subItem->scope->scopeType() == Scope::ProjectScope )
@@ -1052,7 +1052,7 @@ void ProjectConfigurationDlg::getAllSubProjects( TQMakeScopeItem *item, TQPtrLis
                 itemList->append( subItem );
             getAllSubProjects( subItem, itemList );
         }
-        subItem = static_cast<TQMakeScopeItem*>( subItem->nextSibling() );
+        subItem = static_cast<QMakeScopeItem*>( subItem->nextSibling() );
     }
 }
 
@@ -1066,8 +1066,8 @@ void ProjectConfigurationDlg::updateIncludeControl()
     TQStringList incList = myProjectItem->scope->variableValues( "INCLUDEPATH" );
     TQStringList intIncList = incList;
     TQMap<TQString, InsideCheckListItem*> items;
-    TQPtrList <TQMakeScopeItem> itemList = getAllProjects();
-    TQMakeScopeItem *item = itemList.first();
+    TQPtrList <QMakeScopeItem> itemList = getAllProjects();
+    QMakeScopeItem *item = itemList.first();
     while ( item )
     {
         if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 ||
@@ -1112,7 +1112,7 @@ void ProjectConfigurationDlg::updateIncludeControl()
 void ProjectConfigurationDlg::updateLibControls()
 {
 
-    TQPtrList <TQMakeScopeItem> itemList = getAllProjects();
+    TQPtrList <QMakeScopeItem> itemList = getAllProjects();
 
     insidelib_listview->setSorting( -1, false );
     outsidelib_listview->setSorting( -1, false );
@@ -1125,7 +1125,7 @@ void ProjectConfigurationDlg::updateLibControls()
     TQStringList libList = myProjectItem->scope->variableValues( "LIBS" );
     TQStringList intLibList = libList;
     TQMap<TQString, InsideCheckListItem*> items;
-    TQMakeScopeItem* item = itemList.first();
+    QMakeScopeItem* item = itemList.first();
     while ( item )
     {
         if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 )
@@ -1185,7 +1185,7 @@ void ProjectConfigurationDlg::updateLibControls()
 
 void ProjectConfigurationDlg::updateDependenciesControl( )
 {
-    TQPtrList <TQMakeScopeItem> itemList = getAllProjects();
+    TQPtrList <QMakeScopeItem> itemList = getAllProjects();
 
     intDeps_view->setSorting( -1, false );
     extDeps_view->setSorting( -1, false );
@@ -1195,7 +1195,7 @@ void ProjectConfigurationDlg::updateDependenciesControl( )
     TQStringList depsList = myProjectItem->scope->variableValues( "TARGETDEPS" );
     TQStringList intDepList = depsList;
     TQMap<TQString,InsideCheckListItem*> items;
-    TQMakeScopeItem *item = itemList.first();
+    QMakeScopeItem *item = itemList.first();
     while ( item )
     {
         TQStringList templateval = item->scope->variableValues( "TEMPLATE" );
@@ -1251,13 +1251,13 @@ void ProjectConfigurationDlg::updateBuildOrderControl()
     if ( myProjectItem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) != -1 )
     {
 
-        TQPtrList <TQMakeScopeItem> itemList;
+        TQPtrList <QMakeScopeItem> itemList;
 
-        TQMakeScopeItem *item = static_cast<TQMakeScopeItem*>( myProjectItem->firstChild() );
+        QMakeScopeItem *item = static_cast<QMakeScopeItem*>( myProjectItem->firstChild() );
         while ( item )
         {
             itemList.append( item );
-            item = static_cast<TQMakeScopeItem*>( item->nextSibling() );
+            item = static_cast<QMakeScopeItem*>( item->nextSibling() );
         }
 
         incaddTab->setEnabled( false );
@@ -2036,7 +2036,7 @@ void ProjectConfigurationDlg::removeSharedLibDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
+        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
@@ -2060,7 +2060,7 @@ void ProjectConfigurationDlg::addStaticLibDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
+        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
@@ -2081,7 +2081,7 @@ void ProjectConfigurationDlg::removeStaticLibDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
+        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
@@ -2103,7 +2103,7 @@ void ProjectConfigurationDlg::addSharedLibDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
+        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
@@ -2124,7 +2124,7 @@ void ProjectConfigurationDlg::removeAppDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
+        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
@@ -2143,7 +2143,7 @@ void ProjectConfigurationDlg::addAppDeps()
     TQListViewItemIterator it(myProjectItem->listView());
     for( ; it.current() ; ++it )
     {
-        TQMakeScopeItem* prjItem = static_cast<TQMakeScopeItem*>( it.current() );
+        QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() );
         if( prjItem == myProjectItem || !prjItem->isEnabled() )
             continue;
 
diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h
index 29c41b07..d8ec5ea7 100644
--- a/buildtools/qmake/projectconfigurationdlg.h
+++ b/buildtools/qmake/projectconfigurationdlg.h
@@ -25,7 +25,7 @@
 #include <klistview.h>
 #include <tqmap.h>
 
-class TQMakeScopeItem;
+class QMakeScopeItem;
 class KListViewItem;
 class qProjectItem;
 class ProjectConfigurationDlg;
@@ -34,10 +34,10 @@ class TrollProjectWidget;
 class InsideCheckListItem : public TQCheckListItem
 {
 public:
-    InsideCheckListItem( TQListView *tqparent, TQMakeScopeItem *item, ProjectConfigurationDlg *config );
+    InsideCheckListItem( TQListView *tqparent, QMakeScopeItem *item, ProjectConfigurationDlg *config );
 
-    InsideCheckListItem( TQListView *tqparent, TQListViewItem *after, TQMakeScopeItem *item, ProjectConfigurationDlg *config );
-    TQMakeScopeItem *prjItem;
+    InsideCheckListItem( TQListView *tqparent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config );
+    QMakeScopeItem *prjItem;
     ProjectConfigurationDlg *m_config;
 
 protected:
@@ -59,8 +59,8 @@ public:
     ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~ProjectConfigurationDlg();
     void updateControls();
-    void updateSubproject( TQMakeScopeItem* _item );
-    TQMakeScopeItem* currentProjectItem() { return myProjectItem; }
+    void updateSubproject( QMakeScopeItem* _item );
+    QMakeScopeItem* currentProjectItem() { return myProjectItem; }
 
 public slots:
     //  virtual void           radioLibrarytoggled(bool);
@@ -126,10 +126,10 @@ public slots:
 
 protected:
     TQListView *prjList;
-    TQMakeScopeItem *myProjectItem;
-    TQPtrList <TQMakeScopeItem> getAllProjects();
+    QMakeScopeItem *myProjectItem;
+    TQPtrList <QMakeScopeItem> getAllProjects();
     TrollProjectWidget* prjWidget;
-    void getAllSubProjects( TQMakeScopeItem *item, TQPtrList<TQMakeScopeItem> *itemList );
+    void getAllSubProjects( QMakeScopeItem *item, TQPtrList<QMakeScopeItem> *itemList );
 
 private:
     void removeSharedLibDeps();
diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp
index 157b0894..c49bbe79 100644
--- a/buildtools/qmake/qmakescopeitem.cpp
+++ b/buildtools/qmake/qmakescopeitem.cpp
@@ -1,3 +1,4 @@
+
 /***************************************************************************
 *   Copyright (C) 2006 by Andreas Pakulat                                 *
 *   apaku@gmx.de                                                          *
@@ -43,7 +44,7 @@ qProjectItem::qProjectItem( Type type, qProjectItem *tqparent, const TQString &t
  * Class GroupItem
  */
 
-GroupItem::GroupItem( TQListView *lv, GroupType type, const TQString &text, TQMakeScopeItem* spitem )
+GroupItem::GroupItem( TQListView *lv, GroupType type, const TQString &text, QMakeScopeItem* spitem )
         : qProjectItem( Group, lv, text )
 {
     this->owner = spitem;
@@ -302,10 +303,10 @@ FileItem::FileItem( TQListView *lv, const TQString &text )
 
 
 /*
- * Class TQMakeScopeItem
+ * Class QMakeScopeItem
  */
 
-TQMakeScopeItem::TQMakeScopeItem( TQListView *tqparent, const TQString &text, Scope* s, TrollProjectWidget* widget )
+QMakeScopeItem::QMakeScopeItem( TQListView *tqparent, const TQString &text, Scope* s, TrollProjectWidget* widget )
         : qProjectItem( Subproject, tqparent, text ), scope( s ), m_widget( widget )
 {
     //   configuration.m_template = TQTMP_APPLICATION;
@@ -313,13 +314,13 @@ TQMakeScopeItem::TQMakeScopeItem( TQListView *tqparent, const TQString &text, Sc
 }
 
 
-TQMakeScopeItem::TQMakeScopeItem( TQMakeScopeItem *tqparent, const TQString &text, Scope* s )
+QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *tqparent, const TQString &text, Scope* s )
         : qProjectItem( Subproject, tqparent, text ), scope( s ), m_widget( tqparent->m_widget )
 {
     init();
 }
 
-TQMakeScopeItem::~TQMakeScopeItem()
+QMakeScopeItem::~QMakeScopeItem()
 {
     TQMap<GroupItem::GroupType, GroupItem*>::iterator it;
     for ( it = groups.begin() ; it != groups.end() ; ++it )
@@ -331,7 +332,7 @@ TQMakeScopeItem::~TQMakeScopeItem()
 
 }
 
-TQString TQMakeScopeItem::relativePath()
+TQString QMakeScopeItem::relativePath()
 {
     if( !scope || !scope->tqparent() )
         return "";
@@ -345,19 +346,19 @@ TQString TQMakeScopeItem::relativePath()
             return URLUtil::getRelativePath( m_widget->projectDirectory(), scope->projectDir() );
         }
     }else
-        return static_cast<TQMakeScopeItem*>( tqparent() ) ->relativePath();
+        return static_cast<QMakeScopeItem*>( tqparent() ) ->relativePath();
 //     if( !scope->tqparent() )
 //         return "";
 //     else if ( !scope->tqparent()->tqparent() || scope->scopeType() != Scope::ProjectScope )
 //         return scope->scopeName();
 //     else if ( scope->scopeType() == Scope::ProjectScope )
-//         return ( static_cast<TQMakeScopeItem*>( tqparent() ) ->relativePath()
+//         return ( static_cast<QMakeScopeItem*>( tqparent() ) ->relativePath()
 //                  + TQString( TQChar( TQDir::separator() ) ) + scope->scopeName() );
 //     else
-//         return (  static_cast<TQMakeScopeItem*>( tqparent() ) ->relativePath() );
+//         return (  static_cast<QMakeScopeItem*>( tqparent() ) ->relativePath() );
 }
 
-TQString TQMakeScopeItem::getSharedLibAddObject( TQString basePath )
+TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath )
 {
     if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
     {
@@ -392,7 +393,7 @@ TQString TQMakeScopeItem::getSharedLibAddObject( TQString basePath )
     return "";
 }
 
-TQString TQMakeScopeItem::getApplicationObject( TQString basePath )
+TQString QMakeScopeItem::getApplicationObject( TQString basePath )
 {
     TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
     TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
@@ -419,7 +420,7 @@ TQString TQMakeScopeItem::getApplicationObject( TQString basePath )
         return tmpPath + TQString( TQChar( TQDir::separator() ) ) + target;
 }
 
-TQString TQMakeScopeItem::getLibAddObject( TQString basePath )
+TQString QMakeScopeItem::getLibAddObject( TQString basePath )
 {
     if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
     {
@@ -469,7 +470,7 @@ TQString TQMakeScopeItem::getLibAddObject( TQString basePath )
 
     return ( "" );
 }
-TQString TQMakeScopeItem::getLibAddPath( TQString basePath )
+TQString QMakeScopeItem::getLibAddPath( TQString basePath )
 {
 
     //PATH only add if shared lib
@@ -495,7 +496,7 @@ TQString TQMakeScopeItem::getLibAddPath( TQString basePath )
 
 }
 
-TQString TQMakeScopeItem::getIncAddPath( TQString basePath )
+TQString QMakeScopeItem::getIncAddPath( TQString basePath )
 {
     TQString tmpPath = URLUtil::getRelativePath( basePath, scope->projectDir() );
     tmpPath = TQDir::cleanDirPath( tmpPath );
@@ -503,7 +504,7 @@ TQString TQMakeScopeItem::getIncAddPath( TQString basePath )
     return ( tmpPath );
 }
 
-void TQMakeScopeItem::buildSubTree()
+void QMakeScopeItem::buildSubTree()
 {
     TQValueList<Scope*>::const_iterator it;
 
@@ -514,14 +515,14 @@ void TQMakeScopeItem::buildSubTree()
     for ( it = scopes.begin(); it != scopes.end(); ++it )
     {
         if( (*it)->scopeType() != Scope::InvalidScope )
-            new TQMakeScopeItem( this, ( *it )->scopeName(), ( *it ) );
+            new QMakeScopeItem( this, ( *it )->scopeName(), ( *it ) );
         else
-            kdDebug( 9024 ) << "No TQMakeScopeItem created" << endl;
+            kdDebug( 9024 ) << "No QMakeScopeItem created" << endl;
     }
 }
 
 
-void TQMakeScopeItem::init()
+void QMakeScopeItem::init()
 {
     if ( scope->scopeType() == Scope::SimpleScope )
     {
@@ -565,14 +566,14 @@ void TQMakeScopeItem::init()
     }
 }
 
-GroupItem* TQMakeScopeItem::createGroupItem( GroupItem::GroupType type, const TQString& label, TQMakeScopeItem* scopeitem )
+GroupItem* QMakeScopeItem::createGroupItem( GroupItem::GroupType type, const TQString& label, QMakeScopeItem* scopeitem )
 {
     GroupItem * item = new GroupItem( scopeitem->listView(), type, label, scopeitem );
     scopeitem->listView() ->takeItem( item );
     return item;
 }
 
-FileItem* TQMakeScopeItem::createFileItem( const TQString& name )
+FileItem* QMakeScopeItem::createFileItem( const TQString& name )
 {
     TQString display = name;
     if( m_widget->showFilenamesOnly() )
@@ -593,7 +594,7 @@ FileItem* TQMakeScopeItem::createFileItem( const TQString& name )
     return fitem;
 }
 
-void TQMakeScopeItem::buildGroups()
+void QMakeScopeItem::buildGroups()
 {
     if( scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
         return;
@@ -720,7 +721,7 @@ void TQMakeScopeItem::buildGroups()
 
 }
 
-void TQMakeScopeItem::removeValues( const TQString& var, const TQStringList& values )
+void QMakeScopeItem::removeValues( const TQString& var, const TQStringList& values )
 {
     for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it )
     {
@@ -728,7 +729,7 @@ void TQMakeScopeItem::removeValues( const TQString& var, const TQStringList& val
     }
 }
 
-void TQMakeScopeItem::addValues( const TQString& var, const TQStringList& values )
+void QMakeScopeItem::addValues( const TQString& var, const TQStringList& values )
 {
     for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it )
     {
@@ -736,7 +737,7 @@ void TQMakeScopeItem::addValues( const TQString& var, const TQStringList& values
     }
 }
 
-void TQMakeScopeItem::removeValue( const TQString& var, const TQString& value )
+void QMakeScopeItem::removeValue( const TQString& var, const TQString& value )
 {
     if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) != -1 )
     {
@@ -755,7 +756,7 @@ void TQMakeScopeItem::removeValue( const TQString& var, const TQString& value )
     }
 }
 
-void TQMakeScopeItem::addValue( const TQString& var, const TQString& value )
+void QMakeScopeItem::addValue( const TQString& var, const TQString& value )
 {
     if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) == -1 )
     {
@@ -769,7 +770,7 @@ void TQMakeScopeItem::addValue( const TQString& var, const TQString& value )
     }
 }
 
-void TQMakeScopeItem::updateValues( const TQString& var, const TQStringList& values )
+void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& values )
 {
     TQStringList curValues = scope->variableValues( var, (scope->scopeType() != Scope::IncludeScope) );
     TQStringList scopeValues = scope->variableValuesForOp( var, "+=" );
@@ -802,18 +803,18 @@ void TQMakeScopeItem::updateValues( const TQString& var, const TQStringList& val
 //     kdDebug(9024) << "---------------------------------------" << endl;
 }
 
-TQMakeScopeItem* TQMakeScopeItem::projectFileItem()
+QMakeScopeItem* QMakeScopeItem::projectFileItem()
 {
     if( scope->scopeType() != Scope::ProjectScope )
     {
-        TQMakeScopeItem* tqparentitem = dynamic_cast<TQMakeScopeItem*>(tqparent());
+        QMakeScopeItem* tqparentitem = dynamic_cast<QMakeScopeItem*>(tqparent());
         if( tqparentitem )
             return tqparentitem->projectFileItem();
     }
     return this;
 }
 
-void TQMakeScopeItem::reloadProject()
+void QMakeScopeItem::reloadProject()
 {
     kdDebug(9024) << "Reloading Project" << endl;
     TQListViewItem* item = firstChild();
@@ -837,7 +838,7 @@ void TQMakeScopeItem::reloadProject()
     init();
 }
 
-void TQMakeScopeItem::disableSubprojects( const TQStringList& dirs )
+void QMakeScopeItem::disableSubprojects( const TQStringList& dirs )
 {
     TQStringList::const_iterator it = dirs.begin();
     for( ; it != dirs.end() ; ++it)
@@ -849,7 +850,7 @@ void TQMakeScopeItem::disableSubprojects( const TQStringList& dirs )
                 return;
             else
             {
-                TQMakeScopeItem* newitem = new TQMakeScopeItem( this, s->scopeName(), s );
+                QMakeScopeItem* newitem = new QMakeScopeItem( this, s->scopeName(), s );
                 TQListViewItem* lastitem = firstChild();
                 while( lastitem && lastitem->nextSibling() )
                     lastitem = lastitem->nextSibling();
@@ -861,9 +862,9 @@ void TQMakeScopeItem::disableSubprojects( const TQStringList& dirs )
 
 }
 
-int TQMakeScopeItem::compare( TQListViewItem* i, int , bool ) const
+int QMakeScopeItem::compare( TQListViewItem* i, int , bool ) const
 {
-    TQMakeScopeItem* other = dynamic_cast<TQMakeScopeItem*>(i);
+    QMakeScopeItem* other = dynamic_cast<QMakeScopeItem*>(i);
     if( !i )
         return -1;
     if( other->scope->getNum() < scope->getNum() )
@@ -874,7 +875,7 @@ int TQMakeScopeItem::compare( TQListViewItem* i, int , bool ) const
         return 0;
 }
 
-TQMap<TQString, TQString> TQMakeScopeItem::getLibInfos( TQString basePath )
+TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath )
 {
 
     TQMap<TQString, TQString> result;
diff --git a/buildtools/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h
index be42af8f..4dc1dca2 100644
--- a/buildtools/qmake/qmakescopeitem.h
+++ b/buildtools/qmake/qmakescopeitem.h
@@ -16,7 +16,7 @@
 #include <tqstring.h>
 
 class Scope;
-class TQMakeScopeItem;
+class QMakeScopeItem;
 class FileItem;
 class TrollProjectWidget;
 
@@ -50,7 +50,7 @@ public:
     static GroupType groupTypeForExtension( const TQString &ext );
     static void groupTypeMeanings( GroupItem::GroupType type, TQString& title, TQString& ext );
 
-    GroupItem( TQListView *lv, GroupType type, const TQString &text, TQMakeScopeItem* spitem );
+    GroupItem( TQListView *lv, GroupType type, const TQString &text, QMakeScopeItem* spitem );
 
     void removeFileFromScope( const TQString& filename);
     void addFileToScope( const TQString& filename);
@@ -65,7 +65,7 @@ public:
 //     TQStringList str_files_exclude;
     // end qmake INSTALLS support
     GroupType groupType;
-    TQMakeScopeItem* owner;
+    QMakeScopeItem* owner;
 
 protected:
     void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align );
@@ -85,11 +85,11 @@ public:
 /**
  * Stores one Scope
  */
-class TQMakeScopeItem : public qProjectItem
+class QMakeScopeItem : public qProjectItem
 {
 public:
-    TQMakeScopeItem( TQListView *tqparent, const TQString &text, Scope *s, TrollProjectWidget* widget );
-    TQMakeScopeItem( TQMakeScopeItem *tqparent, const TQString &text, Scope* );
+    QMakeScopeItem( TQListView *tqparent, const TQString &text, Scope *s, TrollProjectWidget* widget );
+    QMakeScopeItem( QMakeScopeItem *tqparent, const TQString &text, Scope* );
     void updateValues( const TQString& var, const TQStringList& values );
     void addValue( const TQString& var, const TQString& value );
     void removeValue( const TQString& var, const TQString& value );
@@ -98,7 +98,7 @@ public:
     void disableSubprojects( const TQStringList& );
     void reloadProject();
     int compare( TQListViewItem* i, int col, bool ascending ) const;
-    ~TQMakeScopeItem();
+    ~QMakeScopeItem();
 
     TQMap<GroupItem::GroupType, GroupItem*> groups;
 
@@ -110,10 +110,10 @@ public:
     TQString getApplicationObject( TQString );
     TQString getIncAddPath( TQString downDirs );
     FileItem* createFileItem(const TQString& file);
-    GroupItem* createGroupItem(GroupItem::GroupType type, const TQString& name, TQMakeScopeItem* scopeitem);
+    GroupItem* createGroupItem(GroupItem::GroupType type, const TQString& name, QMakeScopeItem* scopeitem);
     TQMap<TQString, TQString> getLibInfos( TQString );
 
-    TQMakeScopeItem* projectFileItem();
+    QMakeScopeItem* projectFileItem();
 
     TrollProjectWidget* m_widget;
 private:
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index b6ec8f5e..148f8b22 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -358,7 +358,7 @@ void TrollProjectWidget::openProject( const TQString &dirName )
     if( m_rootScope->scopeType() != Scope::InvalidScope )
     {
 
-        m_rootSubproject = new TQMakeScopeItem( overview, m_rootScope->scopeName(), m_rootScope, this );
+        m_rootSubproject = new QMakeScopeItem( overview, m_rootScope->scopeName(), m_rootScope, this );
 
 
         m_rootSubproject->setOpen( true );
@@ -380,7 +380,7 @@ void TrollProjectWidget::openProject( const TQString &dirName )
 
 }
 
-void TrollProjectWidget::createTQMakeScopeItems()
+void TrollProjectWidget::createQMakeScopeItems()
 {
 
 }
@@ -480,7 +480,7 @@ void TrollProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
         return ;
     }
     cleanDetailView( m_shownSubproject );
-    m_shownSubproject = static_cast<TQMakeScopeItem*>( item );
+    m_shownSubproject = static_cast<QMakeScopeItem*>( item );
     setupContext();
     buildProjectDetailTree( m_shownSubproject, details );
 
@@ -527,7 +527,7 @@ TQString TrollProjectWidget::getCurrentOutputFilename()
     }
 }
 
-void TrollProjectWidget::cleanDetailView( TQMakeScopeItem *item )
+void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
 {
     // If no tqchildren in detailview
     // it is a subdir template
@@ -553,7 +553,7 @@ void TrollProjectWidget::cleanDetailView( TQMakeScopeItem *item )
     }
 }
 
-void TrollProjectWidget::buildProjectDetailTree( TQMakeScopeItem *item, KListView *listviewControl )
+void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl )
 {
 
     // Insert all GroupItems and all of their tqchildren into the view
@@ -820,7 +820,7 @@ void TrollProjectWidget::slotRebuildTarget()
     m_part->queueCmd( dir, dircmd + rebuildcmd );
 }
 
-void TrollProjectWidget::slotCreateScope( TQMakeScopeItem *spitem )
+void TrollProjectWidget::slotCreateScope( QMakeScopeItem *spitem )
 {
     if ( spitem == 0 && m_shownSubproject == 0 )
         return ;
@@ -835,7 +835,7 @@ void TrollProjectWidget::slotCreateScope( TQMakeScopeItem *spitem )
     return ;
 }
 
-void TrollProjectWidget::slotAddSubproject( TQMakeScopeItem *spitem )
+void TrollProjectWidget::slotAddSubproject( QMakeScopeItem *spitem )
 {
     if ( spitem == 0 && m_shownSubproject == 0 )
         return ;
@@ -898,12 +898,12 @@ void TrollProjectWidget::slotAddSubproject( TQMakeScopeItem *spitem )
     }
 }
 
-void TrollProjectWidget::addSubprojectToItem( TQMakeScopeItem* spitem, const TQString& subdirname )
+void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQString& subdirname )
 {
     TQListViewItem* item = spitem->firstChild();
     while( item )
     {
-        TQMakeScopeItem* sitem = static_cast<TQMakeScopeItem*>(item);
+        QMakeScopeItem* sitem = static_cast<QMakeScopeItem*>(item);
         if( sitem->scope->scopeName() == subdirname )
         {
             if( sitem->scope->isEnabled() )
@@ -923,7 +923,7 @@ void TrollProjectWidget::addSubprojectToItem( TQMakeScopeItem* spitem, const TQS
     Scope* subproject = spitem->scope->createSubProject( subdirname );
     if( subproject )
     {
-        new TQMakeScopeItem( spitem, subproject->scopeName(), subproject );
+        new QMakeScopeItem( spitem, subproject->scopeName(), subproject );
 //             TQListViewItem* lastitem = spitem->firstChild();
 //             while( lastitem->nextSibling() != 0 )
 //                 lastitem = lastitem->nextSibling();
@@ -938,11 +938,11 @@ void TrollProjectWidget::addSubprojectToItem( TQMakeScopeItem* spitem, const TQS
     spitem->sortChildItems( 0, true );
 }
 
-void TrollProjectWidget::slotRemoveSubproject( TQMakeScopeItem *spitem )
+void TrollProjectWidget::slotRemoveSubproject( QMakeScopeItem *spitem )
 {
     if ( spitem == 0 && m_shownSubproject == 0 )
         return ;
-    else if ( ( spitem = dynamic_cast<TQMakeScopeItem *>( m_shownSubproject->tqparent() ) ) != NULL )
+    else if ( ( spitem = dynamic_cast<QMakeScopeItem *>( m_shownSubproject->tqparent() ) ) != NULL )
     {
 
         m_filesCached = false;
@@ -971,7 +971,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
     if ( !item )
         return ;
 
-    TQMakeScopeItem *spitem = static_cast<TQMakeScopeItem*>( item );
+    QMakeScopeItem *spitem = static_cast<QMakeScopeItem*>( item );
 
     KPopupMenu popup( this );
     popup.insertTitle( i18n( "Subproject %1" ).tqarg( item->text( 0 ) ) );
@@ -1331,14 +1331,14 @@ void TrollProjectWidget::slotAddFiles()
     }
 }
 
-GroupItem* TrollProjectWidget::getInstallRoot( TQMakeScopeItem* item )
+GroupItem* TrollProjectWidget::getInstallRoot( QMakeScopeItem* item )
 {
     if ( item->groups.tqcontains( GroupItem::InstallRoot ) )
         return item->groups[ GroupItem::InstallRoot ];
     return 0;
 }
 
-GroupItem* TrollProjectWidget::getInstallObject( TQMakeScopeItem* item, const TQString& objectname )
+GroupItem* TrollProjectWidget::getInstallObject( QMakeScopeItem* item, const TQString& objectname )
 {
     GroupItem * instroot = getInstallRoot( item );
     if ( !instroot )
@@ -1921,7 +1921,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
 }
 
 
-void TrollProjectWidget::removeFile( TQMakeScopeItem *spitem, FileItem *fitem )
+void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem )
 {
     GroupItem * gitem = static_cast<GroupItem*>( fitem->tqparent() );
 
@@ -2028,9 +2028,9 @@ void TrollProjectWidget::slotBuildOpenFile()
     m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() );
     //    m_part->startMakeCommand(buildDir, target);
 
-    TQPtrList<TQMakeScopeItem> list = findSubprojectForFile( fi );
+    TQPtrList<QMakeScopeItem> list = findSubprojectForFile( fi );
 
-    TQMakeScopeItem *spitem;
+    QMakeScopeItem *spitem;
     for ( spitem = list.first(); spitem; spitem = list.next() )
     {
         TQString buildcmd = constructMakeCommandLine( spitem->scope );
@@ -2112,7 +2112,7 @@ void TrollProjectWidget::slotDistCleanTarget()
     runClean(m_shownSubproject, "distclean");
 }
 
-void TrollProjectWidget::runClean( TQMakeScopeItem* item, const TQString& cleantargetname )
+void TrollProjectWidget::runClean( QMakeScopeItem* item, const TQString& cleantargetname )
 {
     // no subproject selected
     m_part->partController() ->saveAllFiles();
@@ -2165,7 +2165,7 @@ TQString TrollProjectWidget::constructMakeCommandLine( Scope* s )
 }
 
 
-void TrollProjectWidget::createMakefileIfMissing( const TQString &dir, TQMakeScopeItem *item )
+void TrollProjectWidget::createMakefileIfMissing( const TQString &dir, QMakeScopeItem *item )
 {
     TQFileInfo fi;
     TQFileInfo fi2;
@@ -2190,18 +2190,18 @@ void TrollProjectWidget::createMakefileIfMissing( const TQString &dir, TQMakeSco
     }
 }
 
-TQMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const TQString& relPath )
+QMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const TQString& relPath )
 {
     if( !m_rootSubproject )
         return 0;
     TQStringList dirs = TQStringList::split("/", relPath);
-    TQMakeScopeItem* pitem = static_cast<TQMakeScopeItem*>(m_rootSubproject);
+    QMakeScopeItem* pitem = static_cast<QMakeScopeItem*>(m_rootSubproject);
     for( TQStringList::iterator it = dirs.begin(); it != dirs.end(); ++it)
     {
         TQListViewItem* item = pitem->firstChild();
         while( item )
         {
-            TQMakeScopeItem* sitem = static_cast<TQMakeScopeItem*>(item);
+            QMakeScopeItem* sitem = static_cast<QMakeScopeItem*>(item);
             if( TQFileInfo( sitem->scope->projectDir() ).fileName() == *it )
             {
                 pitem = sitem;
@@ -2212,14 +2212,14 @@ TQMakeScopeItem* TrollProjectWidget::findSubprojectForPath( const TQString& relP
     return pitem;
 }
 
-TQPtrList<TQMakeScopeItem> TrollProjectWidget::findSubprojectForFile( TQFileInfo fi )
+TQPtrList<QMakeScopeItem> TrollProjectWidget::findSubprojectForFile( TQFileInfo fi )
 {
-    TQPtrList<TQMakeScopeItem> list;
+    TQPtrList<QMakeScopeItem> list;
     findSubprojectForFile( list, m_rootSubproject, fi.absFilePath() );
     return list;
 }
 
-void TrollProjectWidget::findSubprojectForFile( TQPtrList<TQMakeScopeItem> &list, TQMakeScopeItem * item, TQString absFilePath )
+void TrollProjectWidget::findSubprojectForFile( TQPtrList<QMakeScopeItem> &list, QMakeScopeItem * item, TQString absFilePath )
 {
     if( !item )
         return;
@@ -2245,7 +2245,7 @@ void TrollProjectWidget::findSubprojectForFile( TQPtrList<TQMakeScopeItem> &list
     TQListViewItem * child = item->firstChild();
     while ( child )
     {
-        TQMakeScopeItem * spitem = dynamic_cast<TQMakeScopeItem*>( child );
+        QMakeScopeItem * spitem = dynamic_cast<QMakeScopeItem*>( child );
 
         if ( spitem )
         {
@@ -2256,7 +2256,7 @@ void TrollProjectWidget::findSubprojectForFile( TQPtrList<TQMakeScopeItem> &list
     }
 }
 
-void TrollProjectWidget::slotRemoveScope( TQMakeScopeItem * spitem )
+void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem )
 {
     if ( spitem == 0 && m_shownSubproject == 0 )
         return ;
@@ -2265,7 +2265,7 @@ void TrollProjectWidget::slotRemoveScope( TQMakeScopeItem * spitem )
         m_filesCached = false;
         m_allFilesCache.clear();
 
-        TQMakeScopeItem* pitem = dynamic_cast<TQMakeScopeItem *>( spitem->tqparent() );
+        QMakeScopeItem* pitem = dynamic_cast<QMakeScopeItem *>( spitem->tqparent() );
         if ( pitem != 0 )
         {
             switch ( spitem->scope->scopeType() )
@@ -2287,7 +2287,7 @@ void TrollProjectWidget::slotRemoveScope( TQMakeScopeItem * spitem )
                     //                     pitem->scopes.remove( spitem );
                     delete spitem;
                     spitem = pitem;
-                    pitem = dynamic_cast<TQMakeScopeItem *>( pitem->tqparent() );
+                    pitem = dynamic_cast<QMakeScopeItem *>( pitem->tqparent() );
                     //                     pitem->scopes.remove(spitem);
                     break;
                 case Scope::SimpleScope:
@@ -2311,13 +2311,13 @@ void TrollProjectWidget::slotRemoveScope( TQMakeScopeItem * spitem )
     }
 }
 
-TQMakeScopeItem * TrollProjectWidget::findSubprojectForScope( TQMakeScopeItem * scope )
+QMakeScopeItem * TrollProjectWidget::findSubprojectForScope( QMakeScopeItem * scope )
 {
     if ( ( scope == 0 ) || ( scope->tqparent() == 0 ) )
         return 0;
     if ( scope->scope->scopeType() == Scope::ProjectScope )
         return scope;
-    return findSubprojectForScope( dynamic_cast<TQMakeScopeItem *>( scope->tqparent() ) );
+    return findSubprojectForScope( dynamic_cast<QMakeScopeItem *>( scope->tqparent() ) );
 }
 
 void TrollProjectWidget::focusInEvent( TQFocusEvent * /*e*/ )
@@ -2338,7 +2338,7 @@ void TrollProjectWidget::setLastFocusedView( TrollProjectView view )
     m_lastFocusedView = view;
 }
 
-void TrollProjectWidget::runTQMakeRecursive( TQMakeScopeItem* proj )
+void TrollProjectWidget::runTQMakeRecursive( QMakeScopeItem* proj )
 {
     if( m_part->isTQt4Project() )
     {
@@ -2349,11 +2349,11 @@ void TrollProjectWidget::runTQMakeRecursive( TQMakeScopeItem* proj )
         {
             m_part->startTQMakeCommand( proj->scope->projectDir() );
         }
-        TQMakeScopeItem* item = static_cast<TQMakeScopeItem*>( proj->firstChild() );
+        QMakeScopeItem* item = static_cast<QMakeScopeItem*>( proj->firstChild() );
         while ( item )
         {
             runTQMakeRecursive( item );
-            item = static_cast<TQMakeScopeItem*>( item->nextSibling() );
+            item = static_cast<QMakeScopeItem*>( item->nextSibling() );
         }
     }
 }
@@ -2371,7 +2371,7 @@ void TrollProjectWidget::slotBuildSelectedFile()
     buildFile( m_shownSubproject, fitem );
 }
 
-void TrollProjectWidget::buildFile( TQMakeScopeItem* spitem, FileItem* fitem )
+void TrollProjectWidget::buildFile( QMakeScopeItem* spitem, FileItem* fitem )
 {
     TQFileInfo fi( spitem->scope->projectDir() + TQChar( TQDir::separator() ) + spitem->scope->resolveVariables( fitem->localFilePath ) );
     TQString sourceDir = fi.dirPath();
@@ -2421,7 +2421,7 @@ bool TrollProjectWidget::isTMakeProject()
     return m_part->isTMakeProject();
 }
 
-void TrollProjectWidget::slotDisableSubproject( TQMakeScopeItem* spitem )
+void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
 {
     m_filesCached = false;
     m_allFilesCache.clear();
@@ -2447,7 +2447,7 @@ void TrollProjectWidget::slotDisableSubproject( TQMakeScopeItem* spitem )
         }
     }else
     {
-        TQMakeScopeItem* tqparent = static_cast<TQMakeScopeItem*>(spitem->tqparent());
+        QMakeScopeItem* tqparent = static_cast<QMakeScopeItem*>(spitem->tqparent());
         tqparent->disableSubprojects( TQStringList( spitem->scope->scopeName() ) );
         delete spitem;
         tqparent->scope->saveToFile();
@@ -2463,10 +2463,10 @@ void TrollProjectWidget::slotProjectDirty(const TQString& path)
     {
         m_part->dirWatch()->stopScan();
         TQListViewItemIterator it(m_rootSubproject);
-        TQValueList<TQMakeScopeItem*> itemstoreload;
+        TQValueList<QMakeScopeItem*> itemstoreload;
         while( it.current() )
         {
-            TQMakeScopeItem* projectitem = static_cast<TQMakeScopeItem*>( it.current() );
+            QMakeScopeItem* projectitem = static_cast<QMakeScopeItem*>( it.current() );
             if( projectitem->scope->scopeType() == Scope::ProjectScope
                 || projectitem->scope->scopeType() == Scope::IncludeScope )
             {
@@ -2479,7 +2479,7 @@ void TrollProjectWidget::slotProjectDirty(const TQString& path)
             it++;
         }
 
-        TQValueList<TQMakeScopeItem*>::const_iterator reloadit = itemstoreload.begin();
+        TQValueList<QMakeScopeItem*>::const_iterator reloadit = itemstoreload.begin();
         for( ; reloadit != itemstoreload.end() ; ++reloadit )
         {
             (*reloadit)->reloadProject();
@@ -2501,7 +2501,7 @@ void TrollProjectWidget::slotProjectDirty(const TQString& path)
 }
 
 
-TQMakeScopeItem* TrollProjectWidget::currentSubproject()
+QMakeScopeItem* TrollProjectWidget::currentSubproject()
 {
     return m_shownSubproject;
 }
diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h
index 9c5fac62..d5e86a17 100644
--- a/buildtools/qmake/trollprojectwidget.h
+++ b/buildtools/qmake/trollprojectwidget.h
@@ -94,7 +94,7 @@ public:
     enum TrollProjectView { SubprojectView, DetailsView };
     void setLastFocusedView( TrollProjectView view );
     enum SaveType { AlwaysSave, NeverSave, Ask };
-    TQMakeScopeItem* currentSubproject();
+    QMakeScopeItem* currentSubproject();
 
     bool showFilenamesOnly() const;
     bool showVariablesInTree() const;
@@ -132,43 +132,43 @@ private slots:
     void slotDetailsExecuted( TQListViewItem *item );
     void slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p );
     void slotExcludeFileFromScopeButton();
-    void slotAddSubproject( TQMakeScopeItem *spitem = 0 );
-    void slotRemoveSubproject( TQMakeScopeItem *spitem = 0 );
-    void slotCreateScope( TQMakeScopeItem *spitem = 0 );
-    void slotRemoveScope( TQMakeScopeItem *spitem = 0 );
-    void slotDisableSubproject( TQMakeScopeItem* spitem = 0 );
+    void slotAddSubproject( QMakeScopeItem *spitem = 0 );
+    void slotRemoveSubproject( QMakeScopeItem *spitem = 0 );
+    void slotCreateScope( QMakeScopeItem *spitem = 0 );
+    void slotRemoveScope( QMakeScopeItem *spitem = 0 );
+    void slotDisableSubproject( QMakeScopeItem* spitem = 0 );
     void slotProjectDirty( const TQString& );
 
-    void createTQMakeScopeItems();
+    void createQMakeScopeItems();
 
 private:
-    void cleanDetailView( TQMakeScopeItem *item );
-    void runClean( TQMakeScopeItem*, const TQString& );
-    void buildProjectDetailTree( TQMakeScopeItem *item, KListView *listviewControl );
-    void removeFile( TQMakeScopeItem *spitem, FileItem *fitem );
-    void addSubprojectToItem( TQMakeScopeItem*, const TQString& );
+    void cleanDetailView( QMakeScopeItem *item );
+    void runClean( QMakeScopeItem*, const TQString& );
+    void buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl );
+    void removeFile( QMakeScopeItem *spitem, FileItem *fitem );
+    void addSubprojectToItem( QMakeScopeItem*, const TQString& );
     void setupContext();
-    //     void parseScope(TQMakeScopeItem *item,TQString scopeString, Scope *scope);
-    GroupItem* getInstallRoot( TQMakeScopeItem *item );
-    GroupItem* getInstallObject( TQMakeScopeItem *item, const TQString& objectname );
+    //     void parseScope(QMakeScopeItem *item,TQString scopeString, Scope *scope);
+    GroupItem* getInstallRoot( QMakeScopeItem *item );
+    GroupItem* getInstallObject( QMakeScopeItem *item, const TQString& objectname );
     TQString constructMakeCommandLine( Scope* s = 0 );
 
-    void createMakefileIfMissing( const TQString &dir, TQMakeScopeItem *item );
+    void createMakefileIfMissing( const TQString &dir, QMakeScopeItem *item );
 
-    void runTQMakeRecursive( TQMakeScopeItem* proj);
-    void buildFile( TQMakeScopeItem* spitem, FileItem* fitem);
+    void runTQMakeRecursive( QMakeScopeItem* proj);
+    void buildFile( QMakeScopeItem* spitem, FileItem* fitem);
 
     /*fileName: full base file name like TQFileInfo::baseName ( true )*/
-    TQPtrList<TQMakeScopeItem> findSubprojectForFile( TQFileInfo fi );
-    void findSubprojectForFile( TQPtrList<TQMakeScopeItem> &list, TQMakeScopeItem * item, TQString absFilePath );
-    TQMakeScopeItem* findSubprojectForPath( const TQString& );
+    TQPtrList<QMakeScopeItem> findSubprojectForFile( TQFileInfo fi );
+    void findSubprojectForFile( TQPtrList<QMakeScopeItem> &list, QMakeScopeItem * item, TQString absFilePath );
+    QMakeScopeItem* findSubprojectForPath( const TQString& );
     //    TQString makeEnvironment();
 
     TrollProjectWidget::SaveType dialogSaveBehaviour() const;
 
-    TQMakeScopeItem *findSubprojectForScope( TQMakeScopeItem *scope );
+    QMakeScopeItem *findSubprojectForScope( QMakeScopeItem *scope );
 
-    void reloadProjectFromFile( TQMakeScopeItem* item );
+    void reloadProjectFromFile( QMakeScopeItem* item );
     TQMap<TQString,TQString> qmakeEnvironment() const;
 
     TQVBox *overviewContainer;
@@ -197,8 +197,8 @@ private:
     TQToolButton *excludeFileFromScopeButton;
 
     DomUtil::PairList m_subclasslist;
-    TQMakeScopeItem *m_shownSubproject;
-    TQMakeScopeItem *m_rootSubproject;
+    QMakeScopeItem *m_shownSubproject;
+    QMakeScopeItem *m_rootSubproject;
     Scope* m_rootScope;
     TrollProjectPart *m_part;
     ProjectConfigurationDlg* m_configDlg;
diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp
index 2bd08500..a94b74ff 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/kdevdesigner/designer/actiondnd.cpp
@@ -84,7 +84,7 @@ ActionDrag::~ActionDrag()
     the_action = 0;
 }
 
-void TQDesignerAction::init()
+void QDesignerAction::init()
 {
     MetaDataBase::addEntry( this );
     int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( this ) );
@@ -92,7 +92,7 @@ void TQDesignerAction::init()
     WidgetFactory::saveChangedProperties( this, id );
 }
 
-void TQDesignerActionGroup::init()
+void QDesignerActionGroup::init()
 {
     MetaDataBase::addEntry( this );
     int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( this ) );
@@ -100,7 +100,7 @@ void TQDesignerActionGroup::init()
     WidgetFactory::saveChangedProperties( this, id );
 }
 
-bool TQDesignerAction::addTo( TQWidget *w )
+bool QDesignerAction::addTo( TQWidget *w )
 {
     if ( !widgetToInsert )
 	return TQAction::addTo( w );
@@ -114,7 +114,7 @@ bool TQDesignerAction::addTo( TQWidget *w )
     return TRUE;
 }
 
-bool TQDesignerAction::removeFrom( TQWidget *w )
+bool QDesignerAction::removeFrom( TQWidget *w )
 {
     if ( !widgetToInsert )
 	return TQAction::removeFrom( w );
@@ -123,7 +123,7 @@ bool TQDesignerAction::removeFrom( TQWidget *w )
     return TRUE;
 }
 
-void TQDesignerAction::remove()
+void QDesignerAction::remove()
 {
     if ( !widgetToInsert )
 	return;
@@ -131,7 +131,7 @@ void TQDesignerAction::remove()
     widgetToInsert->reparent( 0, TQPoint( 0, 0 ), FALSE );
 }
 
-TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent,
+QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent,
                                      const char* name )
     : TQWidget( tqparent, name )
 {
@@ -143,17 +143,17 @@ TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(Qt::Orientation o , TQToo
     tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 }
 
-void TQDesignerToolBarSeparator::setOrientation( Qt::Orientation o )
+void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o )
 {
     orient = o;
 }
 
-void TQDesignerToolBarSeparator::styleChange( TQStyle& )
+void QDesignerToolBarSeparator::styleChange( TQStyle& )
 {
     setOrientation( orient );
 }
 
-TQSize TQDesignerToolBarSeparator::tqsizeHint() const
+TQSize QDesignerToolBarSeparator::tqsizeHint() const
 {
     int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
 				      this );
@@ -163,7 +163,7 @@ TQSize TQDesignerToolBarSeparator::tqsizeHint() const
 	return TQSize( 0, extent );
 }
 
-void TQDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
+void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
     TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -177,16 +177,16 @@ void TQDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
 
 
 
-TQSeparatorAction::TQSeparatorAction( TQObject *tqparent )
+QSeparatorAction::QSeparatorAction( TQObject *tqparent )
     : TQAction( tqparent, "qt_designer_separator" ), wid( 0 )
 {
 }
 
-bool TQSeparatorAction::addTo( TQWidget *w )
+bool QSeparatorAction::addTo( TQWidget *w )
 {
     if ( ::tqqt_cast<TQToolBar*>(w) ) {
 	TQToolBar *tb = (TQToolBar*)w;
-	wid = new TQDesignerToolBarSeparator( tb->orientation(), tb );
+	wid = new QDesignerToolBarSeparator( tb->orientation(), tb );
 	return TRUE;
     } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) {
 	idx = ( (TQPopupMenu*)w )->count();
@@ -196,7 +196,7 @@ bool TQSeparatorAction::addTo( TQWidget *w )
     return FALSE;
 }
 
-bool TQSeparatorAction::removeFrom( TQWidget *w )
+bool QSeparatorAction::removeFrom( TQWidget *w )
 {
     if ( ::tqqt_cast<TQToolBar*>(w) ) {
 	delete wid;
@@ -208,14 +208,14 @@ bool TQSeparatorAction::removeFrom( TQWidget *w )
     return FALSE;
 }
 
-TQWidget *TQSeparatorAction::widget() const
+TQWidget *QSeparatorAction::widget() const
 {
     return wid;
 }
 
 
 
-TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw )
+QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw )
     : TQToolBar( mw ), lastIndicatorPos( -1, -1 )
 {
     insertAnchor = 0;
@@ -223,7 +223,7 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw )
     setAcceptDrops( TRUE );
     MetaDataBase::addEntry( TQT_TQOBJECT(this) );
     lastIndicatorPos = TQPoint( -1, -1 );
-    indicator = new TQDesignerIndicatorWidget( this );
+    indicator = new QDesignerIndicatorWidget( this );
     indicator->hide();
     installEventFilter( this );
     widgetInserting = FALSE;
@@ -231,13 +231,13 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw )
     mw->setDockEnabled( DockTornOff, FALSE );
 }
 
-TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw, Dock dock )
+QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw, Dock dock )
     : TQToolBar( TQString(), mw, dock), lastIndicatorPos( -1, -1 )
 {
     insertAnchor = 0;
     afterAnchor = TRUE;
     setAcceptDrops( TRUE );
-    indicator = new TQDesignerIndicatorWidget( this );
+    indicator = new QDesignerIndicatorWidget( this );
     indicator->hide();
     MetaDataBase::addEntry( TQT_TQOBJECT(this) );
     installEventFilter( this );
@@ -246,7 +246,7 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw, Dock dock )
     mw->setDockEnabled( DockTornOff, FALSE );
 }
 
-void TQDesignerToolBar::findFormWindow()
+void QDesignerToolBar::findFormWindow()
 {
     TQWidget *w = this;
     while ( w ) {
@@ -257,29 +257,29 @@ void TQDesignerToolBar::findFormWindow()
     }
 }
 
-void TQDesignerToolBar::addAction( TQAction *a )
+void QDesignerToolBar::addAction( TQAction *a )
 {
     actionList.append( a );
     connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) );
     if ( ::tqqt_cast<TQActionGroup*>(a) ) {
-	( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this );
-	actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a );
-    } else if ( ::tqqt_cast<TQSeparatorAction*>(a) ) {
-	( (TQSeparatorAction*)a )->widget()->installEventFilter( this );
-	actionMap.insert( ( (TQSeparatorAction*)a )->widget(), a );
+	( (QDesignerActionGroup*)a )->widget()->installEventFilter( this );
+	actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a );
+    } else if ( ::tqqt_cast<QSeparatorAction*>(a) ) {
+	( (QSeparatorAction*)a )->widget()->installEventFilter( this );
+	actionMap.insert( ( (QSeparatorAction*)a )->widget(), a );
     } else {
-	( (TQDesignerAction*)a )->widget()->installEventFilter( this );
-	actionMap.insert( ( (TQDesignerAction*)a )->widget(), a );
+	( (QDesignerAction*)a )->widget()->installEventFilter( this );
+	actionMap.insert( ( (QDesignerAction*)a )->widget(), a );
     }
 }
 
 static void fixObject( TQObject *&o )
 {
-    while ( o && o->tqparent() && !::tqqt_cast<TQDesignerToolBar*>(o->tqparent()) )
+    while ( o && o->tqparent() && !::tqqt_cast<QDesignerToolBar*>(o->tqparent()) )
 	o = o->tqparent();
 }
 
-bool TQDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
+bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
 {
     if ( !o || !e || o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) || o->inherits( "TQDockWindowTitleBar" ) )
 	return TQToolBar::eventFilter( o, e );
@@ -334,7 +334,7 @@ bool TQDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
     return TQToolBar::eventFilter( o, e );
 }
 
-void TQDesignerToolBar::paintEvent( TQPaintEvent *e )
+void QDesignerToolBar::paintEvent( TQPaintEvent *e )
 {
     TQToolBar::paintEvent( e );
     if ( e->rect() != rect() )
@@ -342,7 +342,7 @@ void TQDesignerToolBar::paintEvent( TQPaintEvent *e )
     lastIndicatorPos = TQPoint( -1, -1 );
 }
 
-void TQDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e )
+void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e )
 {
     e->accept();
     TQPopupMenu menu( 0 );
@@ -356,7 +356,7 @@ void TQDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e )
     }
 }
 
-void TQDesignerToolBar::mousePressEvent( TQMouseEvent *e )
+void QDesignerToolBar::mousePressEvent( TQMouseEvent *e )
 {
     widgetInserting = FALSE;
     if ( e->button() == Qt::LeftButton &&
@@ -367,14 +367,14 @@ void TQDesignerToolBar::mousePressEvent( TQMouseEvent *e )
 	widgetInserting = TRUE;
 }
 
-void TQDesignerToolBar::mouseReleaseEvent( TQMouseEvent *e )
+void QDesignerToolBar::mouseReleaseEvent( TQMouseEvent *e )
 {
     if ( widgetInserting )
 	doInsertWidget( mapFromGlobal( e->globalPos() ) );
     widgetInserting = FALSE;
 }
 
-void TQDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w )
+void QDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w )
 {
     if ( widgetInserting )
 	doInsertWidget( mapFromGlobal( e->globalPos() ) );
@@ -385,7 +385,7 @@ void TQDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w )
     widgetInserting = FALSE;
 }
 
-void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *o )
+void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *o )
 {
     e->accept();
     TQPopupMenu menu( 0 );
@@ -393,7 +393,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject
     const int ID_SEP = 2;
     const int ID_DELTOOLBAR = 3;
     TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o );
-    if ( it != actionMap.end() && ::tqqt_cast<TQSeparatorAction*>(*it) )
+    if ( it != actionMap.end() && ::tqqt_cast<QSeparatorAction*>(*it) )
 	menu.insertItem( i18n( "Delete Separator" ), ID_DELETE );
     else
 	menu.insertItem( i18n( "Delete Item" ), ID_DELETE );
@@ -415,7 +415,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject
 	cmd->execute();
     } else if ( res == ID_SEP ) {
 	calcIndicatorPos( mapFromGlobal( e->globalPos() ) );
-	TQAction *a = new TQSeparatorAction( 0 );
+	TQAction *a = new QSeparatorAction( 0 );
 	int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) );
 	if ( index != -1 && afterAnchor )
 	    ++index;
@@ -436,7 +436,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject
     }
 }
 
-void TQDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * )
+void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * )
 {
     widgetInserting = FALSE;
 
@@ -455,7 +455,7 @@ void TQDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * )
     dragStartPos = e->pos();
 }
 
-void TQDesignerToolBar::removeWidget( TQWidget *w )
+void QDesignerToolBar::removeWidget( TQWidget *w )
 {
     TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( w );
     if ( it == actionMap.end() )
@@ -472,7 +472,7 @@ void TQDesignerToolBar::removeWidget( TQWidget *w )
     adjustSize();
 }
 
-void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
+void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
 {
     if ( widgetInserting || ( e->state() & Qt::LeftButton ) == 0 )
 	return;
@@ -495,12 +495,12 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
     adjustSize();
 
     TQString type = ::tqqt_cast<TQActionGroup*>(a) ? TQString( "application/x-designer-actiongroup" ) :
-	::tqqt_cast<TQSeparatorAction*>(a) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
+	::tqqt_cast<QSeparatorAction*>(a) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
     TQStoredDrag *drag = new ActionDrag( type, a, this );
     drag->setPixmap( a->iconSet().pixmap() );
-    if ( ::tqqt_cast<TQDesignerAction*>(a) ) {
-	if ( formWindow->widgets()->tqfind( ( (TQDesignerAction*)a )->widget() ) )
-	    formWindow->selectWidget( ( TQT_TQOBJECT(( (TQDesignerAction*)a )->widget())), FALSE );
+    if ( ::tqqt_cast<QDesignerAction*>(a) ) {
+	if ( formWindow->widgets()->tqfind( ( (QDesignerAction*)a )->widget() ) )
+	    formWindow->selectWidget( ( TQT_TQOBJECT(( (QDesignerAction*)a )->widget())), FALSE );
     }
     if ( !drag->drag() ) {
 	AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ).
@@ -515,7 +515,7 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
 
 #ifndef TQT_NO_DRAGANDDROP
 
-void TQDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
+void QDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
 {
     widgetInserting = FALSE;
     lastIndicatorPos = TQPoint( -1, -1 );
@@ -523,7 +523,7 @@ void TQDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
 	e->accept();
 }
 
-void TQDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
+void QDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
 {
     if (ActionDrag::canDecode(e)) {
 	e->accept();
@@ -531,14 +531,14 @@ void TQDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
     }
 }
 
-void TQDesignerToolBar::dragLeaveEvent( TQDragLeaveEvent * )
+void QDesignerToolBar::dragLeaveEvent( TQDragLeaveEvent * )
 {
     indicator->hide();
     insertAnchor = 0;
     afterAnchor = TRUE;
 }
 
-void TQDesignerToolBar::dropEvent( TQDropEvent *e )
+void QDesignerToolBar::dropEvent( TQDropEvent *e )
 {
     if (!ActionDrag::canDecode(e))
 	return;
@@ -555,11 +555,11 @@ void TQDesignerToolBar::dropEvent( TQDropEvent *e )
     if ( e->provides( "application/x-designer-actions" ) ||
 	 e->provides( "application/x-designer-separator" ) ) {
 	if ( e->provides( "application/x-designer-actions" ) )
-	    a = ::tqqt_cast<TQDesignerAction*>(ActionDrag::action());
+	    a = ::tqqt_cast<QDesignerAction*>(ActionDrag::action());
 	else
-	    a = ::tqqt_cast<TQSeparatorAction*>(ActionDrag::action());
+	    a = ::tqqt_cast<QSeparatorAction*>(ActionDrag::action());
     } else {
-	a = ::tqqt_cast<TQDesignerActionGroup*>(ActionDrag::action());
+	a = ::tqqt_cast<QDesignerActionGroup*>(ActionDrag::action());
     }
 
     if ( actionList.tqfindRef( a ) != -1 ) {
@@ -581,7 +581,7 @@ void TQDesignerToolBar::dropEvent( TQDropEvent *e )
 
 #endif
 
-void TQDesignerToolBar::reInsert()
+void QDesignerToolBar::reInsert()
 {
     TQAction *a = 0;
     actionMap.clear();
@@ -589,27 +589,27 @@ void TQDesignerToolBar::reInsert()
     for ( a = actionList.first(); a; a = actionList.next() ) {
 	a->addTo( this );
 	if ( ::tqqt_cast<TQActionGroup*>(a) ) {
-	    actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a );
-	    if ( ( (TQDesignerActionGroup*)a )->widget() )
-		( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this );
-	} else if ( ::tqqt_cast<TQDesignerAction*>(a) ) {
-	    actionMap.insert( ( (TQDesignerAction*)a )->widget(), a );
-	    ( (TQDesignerAction*)a )->widget()->installEventFilter( this );
-	} else if ( ::tqqt_cast<TQSeparatorAction*>(a) ) {
-	    actionMap.insert( ( (TQSeparatorAction*)a )->widget(), a );
-	    ( (TQSeparatorAction*)a )->widget()->installEventFilter( this );
+	    actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a );
+	    if ( ( (QDesignerActionGroup*)a )->widget() )
+		( (QDesignerActionGroup*)a )->widget()->installEventFilter( this );
+	} else if ( ::tqqt_cast<QDesignerAction*>(a) ) {
+	    actionMap.insert( ( (QDesignerAction*)a )->widget(), a );
+	    ( (QDesignerAction*)a )->widget()->installEventFilter( this );
+	} else if ( ::tqqt_cast<QSeparatorAction*>(a) ) {
+	    actionMap.insert( ( (QSeparatorAction*)a )->widget(), a );
+	    ( (QSeparatorAction*)a )->widget()->installEventFilter( this );
 	}
     }
     TQApplication::sendPostedEvents();
     adjustSize();
 }
 
-void TQDesignerToolBar::actionRemoved()
+void QDesignerToolBar::actionRemoved()
 {
     actionList.removeRef( (TQAction*)sender() );
 }
 
-TQPoint TQDesignerToolBar::calcIndicatorPos( const TQPoint &pos )
+TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos )
 {
     if ( orientation() ==Qt::Horizontal ) {
 	TQPoint pnt( width() - 2, 0 );
@@ -660,7 +660,7 @@ TQPoint TQDesignerToolBar::calcIndicatorPos( const TQPoint &pos )
     }
 }
 
-void TQDesignerToolBar::drawIndicator( const TQPoint &pos )
+void QDesignerToolBar::drawIndicator( const TQPoint &pos )
 {
     if ( lastIndicatorPos == pos )
 	return;
@@ -684,7 +684,7 @@ void TQDesignerToolBar::drawIndicator( const TQPoint &pos )
 	TQApplication::sendPostedEvents();
 }
 
-void TQDesignerToolBar::doInsertWidget( const TQPoint &p )
+void QDesignerToolBar::doInsertWidget( const TQPoint &p )
 {
     if ( formWindow != MainWindow::self->formWindow() )
 	return;
@@ -692,7 +692,7 @@ void TQDesignerToolBar::doInsertWidget( const TQPoint &p )
     TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, TRUE );
     installEventFilters( w );
     MainWindow::self->formWindow()->insertWidget( w, TRUE );
-    TQDesignerAction *a = new TQDesignerAction( w, tqparent() );
+    QDesignerAction *a = new QDesignerAction( w, tqparent() );
     int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) );
     if ( index != -1 && afterAnchor )
 	++index;
@@ -706,16 +706,16 @@ void TQDesignerToolBar::doInsertWidget( const TQPoint &p )
     MainWindow::self->resetTool();
 }
 
-void TQDesignerToolBar::clear()
+void QDesignerToolBar::clear()
 {
     for ( TQAction *a = actionList.first(); a; a = actionList.next() ) {
-	if ( ::tqqt_cast<TQDesignerAction*>(a) )
-	    ( (TQDesignerAction*)a )->remove();
+	if ( ::tqqt_cast<QDesignerAction*>(a) )
+	    ( (QDesignerAction*)a )->remove();
     }
     TQToolBar::clear();
 }
 
-void TQDesignerToolBar::installEventFilters( TQWidget *w )
+void QDesignerToolBar::installEventFilters( TQWidget *w )
 {
     if ( !w )
 	return;
diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h
index 560bcca4..8ee705c8 100644
--- a/kdevdesigner/designer/actiondnd.h
+++ b/kdevdesigner/designer/actiondnd.h
@@ -39,17 +39,17 @@
 #include "../shared/widgetdatabase.h"
 
 //class TQDesignerPopupMenu;
-class TQDesignerIndicatorWidget;
+class QDesignerIndicatorWidget;
 class FormWindow;
 class TQPopupMenu;
 
-class TQDesignerIndicatorWidget : public TQWidget
+class QDesignerIndicatorWidget : public TQWidget
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerIndicatorWidget( TQWidget *p )
+    QDesignerIndicatorWidget( TQWidget *p )
 	: TQWidget( p, "qt_dockwidget_internal" ) {
 	    setBackgroundColor( red );
     }
@@ -79,13 +79,13 @@ private:
     static TQAction *the_action;
 };
 
-class TQDesignerActionGroup : public TQActionGroup
+class QDesignerActionGroup : public TQActionGroup
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerActionGroup( TQObject *tqparent )
+    QDesignerActionGroup( TQObject *tqparent )
 	: TQActionGroup( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ) { init(); }
 
     void init();
@@ -115,15 +115,15 @@ private:
 
 };
 
-class TQDesignerAction : public TQAction
+class QDesignerAction : public TQAction
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerAction( TQObject *tqparent )
+    QDesignerAction( TQObject *tqparent )
 	: TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); }
-    TQDesignerAction( TQWidget *w, TQObject *tqparent )
+    QDesignerAction( TQWidget *w, TQObject *tqparent )
 	: TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); }
 
     void init();
@@ -152,13 +152,13 @@ private:
 
 };
 
-class TQDesignerToolBarSeparator : public TQWidget
+class QDesignerToolBarSeparator : public TQWidget
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 );
+    QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 );
 
     TQSize tqsizeHint() const;
     Qt::Orientation orientation() const { return orient; }
@@ -172,13 +172,13 @@ private:
 };
 
 
-class TQSeparatorAction : public TQAction
+class QSeparatorAction : public TQAction
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQSeparatorAction( TQObject *tqparent );
+    QSeparatorAction( TQObject *tqparent );
 
     bool addTo( TQWidget *w );
     bool removeFrom( TQWidget *w );
@@ -192,14 +192,14 @@ private:
 };
 
 
-class TQDesignerToolBar : public TQToolBar
+class QDesignerToolBar : public TQToolBar
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerToolBar( TQMainWindow *mw );
-    TQDesignerToolBar( TQMainWindow *mw, Dock dock );
+    QDesignerToolBar( TQMainWindow *mw );
+    QDesignerToolBar( TQMainWindow *mw, Dock dock );
     TQPtrList<TQAction> insertedActions() const { return actionList; }
     void addAction( TQAction *a );
 
@@ -245,7 +245,7 @@ private:
     TQPtrList<TQAction> actionList;
     TQMap<TQWidget*, TQAction*> actionMap;
     TQPoint dragStartPos;
-    TQDesignerIndicatorWidget *indicator;
+    QDesignerIndicatorWidget *indicator;
     bool widgetInserting;
     FormWindow *formWindow;
 
diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp
index 92b8a044..c17c641a 100644
--- a/kdevdesigner/designer/actionlistview.cpp
+++ b/kdevdesigner/designer/actionlistview.cpp
@@ -43,18 +43,18 @@ ActionListView::ActionListView( TQWidget *tqparent, const char *name )
 ActionItem::ActionItem( TQListView *lv, TQAction *ac )
     : TQListViewItem( lv ), a( 0 ), g( 0 )
 {
-    g = ::tqqt_cast<TQDesignerActionGroup*>(ac);
+    g = ::tqqt_cast<QDesignerActionGroup*>(ac);
     if ( !g )
-	a = ::tqqt_cast<TQDesignerAction*>(ac);
+	a = ::tqqt_cast<QDesignerAction*>(ac);
     setDragEnabled( TRUE );
 }
 
 ActionItem::ActionItem( TQListViewItem *i, TQAction *ac )
     : TQListViewItem( i ), a( 0 ), g( 0 )
 {
-    g = ::tqqt_cast<TQDesignerActionGroup*>(ac);
+    g = ::tqqt_cast<QDesignerActionGroup*>(ac);
     if ( !g )
-	a = ::tqqt_cast<TQDesignerAction*>(ac);
+	a = ::tqqt_cast<QDesignerAction*>(ac);
     setDragEnabled( TRUE );
     moveToEnd();
 }
diff --git a/kdevdesigner/designer/actionlistview.h b/kdevdesigner/designer/actionlistview.h
index a3910c5b..9c213c99 100644
--- a/kdevdesigner/designer/actionlistview.h
+++ b/kdevdesigner/designer/actionlistview.h
@@ -35,24 +35,24 @@ class ActionItem : public TQListViewItem
 public:
     ActionItem( TQListView *lv, bool group )
 	: TQListViewItem( lv ),
-	  a( group ? 0 : new TQDesignerAction( 0 ) ),
-	  g( group ? new TQDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); }
+	  a( group ? 0 : new QDesignerAction( 0 ) ),
+	  g( group ? new QDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); }
     ActionItem( TQListView *lv, TQAction *ac );
     ActionItem( TQListViewItem *i, TQAction *ac );
     ActionItem( ActionItem *tqparent, bool group = FALSE )
 	: TQListViewItem( tqparent ),
-	  a( group ? 0 : new TQDesignerAction( tqparent->actionGroup() ) ),
-	  g( group ? new TQDesignerActionGroup( tqparent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); }
+	  a( group ? 0 : new QDesignerAction( tqparent->actionGroup() ) ),
+	  g( group ? new QDesignerActionGroup( tqparent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); }
 
-    TQDesignerAction *action() const { return a; }
-    TQDesignerActionGroup *actionGroup() const { return g; }
+    QDesignerAction *action() const { return a; }
+    QDesignerActionGroup *actionGroup() const { return g; }
 
 private:
     void moveToEnd();
 
 private:
-    TQDesignerAction *a;
-    TQDesignerActionGroup *g;
+    QDesignerAction *a;
+    QDesignerActionGroup *g;
 
 };
 
diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp
index 5079fff4..14016cbc 100644
--- a/kdevdesigner/designer/command.cpp
+++ b/kdevdesigner/designer/command.cpp
@@ -1848,7 +1848,7 @@ void PopulateTableCommand::unexecute()
 // ------------------------------------------------------------
 
 AddActionToToolBarCommand::AddActionToToolBarCommand( const TQString &n, FormWindow *fw,
-						      TQAction *a, TQDesignerToolBar *tb, int idx )
+						      TQAction *a, QDesignerToolBar *tb, int idx )
     : Command( n, fw ), action( a ), toolBar( tb ), index( idx )
 {
 }
@@ -1870,9 +1870,9 @@ void AddActionToToolBarCommand::execute()
 	    toolBar->insertAction( ( (TQDesignerActionGroup*)action )->widget(), action );
 	    ( (TQDesignerActionGroup*)action )->widget()->installEventFilter( toolBar );
 	}
-    } else if ( ::tqqt_cast<TQSeparatorAction*>(action) ) {
-	toolBar->insertAction( ( (TQSeparatorAction*)action )->widget(), action );
-	( (TQSeparatorAction*)action )->widget()->installEventFilter( toolBar );
+    } else if ( ::tqqt_cast<QSeparatorAction*>(action) ) {
+	toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action );
+	( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar );
     }
     if ( !::tqqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) {
 	if ( index == -1 )
@@ -1953,7 +1953,7 @@ AddToolBarCommand::AddToolBarCommand( const TQString &n, FormWindow *fw, TQMainW
 void AddToolBarCommand::execute()
 {
     if ( !toolBar ) {
-	toolBar = new TQDesignerToolBar( mainWindow );
+	toolBar = new QDesignerToolBar( mainWindow );
 	TQString n = "Toolbar";
 	formWindow()->unify( TQT_TQOBJECT(toolBar), n, TRUE );
 	toolBar->setName( n );
diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h
index a44f2431..f0bfc0a6 100644
--- a/kdevdesigner/designer/command.h
+++ b/kdevdesigner/designer/command.h
@@ -50,7 +50,7 @@ class TQListBox;
 class TQIconView;
 class TQTable;
 class TQAction;
-class TQDesignerToolBar;
+class QDesignerToolBar;
 class TQMainWindow;
 class TQTextEdit;
 struct LanguageInterface;
@@ -887,7 +887,7 @@ class AddActionToToolBarCommand : public Command
 {
 public:
     AddActionToToolBarCommand( const TQString &n, FormWindow *fw,
-			       TQAction *a, TQDesignerToolBar *tb, int idx );
+			       TQAction *a, QDesignerToolBar *tb, int idx );
 
     void execute();
     void unexecute();
@@ -895,7 +895,7 @@ public:
 
 private:
     TQAction *action;
-    TQDesignerToolBar *toolBar;
+    QDesignerToolBar *toolBar;
     int index;
 
 };
@@ -904,7 +904,7 @@ class RemoveActionFromToolBarCommand : public AddActionToToolBarCommand
 {
 public:
     RemoveActionFromToolBarCommand( const TQString &n, FormWindow *fw,
-				    TQAction *a, TQDesignerToolBar *tb, int idx )
+				    TQAction *a, QDesignerToolBar *tb, int idx )
 	: AddActionToToolBarCommand( n, fw, a, tb, idx ) {}
 
     void execute() { AddActionToToolBarCommand::unexecute(); }
@@ -925,7 +925,7 @@ public:
     Type type() const { return AddToolBar; }
 
 protected:
-    TQDesignerToolBar *toolBar;
+    QDesignerToolBar *toolBar;
     TQMainWindow *mainWindow;
 
 };
@@ -933,7 +933,7 @@ protected:
 class RemoveToolBarCommand : public AddToolBarCommand
 {
 public:
-    RemoveToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw, TQDesignerToolBar *tb )
+    RemoveToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw, QDesignerToolBar *tb )
 	: AddToolBarCommand( n, fw, mw ) { toolBar = tb; }
 
     void execute() { AddToolBarCommand::unexecute(); }
diff --git a/kdevdesigner/designer/database.cpp b/kdevdesigner/designer/database.cpp
index b426e9dd..9d12aa21 100644
--- a/kdevdesigner/designer/database.cpp
+++ b/kdevdesigner/designer/database.cpp
@@ -69,12 +69,12 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
     }
 }
 
-TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *tqparent, const char *name )
+QDesignerDataBrowser::QDesignerDataBrowser( TQWidget *tqparent, const char *name )
     : TQDataBrowser( tqparent, name )
 {
 }
 
-bool TQDesignerDataBrowser::event( TQEvent* e )
+bool QDesignerDataBrowser::event( TQEvent* e )
 {
     bool b = TQDataBrowser::event( e );
 #if defined(DESIGNER)
@@ -96,12 +96,12 @@ bool TQDesignerDataBrowser::event( TQEvent* e )
     return b;
 }
 
-TQDesignerDataView::TQDesignerDataView( TQWidget *tqparent, const char *name )
+QDesignerDataView::QDesignerDataView( TQWidget *tqparent, const char *name )
     : TQDataView( tqparent, name )
 {
 }
 
-bool TQDesignerDataView::event( TQEvent* e )
+bool QDesignerDataView::event( TQEvent* e )
 {
     bool b = TQDataView::event( e );
 #if defined(DESIGNER)
diff --git a/kdevdesigner/designer/database.h b/kdevdesigner/designer/database.h
index 8ff9bec3..8fe3442b 100644
--- a/kdevdesigner/designer/database.h
+++ b/kdevdesigner/designer/database.h
@@ -56,25 +56,25 @@ protected:
 
 };
 
-class TQDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport
+class QDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerDataBrowser( TQWidget *tqparent, const char *name );
+    QDesignerDataBrowser( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
 };
 
-class TQDesignerDataView : public TQDataView, public DatabaseSupport
+class QDesignerDataView : public TQDataView, public DatabaseSupport
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerDataView( TQWidget *tqparent, const char *name );
+    QDesignerDataView( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
diff --git a/kdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h
index 5145b3b5..f013f507 100644
--- a/kdevdesigner/designer/hierarchyview.h
+++ b/kdevdesigner/designer/hierarchyview.h
@@ -31,7 +31,7 @@
 #include <tqlistview.h>
 #include <tqtabwidget.h>
 #include <tqguardedptr.h>
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 #include "../interfaces/classbrowserinterface.h"
 
 class FormWindow;
diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp
index 83db3b7d..17592f0f 100644
--- a/kdevdesigner/designer/layout.cpp
+++ b/kdevdesigner/designer/layout.cpp
@@ -747,7 +747,7 @@ void GridLayout::doLayout()
     if ( !prepareLayout( needMove, needRetqparent ) )
 	return;
 
-    TQDesignerGridLayout *tqlayout = (TQDesignerGridLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::Grid );
+    QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::Grid );
 
     if ( !grid )
 	buildGrid();
@@ -1003,13 +1003,13 @@ void Spacer::setOrientation( Qt::Orientation o )
 }
 
 
-void TQDesignerGridLayout::addWidget( TQWidget *w, int row, int col, int align_ )
+void QDesignerGridLayout::addWidget( TQWidget *w, int row, int col, int align_ )
 {
     items.insert( w, Item(row, col, 1, 1) );
     TQGridLayout::addWidget( w, row, col, align_ );
 }
 
-void TQDesignerGridLayout::addMultiCellWidget( TQWidget *w, int fromRow, int toRow,
+void QDesignerGridLayout::addMultiCellWidget( TQWidget *w, int fromRow, int toRow,
 					      int fromCol, int toCol, int align_ )
 {
     items.insert( w, Item(fromRow, fromCol, toRow - fromRow + 1, toCol - fromCol +1) );
diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h
index 67061595..ac4aabb2 100644
--- a/kdevdesigner/designer/layout.h
+++ b/kdevdesigner/designer/layout.h
@@ -161,13 +161,13 @@ protected:
     TQSize sh;
 };
 
-class TQDesignerGridLayout : public TQGridLayout
+class QDesignerGridLayout : public TQGridLayout
 {
    Q_OBJECT
   TQ_OBJECT
 public:
-    TQDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){};
-    TQDesignerGridLayout( TQLayout *tqparentLayout ) : TQGridLayout( tqparentLayout ){};
+    QDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){};
+    QDesignerGridLayout( TQLayout *tqparentLayout ) : TQGridLayout( tqparentLayout ){};
 
     void addWidget( TQWidget *, int row, int col, int align = 0 );
     void addMultiCellWidget( TQWidget *, int fromRow, int toRow,
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index b4b5c1ac..e53d0383 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -826,7 +826,7 @@ void MainWindow::helpAbout()
     dlg.exec();
 }
 
-void MainWindow::helpAboutTQt()
+void MainWindow::helpAboutQt()
 {
     TQMessageBox::aboutTQt( this, "TQt Designer" );
 }
@@ -989,33 +989,33 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	if ( o && currentTool() == POINTER_TOOL &&
 	     ( ::tqqt_cast<MenuBarEditor*>(o) ||
 	       ::tqqt_cast<PopupMenuEditor*>(o) ||
-	       ::tqqt_cast<TQDesignerToolBar*>(o) ||
+	       ::tqqt_cast<QDesignerToolBar*>(o) ||
 	       ( ::tqqt_cast<TQComboBox*>(o) ||
 		 ::tqqt_cast<TQToolButton*>(o) ||
-		 ::tqqt_cast<TQDesignerToolBarSeparator*>(o) ) &&
+		 ::tqqt_cast<QDesignerToolBarSeparator*>(o) ) &&
 	       o->tqparent()
-	       && ( ::tqqt_cast<TQDesignerToolBar*>(o->tqparent())
+	       && ( ::tqqt_cast<QDesignerToolBar*>(o->tqparent())
 		   || ::tqqt_cast<TQDesignerWidgetStack*>(o->tqparent())) ) ) {
 	    TQWidget *w = (TQWidget*)o;
 	    if ( ::tqqt_cast<TQToolButton*>(w) ||
 		 ::tqqt_cast<TQComboBox*>(w) ||
 		 ::tqqt_cast<PopupMenuEditor*>(w) ||
-		 ::tqqt_cast<TQDesignerToolBarSeparator*>(w) )
+		 ::tqqt_cast<QDesignerToolBarSeparator*>(w) )
 		w = w->tqparentWidget();
 	    TQWidget *pw = w->tqparentWidget();
 	    while ( pw ) {
 		if ( ::tqqt_cast<FormWindow*>(pw) ) {
 		    ( (FormWindow*)pw )->emitShowProperties( TQT_TQOBJECT(w) );
-		    if ( !::tqqt_cast<TQDesignerToolBar*>(o) )
+		    if ( !::tqqt_cast<QDesignerToolBar*>(o) )
 			return ( !::tqqt_cast<TQToolButton*>(o) &&
 				 !::tqqt_cast<MenuBarEditor*>(o) &&
 				 !::tqqt_cast<TQComboBox*>(o) &&
-				 !::tqqt_cast<TQDesignerToolBarSeparator*>(o) );
+				 !::tqqt_cast<QDesignerToolBarSeparator*>(o) );
 		}
 		pw = pw->tqparentWidget();
 	    }
 	}
-	if ( o && ( ::tqqt_cast<TQDesignerToolBar*>(o) || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) )
+	if ( o && ( ::tqqt_cast<QDesignerToolBar*>(o) || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) )
 	     && e->type() == TQEvent::ContextMenu )
 	    break;
 	if ( isAToolBarChild( o ) && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL )
@@ -1246,7 +1246,7 @@ TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const
 TQWidget *MainWindow::isAToolBarChild( TQObject *o ) const
 {
     while ( o ) {
-	if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
+	if ( ::tqqt_cast<QDesignerToolBar*>(o) )
 	    return (TQWidget*)o;
 	if ( ::tqqt_cast<FormWindow*>(o) )
 	    return 0;
diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h
index a33c5e25..950cf241 100644
--- a/kdevdesigner/designer/mainwindow.h
+++ b/kdevdesigner/designer/mainwindow.h
@@ -43,7 +43,7 @@
 #include <tqmainwindow.h>
 #include <tqmap.h>
 #include <tqguardedptr.h>
-#include <private/tqpluginmanager_p.h>
+#include <tqpluginmanager_p.h>
 #include <tqobjectlist.h>
 
 class TQToolBox;
@@ -292,7 +292,7 @@ public slots:
     void helpContents();
     void helpManual();
     void helpAbout();
-    void helpAboutTQt();
+    void helpAboutQt();
     void helpRegister();
 
 private slots:
diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp
index 1a609f8f..68f721e8 100644
--- a/kdevdesigner/designer/metadatabase.cpp
+++ b/kdevdesigner/designer/metadatabase.cpp
@@ -50,7 +50,7 @@
 #include <tqwidgetlist.h>
 #include <tqmainwindow.h>
 #include <tqregexp.h>
-#include <private/tqpluginmanager_p.h>
+#include <tqpluginmanager_p.h>
 #include <tqdatetime.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp
index 5d230e05..82378a84 100644
--- a/kdevdesigner/designer/multilineeditorimpl.cpp
+++ b/kdevdesigner/designer/multilineeditorimpl.cpp
@@ -36,7 +36,7 @@
 #include "kdevdesigner_part.h"
 
 #include <tqtextedit.h>
-#include <./private/tqrichtext_p.h>
+#include <tqrichtext_p.h>
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h
index b39aea71..9fc56257 100644
--- a/kdevdesigner/designer/multilineeditorimpl.h
+++ b/kdevdesigner/designer/multilineeditorimpl.h
@@ -29,7 +29,7 @@
 
 #include <tqaction.h>
 #include <tqtextedit.h>
-#include <private/tqrichtext_p.h>
+#include <tqrichtext_p.h>
 #include "multilineeditor.h"
 
 class FormWindow;
diff --git a/kdevdesigner/designer/project.h b/kdevdesigner/designer/project.h
index 350fd6f0..ad3b1ba7 100644
--- a/kdevdesigner/designer/project.h
+++ b/kdevdesigner/designer/project.h
@@ -33,7 +33,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <tqmap.h>
-#include <private/tqpluginmanager_p.h>
+#include <tqpluginmanager_p.h>
 #include "../interfaces/projectsettingsiface.h"
 #include "sourcefile.h"
 #include "formfile.h"
diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp
index f963cf51..6499c78d 100644
--- a/kdevdesigner/designer/qcompletionedit.cpp
+++ b/kdevdesigner/designer/qcompletionedit.cpp
@@ -30,7 +30,7 @@
 #include <tqapplication.h>
 #include <tqvbox.h>
 
-TQCompletionEdit::TQCompletionEdit( TQWidget *tqparent, const char *name )
+QCompletionEdit::QCompletionEdit( TQWidget *tqparent, const char *name )
     : TQLineEdit( tqparent, name ), aAdd( FALSE ), caseSensitive( FALSE )
 {
     popup = new TQVBox( 0, 0, WType_Popup );
@@ -51,27 +51,27 @@ TQCompletionEdit::TQCompletionEdit( TQWidget *tqparent, const char *name )
     installEventFilter( this );
 }
 
-bool TQCompletionEdit::autoAdd() const
+bool QCompletionEdit::autoAdd() const
 {
     return aAdd;
 }
 
-TQStringList TQCompletionEdit::completionList() const
+TQStringList QCompletionEdit::completionList() const
 {
     return compList;
 }
 
-void TQCompletionEdit::setCompletionList( const TQStringList &l )
+void QCompletionEdit::setCompletionList( const TQStringList &l )
 {
     compList = l;
 }
 
-void TQCompletionEdit::setAutoAdd( bool add )
+void QCompletionEdit::setAutoAdd( bool add )
 {
     aAdd = add;
 }
 
-void TQCompletionEdit::textDidChange( const TQString &text )
+void QCompletionEdit::textDidChange( const TQString &text )
 {
     if ( text.isEmpty() ) {
 	popup->close();
@@ -81,7 +81,7 @@ void TQCompletionEdit::textDidChange( const TQString &text )
     placeListBox();
 }
 
-void TQCompletionEdit::placeListBox()
+void QCompletionEdit::placeListBox()
 {
     if ( listbox->count() == 0 ) {
 	popup->close();
@@ -102,7 +102,7 @@ void TQCompletionEdit::placeListBox()
     setFocus();
 }
 
-void TQCompletionEdit::updateListBox()
+void QCompletionEdit::updateListBox()
 {
     listbox->clear();
     if ( compList.isEmpty() )
@@ -114,7 +114,7 @@ void TQCompletionEdit::updateListBox()
     }
 }
 
-bool TQCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
+bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
 {
     if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(popup) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox->viewport()) ) {
 	if ( e->type() == TQEvent::KeyPress ) {
@@ -178,7 +178,7 @@ bool TQCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
     return TQLineEdit::eventFilter( o, e );
 }
 
-void TQCompletionEdit::addCompletionEntry( const TQString &entry )
+void QCompletionEdit::addCompletionEntry( const TQString &entry )
 {
     if ( compList.tqfind( entry ) == compList.end() ) {
 	compList << entry;
@@ -186,24 +186,24 @@ void TQCompletionEdit::addCompletionEntry( const TQString &entry )
     }
 }
 
-void TQCompletionEdit::removeCompletionEntry( const TQString &entry )
+void QCompletionEdit::removeCompletionEntry( const TQString &entry )
 {
     TQStringList::Iterator it = compList.tqfind( entry );
     if ( it != compList.end() )
 	compList.remove( it );
 }
 
-void TQCompletionEdit::setCaseSensitive( bool b )
+void QCompletionEdit::setCaseSensitive( bool b )
 {
     caseSensitive = b;
 }
 
-bool TQCompletionEdit::isCaseSensitive() const
+bool QCompletionEdit::isCaseSensitive() const
 {
     return caseSensitive;
 }
 
-void TQCompletionEdit::clear()
+void QCompletionEdit::clear()
 {
     TQLineEdit::clear();
     compList.clear();
diff --git a/kdevdesigner/designer/qcompletionedit.h b/kdevdesigner/designer/qcompletionedit.h
index 8bc7e72d..6e7ba455 100644
--- a/kdevdesigner/designer/qcompletionedit.h
+++ b/kdevdesigner/designer/qcompletionedit.h
@@ -33,7 +33,7 @@
 class TQListBox;
 class TQVBox;
 
-class TQCompletionEdit : public TQLineEdit
+class QCompletionEdit : public TQLineEdit
 {
     Q_OBJECT
   TQ_OBJECT
@@ -41,7 +41,7 @@ class TQCompletionEdit : public TQLineEdit
     TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive )
 
 public:
-    TQCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 );
+    QCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 );
 
     bool autoAdd() const;
     TQStringList completionList() const;
diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp
index 0e342060..174edc63 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -79,7 +79,7 @@
 #include <tqworkspace.h>
 #include <tqworkspace.h>
 #include <tqsplitter.h>
-#include <private/tqucom_p.h>
+#include <tqucom_p.h>
 
 #include <kiconloader.h>
 #include <kfiledialog.h>
diff --git a/kdevdesigner/designer/syntaxhighlighter_html.h b/kdevdesigner/designer/syntaxhighlighter_html.h
index 607359f0..87f94872 100644
--- a/kdevdesigner/designer/syntaxhighlighter_html.h
+++ b/kdevdesigner/designer/syntaxhighlighter_html.h
@@ -27,7 +27,7 @@
 #ifndef SYNTAXHIGHLIGHTER_HTML_H
 #define SYNTAXHIGHLIGHTER_HTML_H
 
-#include <./private/tqrichtext_p.h>
+#include <tqrichtext_p.h>
 
 class SyntaxHighlighter_HTML : public TQTextPreProcessor
 {
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp
index 43081cdd..5d47c863 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/kdevdesigner/designer/widgetfactory.cpp
@@ -123,52 +123,52 @@ void TQLayoutWidget::paintEvent( TQPaintEvent* )
 }
 
 
-TQDesignerTabWidget::TQDesignerTabWidget( TQWidget *tqparent, const char *name )
+QDesignerTabWidget::QDesignerTabWidget( TQWidget *tqparent, const char *name )
     : TQTabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE )
 {
     tabBar()->setAcceptDrops( TRUE );
     tabBar()->installEventFilter( this );
 }
 
-int TQDesignerTabWidget::currentPage() const
+int QDesignerTabWidget::currentPage() const
 {
     return tabBar()->currentTab();
 }
 
-void TQDesignerTabWidget::setCurrentPage( int i )
+void QDesignerTabWidget::setCurrentPage( int i )
 {
     tabBar()->setCurrentTab( i );
 }
 
-TQString TQDesignerTabWidget::pageTitle() const
+TQString QDesignerTabWidget::pageTitle() const
 {
     return ((TQTabWidget*)this)->tabLabel( TQTabWidget::currentPage() );
 }
 
-void TQDesignerTabWidget::setPageTitle( const TQString& title )
+void QDesignerTabWidget::setPageTitle( const TQString& title )
 {
     changeTab( TQTabWidget::currentPage(), title );
 }
 
-void TQDesignerTabWidget::setPageName( const TQCString& name )
+void QDesignerTabWidget::setPageName( const TQCString& name )
 {
     if ( TQTabWidget::currentPage() )
 	TQTabWidget::currentPage()->setName( name );
 }
 
-TQCString TQDesignerTabWidget::pageName() const
+TQCString QDesignerTabWidget::pageName() const
 {
     if ( !TQTabWidget::currentPage() )
 	return 0;
     return TQTabWidget::currentPage()->name();
 }
 
-int TQDesignerTabWidget::count() const
+int QDesignerTabWidget::count() const
 {
     return tabBar()->count();
 }
 
-bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
+bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 {
     if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(tabBar()) ) return FALSE;
 
@@ -290,7 +290,7 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 }
 
 
-TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *tqparent, const char *name )
+QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *tqparent, const char *name )
     : TQWidgetStack( tqparent, name )
 {
     prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" );
@@ -306,7 +306,7 @@ TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *tqparent, const char *na
     updateButtons();
 }
 
-void TQDesignerWidgetStack::updateButtons()
+void QDesignerWidgetStack::updateButtons()
 {
     prev->setGeometry( width() - 31, 1, 15, 15 );
     next->setGeometry( width() - 16, 1, 15, 15 );
@@ -316,23 +316,23 @@ void TQDesignerWidgetStack::updateButtons()
     next->raise();
 }
 
-void TQDesignerWidgetStack::prevPage()
+void QDesignerWidgetStack::prevPage()
 {
     setCurrentPage( currentPage() - 1 );
 }
 
-void TQDesignerWidgetStack::nextPage()
+void QDesignerWidgetStack::nextPage()
 {
     setCurrentPage( currentPage() + 1 );
 }
 
-int TQDesignerWidgetStack::currentPage() const
+int QDesignerWidgetStack::currentPage() const
 {
-    TQDesignerWidgetStack* that = (TQDesignerWidgetStack*) this;
+    QDesignerWidgetStack* that = (QDesignerWidgetStack*) this;
     return that->pages.tqfind( visibleWidget() );
 }
 
-void TQDesignerWidgetStack::setCurrentPage( int i )
+void QDesignerWidgetStack::setCurrentPage( int i )
 {
     // help next/prev page commands
     if ( i < 0 )
@@ -346,34 +346,34 @@ void TQDesignerWidgetStack::setCurrentPage( int i )
     updateButtons();
 }
 
-TQCString TQDesignerWidgetStack::pageName() const
+TQCString QDesignerWidgetStack::pageName() const
 {
     if ( !visibleWidget() )
 	return 0;
     return visibleWidget()->name();
 }
 
-void TQDesignerWidgetStack::setPageName( const TQCString& name )
+void QDesignerWidgetStack::setPageName( const TQCString& name )
 {
     if ( visibleWidget() )
 	visibleWidget()->setName( name );
 }
 
-int TQDesignerWidgetStack::count() const
+int QDesignerWidgetStack::count() const
 {
     return pages.count();
 }
 
-TQWidget* TQDesignerWidgetStack::page( int i ) const
+TQWidget* QDesignerWidgetStack::page( int i ) const
 {
     if ( i < 0 || i >= count() )
 	return 0;
-    TQDesignerWidgetStack* that = (TQDesignerWidgetStack*) this;
+    QDesignerWidgetStack* that = (QDesignerWidgetStack*) this;
     return that->pages.at( i );
 }
 
 
-int TQDesignerWidgetStack::insertPage( TQWidget *p, int i )
+int QDesignerWidgetStack::insertPage( TQWidget *p, int i )
 {
     if ( i < 0 )
 	pages.append( p );
@@ -387,7 +387,7 @@ int TQDesignerWidgetStack::insertPage( TQWidget *p, int i )
     return pages.tqfind( p );
 }
 
-int TQDesignerWidgetStack::removePage( TQWidget *p )
+int QDesignerWidgetStack::removePage( TQWidget *p )
 {
     int i = pages.tqfind( p );
     pages.remove( p );
@@ -398,7 +398,7 @@ int TQDesignerWidgetStack::removePage( TQWidget *p )
 }
 
 
-int TQDesignerWizard::currentPageNum() const
+int QDesignerWizard::currentPageNum() const
 {
     for ( int i = 0; i < pageCount(); ++i ) {
 	if ( page( i ) == currentPage() )
@@ -411,7 +411,7 @@ int TQDesignerWizard::currentPageNum() const
 
 
 
-void TQDesignerWizard::setCurrentPage( int i )
+void QDesignerWizard::setCurrentPage( int i )
 {
     if ( i < currentPageNum() ) {
 	while ( i < currentPageNum() ) {
@@ -429,30 +429,30 @@ void TQDesignerWizard::setCurrentPage( int i )
     }
 }
 
-TQString TQDesignerWizard::pageTitle() const
+TQString QDesignerWizard::pageTitle() const
 {
     return title( currentPage() );
 }
 
-void TQDesignerWizard::setPageTitle( const TQString& title )
+void QDesignerWizard::setPageTitle( const TQString& title )
 {
     setTitle( currentPage(), title );
 }
 
-void TQDesignerWizard::setPageName( const TQCString& name )
+void QDesignerWizard::setPageName( const TQCString& name )
 {
     if ( TQWizard::currentPage() )
 	TQWizard::currentPage()->setName( name );
 }
 
-TQCString TQDesignerWizard::pageName() const
+TQCString QDesignerWizard::pageName() const
 {
     if ( !TQWizard::currentPage() )
 	return 0;
     return TQWizard::currentPage()->name();
 }
 
-int TQDesignerWizard::pageNum( TQWidget *p )
+int QDesignerWizard::pageNum( TQWidget *p )
 {
     for ( int i = 0; i < pageCount(); ++i ) {
 	if ( page( i ) == p )
@@ -461,20 +461,20 @@ int TQDesignerWizard::pageNum( TQWidget *p )
     return -1;
 }
 
-void TQDesignerWizard::addPage( TQWidget *p, const TQString &t )
+void QDesignerWizard::addPage( TQWidget *p, const TQString &t )
 {
     TQWizard::addPage( p, t );
     if ( removedPages.tqfind( p ) )
 	removedPages.remove( p );
 }
 
-void TQDesignerWizard::removePage( TQWidget *p )
+void QDesignerWizard::removePage( TQWidget *p )
 {
     TQWizard::removePage( p );
     removedPages.insert( p, p );
 }
 
-void TQDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index )
+void QDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index )
 {
     TQWizard::insertPage( p, t, index );
     if ( removedPages.tqfind( p ) )
@@ -603,7 +603,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
 	    l = new TQVBoxLayout( tqlayout );
 	    break;
 	case Grid:
-	    l = new TQDesignerGridLayout( tqlayout );
+	    l = new QDesignerGridLayout( tqlayout );
 	    break;
 	default:
 	    return 0;
@@ -621,7 +621,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
 		l = new TQVBoxLayout( tqlayout );
 		break;
 	    case Grid:
-		l = new TQDesignerGridLayout( tqlayout );
+		l = new QDesignerGridLayout( tqlayout );
 		break;
 	    default:
 		return 0;
@@ -638,7 +638,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
 		l = new TQVBoxLayout( widget );
 		break;
 	    case Grid:
-		l = new TQDesignerGridLayout( widget );
+		l = new QDesignerGridLayout( widget );
 		break;
 	    default:
 		return 0;
@@ -689,17 +689,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
     if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) {
 	TQPushButton *b = 0;
 	if ( init ) {
-	    b = new TQDesignerPushButton( tqparent, name );
+	    b = new QDesignerPushButton( tqparent, name );
 	    b->setText( TQString::tqfromLatin1( name ) );
 	} else {
-	    b = new TQDesignerPushButton( tqparent, name );
+	    b = new QDesignerPushButton( tqparent, name );
 	}
 	TQWidget *w = find_formwindow( b );
 	b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) );
 	return b;
     } else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) {
 	if ( init ) {
-	    TQDesignerToolButton *tb = new TQDesignerToolButton( tqparent, name );
+	    QDesignerToolButton *tb = new QDesignerToolButton( tqparent, name );
 	    if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(tqparent))) {
 		tb->setUsesTextLabel(TRUE);
 		tb->setTextLabel("...");
@@ -710,21 +710,21 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
 	    }
 	    return tb;
 	}
-	return new TQDesignerToolButton( tqparent, name );
+	return new QDesignerToolButton( tqparent, name );
     } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) {
 	if ( init ) {
-	    TQDesignerCheckBox *cb = new TQDesignerCheckBox( tqparent, name );
+	    QDesignerCheckBox *cb = new QDesignerCheckBox( tqparent, name );
 	    cb->setText( TQString::tqfromLatin1( name ) );
 	    return cb;
 	}
-	return new TQDesignerCheckBox( tqparent, name );
+	return new QDesignerCheckBox( tqparent, name );
     } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) {
 	if ( init ) {
-	    TQDesignerRadioButton *rb = new TQDesignerRadioButton( tqparent, name );
+	    QDesignerRadioButton *rb = new QDesignerRadioButton( tqparent, name );
 	    rb->setText( TQString::tqfromLatin1( name ) );
 	    return rb;
 	}
-	return new TQDesignerRadioButton( tqparent, name );
+	return new QDesignerRadioButton( tqparent, name );
     } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) {
 	if ( init )
 	    return new TQGroupBox( TQString::tqfromLatin1( name ), tqparent, name );
@@ -787,7 +787,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
     else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING )
 	return new TQTextEdit( tqparent, name );
     else if ( className == TQLABEL_OBJECT_NAME_STRING  || className == "TextLabel" ) {
-	TQDesignerLabel *l = new TQDesignerLabel( tqparent, name );
+	QDesignerLabel *l = new QDesignerLabel( tqparent, name );
 	if ( init ) {
 	    l->setText( TQString::tqfromLatin1( name ) );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
@@ -795,7 +795,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
 	}
 	return l;
     } else if ( className == "PixmapLabel" ) {
-	TQDesignerLabel *l = new TQDesignerLabel( tqparent, name );
+	QDesignerLabel *l = new QDesignerLabel( tqparent, name );
 	if ( init ) {
 	    l->setPixmap( BarIcon( "designer_qtlogo.png", KDevDesignerPartFactory::instance() ) );
 	    l->setScaledContents( TRUE );
@@ -807,23 +807,23 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
     } else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
 	return new TQLayoutWidget( tqparent, name );
     else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) {
-	TQTabWidget *tw = new TQDesignerTabWidget( tqparent, name );
+	TQTabWidget *tw = new QDesignerTabWidget( tqparent, name );
 	if ( init ) {
 	    FormWindow *fw = find_formwindow( tqparent );
-	    TQWidget *w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
+	    TQWidget *w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
 	    tw->addTab( w, i18n("Tab 1") );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
-	    w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
+	    w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
 	    tw->addTab( w, i18n("Tab 2") );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(tw) );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
 	}
 	return tw;
     } else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) {
-	TQDesignerWidgetStack *ws = new TQDesignerWidgetStack( tqparent, name );
+	QDesignerWidgetStack *ws = new QDesignerWidgetStack( tqparent, name );
 	if ( init ) {
 	    FormWindow *fw = find_formwindow( tqparent );
-	    TQWidget *w = fw ? new TQDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" );
+	    TQWidget *w = fw ? new QDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" );
 	    ws->insertPage( w );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(ws) );
@@ -841,7 +841,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
 	       ::tqqt_cast<TQMainWindow*>(tqparent) ) ) {
 	    FormWindow *fw = find_formwindow( tqparent );
 	    if ( fw ) {
-		TQDesignerWidget *dw = new TQDesignerWidget( fw, tqparent, name );
+		QDesignerWidget *dw = new QDesignerWidget( fw, tqparent, name );
 		MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
 		return dw;
 	    }
@@ -850,7 +850,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
     } else if ( className == TQDIALOG_OBJECT_NAME_STRING ) {
 	TQDialog *dia = 0;
 	if ( ::tqqt_cast<FormWindow*>(tqparent) )
-	    dia = new TQDesignerDialog( (FormWindow*)tqparent, tqparent, name );
+	    dia = new QDesignerDialog( (FormWindow*)tqparent, tqparent, name );
 	else
 	    dia = new TQDialog( tqparent, name );
 #if defined(TQT_NON_COMMERCIAL)
@@ -861,7 +861,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
 	    dia->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
 	return dia;
     } else if ( className == TQWIZARD_OBJECT_NAME_STRING ) {
-	TQWizard *wiz = new TQDesignerWizard( tqparent, name );
+	TQWizard *wiz = new QDesignerWizard( tqparent, name );
 #if defined(TQT_NON_COMMERCIAL)
 	if ( ::tqqt_cast<MainWindow*>(tqparent) )
 #else
@@ -869,7 +869,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
 #endif
 	    wiz->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
 	if ( init && ::tqqt_cast<FormWindow*>(tqparent) ) {
-	    TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, wiz, "WizardPage" );
+	    QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)tqparent, wiz, "WizardPage" );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
 	    wiz->addPage( dw, i18n( "Page" ) );
 	    TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) );
@@ -943,7 +943,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
     } else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) {
 	TQMainWindow *mw = new TQMainWindow( tqparent, name, 0 );
 	mw->setDockEnabled( TQt::DockMinimized, FALSE );
-	TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, mw, "central widget" );
+	QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)tqparent, mw, "central widget" );
 	mw->setDockMenuEnabled( FALSE );
 	MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
 	mw->setCentralWidget( dw );
@@ -952,14 +952,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
 	return mw;
     } else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) {
 	if ( !init )
-	    return new TQDesignerToolBox( tqparent, name );
-	TQToolBox *tb = new TQDesignerToolBox( tqparent, name );
+	    return new QDesignerToolBox( tqparent, name );
+	TQToolBox *tb = new QDesignerToolBox( tqparent, name );
 	FormWindow *fw = find_formwindow( tqparent );
-	TQWidget *w = fw ? new TQDesignerWidget( fw, tb, "page1" ) :
+	TQWidget *w = fw ? new QDesignerWidget( fw, tb, "page1" ) :
 		     new TQWidget( tb, "page1" );
 	tb->addItem( w, i18n("Page 1") );
 	MetaDataBase::addEntry( TQT_TQOBJECT(w) );
-	w = fw ? new TQDesignerWidget( fw, tb, "page2" ) : new TQWidget( tb, "page2" );
+	w = fw ? new QDesignerWidget( fw, tb, "page2" ) : new TQWidget( tb, "page2" );
 	tb->addItem( w, i18n("Page 2") );
 	MetaDataBase::addEntry( TQT_TQOBJECT(tb) );
 	MetaDataBase::addEntry( TQT_TQOBJECT(w) );
@@ -967,12 +967,12 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
     }
 #ifndef TQT_NO_SQL
     else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) {
-	TQWidget *w = new TQDesignerDataBrowser( tqparent, name );
+	TQWidget *w = new QDesignerDataBrowser( tqparent, name );
 	if ( tqparent )
 	    w->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
 	return w;
     } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) {
-	TQWidget *w = new TQDesignerDataView( tqparent, name );
+	TQWidget *w = new QDesignerDataView( tqparent, name );
 	if ( tqparent )
 	    w->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
 	return w;
@@ -1222,46 +1222,46 @@ const char* WidgetFactory::classNameOf( TQObject* o )
 	return o->className();
     if (WidgetDatabase::isCustomPluginWidget(WidgetDatabase::idFromClassName(o->className())))
         return o->className();
-    else if ( ::tqqt_cast<TQDesignerTabWidget*>(o) )
+    else if ( ::tqqt_cast<QDesignerTabWidget*>(o) )
 	return TQTABWIDGET_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerWidgetStack*>(o) )
+    else if ( ::tqqt_cast<QDesignerWidgetStack*>(o) )
 	return TQWIDGETSTACK_OBJECT_NAME_STRING;
     else if ( ::tqqt_cast<TQWidgetStack*>(o) )
 	return "TQWeDoNotWantToBreakTabWidget";
-    else if ( ::tqqt_cast<TQDesignerDialog*>(o) )
+    else if ( ::tqqt_cast<QDesignerDialog*>(o) )
 	return TQDIALOG_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerWidget*>(o) )
+    else if ( ::tqqt_cast<QDesignerWidget*>(o) )
 	return TQWIDGET_OBJECT_NAME_STRING;
     else if ( o->inherits( "CustomWidget" ) )
 	return ( (CustomWidget*)o )->realClassName().latin1();
-    else if ( ::tqqt_cast<TQDesignerLabel*>(o) )
+    else if ( ::tqqt_cast<QDesignerLabel*>(o) )
 	return TQLABEL_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerWizard*>(o) )
+    else if ( ::tqqt_cast<QDesignerWizard*>(o) )
 	return TQWIZARD_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerPushButton*>(o) )
+    else if ( ::tqqt_cast<QDesignerPushButton*>(o) )
 	return TQPUSHBUTTON_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerToolButton*>(o) )
+    else if ( ::tqqt_cast<QDesignerToolButton*>(o) )
 	return TQTOOLBUTTON_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerRadioButton*>(o) )
+    else if ( ::tqqt_cast<QDesignerRadioButton*>(o) )
 	return TQRADIOBUTTON_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerCheckBox*>(o) )
+    else if ( ::tqqt_cast<QDesignerCheckBox*>(o) )
 	return TQCHECKBOX_OBJECT_NAME_STRING;
     else if ( ::tqqt_cast<MenuBarEditor*>(o) )
 	return TQMENUBAR_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
+    else if ( ::tqqt_cast<QDesignerToolBar*>(o) )
 	return TQTOOLBAR_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerAction*>(o) )
+    else if ( ::tqqt_cast<QDesignerAction*>(o) )
 	return TQACTION_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerActionGroup*>(o) )
+    else if ( ::tqqt_cast<QDesignerActionGroup*>(o) )
 	return TQACTIONGROUP_OBJECT_NAME_STRING;
     else if ( ::tqqt_cast<PopupMenuEditor*>(o) )
 	return TQPOPUPMENU_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerToolBox*>(o) )
+    else if ( ::tqqt_cast<QDesignerToolBox*>(o) )
 	return TQTOOLBOX_OBJECT_NAME_STRING;
 #ifndef TQT_NO_SQL
-    else if ( ::tqqt_cast<TQDesignerDataBrowser*>(o) )
+    else if ( ::tqqt_cast<QDesignerDataBrowser*>(o) )
 	return TQDATABROWSER_OBJECT_NAME_STRING;
-    else if ( ::tqqt_cast<TQDesignerDataView*>(o) )
+    else if ( ::tqqt_cast<QDesignerDataView*>(o) )
 	return TQDATAVIEW_OBJECT_NAME_STRING;
 #endif
     return o->className();
@@ -1307,7 +1307,7 @@ void WidgetFactory::initChangedProperties( TQObject *o )
 	 MainWindow::self->currProject()->fakeFormFileFor( o ) )
 	return;
     MetaDataBase::setPropertyChanged( o, "name", TRUE );
-    if ( !::tqqt_cast<TQDesignerToolBar*>(o) && !::tqqt_cast<MenuBarEditor*>(o) )
+    if ( !::tqqt_cast<QDesignerToolBar*>(o) && !::tqqt_cast<MenuBarEditor*>(o) )
 	MetaDataBase::setPropertyChanged( o, "geometry", TRUE );
 
     if ( ::tqqt_cast<TQPushButton*>(o) ||
@@ -1359,7 +1359,7 @@ void WidgetFactory::initChangedProperties( TQObject *o )
 #endif
     } else if ( ::tqqt_cast<TQSplitter*>(o)  ) {
 	MetaDataBase::setPropertyChanged( o, "orientation", TRUE );
-    } else if ( ::tqqt_cast<TQDesignerToolBar*>(o)  ) {
+    } else if ( ::tqqt_cast<QDesignerToolBar*>(o)  ) {
 	MetaDataBase::setPropertyChanged( o, "label", TRUE );
     } else if ( ::tqqt_cast<MenuBarEditor*>(o)  ) {
 	MetaDataBase::setPropertyChanged( o, "itemName", TRUE );
@@ -1543,7 +1543,7 @@ TQVariant WidgetFactory::property( TQObject *w, const char *name )
     return w->property( name );
 }
 
-void TQDesignerLabel::updateBuddy()
+void QDesignerLabel::updateBuddy()
 {
 
     if ( myBuddy.isEmpty() )
@@ -1560,7 +1560,7 @@ void TQDesignerLabel::updateBuddy()
 }
 
 
-void TQDesignerWidget::resizeEvent( TQResizeEvent* e)
+void QDesignerWidget::resizeEvent( TQResizeEvent* e)
 {
     if ( need_frame ) {
 	TQPainter p(this);
@@ -1569,7 +1569,7 @@ void TQDesignerWidget::resizeEvent( TQResizeEvent* e)
     }
 }
 
-void TQDesignerWidget::paintEvent( TQPaintEvent *e )
+void QDesignerWidget::paintEvent( TQPaintEvent *e )
 {
     if ( need_frame ) {
 	TQPainter p(this);
@@ -1579,7 +1579,7 @@ void TQDesignerWidget::paintEvent( TQPaintEvent *e )
     formwindow->paintGrid( this, e );
 }
 
-void TQDesignerDialog::paintEvent( TQPaintEvent *e )
+void QDesignerDialog::paintEvent( TQPaintEvent *e )
 {
     formwindow->paintGrid( this, e );
 }
@@ -1757,39 +1757,39 @@ TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget
 }
 
 
-TQDesignerToolBox::TQDesignerToolBox( TQWidget *tqparent, const char *name )
+QDesignerToolBox::QDesignerToolBox( TQWidget *tqparent, const char *name )
     : TQToolBox( tqparent, name )
 {
 }
 
-TQString TQDesignerToolBox::itemLabel() const
+TQString QDesignerToolBox::itemLabel() const
 {
     return TQToolBox::itemLabel( currentIndex() );
 }
 
-void TQDesignerToolBox::setItemLabel( const TQString &l )
+void QDesignerToolBox::setItemLabel( const TQString &l )
 {
     TQToolBox::setItemLabel( currentIndex(), l );
 }
 
-TQCString TQDesignerToolBox::itemName() const
+TQCString QDesignerToolBox::itemName() const
 {
     return currentItem() ? currentItem()->name() : 0;
 }
 
-void TQDesignerToolBox::setItemName( const TQCString &n )
+void QDesignerToolBox::setItemName( const TQCString &n )
 {
     if (currentItem())
 	currentItem()->setName( n );
 }
 
 
-TQt::BackgroundMode TQDesignerToolBox::itemBackgroundMode() const
+TQt::BackgroundMode QDesignerToolBox::itemBackgroundMode() const
 {
     return (item(0) ? item(0)->backgroundMode() : PaletteBackground);
 }
 
-void TQDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode )
+void QDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode )
 {
     for (int i = 0; i < count(); ++i) {
 	TQWidget *w = item(i);
@@ -1798,7 +1798,7 @@ void TQDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode )
     }
 }
 
-void TQDesignerToolBox::itemInserted( int index )
+void QDesignerToolBox::itemInserted( int index )
 {
     if (count() > 1)
 	item(index)->setBackgroundMode(item(index>0?0:1)->backgroundMode());
diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h
index 17f5133b..1100418c 100644
--- a/kdevdesigner/designer/widgetfactory.h
+++ b/kdevdesigner/designer/widgetfactory.h
@@ -119,7 +119,7 @@ private:
 };
 
 
-class TQDesignerTabWidget : public TQTabWidget
+class QDesignerTabWidget : public TQTabWidget
 {
     Q_OBJECT
   TQ_OBJECT
@@ -127,7 +127,7 @@ class TQDesignerTabWidget : public TQTabWidget
     TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
     TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
 public:
-    TQDesignerTabWidget( TQWidget *tqparent, const char *name );
+    QDesignerTabWidget( TQWidget *tqparent, const char *name );
 
     int currentPage() const;
     void setCurrentPage( int i );
@@ -149,14 +149,14 @@ private:
      bool mousePressed;
 };
 
-class TQDesignerWidgetStack : public TQWidgetStack
+class QDesignerWidgetStack : public TQWidgetStack
 {
     Q_OBJECT
   TQ_OBJECT
     TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
     TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
 public:
-    TQDesignerWidgetStack( TQWidget *tqparent, const char *name );
+    QDesignerWidgetStack( TQWidget *tqparent, const char *name );
 
     int currentPage() const;
     void setCurrentPage( int i );
@@ -193,7 +193,7 @@ private:
 
 };
 
-class TQDesignerWizard : public TQWizard
+class QDesignerWizard : public TQWizard
 {
     Q_OBJECT
   TQ_OBJECT
@@ -203,7 +203,7 @@ class TQDesignerWizard : public TQWizard
     TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
 
 public:
-    TQDesignerWizard( TQWidget *tqparent, const char *name ) 
+    QDesignerWizard( TQWidget *tqparent, const char *name ) 
         : TQWizard( tqparent, name ), modal(FALSE) {}
 
     int currentPageNum() const;
@@ -315,7 +315,7 @@ public:
     }
 };
 
-class TQDesignerLabel : public TQLabel
+class QDesignerLabel : public TQLabel
 {
     Q_OBJECT
   TQ_OBJECT
@@ -323,7 +323,7 @@ class TQDesignerLabel : public TQLabel
     TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget )
 
 public:
-    TQDesignerLabel( TQWidget *tqparent = 0, const char *name = 0 )
+    QDesignerLabel( TQWidget *tqparent = 0, const char *name = 0 )
 	: TQLabel( tqparent, name ) { myBuddy = 0; }
 
     void setBuddyWidget( const TQCString &b ) {
@@ -348,15 +348,15 @@ private:
 
 };
 
-class TQDesignerWidget : public TQWidget
+class QDesignerWidget : public TQWidget
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name )
+    QDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name )
 	: TQWidget( tqparent, name, WResizeNoErase ), formwindow( fw ) {
-	    need_frame = tqparent && tqparent->inherits("TQDesignerWidgetStack" );
+	    need_frame = tqparent && tqparent->inherits("QDesignerWidgetStack" );
     }
 
 protected:
@@ -369,14 +369,14 @@ private:
 
 };
 
-class TQDesignerDialog : public TQDialog
+class QDesignerDialog : public TQDialog
 {
     Q_OBJECT
   TQ_OBJECT
     TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
 
 public:
-    TQDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name )
+    QDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name )
 	: TQDialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {}
 
     bool isModal() const { return modal; }
@@ -391,14 +391,14 @@ private:
 
 };
 
-class TQDesignerToolButton : public TQToolButton
+class QDesignerToolButton : public TQToolButton
 {
     Q_OBJECT
   TQ_OBJECT
     TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    TQDesignerToolButton( TQWidget *tqparent, const char *name )
+    QDesignerToolButton( TQWidget *tqparent, const char *name )
 	: TQToolButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
@@ -415,14 +415,14 @@ public:
     }
 };
 
-class TQDesignerRadioButton : public TQRadioButton
+class QDesignerRadioButton : public TQRadioButton
 {
     Q_OBJECT
   TQ_OBJECT
     TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    TQDesignerRadioButton( TQWidget *tqparent, const char *name )
+    QDesignerRadioButton( TQWidget *tqparent, const char *name )
 	: TQRadioButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
@@ -440,14 +440,14 @@ public:
 
 };
 
-class TQDesignerPushButton : public TQPushButton
+class QDesignerPushButton : public TQPushButton
 {
     Q_OBJECT
   TQ_OBJECT
     TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    TQDesignerPushButton( TQWidget *tqparent, const char *name )
+    QDesignerPushButton( TQWidget *tqparent, const char *name )
 	: TQPushButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
@@ -465,14 +465,14 @@ public:
 
 };
 
-class TQDesignerCheckBox : public TQCheckBox
+class QDesignerCheckBox : public TQCheckBox
 {
     Q_OBJECT
   TQ_OBJECT
     TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    TQDesignerCheckBox( TQWidget *tqparent, const char *name )
+    QDesignerCheckBox( TQWidget *tqparent, const char *name )
 	: TQCheckBox( tqparent, name ) {}
 
     bool isInButtonGroup() const {
@@ -490,7 +490,7 @@ public:
 
 };
 
-class TQDesignerToolBox : public TQToolBox
+class QDesignerToolBox : public TQToolBox
 {
     Q_OBJECT
   TQ_OBJECT
@@ -499,7 +499,7 @@ class TQDesignerToolBox : public TQToolBox
     TQ_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true )
 
 public:
-    TQDesignerToolBox( TQWidget *tqparent, const char *name );
+    QDesignerToolBox( TQWidget *tqparent, const char *name );
 
     TQString itemLabel() const;
     void setItemLabel( const TQString &l );
diff --git a/kdevdesigner/interfaces/actioninterface.h b/kdevdesigner/interfaces/actioninterface.h
index ce5f844c..03e1c98e 100644
--- a/kdevdesigner/interfaces/actioninterface.h
+++ b/kdevdesigner/interfaces/actioninterface.h
@@ -27,7 +27,7 @@
 #ifndef ACTIONINTERFACE_H
 #define ACTIONINTERFACE_H
 
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 
 class TQAction;
 class TQObject;
diff --git a/kdevdesigner/interfaces/classbrowserinterface.h b/kdevdesigner/interfaces/classbrowserinterface.h
index 320f3d88..d76df941 100644
--- a/kdevdesigner/interfaces/classbrowserinterface.h
+++ b/kdevdesigner/interfaces/classbrowserinterface.h
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 #include <tqobject.h>
 class TQListView;
 
diff --git a/kdevdesigner/interfaces/designerinterface.h b/kdevdesigner/interfaces/designerinterface.h
index d7f0667b..d96cc388 100644
--- a/kdevdesigner/interfaces/designerinterface.h
+++ b/kdevdesigner/interfaces/designerinterface.h
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
 #include <tqmap.h>
diff --git a/kdevdesigner/interfaces/editorinterface.h b/kdevdesigner/interfaces/editorinterface.h
index 02fa1bf4..e0d6fc06 100644
--- a/kdevdesigner/interfaces/editorinterface.h
+++ b/kdevdesigner/interfaces/editorinterface.h
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
diff --git a/kdevdesigner/interfaces/filterinterface.h b/kdevdesigner/interfaces/filterinterface.h
index abca17b4..6af54bcb 100644
--- a/kdevdesigner/interfaces/filterinterface.h
+++ b/kdevdesigner/interfaces/filterinterface.h
@@ -27,7 +27,7 @@
 #ifndef FILTERINTERFACE_H
 #define FILTERINTERFACE_H
 
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 
 // {ea8cb381-59b5-44a8-bae5-9bea8295762a}
 #ifndef IID_ImportFilter
diff --git a/kdevdesigner/interfaces/interpreterinterface.h b/kdevdesigner/interfaces/interpreterinterface.h
index fd6a86d3..45ba9e12 100644
--- a/kdevdesigner/interfaces/interpreterinterface.h
+++ b/kdevdesigner/interfaces/interpreterinterface.h
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 
 class TQObject;
 
diff --git a/kdevdesigner/interfaces/languageinterface.h b/kdevdesigner/interfaces/languageinterface.h
index 31e9f013..9d1f7e3d 100644
--- a/kdevdesigner/interfaces/languageinterface.h
+++ b/kdevdesigner/interfaces/languageinterface.h
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
diff --git a/kdevdesigner/interfaces/preferenceinterface.h b/kdevdesigner/interfaces/preferenceinterface.h
index ba972933..5b356c4b 100644
--- a/kdevdesigner/interfaces/preferenceinterface.h
+++ b/kdevdesigner/interfaces/preferenceinterface.h
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 #include <tqwidgetlist.h>
 #include <tqcstring.h>
 
diff --git a/kdevdesigner/interfaces/projectsettingsiface.h b/kdevdesigner/interfaces/projectsettingsiface.h
index d8d39097..e47f8ae7 100644
--- a/kdevdesigner/interfaces/projectsettingsiface.h
+++ b/kdevdesigner/interfaces/projectsettingsiface.h
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 #include <tqwidgetlist.h>
 #include <tqcstring.h>
 
diff --git a/kdevdesigner/interfaces/sourcetemplateiface.h b/kdevdesigner/interfaces/sourcetemplateiface.h
index cc54f274..8d914625 100644
--- a/kdevdesigner/interfaces/sourcetemplateiface.h
+++ b/kdevdesigner/interfaces/sourcetemplateiface.h
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 #include <tqstring.h>
 
 // {1b3446a4-1c71-424b-8789-1f34eb5697d8}
diff --git a/kdevdesigner/interfaces/templatewizardiface.h b/kdevdesigner/interfaces/templatewizardiface.h
index 561b5264..be1c57f1 100644
--- a/kdevdesigner/interfaces/templatewizardiface.h
+++ b/kdevdesigner/interfaces/templatewizardiface.h
@@ -40,7 +40,7 @@
 //
 //
 
-#include <private/tqcom_p.h>
+#include <tqcom_p.h>
 
 class TQWidget;
 struct DesignerFormWindow;
diff --git a/kdevdesigner/interfaces/widgetinterface.h b/kdevdesigner/interfaces/widgetinterface.h
index dea77857..5f0312f8 100644
--- a/kdevdesigner/interfaces/widgetinterface.h
+++ b/kdevdesigner/interfaces/widgetinterface.h
@@ -27,7 +27,7 @@
 #ifndef WIDGETINTERFACE_H
 #define WIDGETINTERFACE_H
 
-#include <private/tqwidgetinterface_p.h>
+#include <tqwidgetinterface_p.h>
 
 #define WidgetInterface TQWidgetFactoryInterface
 #define IID_Widget IID_TQWidgetFactory
diff --git a/kdevdesigner/shared/widgetdatabase.h b/kdevdesigner/shared/widgetdatabase.h
index e64e4fae..5395f2ef 100644
--- a/kdevdesigner/shared/widgetdatabase.h
+++ b/kdevdesigner/shared/widgetdatabase.h
@@ -30,7 +30,7 @@
 #include <tqiconset.h>
 #include <tqstring.h>
 #include "../interfaces/widgetinterface.h" // up here for GCC 2.7.* compatibility
-#include <private/tqpluginmanager_p.h>
+#include <tqpluginmanager_p.h>
 
 
 extern TQPluginManager<WidgetInterface> *widgetManager();
diff --git a/kdevdesigner/uilib/database2.h b/kdevdesigner/uilib/database2.h
index ada42364..c8881736 100644
--- a/kdevdesigner/uilib/database2.h
+++ b/kdevdesigner/uilib/database2.h
@@ -56,25 +56,25 @@ protected:
 
 };
 
-class TQDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2
+class QDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerDataBrowser2( TQWidget *tqparent, const char *name );
+    QDesignerDataBrowser2( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
 };
 
-class TQDesignerDataView2 : public TQDataView, public DatabaseSupport2
+class QDesignerDataView2 : public TQDataView, public DatabaseSupport2
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerDataView2( TQWidget *tqparent, const char *name );
+    QDesignerDataView2( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
@@ -82,8 +82,8 @@ protected:
 };
 
 #define DatabaseSupport DatabaseSupport2
-#define TQDesignerDataBrowser TQDesignerDataBrowser2
-#define TQDesignerDataView TQDesignerDataView2
+#define TQDesignerDataBrowser QDesignerDataBrowser2
+#define TQDesignerDataView QDesignerDataView2
 
 #endif
 
diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp
index b19d7d14..7b5cf28b 100644
--- a/kdevdesigner/uilib/qwidgetfactory.cpp
+++ b/kdevdesigner/uilib/qwidgetfactory.cpp
@@ -41,7 +41,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqobjectlist.h>
-#include <private/tqpluginmanager_p.h>
+#include <tqpluginmanager_p.h>
 #include <tqmime.h>
 #include <tqdragobject.h>
 
@@ -354,11 +354,11 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
 	    if ( widgetFactory->noDatabaseWidgets.tqfind( cit.key()->name() ) !=
 		 widgetFactory->noDatabaseWidgets.end() )
 		continue;
-	    if ( cit.key()->inherits( "TQDesignerDataBrowser2" ) )
-		( (TQDesignerDataBrowser2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
+	    if ( cit.key()->inherits( "QDesignerDataBrowser2" ) )
+		( (QDesignerDataBrowser2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
 								    TQT_TQOBJECT(cit.key()), *(*cit).dbControls );
-	    else if ( cit.key()->inherits( "TQDesignerDataView2" ) )
-		( (TQDesignerDataView2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
+	    else if ( cit.key()->inherits( "QDesignerDataView2" ) )
+		( (QDesignerDataView2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
 								 TQT_TQOBJECT(cit.key()), *(*cit).dbControls );
 	}
 
@@ -1516,9 +1516,9 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq
     else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) {
 	return new TQDataTable( tqparent, name );
     } else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) {
-	return new TQDesignerDataBrowser2( tqparent, name );
+	return new QDesignerDataBrowser2( tqparent, name );
     } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) {
-	return new TQDesignerDataView2( tqparent, name );
+	return new QDesignerDataView2( tqparent, name );
     }
 #endif
 
diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h
index c7028696..575a3630 100644
--- a/kdevdesigner/uilib/qwidgetfactory.h
+++ b/kdevdesigner/uilib/qwidgetfactory.h
@@ -27,7 +27,6 @@
 #ifndef TQWIDGETFACTORY_H
 #define TQWIDGETFACTORY_H
 
-#ifndef TQT_H
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqimage.h>
@@ -35,7 +34,6 @@
 #include <tqvaluelist.h>
 #include <tqmap.h>
 #include <tqaction.h>
-#endif // TQT_H
 
 class TQDomDocument;
 class TQDomElement;
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index f3400a28..c9092969 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -397,7 +397,7 @@ void CCConfigWidget::initTQtTab()
 {
 	m_qtDir->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly);
 
-	TQtBuildConfig* c = m_pPart->qtBuildConfig();
+	QtBuildConfig* c = m_pPart->qtBuildConfig();
 	c->init();
 
 	m_qtUsed->setChecked( c->isUsed() );
@@ -484,7 +484,7 @@ void CCConfigWidget::isDesignerExecutable( const TQString& path )
 
 void CCConfigWidget::saveTQtTab()
 {
-	TQtBuildConfig* c = m_pPart->qtBuildConfig();
+	QtBuildConfig* c = m_pPart->qtBuildConfig();
 
 	c->setUsed( m_qtUsed->isChecked() );
 	if( m_versionQt4->isChecked() )
@@ -559,7 +559,7 @@ void CCConfigWidget::toggleTQtVersion( bool )
 void CCConfigWidget::openPluginPaths()
 {
     kdDebug(9024) << "Plugin paths opened" << endl;
-    TQtBuildConfig* c = m_pPart->qtBuildConfig();
+    QtBuildConfig* c = m_pPart->qtBuildConfig();
     KDialog d( this );
     TQVBoxLayout* maintqlayout = new TQVBoxLayout( &d );
     KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d );
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 2fa5e2d8..e58d3a86 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -205,7 +205,7 @@ CppSupportPart::CppSupportPart( TQObject *tqparent, const char *name, const TQSt
 		this, TQT_SLOT( splitHeaderSourceConfigStored() ) );
 	connect( m_pCompletionConfig, TQT_SIGNAL( stored() ),
 	         this, TQT_SLOT( codeCompletionConfigStored() ) );
-	m_qtBuildConfig = new TQtBuildConfig( this, projectDom() );
+	m_qtBuildConfig = new QtBuildConfig( this, projectDom() );
     m_qtBuildConfig->store();
 
 	m_backgroundParserConfig = new BackgroundParserConfig;
@@ -2764,7 +2764,7 @@ KDevDesignerIntegration * CppSupportPart::designer( KInterfaceDesigner::Designer
 		if ( des == 0 )
 		{
 			CppImplementationWidget * impl = new CppImplementationWidget( this );
-			des = new TQtDesignerCppIntegration( this, impl );
+			des = new QtDesignerCppIntegration( this, impl );
 			des->loadSettings( *project() ->projectDom(), "kdevcppsupport/designerintegration" );
 			m_designers[ type ] = des;
 		}
@@ -2791,7 +2791,7 @@ void CppSupportPart::slotCreateSubclass()
 	TQFileInfo fi( m_contextFileName );
 	if ( fi.extension( false ) != "ui" )
 		return ;
-	TQtDesignerCppIntegration *des = dynamic_cast<TQtDesignerCppIntegration*>( designer( KInterfaceDesigner::TQtDesigner ) );
+	QtDesignerCppIntegration *des = dynamic_cast<QtDesignerCppIntegration*>( designer( KInterfaceDesigner::TQtDesigner ) );
 	if ( des )
 		des->selectImplementation( m_contextFileName );
 }
diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h
index b9d5a53f..6e2ee964 100644
--- a/languages/cpp/cppsupportpart.h
+++ b/languages/cpp/cppsupportpart.h
@@ -75,7 +75,7 @@ class CppCodeCompletion;
 class CppCodeCompletionConfig;
 class CppSplitHeaderSourceConfig;
 class CreateGetterSetterConfiguration;
-class TQtBuildConfig;
+class QtBuildConfig;
 class ProblemReporter;
 class BackgroundParser;
 class Catalog;
@@ -205,10 +205,10 @@ public:
 	}
 	
 	/**
-		Get a pointer to the TQtBuildConfig object
-		@return A pointer to the TQtBuildConfig object.
+		Get a pointer to the QtBuildConfig object
+		@return A pointer to the QtBuildConfig object.
 	*/
-	inline TQtBuildConfig* qtBuildConfig() const { return m_qtBuildConfig; }
+	inline QtBuildConfig* qtBuildConfig() const { return m_qtBuildConfig; }
 
     const TQPtrList<Catalog>& catalogList() const
 	{
@@ -417,7 +417,7 @@ private:
 	KAction * m_createGetterSetterAction;
 	KAction * m_switchHeaderSourceAction;
 	
-	TQtBuildConfig* m_qtBuildConfig;
+	QtBuildConfig* m_qtBuildConfig;
 
 	bool withcpp;
 	TQString m_contextFileName;
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
index 5864659c..e26872e2 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
@@ -22,15 +22,15 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevTQt4Importer>( "kdevqt4importer" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) )
 
-KDevTQt4Importer::KDevTQt4Importer( TQObject * tqparent, const char * name, const TQStringList& )
+KDevQt4Importer::KDevQt4Importer( TQObject * tqparent, const char * name, const TQStringList& )
     : KDevPCSImporter( tqparent, name )
 {
     m_qtfile = 0;
 }
 
-KDevTQt4Importer::~KDevTQt4Importer()
+KDevQt4Importer::~KDevQt4Importer()
 {
     if (m_qtfile)
         delete m_qtfile;
@@ -38,7 +38,7 @@ KDevTQt4Importer::~KDevTQt4Importer()
     m_qtfile = 0;
 }
 
-TQStringList KDevTQt4Importer::fileList()
+TQStringList KDevQt4Importer::fileList()
 {
     if( !m_settings )
         return TQStringList();
@@ -86,7 +86,7 @@ TQStringList KDevTQt4Importer::fileList()
     return m_qtfile->name();
 }
 
-TQStringList KDevTQt4Importer::includePaths()
+TQStringList KDevQt4Importer::includePaths()
 {
     if( !m_settings || !m_qtfile)
         return TQStringList();
@@ -99,7 +99,7 @@ TQStringList KDevTQt4Importer::includePaths()
     return includePaths;
 }
 
-TQWidget * KDevTQt4Importer::createSettingsPage( TQWidget * tqparent, const char * name )
+TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * tqparent, const char * name )
 {
     m_settings = new SettingsDialog( tqparent, name );
     return m_settings;
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
index 5a365bf6..0da1185d 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
@@ -18,13 +18,13 @@
 class SettingsDialog;
 class KTempFile;
 
-class KDevTQt4Importer : public KDevPCSImporter
+class KDevQt4Importer : public KDevPCSImporter
 {
     Q_OBJECT
   TQ_OBJECT
 public:
-    KDevTQt4Importer( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~KDevTQt4Importer();
+    KDevQt4Importer( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~KDevQt4Importer();
 
     virtual TQString dbName() const { return TQString::tqfromLatin1("TQt4"); }
     virtual TQStringList fileList();
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
index 25937879..ea9bfb52 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
@@ -18,16 +18,16 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevTQtImporter>( "kdevqtimporter" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevQtImporter>( "kdevqtimporter" ) )
 
-KDevTQtImporter::KDevTQtImporter( TQObject * tqparent, const char * name, const TQStringList& )
+KDevQtImporter::KDevQtImporter( TQObject * tqparent, const char * name, const TQStringList& )
 		: KDevPCSImporter( tqparent, name )
 {}
 
-KDevTQtImporter::~KDevTQtImporter()
+KDevQtImporter::~KDevQtImporter()
 {}
 
-TQStringList KDevTQtImporter::fileList()
+TQStringList KDevQtImporter::fileList()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -50,7 +50,7 @@ TQStringList KDevTQtImporter::fileList()
 	return fileList;
 }
 
-TQStringList KDevTQtImporter::includePaths()
+TQStringList KDevQtImporter::includePaths()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -64,7 +64,7 @@ TQStringList KDevTQtImporter::includePaths()
 	return includePaths;
 }
 
-TQWidget * KDevTQtImporter::createSettingsPage( TQWidget * tqparent, const char * name )
+TQWidget * KDevQtImporter::createSettingsPage( TQWidget * tqparent, const char * name )
 {
 	m_settings = new SettingsDialog( tqparent, name );
 	return m_settings;
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
index 744a4b67..ebbc7ab4 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
@@ -17,13 +17,13 @@
 
 class SettingsDialog;
 
-class KDevTQtImporter : public KDevPCSImporter
+class KDevQtImporter : public KDevPCSImporter
 {
     Q_OBJECT
   TQ_OBJECT
 public:
-    KDevTQtImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~KDevTQtImporter();
+    KDevQtImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~KDevQtImporter();
 
     virtual TQString dbName() const { return TQString::tqfromLatin1("TQt"); }
     virtual TQStringList fileList();
diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp
index 21717dd2..1d20a9f9 100644
--- a/languages/cpp/qtbuildconfig.cpp
+++ b/languages/cpp/qtbuildconfig.cpp
@@ -25,19 +25,19 @@
 
 #include <stdlib.h>
 
-const TQString TQtBuildConfig::m_configRoot = TQString( "/kdevcppsupport/qt" );
+const TQString QtBuildConfig::m_configRoot = TQString( "/kdevcppsupport/qt" );
 
-TQtBuildConfig::TQtBuildConfig( CppSupportPart * part, TQDomDocument* dom )
+QtBuildConfig::QtBuildConfig( CppSupportPart * part, TQDomDocument* dom )
 	: TQObject( part ), m_part( part ), m_dom( dom )
 {
 	init();
 }
 
-TQtBuildConfig::~TQtBuildConfig()
+QtBuildConfig::~QtBuildConfig()
 {
 }
 
-void TQtBuildConfig::init( )
+void QtBuildConfig::init( )
 {
 	m_used = DomUtil::readBoolEntry( *m_dom, m_configRoot + "/used", false );
 	m_version = DomUtil::readIntEntry( *m_dom, m_configRoot + "/version", 3 );
@@ -83,7 +83,7 @@ void TQtBuildConfig::init( )
 	}
 }
 
-bool TQtBuildConfig::isValidTQtDir( const TQString& path ) const
+bool QtBuildConfig::isValidTQtDir( const TQString& path ) const
 {
     TQFileInfo inc( path + TQString( TQChar( TQDir::separator() ) )+
                    "include"+TQString( TQChar( TQDir::separator() ) )+
@@ -91,7 +91,7 @@ bool TQtBuildConfig::isValidTQtDir( const TQString& path ) const
     return ( m_version == 4 || ( m_version != 4 && inc.exists() ) );
 }
 
-void TQtBuildConfig::buildBinDirs( TQStringList & dirs ) const
+void QtBuildConfig::buildBinDirs( TQStringList & dirs ) const
 {
     if( m_version == 3 )
     {
@@ -114,7 +114,7 @@ void TQtBuildConfig::buildBinDirs( TQStringList & dirs ) const
 }
 
 
-TQString TQtBuildConfig::findExecutable( const TQString& execname ) const
+TQString QtBuildConfig::findExecutable( const TQString& execname ) const
 {
     TQStringList dirs;
     buildBinDirs( dirs );
@@ -130,13 +130,13 @@ TQString TQtBuildConfig::findExecutable( const TQString& execname ) const
     return "";
 }
 
-bool TQtBuildConfig::isExecutable( const TQString& path ) const
+bool QtBuildConfig::isExecutable( const TQString& path ) const
 {
     TQFileInfo fi(path);
     return( fi.exists() && fi.isExecutable() );
 }
 
-void TQtBuildConfig::findTQtDir()
+void QtBuildConfig::findTQtDir()
 {
     TQStringList qtdirs;
     if( m_version == 3 )
@@ -158,7 +158,7 @@ void TQtBuildConfig::findTQtDir()
     }
 }
 
-void TQtBuildConfig::store( )
+void QtBuildConfig::store( )
 {
 	DomUtil::writeBoolEntry( *m_dom, m_configRoot + "/used", m_used );
 	DomUtil::writeIntEntry( *m_dom, m_configRoot + "/version", m_version );
@@ -172,42 +172,42 @@ void TQtBuildConfig::store( )
 	emit stored();
 }
 
-void TQtBuildConfig::setUsed( bool used )
+void QtBuildConfig::setUsed( bool used )
 {
 	m_used = used;
 }
 
-void TQtBuildConfig::setVersion( int version )
+void QtBuildConfig::setVersion( int version )
 {
 	m_version = version;
 }
 
-void TQtBuildConfig::setIncludeStyle( int style )
+void QtBuildConfig::setIncludeStyle( int style )
 {
 	m_includeStyle = style;
 }
 
-void TQtBuildConfig::setRoot( const TQString& root )
+void QtBuildConfig::setRoot( const TQString& root )
 {
 	m_root = root;
 }
 
-void TQtBuildConfig::setTQMakePath( const TQString& path )
+void QtBuildConfig::setTQMakePath( const TQString& path )
 {
     m_qmakePath = path;
 }
 
-void TQtBuildConfig::setDesignerPluginPaths( const TQStringList& pfx )
+void QtBuildConfig::setDesignerPluginPaths( const TQStringList& pfx )
 {
     m_designerPluginPaths = pfx;
 }
 
-void TQtBuildConfig::setDesignerPath( const TQString& path )
+void QtBuildConfig::setDesignerPath( const TQString& path )
 {
     m_designerPath = path;
 }
 
-void TQtBuildConfig::setDesignerIntegration( const TQString& designerIntegration )
+void QtBuildConfig::setDesignerIntegration( const TQString& designerIntegration )
 {
 	m_designerIntegration = designerIntegration;
 }
diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h
index df92869b..1d6e1e25 100644
--- a/languages/cpp/qtbuildconfig.h
+++ b/languages/cpp/qtbuildconfig.h
@@ -25,18 +25,18 @@ class CppSupportPart;
 class TQDomDocument;
 
 /**
-	@brief The TQtBuildConfig class stores all parameters related to the used TQt library
+	@brief The QtBuildConfig class stores all parameters related to the used TQt library
 
 	@author Tobias Erbsland <te@profzone.ch>
 */
-class TQtBuildConfig : public TQObject
+class QtBuildConfig : public TQObject
 {
 	Q_OBJECT
   TQ_OBJECT
 
 public:
-	TQtBuildConfig( CppSupportPart* part, TQDomDocument* dom );
-	virtual ~TQtBuildConfig();
+	QtBuildConfig( CppSupportPart* part, TQDomDocument* dom );
+	virtual ~QtBuildConfig();
 
 	inline bool isUsed() const { return m_used; }
 	inline int version() const { return m_version; }
diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index 83354fa8..b39d3ea1 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -40,12 +40,12 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-TQtDesignerCppIntegration::TQtDesignerCppIntegration( KDevLanguageSupport *part,
+QtDesignerCppIntegration::QtDesignerCppIntegration( KDevLanguageSupport *part,
 	                                                ImplementationWidget *impl )
-: TQtDesignerIntegration( part, impl, true, 0 )
+: QtDesignerIntegration( part, impl, true, 0 )
 {}
 
-void TQtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass )
+void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass )
 {
 	m_part->partController() ->editDocument( KURL( klass->fileName() ) );
 	KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( m_part->partController() ->activePart() );
@@ -182,7 +182,7 @@ void TQtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 	cppPart->backgroundParser() ->addFile( implementationFile );
 }
 
-TQString TQtDesignerCppIntegration::accessID( FunctionDom fun ) const
+TQString QtDesignerCppIntegration::accessID( FunctionDom fun ) const
 {
 	if ( fun->isSignal() )
 		return TQString::tqfromLatin1( "signals" );
@@ -208,7 +208,7 @@ TQString TQtDesignerCppIntegration::accessID( FunctionDom fun ) const
 	return TQString();
 }
 
-void TQtDesignerCppIntegration::processImplementationName( TQString &name )
+void QtDesignerCppIntegration::processImplementationName( TQString &name )
 {
 	name.tqreplace( ".h", ".cpp" );
 }
diff --git a/languages/cpp/qtdesignercppintegration.h b/languages/cpp/qtdesignercppintegration.h
index 5fd95b58..995898e1 100644
--- a/languages/cpp/qtdesignercppintegration.h
+++ b/languages/cpp/qtdesignercppintegration.h
@@ -22,12 +22,12 @@
 
 #include <qtdesignerintegration.h>
 
-class TQtDesignerCppIntegration : public TQtDesignerIntegration
+class QtDesignerCppIntegration : public QtDesignerIntegration
 {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	TQtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl );
+	QtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl );
 
 protected:
 	virtual void addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass );
diff --git a/languages/lib/designer_integration/qtdesignerintegration.cpp b/languages/lib/designer_integration/qtdesignerintegration.cpp
index f46bd422..43359bd1 100644
--- a/languages/lib/designer_integration/qtdesignerintegration.cpp
+++ b/languages/lib/designer_integration/qtdesignerintegration.cpp
@@ -38,20 +38,20 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-TQtDesignerIntegration::TQtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name)
+QtDesignerIntegration::QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name)
     :KDevDesignerIntegration(part, name), m_part(part), m_impl(impl),
     m_classHasDefinitions(classHasDefinitions)
 {
 }
 
-TQtDesignerIntegration::~TQtDesignerIntegration()
+QtDesignerIntegration::~QtDesignerIntegration()
 {
     delete m_impl;
 }
 
-void TQtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDesigner::Function function)
+void QtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDesigner::Function function)
 {
-    kdDebug() << "TQtDesignerIntegration::addFunction: form: " << formName << ", function: " << function.function << endl;
+    kdDebug() << "QtDesignerIntegration::addFunction: form: " << formName << ", function: " << function.function << endl;
 
     if (!m_implementations.tqcontains(formName))
         if (!selectImplementation(formName))
@@ -67,19 +67,19 @@ void TQtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDes
     addFunctionToClass(function, klass);
 }
 
-void TQtDesignerIntegration::editFunction(const TQString& formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function)
+void QtDesignerIntegration::editFunction(const TQString& formName, KInterfaceDesigner::Function oldFunction, KInterfaceDesigner::Function function)
 {
-    kdDebug() << "TQtDesignerIntegration::editFunction: form: " << formName
+    kdDebug() << "QtDesignerIntegration::editFunction: form: " << formName
         << ", old function: " << oldFunction.function
         << ", function: " << function.function << endl;
 }
 
-void TQtDesignerIntegration::removeFunction(const TQString& formName, KInterfaceDesigner::Function function)
+void QtDesignerIntegration::removeFunction(const TQString& formName, KInterfaceDesigner::Function function)
 {
-    kdDebug() << "TQtDesignerIntegration::removeFunction: form: " << formName << ", function: " << function.function << endl;
+    kdDebug() << "QtDesignerIntegration::removeFunction: form: " << formName << ", function: " << function.function << endl;
 }
 
-bool TQtDesignerIntegration::selectImplementation(const TQString &formName)
+bool QtDesignerIntegration::selectImplementation(const TQString &formName)
 {
     TQFileInfo fi(formName);
     if (!fi.exists())
@@ -93,7 +93,7 @@ bool TQtDesignerIntegration::selectImplementation(const TQString &formName)
     return false;
 }
 
-void TQtDesignerIntegration::loadSettings(TQDomDocument dom, TQString path)
+void QtDesignerIntegration::loadSettings(TQDomDocument dom, TQString path)
 {
     TQDomElement el = DomUtil::elementByPath(dom, path + "/qtdesigner");
     if (el.isNull())
@@ -117,9 +117,9 @@ void TQtDesignerIntegration::loadSettings(TQDomDocument dom, TQString path)
     }
 }
 
-void TQtDesignerIntegration::saveSettings(TQDomDocument dom, TQString path)
+void QtDesignerIntegration::saveSettings(TQDomDocument dom, TQString path)
 {
-    kdDebug() << "TQtDesignerIntegration::saveSettings" << endl;
+    kdDebug() << "QtDesignerIntegration::saveSettings" << endl;
     TQDomElement el = DomUtil::createElementByPath(dom, path + "/qtdesigner");
     for (TQMap<TQString, ClassDom>::const_iterator it = m_implementations.begin();
         it != m_implementations.end(); ++it)
@@ -134,9 +134,9 @@ void TQtDesignerIntegration::saveSettings(TQDomDocument dom, TQString path)
     }
 }
 
-void TQtDesignerIntegration::openFunction(const TQString &formName, const TQString &functionName)
+void QtDesignerIntegration::openFunction(const TQString &formName, const TQString &functionName)
 {
-    kdDebug() << "TQtDesignerIntegration::openFunction, formName = " << formName
+    kdDebug() << "QtDesignerIntegration::openFunction, formName = " << formName
         << ", functionName = " << functionName << endl;
     TQString fn = functionName;
     if (fn.tqfind("(") > 0)
@@ -177,12 +177,12 @@ void TQtDesignerIntegration::openFunction(const TQString &formName, const TQStri
     m_part->partController()->editDocument(KURL(impl), line, col);
 }
 
-void TQtDesignerIntegration::processImplementationName(TQString &// name
+void QtDesignerIntegration::processImplementationName(TQString &// name
                                                       )
 {
 }
 
-void TQtDesignerIntegration::openSource(const TQString &formName)
+void QtDesignerIntegration::openSource(const TQString &formName)
 {
     if (!m_implementations.tqcontains(formName))
         if (!selectImplementation(formName))
diff --git a/languages/lib/designer_integration/qtdesignerintegration.h b/languages/lib/designer_integration/qtdesignerintegration.h
index 9a750fbd..aa0c0f2f 100644
--- a/languages/lib/designer_integration/qtdesignerintegration.h
+++ b/languages/lib/designer_integration/qtdesignerintegration.h
@@ -35,14 +35,14 @@ Ready to use in KDevelop language support plugins.
 
 Subclasses of this class should reimplement only pure virtual functions in the common case.
 */
-class TQtDesignerIntegration : public KDevDesignerIntegration
+class QtDesignerIntegration : public KDevDesignerIntegration
 {
 Q_OBJECT
   TQ_OBJECT
 public:
-    TQtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl,
+    QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl,
         bool classHasDefinitions, const char* name = 0);
-    virtual ~TQtDesignerIntegration();
+    virtual ~QtDesignerIntegration();
 
 public slots:
     virtual void addFunction(const TQString& formName, KInterfaceDesigner::Function function);
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index d1f2e503..3ecc2109 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -379,7 +379,7 @@ KDevDesignerIntegration *PythonSupportPart::designer(KInterfaceDesigner::Designe
             if (des == 0)
             {
                 PythonImplementationWidget *impl = new PythonImplementationWidget(this);
-                des = new TQtDesignerPythonIntegration(this, impl);
+                des = new QtDesignerPythonIntegration(this, impl);
                 des->loadSettings(*project()->projectDom(),
                     "kdevpythonsupport/designerintegration");
                 m_designers[type] = des;
@@ -398,7 +398,7 @@ void PythonSupportPart::slotCreateSubclass()
     kdDebug(9014) << k_funcinfo << " file: " << m_contextFileName << " ext: " << fi.extension(false) << endl;
     if (fi.extension(false) != "ui")
         return;
-    TQtDesignerPythonIntegration *des = dynamic_cast<TQtDesignerPythonIntegration*>(designer(KInterfaceDesigner::TQtDesigner));
+    QtDesignerPythonIntegration *des = dynamic_cast<QtDesignerPythonIntegration*>(designer(KInterfaceDesigner::TQtDesigner));
     if (des)
     {
         kdDebug(9014) << "ok: " << des << endl;
diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp
index c0e6dba1..0eb67147 100644
--- a/languages/python/qtdesignerpythonintegration.cpp
+++ b/languages/python/qtdesignerpythonintegration.cpp
@@ -38,18 +38,18 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-TQtDesignerPythonIntegration::TQtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl)
-    :TQtDesignerIntegration(part, impl, false, 0)
+QtDesignerPythonIntegration::QtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl)
+    :QtDesignerIntegration(part, impl, false, 0)
 {
 }
 
 
-TQtDesignerPythonIntegration::~TQtDesignerPythonIntegration()
+QtDesignerPythonIntegration::~QtDesignerPythonIntegration()
 {
 }
 
 
-void TQtDesignerPythonIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
+void QtDesignerPythonIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
 {
     m_part->partController()->editDocument( KURL( klass->fileName() ) );
     KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( m_part->partController()->activePart() );
diff --git a/languages/python/qtdesignerpythonintegration.h b/languages/python/qtdesignerpythonintegration.h
index 8af2f271..63759d23 100644
--- a/languages/python/qtdesignerpythonintegration.h
+++ b/languages/python/qtdesignerpythonintegration.h
@@ -22,14 +22,14 @@
 
 #include <qtdesignerintegration.h>
 
-class TQtDesignerPythonIntegration : public TQtDesignerIntegration
+class QtDesignerPythonIntegration : public QtDesignerIntegration
 {
 Q_OBJECT
   TQ_OBJECT
 public:
-    TQtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl);
+    QtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl);
 
-    ~TQtDesignerPythonIntegration();
+    ~QtDesignerPythonIntegration();
 
     virtual void addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass);
 
diff --git a/languages/ruby/qtdesignerrubyintegration.cpp b/languages/ruby/qtdesignerrubyintegration.cpp
index 068d983a..4ad11e8e 100644
--- a/languages/ruby/qtdesignerrubyintegration.cpp
+++ b/languages/ruby/qtdesignerrubyintegration.cpp
@@ -39,13 +39,13 @@
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-TQtDesignerRubyIntegration::TQtDesignerRubyIntegration(KDevLanguageSupport *part,
+QtDesignerRubyIntegration::QtDesignerRubyIntegration(KDevLanguageSupport *part,
     ImplementationWidget *impl)
-    :TQtDesignerIntegration(part, impl, false, 0)
+    :QtDesignerIntegration(part, impl, false, 0)
 {
 }
 
-void TQtDesignerRubyIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
+void QtDesignerRubyIntegration::addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass)
 {
     m_part->partController()->editDocument( KURL( klass->fileName() ) );
     KTextEditor::EditInterface* editIface = dynamic_cast<KTextEditor::EditInterface*>( m_part->partController()->activePart() );
diff --git a/languages/ruby/qtdesignerrubyintegration.h b/languages/ruby/qtdesignerrubyintegration.h
index b2f8d4ef..20a2544c 100644
--- a/languages/ruby/qtdesignerrubyintegration.h
+++ b/languages/ruby/qtdesignerrubyintegration.h
@@ -22,12 +22,12 @@
 
 #include <qtdesignerintegration.h>
 
-class TQtDesignerRubyIntegration : public TQtDesignerIntegration
+class QtDesignerRubyIntegration : public QtDesignerIntegration
 {
 Q_OBJECT
   TQ_OBJECT
 public:
-    TQtDesignerRubyIntegration(KDevLanguageSupport *part, ImplementationWidget *impl);
+    QtDesignerRubyIntegration(KDevLanguageSupport *part, ImplementationWidget *impl);
 
 protected:
     void addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass);
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 4fe000a5..7c451a05 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -637,7 +637,7 @@ KDevDesignerIntegration *RubySupportPart::designer(KInterfaceDesigner::DesignerT
             if (des == 0)
             {
                 RubyImplementationWidget *impl = new RubyImplementationWidget(this);
-                des = new TQtDesignerRubyIntegration(this, impl);
+                des = new QtDesignerRubyIntegration(this, impl);
                 des->loadSettings(*project()->projectDom(),
                     "kdevrubysupport/designerintegration");
                 m_designers[type] = des;
@@ -679,7 +679,7 @@ void RubySupportPart::slotCreateSubclass()
     TQFileInfo fi(m_contextFileName);
     if (fi.extension(false) != "ui")
         return;
-    TQtDesignerRubyIntegration *des = dynamic_cast<TQtDesignerRubyIntegration*>(designer(KInterfaceDesigner::TQtDesigner));
+    QtDesignerRubyIntegration *des = dynamic_cast<QtDesignerRubyIntegration*>(designer(KInterfaceDesigner::TQtDesigner));
     if (des)
         des->selectImplementation(m_contextFileName);
 }
diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp
index 8d533a9e..eabb1c5a 100644
--- a/languages/sql/sqlactions.cpp
+++ b/languages/sql/sqlactions.cpp
@@ -25,7 +25,7 @@
 #include "kdevlanguagesupport.h"
 #include "sqlsupport_part.h"
 
-SqlListAction::SqlListAction(STQLSupportPart *part, const TQString &text, 
+SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, 
 				 const KShortcut& cut,
                                  const TQObject *receiver, const char *slot,
                                  KActionCollection *tqparent, const char *name)
diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h
index ff71ae54..a85f3709 100644
--- a/languages/sql/sqlactions.h
+++ b/languages/sql/sqlactions.h
@@ -16,7 +16,7 @@
 #include <kxmlguiclient.h>
 #include <kaction.h>
 
-class STQLSupportPart;
+class SQLSupportPart;
 class KComboBox;
 
 class SqlListAction : public KWidgetAction
@@ -24,7 +24,7 @@ class SqlListAction : public KWidgetAction
     Q_OBJECT
   TQ_OBJECT
 public:
-    SqlListAction( STQLSupportPart *part, const TQString &text, const KShortcut& cut,
+    SqlListAction( SQLSupportPart *part, const TQString &text, const KShortcut& cut,
                      const TQObject *receiver, const char *slot,
                      KActionCollection *tqparent, const char *name );
     void setCurrentConnectionName(const TQString &name);
@@ -35,7 +35,7 @@ private slots:
     void activated(int);
 
 private:
-    STQLSupportPart *m_part;
+    SQLSupportPart *m_part;
     KComboBox* m_combo;
 };
 
diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h
index 877c1569..808ca504 100644
--- a/languages/sql/sqlconfigwidget.ui.h
+++ b/languages/sql/sqlconfigwidget.ui.h
@@ -203,7 +203,7 @@ void SqlConfigWidget::accept()
 	db << dbTable->text( i, 0 ) << dbTable->text( i, 1 )
 		<< dbTable->text( i, 2 ) << dbTable->text( i, 3 )
 		<< dbTable->text( i, 4 )
-		<< STQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password );
+		<< SQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password );
 	
 	DomUtil::writeListEntry( *doc, 
 				 "/kdevsqlsupport/servers/server" + TQString::number( i ), 
@@ -235,7 +235,7 @@ void SqlConfigWidget::loadConfig()
         int row = dbTable->numRows() - 2;
         for ( int ii = 0; ii < 6; ii++ )
             dbTable->setText( row, ii, db[ii] );
-        ((PasswordTableItem*)dbTable->item( row, 5 ))->password = STQLSupportPart::cryptStr( db[5] );
+        ((PasswordTableItem*)dbTable->item( row, 5 ))->password = SQLSupportPart::cryptStr( db[5] );
 
         i++;
     }
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index c31a4499..9ce617e3 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -29,12 +29,12 @@
 #include "sqloutputwidget.h"
 #include "domutil.h"
 
-typedef KDevGenericFactory<STQLSupportPart> STQLSupportFactory;
+typedef KDevGenericFactory<SQLSupportPart> STQLSupportFactory;
 static const KDevPluginInfo data("kdevsqlsupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, STQLSupportFactory( data ) )
 
-STQLSupportPart::STQLSupportPart( TQObject *tqparent, const char *name, const TQStringList& )
-        : KDevLanguageSupport ( &data, tqparent, name ? name : "STQLSupportPart" )
+SQLSupportPart::SQLSupportPart( TQObject *tqparent, const char *name, const TQStringList& )
+        : KDevLanguageSupport ( &data, tqparent, name ? name : "SQLSupportPart" )
 {
     setInstance( STQLSupportFactory::instance() );
     setXMLFile( "kdevsqlsupport.rc" );
@@ -46,7 +46,7 @@ STQLSupportPart::STQLSupportPart( TQObject *tqparent, const char *name, const TQ
 
     dbAction = new SqlListAction( this, i18n( "&Database Connections" ), 0, this, TQT_SLOT(activeConnectionChanged()), actionCollection(), "connection_combo" );
 
-    kdDebug( 9000 ) << "Creating STQLSupportPart" << endl;
+    kdDebug( 9000 ) << "Creating SQLSupportPart" << endl;
 
     connect( core(), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ),
              this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) );
@@ -61,13 +61,13 @@ STQLSupportPart::STQLSupportPart( TQObject *tqparent, const char *name, const TQ
 }
 
 
-STQLSupportPart::~STQLSupportPart()
+SQLSupportPart::~SQLSupportPart()
 {
     mainWindow()->removeView(m_widget);
     delete m_widget;
 }
 
-TQString STQLSupportPart::cryptStr(const TQString& aStr)
+TQString SQLSupportPart::cryptStr(const TQString& aStr)
 {
     TQString result;
     for (unsigned int i = 0; i < aStr.length(); i++)
@@ -76,12 +76,12 @@ TQString STQLSupportPart::cryptStr(const TQString& aStr)
     return result;
 }
 
-void STQLSupportPart::activeConnectionChanged()
+void SQLSupportPart::activeConnectionChanged()
 {
     updateCatalog();
 }
 
-void STQLSupportPart::clearConfig()
+void SQLSupportPart::clearConfig()
 {
     for ( TQStringList::Iterator it = conNames.begin(); it != conNames.end(); ++it ) {
         if ( TQSqlDatabase::tqcontains( *it ) ) {
@@ -96,7 +96,7 @@ void STQLSupportPart::clearConfig()
     dbAction->refresh();
 }
 
-void STQLSupportPart::loadConfig()
+void SQLSupportPart::loadConfig()
 {
     clearConfig();
 
@@ -130,7 +130,7 @@ void STQLSupportPart::loadConfig()
     dbAction->refresh();
 }
 
-void STQLSupportPart::projectConfigWidget( KDialogBase *dlg )
+void SQLSupportPart::projectConfigWidget( KDialogBase *dlg )
 {
     TQVBox *vbox = dlg->addVBoxPage( TQString( "SQL" ), i18n( "Specify Your Database Connections" ), BarIcon("source", KIcon::SizeMedium) );
     SqlConfigWidget *w = new SqlConfigWidget( (TQWidget*)vbox, "SQL config widget" );
@@ -140,7 +140,7 @@ void STQLSupportPart::projectConfigWidget( KDialogBase *dlg )
     connect( w, TQT_SIGNAL(newConfigSaved()), this, TQT_SLOT(loadConfig()) );
 }
 
-void STQLSupportPart::projectOpened()
+void SQLSupportPart::projectOpened()
 {
     connect( project(), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ),
              this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) );
@@ -155,12 +155,12 @@ void STQLSupportPart::projectOpened()
 }
 
 
-void STQLSupportPart::projectClosed()
+void SQLSupportPart::projectClosed()
 {
     clearConfig();
 }
 
-void STQLSupportPart::slotRun ()
+void SQLSupportPart::slotRun ()
 {
     TQString cName = dbAction->currentConnectionName();
     if ( cName.isEmpty() ) {
@@ -191,12 +191,12 @@ static TQString dbCaption(const TQSqlDatabase* db)
 }
 #endif
 
-void STQLSupportPart::parse()
+void SQLSupportPart::parse()
 {
     // @todo
 }
 
-void STQLSupportPart::updateCatalog()
+void SQLSupportPart::updateCatalog()
 {
     if (!project() || !dbAction)
         return;
@@ -236,7 +236,7 @@ void STQLSupportPart::updateCatalog()
     emit updatedSourceInfo();
 }
 
-void STQLSupportPart::addedFilesToProject( const TQStringList &fileList )
+void SQLSupportPart::addedFilesToProject( const TQStringList &fileList )
 {
     TQStringList::ConstIterator it;
 
@@ -248,7 +248,7 @@ void STQLSupportPart::addedFilesToProject( const TQStringList &fileList )
 }
 
 
-void STQLSupportPart::removedFilesFromProject( const TQStringList &fileList )
+void SQLSupportPart::removedFilesFromProject( const TQStringList &fileList )
 {
     TQStringList::ConstIterator it;
 
@@ -259,7 +259,7 @@ void STQLSupportPart::removedFilesFromProject( const TQStringList &fileList )
     emit updatedSourceInfo();
 }
 
-void STQLSupportPart::savedFile( const KURL &fileName )
+void SQLSupportPart::savedFile( const KURL &fileName )
 {
     if ( project() ->allFiles().tqcontains( fileName.path().mid ( project() ->projectDirectory().length() + 1 ) ) ) {
 //        parse( fileName );
@@ -267,12 +267,12 @@ void STQLSupportPart::savedFile( const KURL &fileName )
     }
 }
 
-KDevLanguageSupport::Features STQLSupportPart::features()
+KDevLanguageSupport::Features SQLSupportPart::features()
 {
     return Features( Classes | Functions );
 }
 
-KMimeType::List STQLSupportPart::mimeTypes( )
+KMimeType::List SQLSupportPart::mimeTypes( )
 {
     KMimeType::List list;
     KMimeType::Ptr mime = KMimeType::mimeType( "text/plain" );
diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h
index 71007d3c..1e72eca1 100644
--- a/languages/sql/sqlsupport_part.h
+++ b/languages/sql/sqlsupport_part.h
@@ -14,15 +14,15 @@ class SqlListAction;
 class SqlOutputWidget;
 class CodeModel;
 
-class STQLSupportPart : public KDevLanguageSupport
+class SQLSupportPart : public KDevLanguageSupport
 {
   Q_OBJECT
   TQ_OBJECT
 
 public:
 
-    STQLSupportPart(TQObject *tqparent, const char *name, const TQStringList &);
-    virtual ~STQLSupportPart();
+    SQLSupportPart(TQObject *tqparent, const char *name, const TQStringList &);
+    virtual ~SQLSupportPart();
 
     static TQString cryptStr(const TQString& aStr);
     const TQStringList& connections() const { return conNames; }
diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp
index eea88588..6a53f92b 100644
--- a/lib/widgets/qcomboview.cpp
+++ b/lib/widgets/qcomboview.cpp
@@ -26,7 +26,7 @@
 #include "tqapplication.h"
 #include "tqlineedit.h"
 #include "tqbitmap.h"
-#include "private/tqeffects_p.h"
+#include "tqeffects_p.h"
 #include "tqstringlist.h"
 #include "tqcombobox.h"
 #include "tqstyle.h"
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index f6495932..0943a092 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -196,7 +196,7 @@ void DiffPart::receivedStdout( KProcess* /* p */, char* buf, int buflen )
 
 void DiffPart::receivedStderr( KProcess* /* p */, char* buf, int buflen )
 {
-  kdDebug(9033) << "received Stderr: " << TQString::fromLocal8Bit( buf, buflen ).data() << endl;
+  kdDebug(9033) << "received Stderr: " << TQString(TQString::fromLocal8Bit( buf, buflen )).ascii() << endl;
   resultErr += TQString::fromLocal8Bit( buf, buflen );
 }
 
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 5efe880f..ee90caa0 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -57,21 +57,21 @@ private:
 };
 
 static const KDevPluginInfo data("docqtplugin");
-typedef KDevGenericFactory<DocTQtPlugin> DocTQtPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocTQtPluginFactory(data) )
+typedef KDevGenericFactory<DocQtPlugin> DocQtPluginFactory;
+K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) )
 
-DocTQtPlugin::DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList)
-    :DocumentationPlugin(DocTQtPluginFactory::instance()->config(), tqparent, name)
+DocQtPlugin::DocQtPlugin(TQObject* tqparent, const char* name, const TQStringList)
+    :DocumentationPlugin(DocQtPluginFactory::instance()->config(), tqparent, name)
 {
     setCapabilities(Index | FullTextSearch | CustomDocumentationTitles);
     autoSetup();
 }
 
-DocTQtPlugin::~DocTQtPlugin()
+DocQtPlugin::~DocQtPlugin()
 {
 }
 
-void DocTQtPlugin::createTOC(DocumentationCatalogItem *item)
+void DocQtPlugin::createTOC(DocumentationCatalogItem *item)
 {
     TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
@@ -135,7 +135,7 @@ void DocTQtPlugin::createTOC(DocumentationCatalogItem *item)
     }
 }
 
-void DocTQtPlugin::autoSetupPlugin()
+void DocQtPlugin::autoSetupPlugin()
 {
     TQString qtDocDir(QT_DOCDIR);
     qtDocDir = URLUtil::envExpand(qtDocDir);
@@ -158,7 +158,7 @@ void DocTQtPlugin::autoSetupPlugin()
     }
 }
 
-void DocTQtPlugin::setCatalogURL(DocumentationCatalogItem *item)
+void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item)
 {
     TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
@@ -190,12 +190,12 @@ void DocTQtPlugin::setCatalogURL(DocumentationCatalogItem *item)
     }
 }
 
-TQString DocTQtPlugin::pluginName() const
+TQString DocQtPlugin::pluginName() const
 {
     return i18n("TQt Documentation Collection");
 }
 
-bool DocTQtPlugin::needRefreshIndex(DocumentationCatalogItem *item)
+bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item)
 {
     TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
@@ -213,7 +213,7 @@ bool DocTQtPlugin::needRefreshIndex(DocumentationCatalogItem *item)
         return false;
 }
 
-void DocTQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
+void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
 {
     TQtDocumentationCatalogItem *qtItem = dynamic_cast<TQtDocumentationCatalogItem *>(item);
     if (!qtItem)
@@ -249,7 +249,7 @@ void DocTQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item)
     }
 }
 
-void DocTQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item,
+void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item,
                                      TQDomElement section)
 {
     //adymo: do not load section to index for TQt reference documentation
@@ -285,7 +285,7 @@ void DocTQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, Documenta
     }
 }
 
-TQStringList DocTQtPlugin::fullTextSearchLocations()
+TQStringList DocQtPlugin::fullTextSearchLocations()
 {
     TQStringList locs;
 
@@ -306,12 +306,12 @@ TQStringList DocTQtPlugin::fullTextSearchLocations()
     return locs;
 }
 
-TQPair<KFile::Mode, TQString> DocTQtPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocQtPlugin::catalogLocatorProps()
 {
     return TQPair<KFile::Mode, TQString>(KFile::File, "*.xml *.dcf");
 }
 
-TQString DocTQtPlugin::catalogTitle(const TQString &url)
+TQString DocQtPlugin::catalogTitle(const TQString &url)
 {
     TQFileInfo fi(url);
     if (!fi.exists())
@@ -331,7 +331,7 @@ TQString DocTQtPlugin::catalogTitle(const TQString &url)
     return docEl.attribute("title", TQString());
 }
 
-DocumentationCatalogItem *DocTQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url)
+DocumentationCatalogItem *DocQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url)
 {
     return new TQtDocumentationCatalogItem(url, this, contents, title);
 }
diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h
index 1bc1e865..afc7cf76 100644
--- a/parts/documentation/plugins/qt/docqtplugin.h
+++ b/parts/documentation/plugins/qt/docqtplugin.h
@@ -25,13 +25,13 @@
 
 class KConfig;
 
-class DocTQtPlugin : public DocumentationPlugin
+class DocQtPlugin : public DocumentationPlugin
 {
     Q_OBJECT
   TQ_OBJECT
 public:
-    DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
-    ~DocTQtPlugin();
+    DocQtPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
+    ~DocQtPlugin();
 
     virtual TQString pluginName() const;
 
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index b7d5ed2f..4734408f 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -42,7 +42,7 @@
 #include <tqfileinfo.h>
 #include <tqclipboard.h>
 #include <tqpopupmenu.h>
-#include <private/tqrichtext_p.h>
+#include <tqrichtext_p.h>
 
 #include <stdlib.h>
 #include <limits.h>
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index e30e64ee..9eaa6aa9 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -64,7 +64,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *tqparent)
     TQFont textEdit1_font(  textEdit1->font() );
     textEdit1_font.setPointSize( 9 );
     textEdit1->setFont( textEdit1_font );
-    textEdit1->setFocusPolicy( Qt::WheelFocus );
+    textEdit1->setFocusPolicy( TQ_WheelFocus );
     textEdit1->setReadOnly( TRUE );
 
     m_layout->addWidget( splitter1, 0, 0 );