Trinity Qt initial conversion

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

1 files changed, 125 insertions, 125 deletions

diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp
index 66fa3c3f..73edf730 100644
--- a/buildtools/qmake/qmakescopeitem.cpp
+++ b/buildtools/qmake/qmakescopeitem.cpp
@@ -13,8 +13,8 @@
 
 #include "qmakescopeitem.h"
 
-#include <qdir.h>
-#include <qregexp.h>
+#include <tqdir.h>
+#include <tqregexp.h>
 
 #include <kiconloader.h>
 #include <klocale.h>
@@ -28,13 +28,13 @@
  * Class qProjectItem
  */
 
-qProjectItem::qProjectItem( Type type, QListView *parent, const QString &text )
-        : QListViewItem( parent, text ), typ( type )
+qProjectItem::qProjectItem( Type type, TQListView *parent, const TQString &text )
+        : TQListViewItem( parent, text ), typ( type )
 {}
 
 
-qProjectItem::qProjectItem( Type type, qProjectItem *parent, const QString &text )
-        : QListViewItem( parent, text ), typ( type )
+qProjectItem::qProjectItem( Type type, qProjectItem *parent, const TQString &text )
+        : TQListViewItem( parent, text ), typ( type )
 {}
 
 
@@ -43,7 +43,7 @@ qProjectItem::qProjectItem( Type type, qProjectItem *parent, const QString &text
  * Class GroupItem
  */
 
-GroupItem::GroupItem( QListView *lv, GroupType type, const QString &text, QMakeScopeItem* spitem )
+GroupItem::GroupItem( TQListView *lv, GroupType type, const TQString &text, QMakeScopeItem* spitem )
         : qProjectItem( Group, lv, text )
 {
     this->owner = spitem;
@@ -52,7 +52,7 @@ GroupItem::GroupItem( QListView *lv, GroupType type, const QString &text, QMakeS
     setPixmap( 0, SmallIcon( "tar" ) );
 }
 
-GroupItem::GroupType GroupItem::groupTypeForExtension( const QString &ext )
+GroupItem::GroupType GroupItem::groupTypeForExtension( const TQString &ext )
 {
     if ( ext == "cpp" || ext == "cc" || ext == "c" || ext == "C" || ext == "c++" || ext == "cxx" || ext == "ocl" )
         return Sources;
@@ -76,7 +76,7 @@ GroupItem::GroupType GroupItem::groupTypeForExtension( const QString &ext )
         return Distfiles;
 }
 
-void GroupItem::groupTypeMeanings( GroupItem::GroupType type, QString& title, QString& ext )
+void GroupItem::groupTypeMeanings( GroupItem::GroupType type, TQString& title, TQString& ext )
 {
     switch ( type )
     {
@@ -135,22 +135,22 @@ void GroupItem::groupTypeMeanings( GroupItem::GroupType type, QString& title, QS
     }
 }
 
-void GroupItem::paintCell( QPainter* p, const QColorGroup& c, int column, int width, int align )
+void GroupItem::paintCell( TQPainter* p, const TQColorGroup& c, int column, int width, int align )
 {
-    QColorGroup cg( c );
+    TQColorGroup cg( c );
     if ( !firstChild() )
     {
-        cg.setColor( QColorGroup::Text, cg.mid() );
+        cg.setColor( TQColorGroup::Text, cg.mid() );
     }
 
     qProjectItem::paintCell( p, cg, column, width, align );
 }
 
-void GroupItem::addFileToScope( const QString& filename )
+void GroupItem::addFileToScope( const TQString& filename )
 {
-    QString file = filename;
+    TQString file = filename;
 
-    QPtrListIterator<FileItem> it( files );
+    TQPtrListIterator<FileItem> it( files );
     while ( it.current() != 0 )
     {
         if ( it.current() ->text( 0 ) == file )      //File already exists in this subproject
@@ -160,7 +160,7 @@ void GroupItem::addFileToScope( const QString& filename )
 
     FileItem *fitem = owner->createFileItem( file );
 
-    fitem->uiFileLink = owner->m_widget->getUiFileLink( owner->relativePath() + QString( QChar( QDir::separator() ) ), owner->scope->resolveVariables( filename ) );
+    fitem->uiFileLink = owner->m_widget->getUiFileLink( owner->relativePath() + TQString( TQChar( TQDir::separator() ) ), owner->scope->resolveVariables( filename ) );
     files.append( fitem );
     switch ( groupType )
     {
@@ -206,11 +206,11 @@ void GroupItem::addFileToScope( const QString& filename )
     owner->scope->saveToFile();
 }
 
-void GroupItem::removeFileFromScope( const QString& filename )
+void GroupItem::removeFileFromScope( const TQString& filename )
 {
-    QString filePath;
+    TQString filePath;
 
-    QPtrListIterator<FileItem> it( files );
+    TQPtrListIterator<FileItem> it( files );
     while ( it.current() != 0 )
     {
         if ( it.current() ->text( 0 ) == filename )      //File already exists in this subproject
@@ -271,7 +271,7 @@ void GroupItem::removeFileFromScope( const QString& filename )
     owner->scope->saveToFile();
 }
 
-void GroupItem::addInstallObject( const QString& objectname )
+void GroupItem::addInstallObject( const TQString& objectname )
 {
     GroupItem * objitem = owner->createGroupItem( GroupItem::InstallObject, objectname, owner );
     owner->addValue( "INSTALLS", objectname );
@@ -291,7 +291,7 @@ void GroupItem::removeInstallObject( GroupItem* item )
  * Class FileItem
  */
 
-FileItem::FileItem( QListView *lv, const QString &text )
+FileItem::FileItem( TQListView *lv, const TQString &text )
         : qProjectItem( File, lv, text ), uiFileLink( "" )
 {
     // if excluded is set the file is excluded in the subproject/project.
@@ -305,7 +305,7 @@ FileItem::FileItem( QListView *lv, const QString &text )
  * Class QMakeScopeItem
  */
 
-QMakeScopeItem::QMakeScopeItem( QListView *parent, const QString &text, Scope* s, TrollProjectWidget* widget )
+QMakeScopeItem::QMakeScopeItem( TQListView *parent, const TQString &text, Scope* s, TrollProjectWidget* widget )
         : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( widget )
 {
     //   configuration.m_template = QTMP_APPLICATION;
@@ -313,7 +313,7 @@ QMakeScopeItem::QMakeScopeItem( QListView *parent, const QString &text, Scope* s
 }
 
 
-QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const QString &text, Scope* s )
+QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const TQString &text, Scope* s )
         : qProjectItem( Subproject, parent, text ), scope( s ), m_widget( parent->m_widget )
 {
     init();
@@ -321,7 +321,7 @@ QMakeScopeItem::QMakeScopeItem( QMakeScopeItem *parent, const QString &text, Sco
 
 QMakeScopeItem::~QMakeScopeItem()
 {
-    QMap<GroupItem::GroupType, GroupItem*>::iterator it;
+    TQMap<GroupItem::GroupType, GroupItem*>::iterator it;
     for ( it = groups.begin() ; it != groups.end() ; ++it )
     {
         GroupItem* s = it.data();
@@ -331,7 +331,7 @@ QMakeScopeItem::~QMakeScopeItem()
 
 }
 
-QString QMakeScopeItem::relativePath()
+TQString QMakeScopeItem::relativePath()
 {
     if( !scope || !scope->parent() )
         return "";
@@ -352,39 +352,39 @@ QString QMakeScopeItem::relativePath()
 //         return scope->scopeName();
 //     else if ( scope->scopeType() == Scope::ProjectScope )
 //         return ( static_cast<QMakeScopeItem*>( parent() ) ->relativePath()
-//                  + QString( QChar( QDir::separator() ) ) + scope->scopeName() );
+//                  + TQString( TQChar( TQDir::separator() ) ) + scope->scopeName() );
 //     else
 //         return (  static_cast<QMakeScopeItem*>( parent() ) ->relativePath() );
 }
 
-QString QMakeScopeItem::getSharedLibAddObject( QString basePath )
+TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath )
 {
     if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
     {
-        QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
+        TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
         if ( !scope->variableValues( "DESTDIR" ).front().isEmpty() )
         {
-            if ( QDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) )
-                tmpPath += QString( QChar( QDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front();
+            if ( TQDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) )
+                tmpPath += TQString( TQChar( TQDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front();
             else
                 tmpPath = scope->variableValues( "DESTDIR" ).front();
         }
         else
         {
-            tmpPath += QString( QChar( QDir::separator() ) );
+            tmpPath += TQString( TQChar( TQDir::separator() ) );
         }
 
-        tmpPath = QDir::cleanDirPath( tmpPath );
+        tmpPath = TQDir::cleanDirPath( tmpPath );
 
-        QString libString;
+        TQString libString;
         if ( !scope->variableValues( "TARGET" ).front().isEmpty() )
         {
-            libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + scope->variableValues( "TARGET" ).front() + ".so";
+            libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + scope->variableValues( "TARGET" ).front() + ".so";
 
         }
         else
         {
-            libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + scope->projectName() + ".so";
+            libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + scope->projectName() + ".so";
 
         }
         return ( libString );
@@ -392,38 +392,38 @@ QString QMakeScopeItem::getSharedLibAddObject( QString basePath )
     return "";
 }
 
-QString QMakeScopeItem::getApplicationObject( QString basePath )
+TQString QMakeScopeItem::getApplicationObject( TQString basePath )
 {
-    QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
-    QString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
+    TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
+    TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
 
     if ( !destdir.isEmpty() )
     {
-        if ( QDir::isRelativePath( destdir ) )
-            tmpPath += QString( QChar( QDir::separator() ) ) + destdir;
+        if ( TQDir::isRelativePath( destdir ) )
+            tmpPath += TQString( TQChar( TQDir::separator() ) ) + destdir;
         else
             tmpPath = destdir;
     }
     else
     {
-        tmpPath += QString( QChar( QDir::separator() ) );
+        tmpPath += TQString( TQChar( TQDir::separator() ) );
     }
 
-    tmpPath = QDir::cleanDirPath( tmpPath );
+    tmpPath = TQDir::cleanDirPath( tmpPath );
 
-    QString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() );
+    TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() );
 
     if ( target.isEmpty() )
-        return tmpPath + QString( QChar( QDir::separator() ) ) + scope->projectName();
+        return tmpPath + TQString( TQChar( TQDir::separator() ) ) + scope->projectName();
     else
-        return tmpPath + QString( QChar( QDir::separator() ) ) + target;
+        return tmpPath + TQString( TQChar( TQDir::separator() ) ) + target;
 }
 
-QString QMakeScopeItem::getLibAddObject( QString basePath )
+TQString QMakeScopeItem::getLibAddObject( TQString basePath )
 {
     if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
     {
-        QString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() );
+        TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() );
         if ( !target.isEmpty() )
         {
             return ( "-l" + target );
@@ -436,32 +436,32 @@ QString QMakeScopeItem::getLibAddObject( QString basePath )
     else if ( scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1
             || scope->variableValues("TEMPLATE").findIndex("lib") != -1 )
     {
-        QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
-        QString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
+        TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
+        TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
         if ( !destdir.isEmpty() )
         {
-            if ( QDir::isRelativePath( destdir ) )
-                tmpPath += QString( QChar( QDir::separator() ) ) + destdir;
+            if ( TQDir::isRelativePath( destdir ) )
+                tmpPath += TQString( TQChar( TQDir::separator() ) ) + destdir;
             else
                 tmpPath = destdir;
         }
         else
         {
-            tmpPath += QString( QChar( QDir::separator() ) );
+            tmpPath += TQString( TQChar( TQDir::separator() ) );
         }
 
-        tmpPath = QDir::cleanDirPath( tmpPath );
+        tmpPath = TQDir::cleanDirPath( tmpPath );
 
-        QString libString;
-        QString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() );
+        TQString libString;
+        TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() );
         if ( !target.isEmpty() )
         {
-            libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + target + ".a";
+            libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + target + ".a";
 
         }
         else
         {
-            libString = tmpPath + QString( QChar( QDir::separator() ) ) + "lib" + scope->projectName() + ".a";
+            libString = tmpPath + TQString( TQChar( TQDir::separator() ) ) + "lib" + scope->projectName() + ".a";
 
         }
         return ( libString );
@@ -469,47 +469,47 @@ QString QMakeScopeItem::getLibAddObject( QString basePath )
 
     return ( "" );
 }
-QString QMakeScopeItem::getLibAddPath( QString basePath )
+TQString QMakeScopeItem::getLibAddPath( TQString basePath )
 {
 
     //PATH only add if shared lib
     if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) == -1 ) return ( "" );
 
-    QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
-    QString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
+    TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
+    TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
     if ( !destdir.isEmpty() )
     {
-        if ( QDir::isRelativePath( destdir ) )
-            tmpPath += QString( QChar( QDir::separator() ) ) + destdir;
+        if ( TQDir::isRelativePath( destdir ) )
+            tmpPath += TQString( TQChar( TQDir::separator() ) ) + destdir;
         else
             tmpPath = destdir;
     }
     else
     {
-        tmpPath += QString( QChar( QDir::separator() ) );
+        tmpPath += TQString( TQChar( TQDir::separator() ) );
     }
 
-    tmpPath = QDir::cleanDirPath( tmpPath );
+    tmpPath = TQDir::cleanDirPath( tmpPath );
 
     return ( tmpPath );
 
 }
 
-QString QMakeScopeItem::getIncAddPath( QString basePath )
+TQString QMakeScopeItem::getIncAddPath( TQString basePath )
 {
-    QString tmpPath = URLUtil::getRelativePath( basePath, scope->projectDir() );
-    tmpPath = QDir::cleanDirPath( tmpPath );
+    TQString tmpPath = URLUtil::getRelativePath( basePath, scope->projectDir() );
+    tmpPath = TQDir::cleanDirPath( tmpPath );
 
     return ( tmpPath );
 }
 
 void QMakeScopeItem::buildSubTree()
 {
-    QValueList<Scope*>::const_iterator it;
+    TQValueList<Scope*>::const_iterator it;
 
     sortChildItems( 0, false );
 
-    QValueList<Scope*> scopes = scope->scopesInOrder();
+    TQValueList<Scope*> scopes = scope->scopesInOrder();
 
     for ( it = scopes.begin(); it != scopes.end(); ++it )
     {
@@ -537,7 +537,7 @@ void QMakeScopeItem::init()
     }
     else
     {
-        QStringList tmp = scope->variableValues( "TEMPLATE" );
+        TQStringList tmp = scope->variableValues( "TEMPLATE" );
         if( scope->isEnabled() )
         {
             if ( tmp.findIndex( "subdirs" ) != -1 )
@@ -565,19 +565,19 @@ void QMakeScopeItem::init()
     }
 }
 
-GroupItem* QMakeScopeItem::createGroupItem( GroupItem::GroupType type, const QString& label, QMakeScopeItem* 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* QMakeScopeItem::createFileItem( const QString& name )
+FileItem* QMakeScopeItem::createFileItem( const TQString& name )
 {
-    QString display = name;
+    TQString display = name;
     if( m_widget->showFilenamesOnly() )
     {
-        int dirSepPos = name.findRev( QChar( QDir::separator() ) );
+        int dirSepPos = name.findRev( TQChar( TQDir::separator() ) );
         if  ( dirSepPos != - 1 )
             display = name.mid( dirSepPos + 1 );
     }
@@ -597,10 +597,10 @@ void QMakeScopeItem::buildGroups()
 {
     if( scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
         return;
-    QStringList values;
+    TQStringList values;
 
     GroupItem* item;
-    QStringList::iterator it;
+    TQStringList::iterator it;
 
     values = scope->variableValues( "INSTALLS" );
     item = createGroupItem( GroupItem::InstallRoot, "INSTALLS", this );
@@ -610,13 +610,13 @@ void QMakeScopeItem::buildGroups()
         if ( ( *it ) == "target" )
             continue;
 
-        QString path = scope->variableValues( *it + ".path" ).front();
+        TQString path = scope->variableValues( *it + ".path" ).front();
         GroupItem* installitem = createGroupItem( GroupItem::InstallObject, *it, this );
         item->installs.append( installitem );
-        QStringList files = scope -> variableValues( *it + ".files" );
+        TQStringList files = scope -> variableValues( *it + ".files" );
         if ( !files.isEmpty() )
         {
-            QStringList::iterator filesit = files.begin();
+            TQStringList::iterator filesit = files.begin();
             for ( ;filesit != files.end(); ++filesit )
             {
                 installitem->files.append( createFileItem( *filesit ) );
@@ -704,7 +704,7 @@ void QMakeScopeItem::buildGroups()
     for ( it = values.begin(); it != values.end(); ++it )
     {
         FileItem* fitem = createFileItem( *it );
-        fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + QString( QChar( QDir::separator() ) ), scope->resolveVariables( *it ) );
+        fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + TQString( TQChar( TQDir::separator() ) ), scope->resolveVariables( *it ) );
         item->files.append( fitem );
     }
 
@@ -714,78 +714,78 @@ void QMakeScopeItem::buildGroups()
     for ( it = values.begin(); it != values.end(); ++it )
     {
         FileItem* fitem = createFileItem( *it );
-        fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + QString( QChar( QDir::separator() ) ), scope->resolveVariables( *it ) );
+        fitem->uiFileLink = m_widget->getUiFileLink( relativePath() + TQString( TQChar( TQDir::separator() ) ), scope->resolveVariables( *it ) );
         item->files.append( fitem );
     }
 
 }
 
-void QMakeScopeItem::removeValues( const QString& var, const QStringList& values )
+void QMakeScopeItem::removeValues( const TQString& var, const TQStringList& values )
 {
-    for( QStringList::const_iterator it = values.begin() ; it != values.end(); ++it )
+    for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it )
     {
         removeValue( var, *it );
     }
 }
 
-void QMakeScopeItem::addValues( const QString& var, const QStringList& values )
+void QMakeScopeItem::addValues( const TQString& var, const TQStringList& values )
 {
-    for( QStringList::const_iterator it = values.begin() ; it != values.end(); ++it )
+    for( TQStringList::const_iterator it = values.begin() ; it != values.end(); ++it )
     {
         addValue( var, *it );
     }
 }
 
-void QMakeScopeItem::removeValue( const QString& var, const QString& value )
+void QMakeScopeItem::removeValue( const TQString& var, const TQString& value )
 {
     if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) != -1 )
     {
         if( scope->variableValuesForOp( var, "+=" ).findIndex(value) != -1 )
         {
-            scope->removeFromPlusOp( var, QStringList( value ) );
+            scope->removeFromPlusOp( var, TQStringList( value ) );
             if( scope->variableValues( var ).findIndex( value ) != -1 )
             {
-                scope->addToMinusOp( var, QStringList( value ) );
+                scope->addToMinusOp( var, TQStringList( value ) );
             }
         }else
-            scope->addToMinusOp( var, QStringList( value ) );
+            scope->addToMinusOp( var, TQStringList( value ) );
     }else if( scope->scopeType() == Scope::IncludeScope )
     {
-        scope->addToMinusOp( var, QStringList( value ) );
+        scope->addToMinusOp( var, TQStringList( value ) );
     }
 }
 
-void QMakeScopeItem::addValue( const QString& var, const QString& value )
+void QMakeScopeItem::addValue( const TQString& var, const TQString& value )
 {
     if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) == -1 )
     {
         if( scope->variableValuesForOp( var, "-=" ).findIndex(value) != -1 )
-            scope->removeFromMinusOp( var, QStringList( value ) );
+            scope->removeFromMinusOp( var, TQStringList( value ) );
         else
-            scope->addToPlusOp( var, QStringList( value ) );
+            scope->addToPlusOp( var, TQStringList( value ) );
     }else if( scope->scopeType() == Scope::IncludeScope )
     {
-        scope->addToPlusOp( var, QStringList( value ) );
+        scope->addToPlusOp( var, TQStringList( value ) );
     }
 }
 
-void QMakeScopeItem::updateValues( const QString& var, const QStringList& values )
+void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& values )
 {
-    QStringList curValues = scope->variableValues( var, (scope->scopeType() != Scope::IncludeScope) );
-    QStringList scopeValues = scope->variableValuesForOp( var, "+=" );
-    for( QStringList::const_iterator it = curValues.begin(); it != curValues.end(); ++it )
+    TQStringList curValues = scope->variableValues( var, (scope->scopeType() != Scope::IncludeScope) );
+    TQStringList scopeValues = scope->variableValuesForOp( var, "+=" );
+    for( TQStringList::const_iterator it = curValues.begin(); it != curValues.end(); ++it )
     {
         if ( values.findIndex( *it ) == -1 )
         {
             if( scopeValues.findIndex( *it ) != -1 )
             {
-                scope->removeFromPlusOp( var, QStringList( *it ) );
+                scope->removeFromPlusOp( var, TQStringList( *it ) );
                 scopeValues.remove( *it );
             }else
-                scope->addToMinusOp( var, QStringList( *it ) );
+                scope->addToMinusOp( var, TQStringList( *it ) );
         }
     }
-    for( QStringList::const_iterator it = values.begin(); it != values.end(); ++it )
+    for( TQStringList::const_iterator it = values.begin(); it != values.end(); ++it )
     {
         if ( scopeValues.findIndex( *it ) != -1 )
         {
@@ -797,7 +797,7 @@ void QMakeScopeItem::updateValues( const QString& var, const QStringList& values
     scopeValues += values;
 //     kdDebug(9024) << "values: " << values << "| scope:" << scopeValues << endl;
     scope->setPlusOp( var, scopeValues );
-//     QStringList tmp = scope->variableValuesForOp( var, "+=" );
+//     TQStringList tmp = scope->variableValuesForOp( var, "+=" );
 //     kdDebug(9024) << "result:" << tmp << endl;
 //     kdDebug(9024) << "---------------------------------------" << endl;
 }
@@ -816,18 +816,18 @@ QMakeScopeItem* QMakeScopeItem::projectFileItem()
 void QMakeScopeItem::reloadProject()
 {
     kdDebug(9024) << "Reloading Project" << endl;
-    QListViewItem* item = firstChild();
+    TQListViewItem* item = firstChild();
     while( item )
     {
-        QListViewItem* olditem = item;
+        TQListViewItem* olditem = item;
         item = olditem->nextSibling();
         delete olditem;
     }
-    QMap<GroupItem::GroupType, GroupItem*>::iterator it;
+    TQMap<GroupItem::GroupType, GroupItem*>::iterator it;
     for ( it = groups.begin() ; it != groups.end() ; ++it )
     {
         GroupItem* s = it.data();
-        QListView* l = s->listView();
+        TQListView* l = s->listView();
         if(l)
             l->removeItem(s);
         delete s;
@@ -837,9 +837,9 @@ void QMakeScopeItem::reloadProject()
     init();
 }
 
-void QMakeScopeItem::disableSubprojects( const QStringList& dirs )
+void QMakeScopeItem::disableSubprojects( const TQStringList& dirs )
 {
-    QStringList::const_iterator it = dirs.begin();
+    TQStringList::const_iterator it = dirs.begin();
     for( ; it != dirs.end() ; ++it)
     {
         if( scope->variableValues("SUBDIRS").findIndex(*it) != -1 )
@@ -850,7 +850,7 @@ void QMakeScopeItem::disableSubprojects( const QStringList& dirs )
             else
             {
                 QMakeScopeItem* newitem = new QMakeScopeItem( this, s->scopeName(), s );
-                QListViewItem* lastitem = firstChild();
+                TQListViewItem* lastitem = firstChild();
                 while( lastitem && lastitem->nextSibling() )
                     lastitem = lastitem->nextSibling();
                 if( lastitem )
@@ -861,7 +861,7 @@ void QMakeScopeItem::disableSubprojects( const QStringList& dirs )
 
 }
 
-int QMakeScopeItem::compare( QListViewItem* i, int , bool ) const
+int QMakeScopeItem::compare( TQListViewItem* i, int , bool ) const
 {
     QMakeScopeItem* other = dynamic_cast<QMakeScopeItem*>(i);
     if( !i )
@@ -874,52 +874,52 @@ int QMakeScopeItem::compare( QListViewItem* i, int , bool ) const
         return 0;
 }
 
-QMap<QString, QString> QMakeScopeItem::getLibInfos( QString basePath )
+TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath )
 {
 
-    QMap<QString, QString> result;
+    TQMap<TQString, TQString> result;
     if ( scope->variableValues( "TARGET" ).front().isEmpty() )
         result["shared_lib"] = "-l"+scope->projectName();
     else
         result["shared_lib"] = "-l"+scope->variableValues( "TARGET" ).front();
 
-    QString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
+    TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
     if ( !scope->variableValues( "DESTDIR" ).front().isEmpty() )
     {
-        if ( QDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) )
-            tmpPath += QString( QChar( QDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front();
+        if ( TQDir::isRelativePath( scope->variableValues( "DESTDIR" ).front() ) )
+            tmpPath += TQString( TQChar( TQDir::separator() ) ) + scope->variableValues( "DESTDIR" ).front();
         else
             tmpPath = scope->variableValues( "DESTDIR" ).front();
     }
     else
     {
-        tmpPath += QString( QChar( QDir::separator() ) );
+        tmpPath += TQString( TQChar( TQDir::separator() ) );
     }
 
-    tmpPath = QDir::cleanDirPath( tmpPath );
+    tmpPath = TQDir::cleanDirPath( tmpPath );
 
     result["shared_libdir"] = "-L"+tmpPath;
 
     if ( scope->variableValues( "TARGET" ).front().isEmpty() )
-        result["shared_depend"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->projectName()+".so";
+        result["shared_depend"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->projectName()+".so";
     else
-        result["shared_depend"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".so";
+        result["shared_depend"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".so";
 
 
     if ( scope->variableValues( "TARGET" ).front().isEmpty() )
-        result["static_lib"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->projectName()+".a";
+        result["static_lib"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->projectName()+".a";
     else
-        result["static_lib"] = tmpPath+QString(QChar(QDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".a";
+        result["static_lib"] = tmpPath+TQString(TQChar(TQDir::separator()))+"lib"+scope->variableValues( "TARGET" ).front()+".a";
 
     result["static_depend"] = result["static_lib"];
 
     if ( scope->variableValues( "TARGET" ).front().isEmpty() )
-        result["app_depend"] = tmpPath + QString( QChar( QDir::separator() ) ) + scope->projectName();
+        result["app_depend"] = tmpPath + TQString( TQChar( TQDir::separator() ) ) + scope->projectName();
     else
-        result["app_depend"] = tmpPath + QString( QChar( QDir::separator() ) ) + scope->variableValues( "TARGET" ).front();
+        result["app_depend"] = tmpPath + TQString( TQChar( TQDir::separator() ) ) + scope->variableValues( "TARGET" ).front();
 
-    QString map;
-    for( QMap<QString, QString>::const_iterator it = result.begin(); it != result.end(); ++it )
+    TQString map;
+    for( TQMap<TQString, TQString>::const_iterator it = result.begin(); it != result.end(); ++it )
         map += "["+it.key() + "=>" +it.data() + "],";
     kdDebug(9024) << "Running getLibInfo for" << scope->projectName() << "|" << map << endl;
     return result;