10 files changed, 162 insertions, 161 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;