diff options
Diffstat (limited to 'buildtools/qmake/projectconfigurationdlg.cpp')
| -rw-r--r-- | buildtools/qmake/projectconfigurationdlg.cpp | 390 |
1 files changed, 195 insertions, 195 deletions
diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index b76fc3a5..7c646e62 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -16,10 +16,10 @@ ***************************************************************************/ #include "projectconfigurationdlg.h" -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qmessagebox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqmessagebox.h> #include <kfiledialog.h> #include <knotifyclient.h> #include <klineedit.h> @@ -31,15 +31,15 @@ #include <kiconloader.h> #include <ktextedit.h> -#include <qdialog.h> -#include <qpushbutton.h> -#include <qbuttongroup.h> -#include <qlistview.h> -#include <qlabel.h> +#include <tqdialog.h> +#include <tqpushbutton.h> +#include <tqbuttongroup.h> +#include <tqlistview.h> +#include <tqlabel.h> #include <iostream> -#include <qregexp.h> -#include <qvalidator.h> -#include <qtabwidget.h> +#include <tqregexp.h> +#include <tqvalidator.h> +#include <tqtabwidget.h> #include <kpushbutton.h> #include <kcombobox.h> #include <klocale.h> @@ -51,17 +51,17 @@ #include "scope.h" #include "urlutil.h" -InsideCheckListItem::InsideCheckListItem( QListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : - QCheckListItem( parent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), QCheckListItem::CheckBox ) +InsideCheckListItem::InsideCheckListItem( TQListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : + TQCheckListItem( parent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), TQCheckListItem::CheckBox ) { prjItem = item; m_config = config; } -InsideCheckListItem::InsideCheckListItem( QListView *parent, QListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : - QCheckListItem( parent, +InsideCheckListItem::InsideCheckListItem( TQListView *parent, TQListViewItem *after, QMakeScopeItem *item, ProjectConfigurationDlg *config ) : + TQCheckListItem( parent, after, - item->relativePath(), QCheckListItem::CheckBox ) + item->relativePath(), TQCheckListItem::CheckBox ) { prjItem = item; m_config = config; @@ -72,7 +72,7 @@ void InsideCheckListItem::stateChange( bool state ) { if ( listView() == m_config->insidelib_listview ) { - QListViewItemIterator it( m_config->intDeps_view ); + TQListViewItemIterator it( m_config->intDeps_view ); while ( it.current() ) { InsideCheckListItem * chi = dynamic_cast<InsideCheckListItem*>( it.current() ); @@ -84,7 +84,7 @@ void InsideCheckListItem::stateChange( bool state ) } } -CustomVarListItem::CustomVarListItem(QListView* parent, unsigned int id, QMap<QString, QString> var) +CustomVarListItem::CustomVarListItem(TQListView* parent, unsigned int id, TQMap<TQString, TQString> var) : KListViewItem(parent), m_key(id) { setText(0, var["var"]); @@ -92,21 +92,21 @@ CustomVarListItem::CustomVarListItem(QListView* parent, unsigned int id, QMap<QS setText(2, var["values"]); } -QString CustomVarListItem::key(int column, bool ascending) const +TQString CustomVarListItem::key(int column, bool ascending) const { if( column == 0) - return QString::number(m_key); + return TQString::number(m_key); return KListViewItem::key(column, ascending); } -ProjectConfigurationDlg::ProjectConfigurationDlg( QListView *_prjList, TrollProjectWidget* _prjWidget, QWidget* parent, const char* name, bool modal, WFlags fl ) +ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent, const char* name, bool modal, WFlags fl ) : ProjectConfigurationDlgBase( parent, name, modal, fl | Qt::WStyle_Tool ), myProjectItem(0) { prjList = _prjList; prjWidget = _prjWidget; // m_projectConfiguration = conf; - m_targetLibraryVersion->setValidator( new QRegExpValidator( - QRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), this ) ); + m_targetLibraryVersion->setValidator( new TQRegExpValidator( + TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), this ) ); customVariables->setSortColumn(0); customVariables->setSortOrder(Qt::Ascending); mocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); @@ -170,7 +170,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" ); myProjectItem->setPixmap( 0, SmallIcon( "qmake_app" ) ); - QString targetname = prjWidget->getCurrentOutputFilename(); + TQString targetname = prjWidget->getCurrentOutputFilename(); if( targetname.findRev("/") != -1 ) targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); DomUtil::writeEntry( *prjWidget->m_part->projectDom(), @@ -410,9 +410,9 @@ void ProjectConfigurationDlg::updateProjectConfiguration() myProjectItem->removeValue( "QT", "phonon" ); } - QStringList confValues = myProjectItem->scope->variableValues( "CONFIG" ); - QStringList extraValues = QStringList::split( " ", editConfigExtra->text() ); - for ( QStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) + TQStringList confValues = myProjectItem->scope->variableValues( "CONFIG" ); + TQStringList extraValues = TQStringList::split( " ", editConfigExtra->text() ); + for ( TQStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) { if ( Scope::KnownConfigValues.findIndex( *it ) == -1 && extraValues.findIndex( *it ) == -1 ) { @@ -420,51 +420,51 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } } - for ( QStringList::iterator it = extraValues.begin() ; it != extraValues.end() ; ++it ) + for ( TQStringList::iterator it = extraValues.begin() ; it != extraValues.end() ; ++it ) { if ( confValues.findIndex( *it ) == -1 ) myProjectItem->scope->addToPlusOp( "CONFIG", *it ); } - QString targetpath = m_targetPath->url(); -// if( !QFileInfo( targetpath ).isRelative() ) + TQString targetpath = m_targetPath->url(); +// if( !TQFileInfo( targetpath ).isRelative() ) // targetpath = URLUtil::getRelativePath( myProjectItem->scope->projectDir(), targetpath ); if( myProjectItem->scope->scopeType() == Scope::FunctionScope || myProjectItem->scope->scopeType() == Scope::SimpleScope ) { if( myProjectItem->scope->variableValues("TARGET").findIndex( m_targetOutputFile->text() ) == -1 ) - myProjectItem->scope->setEqualOp( "TARGET", QStringList( m_targetOutputFile->text() ) ); + myProjectItem->scope->setEqualOp( "TARGET", TQStringList( m_targetOutputFile->text() ) ); if( myProjectItem->scope->variableValues("DESTDIR").findIndex( targetpath ) == -1 ) - myProjectItem->scope->setEqualOp( "DESTDIR", QStringList( targetpath ) ); + myProjectItem->scope->setEqualOp( "DESTDIR", TQStringList( targetpath ) ); }else { - myProjectItem->scope->setEqualOp( "TARGET", QStringList( m_targetOutputFile->text() ) ); - myProjectItem->scope->setEqualOp( "DESTDIR", QStringList( targetpath ) ); + myProjectItem->scope->setEqualOp( "TARGET", TQStringList( m_targetOutputFile->text() ) ); + myProjectItem->scope->setEqualOp( "DESTDIR", TQStringList( targetpath ) ); } - myProjectItem->updateValues( "DEFINES", QStringList::split( " ", m_defines->text() ) ); - myProjectItem->updateValues( "QMAKE_CXXFLAGS_DEBUG", QStringList::split( " ", m_debugFlags->text() ) ); - myProjectItem->updateValues( "QMAKE_CXXFLAGS_RELEASE", QStringList::split( " ", m_releaseFlags->text() ) ); + myProjectItem->updateValues( "DEFINES", TQStringList::split( " ", m_defines->text() ) ); + myProjectItem->updateValues( "QMAKE_CXXFLAGS_DEBUG", TQStringList::split( " ", m_debugFlags->text() ) ); + myProjectItem->updateValues( "QMAKE_CXXFLAGS_RELEASE", TQStringList::split( " ", m_releaseFlags->text() ) ); //add selected includes - QStringList values; + TQStringList values; InsideCheckListItem *insideItem = ( InsideCheckListItem * ) insideinc_listview->firstChild(); while ( insideItem ) { if ( insideItem->isOn() ) { - QString tmpInc = insideItem->prjItem->getIncAddPath( myProjectItem->scope->projectDir() ); - tmpInc = QDir::cleanDirPath( tmpInc ); + TQString tmpInc = insideItem->prjItem->getIncAddPath( myProjectItem->scope->projectDir() ); + tmpInc = TQDir::cleanDirPath( tmpInc ); values << tmpInc; } insideItem = ( InsideCheckListItem* ) insideItem->itemBelow(); } - QCheckListItem *outsideItem = ( QCheckListItem * ) outsideinc_listview->firstChild(); + TQCheckListItem *outsideItem = ( TQCheckListItem * ) outsideinc_listview->firstChild(); while ( outsideItem ) { values << outsideItem->text( 0 ); - outsideItem = ( QCheckListItem* ) outsideItem->itemBelow(); + outsideItem = ( TQCheckListItem* ) outsideItem->itemBelow(); } // myProjectItem->removeValues( "INCLUDEPATH", values ); myProjectItem->updateValues( "INCLUDEPATH", values ); @@ -473,7 +473,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if ( checkInstallTarget->isChecked() == true ) { myProjectItem->addValue( "INSTALLS", "target" ); - myProjectItem->scope->setEqualOp( "target.path", QStringList( m_InstallTargetPath->text() ) ); + myProjectItem->scope->setEqualOp( "target.path", TQStringList( m_InstallTargetPath->text() ) ); } else { @@ -482,12 +482,12 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } //makefile - myProjectItem->scope->setEqualOp( "MAKEFILE", QStringList( makefile_url->url() ) ); + myProjectItem->scope->setEqualOp( "MAKEFILE", TQStringList( makefile_url->url() ) ); //add libs to link values.clear(); - QStringList libPaths; + TQStringList libPaths; //inside libs to link insideItem = ( InsideCheckListItem * ) insidelib_listview->firstChild(); @@ -496,11 +496,11 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if ( insideItem->isOn() ) { - QString tmpLib = insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); + TQString tmpLib = insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { //add path if shared lib is linked - QString tmpPath = insideItem->prjItem->getLibAddPath( + TQString tmpPath = insideItem->prjItem->getLibAddPath( myProjectItem->scope->projectDir() ); if ( tmpPath != "" ) { @@ -514,7 +514,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } //extra lib paths - QListViewItem *lvItem = outsidelibdir_listview->firstChild(); + TQListViewItem *lvItem = outsidelibdir_listview->firstChild(); while ( lvItem ) { values << ( "-L"+lvItem->text( 0 ) ); @@ -523,11 +523,11 @@ void ProjectConfigurationDlg::updateProjectConfiguration() //outside libs to link - outsideItem = ( QCheckListItem * ) outsidelib_listview->firstChild(); + outsideItem = ( TQCheckListItem * ) outsidelib_listview->firstChild(); while ( outsideItem ) { values << outsideItem->text( 0 ); - outsideItem = ( QCheckListItem* ) outsideItem->itemBelow(); + outsideItem = ( TQCheckListItem* ) outsideItem->itemBelow(); } @@ -537,7 +537,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() values.clear(); //external project dependencies - QListViewItem *depItem = extDeps_view->firstChild(); + TQListViewItem *depItem = extDeps_view->firstChild(); while ( depItem ) { values << depItem->text( 0 ); @@ -601,19 +601,19 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } // intermediate locations - myProjectItem->scope->setEqualOp( "OBJECTS_DIR", QStringList( objdir_url->url() ) ); - myProjectItem->scope->setEqualOp( "UI_DIR", QStringList( uidir_url->url() ) ); - myProjectItem->scope->setEqualOp( "MOC_DIR", QStringList( mocdir_url->url() ) ); - myProjectItem->scope->setEqualOp( "RCC_DIR", QStringList( rccdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "OBJECTS_DIR", TQStringList( objdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "UI_DIR", TQStringList( uidir_url->url() ) ); + myProjectItem->scope->setEqualOp( "MOC_DIR", TQStringList( mocdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "RCC_DIR", TQStringList( rccdir_url->url() ) ); //CORBA - myProjectItem->scope->setEqualOp( "IDL_COMPILER", QStringList( idlCmdEdit->url() ) ); - myProjectItem->updateValues( "IDL_OPTIONS", QStringList::split( " ", idlCmdOptionsEdit->text() ) ); + myProjectItem->scope->setEqualOp( "IDL_COMPILER", TQStringList( idlCmdEdit->url() ) ); + myProjectItem->updateValues( "IDL_OPTIONS", TQStringList::split( " ", idlCmdOptionsEdit->text() ) ); - QListViewItemIterator iter(customVariables); + TQListViewItemIterator iter(customVariables); for( ; iter.current() ; iter++ ) { - QListViewItem* item = iter.current(); + TQListViewItem* item = iter.current(); myProjectItem->scope->updateCustomVariable( item->key(0, true).toUInt(), item->text(0), item->text(1), item->text(2) ); } } @@ -623,13 +623,13 @@ void ProjectConfigurationDlg::accept() if( buttonApply->isEnabled() ) apply(); myProjectItem = 0; - QDialog::accept(); + TQDialog::accept(); } void ProjectConfigurationDlg::reject() { myProjectItem = 0; - QDialog::reject(); + TQDialog::reject(); } @@ -644,8 +644,8 @@ void ProjectConfigurationDlg::updateControls() groupTemplate->setEnabled( true ); //cache the value of the some variables - QStringList configValues = myProjectItem->scope->variableValues( "CONFIG" ); - QStringList templateValues = myProjectItem->scope->variableValues( "TEMPLATE" ); + TQStringList configValues = myProjectItem->scope->variableValues( "CONFIG" ); + TQStringList templateValues = myProjectItem->scope->variableValues( "TEMPLATE" ); //if( !myProjectItem->isScope ) //{ if ( templateValues.findIndex( "lib" ) != -1 ) @@ -708,13 +708,13 @@ void ProjectConfigurationDlg::updateControls() { checkConsole->setChecked( true ); } - QString targetname = prjWidget->getCurrentOutputFilename(); + TQString targetname = prjWidget->getCurrentOutputFilename(); if( targetname.findRev("/") != -1 ) targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); m_editRunArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/runarguments/"+targetname, "" ) ); - QString dir = DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/cwd/"+targetname, "" ); - if( QFileInfo(dir).isRelative() ) + TQString dir = DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/cwd/"+targetname, "" ); + if( TQFileInfo(dir).isRelative() ) { m_CWDEdit->completionObject()->setDir( myProjectItem->scope->projectDir() ); m_CWDEdit->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -728,7 +728,7 @@ void ProjectConfigurationDlg::updateControls() if( m_CWDEdit->url().isEmpty() ) { - QString destdir = myProjectItem->m_widget->getCurrentDestDir(); + TQString destdir = myProjectItem->m_widget->getCurrentDestDir(); if( !destdir.startsWith( "/" ) ) destdir = myProjectItem->m_widget->projectDirectory()+"/"+destdir; m_CWDEdit->setURL( destdir.left( destdir.findRev("/") ) ); @@ -834,7 +834,7 @@ void ProjectConfigurationDlg::updateControls() else checkQtHelp->setChecked( false ); - QStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); + TQStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); if ( qtLibs.findIndex( "core" ) != -1 ) checkQt4Core->setChecked( true ); else @@ -892,8 +892,8 @@ void ProjectConfigurationDlg::updateControls() } //fill the custom config edit - QStringList extraValues; - for ( QStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) + TQStringList extraValues; + for ( TQStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) { if ( Scope::KnownConfigValues.findIndex( *it ) == -1 ) { @@ -902,8 +902,8 @@ void ProjectConfigurationDlg::updateControls() } editConfigExtra->setText( extraValues.join( " " ) ); - QString dir = myProjectItem->scope->variableValues( "MAKEFILE" ).front(); - if( QFileInfo(dir).isRelative() ) + TQString dir = myProjectItem->scope->variableValues( "MAKEFILE" ).front(); + if( TQFileInfo(dir).isRelative() ) { makefile_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); makefile_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -929,7 +929,7 @@ void ProjectConfigurationDlg::updateControls() m_targetOutputFile->setText( myProjectItem->scope->variableValues( "TARGET" ).front() ); dir = myProjectItem->scope->variableValues( "DESTDIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { m_targetPath->completionObject()->setDir( myProjectItem->scope->projectDir() ); m_targetPath->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -950,7 +950,7 @@ void ProjectConfigurationDlg::updateControls() updateDependenciesControl(); dir = myProjectItem->scope->variableValues( "OBJECTS_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { objdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); objdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -961,7 +961,7 @@ void ProjectConfigurationDlg::updateControls() } objdir_url->setURL( dir ); dir = myProjectItem->scope->variableValues( "UI_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { uidir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); uidir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -972,7 +972,7 @@ void ProjectConfigurationDlg::updateControls() } uidir_url->setURL( dir ); dir = myProjectItem->scope->variableValues( "MOC_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { mocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); mocdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -983,7 +983,7 @@ void ProjectConfigurationDlg::updateControls() } mocdir_url->setURL( dir ); dir = myProjectItem->scope->variableValues( "RC_DIR" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { rccdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); rccdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -996,7 +996,7 @@ void ProjectConfigurationDlg::updateControls() dir = myProjectItem->scope->variableValues( "IDL_COMPILER" ).front(); - if( QFileInfo(dir).isRelative() ) + if( TQFileInfo(dir).isRelative() ) { idlCmdEdit->completionObject()->setDir( myProjectItem->scope->projectDir() ); idlCmdEdit->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); @@ -1012,8 +1012,8 @@ void ProjectConfigurationDlg::updateControls() customVariableName->setText(""); customVariableData->setText(""); customVariableOp->setCurrentItem( 0 ); - QMap<unsigned int, QMap<QString, QString> > customvars = myProjectItem->scope->customVariables(); - QMap<unsigned int, QMap<QString, QString> >::iterator idx = customvars.begin(); + TQMap<unsigned int, TQMap<TQString, TQString> > customvars = myProjectItem->scope->customVariables(); + TQMap<unsigned int, TQMap<TQString, TQString> >::iterator idx = customvars.begin(); for ( ; idx != customvars.end(); ++idx ) { CustomVarListItem* item = new CustomVarListItem( customVariables, idx.key(), idx.data() ); @@ -1023,9 +1023,9 @@ void ProjectConfigurationDlg::updateControls() groupTemplateChanged(0); } -QPtrList<QMakeScopeItem> ProjectConfigurationDlg::getAllProjects() +TQPtrList<QMakeScopeItem> ProjectConfigurationDlg::getAllProjects() { - QPtrList <QMakeScopeItem> tmpPrjList; + TQPtrList <QMakeScopeItem> tmpPrjList; QMakeScopeItem *item = static_cast<QMakeScopeItem*>( prjList->firstChild() ); while ( item ) { @@ -1040,7 +1040,7 @@ QPtrList<QMakeScopeItem> ProjectConfigurationDlg::getAllProjects() return ( tmpPrjList ); } -void ProjectConfigurationDlg::getAllSubProjects( QMakeScopeItem *item, QPtrList <QMakeScopeItem> *itemList ) +void ProjectConfigurationDlg::getAllSubProjects( QMakeScopeItem *item, TQPtrList <QMakeScopeItem> *itemList ) { QMakeScopeItem * subItem = static_cast<QMakeScopeItem*>( item->firstChild() ); @@ -1063,18 +1063,18 @@ void ProjectConfigurationDlg::updateIncludeControl() insideinc_listview->clear(); outsideinc_listview->clear(); - QStringList incList = myProjectItem->scope->variableValues( "INCLUDEPATH" ); - QStringList intIncList = incList; - QMap<QString, InsideCheckListItem*> items; - QPtrList <QMakeScopeItem> itemList = getAllProjects(); + TQStringList incList = myProjectItem->scope->variableValues( "INCLUDEPATH" ); + TQStringList intIncList = incList; + TQMap<TQString, InsideCheckListItem*> items; + TQPtrList <QMakeScopeItem> itemList = getAllProjects(); QMakeScopeItem *item = itemList.first(); while ( item ) { if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 || item->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) != -1 ) { - QString tmpInc = item->getIncAddPath( myProjectItem->scope->projectDir() ); - tmpInc = QDir::cleanDirPath( tmpInc ); + TQString tmpInc = item->getIncAddPath( myProjectItem->scope->projectDir() ); + tmpInc = TQDir::cleanDirPath( tmpInc ); InsideCheckListItem *newItem = new InsideCheckListItem( insideinc_listview, insideinc_listview->lastItem(), item, this ); @@ -1092,18 +1092,18 @@ void ProjectConfigurationDlg::updateIncludeControl() //all other in incList are outside incs outsideinc_listview->clear(); - QStringList::Iterator it1 = incList.begin(); + TQStringList::Iterator it1 = incList.begin(); for ( ;it1 != incList.end();++it1 ) { intIncList.remove(*it1); - new QListViewItem( outsideinc_listview, outsideinc_listview->lastItem(), ( *it1 ) ); + new TQListViewItem( outsideinc_listview, outsideinc_listview->lastItem(), ( *it1 ) ); } - for( QStringList::const_iterator it = intIncList.begin(); it != intIncList.end(); ++it ) + for( TQStringList::const_iterator it = intIncList.begin(); it != intIncList.end(); ++it ) { insideinc_listview->insertItem( items[*it] ); items.remove(*it); } - for( QMap<QString,InsideCheckListItem*>::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) + for( TQMap<TQString,InsideCheckListItem*>::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) { insideinc_listview->insertItem( it3.data() ); } @@ -1112,7 +1112,7 @@ void ProjectConfigurationDlg::updateIncludeControl() void ProjectConfigurationDlg::updateLibControls() { - QPtrList <QMakeScopeItem> itemList = getAllProjects(); + TQPtrList <QMakeScopeItem> itemList = getAllProjects(); insidelib_listview->setSorting( -1, false ); outsidelib_listview->setSorting( -1, false ); @@ -1122,9 +1122,9 @@ void ProjectConfigurationDlg::updateLibControls() outsidelibdir_listview->clear(); //update librarys //temp strlist - QStringList libList = myProjectItem->scope->variableValues( "LIBS" ); - QStringList intLibList = libList; - QMap<QString, InsideCheckListItem*> items; + TQStringList libList = myProjectItem->scope->variableValues( "LIBS" ); + TQStringList intLibList = libList; + TQMap<TQString, InsideCheckListItem*> items; QMakeScopeItem* item = itemList.first(); while ( item ) { @@ -1133,13 +1133,13 @@ void ProjectConfigurationDlg::updateLibControls() if ( item != myProjectItem ) { // create lib string - QString tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() ); + TQString tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() ); InsideCheckListItem * newItem = new InsideCheckListItem( insidelib_listview, insidelib_listview->lastItem(), item, this ); insidelib_listview->takeItem( newItem ); items[tmpLib] = newItem; - QString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() ); + TQString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() ); kdDebug(9024) << "lib:" << tmpLib << " dir:" << tmpLibDir << "|" << libList << endl; if ( libList.findIndex( "-L" + tmpLibDir ) != -1 ) { @@ -1156,28 +1156,28 @@ void ProjectConfigurationDlg::updateLibControls() } //all other in libList are outside libs - QStringList::Iterator it1 = libList.begin(); + TQStringList::Iterator it1 = libList.begin(); for ( ;it1 != libList.end();++it1 ) { intLibList.remove( *it1 ); if ( ( *it1 ).startsWith( "-L" ) ) - new QListViewItem( outsidelibdir_listview, outsidelibdir_listview->lastItem(), ( *it1 ).mid( 2 ) ); + new TQListViewItem( outsidelibdir_listview, outsidelibdir_listview->lastItem(), ( *it1 ).mid( 2 ) ); else { - new QListViewItem( outsidelib_listview, outsidelib_listview->lastItem(), ( *it1 ) ); + new TQListViewItem( outsidelib_listview, outsidelib_listview->lastItem(), ( *it1 ) ); } } - for( QStringList::const_iterator it = intLibList.begin(); it != intLibList.end(); ++it ) + for( TQStringList::const_iterator it = intLibList.begin(); it != intLibList.end(); ++it ) { - QString lib = *it; + TQString lib = *it; if( !lib.startsWith( "-L" ) ) { insidelib_listview->insertItem( items[lib] ); items.remove(lib); } } - for( QMap<QString,InsideCheckListItem*>::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) + for( TQMap<TQString,InsideCheckListItem*>::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ ) { insidelib_listview->insertItem( it3.data() ); } @@ -1185,25 +1185,25 @@ void ProjectConfigurationDlg::updateLibControls() void ProjectConfigurationDlg::updateDependenciesControl( ) { - QPtrList <QMakeScopeItem> itemList = getAllProjects(); + TQPtrList <QMakeScopeItem> itemList = getAllProjects(); intDeps_view->setSorting( -1, false ); extDeps_view->setSorting( -1, false ); intDeps_view->clear(); extDeps_view->clear(); - QStringList depsList = myProjectItem->scope->variableValues( "TARGETDEPS" ); - QStringList intDepList = depsList; - QMap<QString,InsideCheckListItem*> items; + TQStringList depsList = myProjectItem->scope->variableValues( "TARGETDEPS" ); + TQStringList intDepList = depsList; + TQMap<TQString,InsideCheckListItem*> items; QMakeScopeItem *item = itemList.first(); while ( item ) { - QStringList templateval = item->scope->variableValues( "TEMPLATE" ); + TQStringList templateval = item->scope->variableValues( "TEMPLATE" ); if ( templateval.findIndex( "lib" ) != -1 || templateval.findIndex( "app" ) != -1 ) { - QString tmpLib; - QStringList values = item->scope->variableValues( "CONFIG" ); + TQString tmpLib; + TQStringList values = item->scope->variableValues( "CONFIG" ); if ( templateval.findIndex( "lib" ) != -1 && values.findIndex( "dll" ) != -1 ) tmpLib = item->getSharedLibAddObject( myProjectItem->scope->projectDir() ); else if ( templateval.findIndex( "lib" ) != -1 ) @@ -1225,20 +1225,20 @@ void ProjectConfigurationDlg::updateDependenciesControl( ) //add all other prj in itemList unchecked extDeps_view->clear(); - for ( QStringList::Iterator it1 = depsList.begin();it1 != depsList.end();++it1 ) + for ( TQStringList::Iterator it1 = depsList.begin();it1 != depsList.end();++it1 ) { intDepList << *it1; - new QListViewItem( extDeps_view, extDeps_view->lastItem(), ( *it1 ) ); + new TQListViewItem( extDeps_view, extDeps_view->lastItem(), ( *it1 ) ); } - for( QStringList::const_iterator it = intDepList.begin(); it != intDepList.end(); ++it ) + for( TQStringList::const_iterator it = intDepList.begin(); it != intDepList.end(); ++it ) { intDeps_view->insertItem( items[*it] ); items.remove(*it); } - for( QMap<QString,InsideCheckListItem*>::ConstIterator it2 = items.begin(); it2 != items.end(); it2++ ) + for( TQMap<TQString,InsideCheckListItem*>::ConstIterator it2 = items.begin(); it2 != items.end(); it2++ ) { intDeps_view->insertItem( it2.data() ); } @@ -1251,7 +1251,7 @@ void ProjectConfigurationDlg::updateBuildOrderControl() if ( myProjectItem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 ) { - QPtrList <QMakeScopeItem> itemList; + TQPtrList <QMakeScopeItem> itemList; QMakeScopeItem *item = static_cast<QMakeScopeItem*>( myProjectItem->firstChild() ); while ( item ) @@ -1263,8 +1263,8 @@ void ProjectConfigurationDlg::updateBuildOrderControl() incaddTab->setEnabled( false ); buildorder_listview->setSorting( -1, false ); buildorder_listview->clear(); - QStringList buildList = myProjectItem->scope->variableValues( "SUBDIRS" ); - QStringList::Iterator it1 = buildList.begin(); + TQStringList buildList = myProjectItem->scope->variableValues( "SUBDIRS" ); + TQStringList::Iterator it1 = buildList.begin(); for ( ;it1 != buildList.end();++it1 ) { item = itemList.first(); @@ -1274,7 +1274,7 @@ void ProjectConfigurationDlg::updateBuildOrderControl() { if ( item->text( 0 ) == ( *it1 ) ) { - new QListViewItem( buildorder_listview, buildorder_listview->lastItem(), item->text( 0 ) ); + new TQListViewItem( buildorder_listview, buildorder_listview->lastItem(), item->text( 0 ) ); itemList.take(); break; } @@ -1295,7 +1295,7 @@ void ProjectConfigurationDlg::buildorderMoveUpClicked() return ; } - QListViewItem *item = buildorder_listview->firstChild(); + TQListViewItem *item = buildorder_listview->firstChild(); while ( item->nextSibling() != buildorder_listview->currentItem() ) item = item->nextSibling(); item->moveItem( buildorder_listview->currentItem() ); @@ -1325,7 +1325,7 @@ void ProjectConfigurationDlg::insideIncMoveUpClicked() return ; } - QListViewItem *item = insideinc_listview->firstChild(); + TQListViewItem *item = insideinc_listview->firstChild(); while ( item->nextSibling() != insideinc_listview->currentItem() ) item = item->nextSibling(); item->moveItem( insideinc_listview->currentItem() ); @@ -1354,7 +1354,7 @@ void ProjectConfigurationDlg::outsideIncMoveUpClicked() return ; } - QListViewItem *item = outsideinc_listview->firstChild(); + TQListViewItem *item = outsideinc_listview->firstChild(); while ( item->nextSibling() != outsideinc_listview->currentItem() ) item = item->nextSibling(); item->moveItem( outsideinc_listview->currentItem() ); @@ -1379,15 +1379,15 @@ void ProjectConfigurationDlg::outsideIncAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add include directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { - new QListViewItem( outsideinc_listview, dir ); + new TQListViewItem( outsideinc_listview, dir ); activateApply( 0 ); } } @@ -1408,7 +1408,7 @@ void ProjectConfigurationDlg::insideLibMoveUpClicked() return ; } - QListViewItem *item = insidelib_listview->firstChild(); + TQListViewItem *item = insidelib_listview->firstChild(); while ( item->nextSibling() != insidelib_listview->currentItem() ) item = item->nextSibling(); item->moveItem( insidelib_listview->currentItem() ); @@ -1437,7 +1437,7 @@ void ProjectConfigurationDlg::outsideLibMoveUpClicked() return ; } - QListViewItem *item = outsidelib_listview->firstChild(); + TQListViewItem *item = outsidelib_listview->firstChild(); while ( item->nextSibling() != outsidelib_listview->currentItem() ) item = item->nextSibling(); item->moveItem( outsidelib_listview->currentItem() ); @@ -1463,40 +1463,40 @@ void ProjectConfigurationDlg::outsideLibAddClicked() KURLRequesterDlg dialog( "", i18n( "Add Library: Either choose the .a/.so file or give -l<libname>" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); dialog.urlRequester() ->setFilter( "*.so|"+i18n("Shared Library (*.so)")+"\n*.a|"+i18n("Static Library (*.a)") ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString file = dialog.urlRequester() ->url(); + TQString file = dialog.urlRequester() ->url(); if ( !file.isEmpty() ) { if( file.startsWith("-l") ) { - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); activateApply( 0 ); } else { - QFileInfo fi(file); + TQFileInfo fi(file); if( !fi.exists() ) { - new QListViewItem( outsidelib_listview, file );; + new TQListViewItem( outsidelib_listview, file );; activateApply( 0 ); } if( fi.extension(false) == "a" ) { - new QListViewItem( outsidelib_listview, file ); + new TQListViewItem( outsidelib_listview, file ); activateApply( 0 ); }else if ( fi.extension(false) == "so" ) { - QString path = fi.dirPath( true ); - QString name = fi.fileName(); + TQString path = fi.dirPath( true ); + TQString name = fi.fileName(); if( name.startsWith( "lib" ) ) name = name.mid(3); name = "-l"+name.left( name.length() - 3 ); - new QListViewItem( outsidelib_listview, name ); - new QListViewItem( outsidelibdir_listview, path ); + new TQListViewItem( outsidelib_listview, name ); + new TQListViewItem( outsidelibdir_listview, path ); activateApply( 0 ); }else return; @@ -1521,7 +1521,7 @@ void ProjectConfigurationDlg::outsideLibDirMoveUpClicked() return ; } - QListViewItem *item = outsidelibdir_listview->firstChild(); + TQListViewItem *item = outsidelibdir_listview->firstChild(); while ( item->nextSibling() != outsidelibdir_listview->currentItem() ) item = item->nextSibling(); item->moveItem( outsidelibdir_listview->currentItem() ); @@ -1546,15 +1546,15 @@ void ProjectConfigurationDlg::outsideLibDirAddClicked() { KURLRequesterDlg dialog( "", i18n( "Add library directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { - new QListViewItem( outsidelibdir_listview, dir ); + new TQListViewItem( outsidelibdir_listview, dir ); activateApply( 0 ); } } @@ -1568,13 +1568,13 @@ void ProjectConfigurationDlg::outsideLibDirRemoveClicked() void ProjectConfigurationDlg::outsideIncEditClicked() { - QListViewItem * item = outsideinc_listview->currentItem(); + TQListViewItem * item = outsideinc_listview->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change include directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1585,9 +1585,9 @@ void ProjectConfigurationDlg::outsideIncEditClicked() dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { item->setText( 0, dir ); @@ -1597,13 +1597,13 @@ void ProjectConfigurationDlg::outsideIncEditClicked() void ProjectConfigurationDlg::outsideLibEditClicked() { - QListViewItem *item = outsidelib_listview->currentItem(); + TQListViewItem *item = outsidelib_listview->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change Library:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1613,9 +1613,9 @@ void ProjectConfigurationDlg::outsideLibEditClicked() dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString file = dialog.urlRequester() ->url(); + TQString file = dialog.urlRequester() ->url(); if ( !file.isEmpty() ) { if( file.startsWith("-l") ) @@ -1625,7 +1625,7 @@ void ProjectConfigurationDlg::outsideLibEditClicked() } else { - QFileInfo fi(file); + TQFileInfo fi(file); if( !fi.exists() ) { item->setText( 0, file ); @@ -1637,13 +1637,13 @@ void ProjectConfigurationDlg::outsideLibEditClicked() activateApply( 0 ); }else if ( fi.extension(false) == "so" ) { - QString path = fi.dirPath( true ); - QString name = fi.fileName(); + TQString path = fi.dirPath( true ); + TQString name = fi.fileName(); if( name.startsWith( "lib" ) ) name = name.mid(3); name = "-l"+name.left( name.length() - 3 ); item->setText( 0, name ); - new QListViewItem( outsidelibdir_listview, path ); + new TQListViewItem( outsidelibdir_listview, path ); activateApply( 0 ); }else return; @@ -1653,14 +1653,14 @@ void ProjectConfigurationDlg::outsideLibEditClicked() void ProjectConfigurationDlg::outsideLibDirEditClicked() { - QListViewItem * item = outsidelibdir_listview->currentItem(); + TQListViewItem * item = outsidelibdir_listview->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change library directory:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::Directory | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1671,9 +1671,9 @@ void ProjectConfigurationDlg::outsideLibDirEditClicked() dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString dir = dialog.urlRequester() ->url(); + TQString dir = dialog.urlRequester() ->url(); if ( !dir.isEmpty() ) { item->setText( 0, dir ); @@ -1686,28 +1686,28 @@ void ProjectConfigurationDlg::extAdd_button_clicked( ) { KURLRequesterDlg dialog( "", i18n( "Add target:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::LocalOnly ); - dialog.urlRequester() ->setURL( QString::null ); + dialog.urlRequester() ->setURL( TQString::null ); dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir() ) ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString path = dialog.urlRequester() ->url(); + TQString path = dialog.urlRequester() ->url(); if ( !path.isEmpty() ) { - new QListViewItem( extDeps_view, path ); + new TQListViewItem( extDeps_view, path ); activateApply( 0 ); } } void ProjectConfigurationDlg::extEdit_button_clicked( ) { - QListViewItem * item = extDeps_view->currentItem(); + TQListViewItem * item = extDeps_view->currentItem(); if ( item == NULL ) return ; - QString text = item->text( 0 ); + TQString text = item->text( 0 ); KURLRequesterDlg dialog( text, i18n( "Change target:" ), 0, 0 ); dialog.urlRequester() ->setMode( KFile::File | KFile::LocalOnly ); - if( QFileInfo(text).isRelative() ) + if( TQFileInfo(text).isRelative() ) { dialog.urlRequester() ->completionObject() ->setDir( myProjectItem->scope->projectDir() ); dialog.urlRequester() ->fileDialog() ->setURL( KURL( myProjectItem->scope->projectDir()+"/"+text ) ); @@ -1718,9 +1718,9 @@ void ProjectConfigurationDlg::extEdit_button_clicked( ) dialog.urlRequester() ->fileDialog() ->setURL( KURL( text ) ); } dialog.urlRequester() ->setURL( text ); - if ( dialog.exec() != QDialog::Accepted ) + if ( dialog.exec() != TQDialog::Accepted ) return ; - QString path = dialog.urlRequester() ->url(); + TQString path = dialog.urlRequester() ->url(); if ( !path.isEmpty() ) { item->setText( 0, path ); @@ -1748,7 +1748,7 @@ void ProjectConfigurationDlg::extMoveUp_button_clicked( ) return ; } - QListViewItem *item = extDeps_view->firstChild(); + TQListViewItem *item = extDeps_view->firstChild(); while ( item->nextSibling() != extDeps_view->currentItem() ) item = item->nextSibling(); item->moveItem( extDeps_view->currentItem() ); @@ -1781,7 +1781,7 @@ void ProjectConfigurationDlg::intMoveUp_button_clicked( ) return ; } - QListViewItem *item = intDeps_view->firstChild(); + TQListViewItem *item = intDeps_view->firstChild(); while ( item->nextSibling() != intDeps_view->currentItem() ) item = item->nextSibling(); item->moveItem( intDeps_view->currentItem() ); @@ -1790,7 +1790,7 @@ void ProjectConfigurationDlg::intMoveUp_button_clicked( ) void ProjectConfigurationDlg::addCustomValueClicked() { - QMap<QString, QString> customvar; + TQMap<TQString, TQString> customvar; customvar["var"] = i18n("Name"); customvar["op"] = "="; customvar["values"] = i18n("Value"); @@ -1804,7 +1804,7 @@ void ProjectConfigurationDlg::addCustomValueClicked() } void ProjectConfigurationDlg::removeCustomValueClicked() { - QListViewItem * item = customVariables->currentItem(); + TQListViewItem * item = customVariables->currentItem(); if ( item ) { myProjectItem->scope->removeCustomVariable( item->key(0, true).toUInt() ); @@ -1829,7 +1829,7 @@ void ProjectConfigurationDlg::removeCustomValueClicked() void ProjectConfigurationDlg::upCustomValueClicked() { // custom vars - QListViewItem * item = customVariables->firstChild(); + TQListViewItem * item = customVariables->firstChild(); if ( customVariables->currentItem() == item ) { KNotifyClient::beep(); @@ -1857,7 +1857,7 @@ void ProjectConfigurationDlg::newCustomVariableActive( ) customVariableOp->blockSignals(true); customVariableName->blockSignals(true); customVariableData->blockSignals(true); - QListViewItem * item = customVariables->currentItem(); + TQListViewItem * item = customVariables->currentItem(); if ( item ) { customVariableName->setText( item->text( 0 ) ); @@ -2021,26 +2021,26 @@ void ProjectConfigurationDlg::activateApply( int ) { buttonApply->setEnabled( true ); } -void ProjectConfigurationDlg::activateApply( const QString& ) +void ProjectConfigurationDlg::activateApply( const TQString& ) { buttonApply->setEnabled( true ); } -void ProjectConfigurationDlg::activateApply( QListViewItem* ) +void ProjectConfigurationDlg::activateApply( TQListViewItem* ) { buttonApply->setEnabled( true ); } void ProjectConfigurationDlg::removeSharedLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["shared_lib"]); @@ -2057,14 +2057,14 @@ void ProjectConfigurationDlg::removeSharedLibDeps() void ProjectConfigurationDlg::addStaticLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 ) @@ -2078,7 +2078,7 @@ void ProjectConfigurationDlg::addStaticLibDeps() void ProjectConfigurationDlg::removeStaticLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); @@ -2086,7 +2086,7 @@ void ProjectConfigurationDlg::removeStaticLibDeps() continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("LIBS").findIndex(infos["static_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["static_lib"]); @@ -2100,14 +2100,14 @@ void ProjectConfigurationDlg::removeStaticLibDeps() void ProjectConfigurationDlg::addSharedLibDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) { @@ -2121,14 +2121,14 @@ void ProjectConfigurationDlg::addSharedLibDeps() void ProjectConfigurationDlg::removeAppDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 ) { @@ -2140,14 +2140,14 @@ void ProjectConfigurationDlg::removeAppDeps() void ProjectConfigurationDlg::addAppDeps() { - QListViewItemIterator it(myProjectItem->listView()); + TQListViewItemIterator it(myProjectItem->listView()); for( ; it.current() ; ++it ) { QMakeScopeItem* prjItem = static_cast<QMakeScopeItem*>( it.current() ); if( prjItem == myProjectItem || !prjItem->isEnabled() ) continue; - QMap<QString, QString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); + TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) @@ -2161,7 +2161,7 @@ void ProjectConfigurationDlg::addAppDeps() void ProjectConfigurationDlg::customVarChanged() { - QListViewItem * item = customVariables->currentItem(); + TQListViewItem * item = customVariables->currentItem(); if ( item ) { item->setText( 0, customVariableName->text() ); |