summaryrefslogtreecommitdiffstats
path: root/buildtools/qmake
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools/qmake')
-rw-r--r--buildtools/qmake/projectconfigurationdlgbase.ui2
-rw-r--r--buildtools/qmake/qmakeoptionswidgetbase.ui2
-rw-r--r--buildtools/qmake/scope.cpp44
-rw-r--r--buildtools/qmake/trollprojectpart.cpp6
-rw-r--r--buildtools/qmake/trollprojectwidget.cpp14
5 files changed, 34 insertions, 34 deletions
diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui
index 1ded80ef..a952d6f8 100644
--- a/buildtools/qmake/projectconfigurationdlgbase.ui
+++ b/buildtools/qmake/projectconfigurationdlgbase.ui
@@ -2162,7 +2162,7 @@
<property name="text">
<string>Value:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
</widget>
diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui
index 7f30c4e1..b70e6af1 100644
--- a/buildtools/qmake/qmakeoptionswidgetbase.ui
+++ b/buildtools/qmake/qmakeoptionswidgetbase.ui
@@ -80,7 +80,7 @@ Leave this empty to automatically search for a .pro file in the project director
<property name="text">
<string>The following settings determine what the project configuration dialog should do when another subproject is selected while the dialog is still open.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp
index b937287c..2c862fb3 100644
--- a/buildtools/qmake/scope.cpp
+++ b/buildtools/qmake/scope.cpp
@@ -158,7 +158,7 @@ bool Scope::loadFromFile( const TQString& filename )
if( DomUtil::readBoolEntry( *m_part->projectDom(),
"/kdevtrollproject/qmake/showParseErrors", true ) )
{
- KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).tqarg( filename ),
+ KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).arg( filename ),
i18n( "Could not parse project file" ) );
}
m_root = 0;
@@ -198,7 +198,7 @@ void Scope::saveToFile() const
file.close();
}else
{
- KMessageBox::error( 0, i18n( "Could not write project file: %1" ).tqarg( filename ),
+ KMessageBox::error( 0, i18n( "Could not write project file: %1" ).arg( filename ),
i18n( "Could not write project file" ) );
}
#ifdef DEBUG
@@ -292,7 +292,7 @@ TQStringList Scope::variableValuesForOp( const TQString& variable , const TQStri
return result;
TQValueList<TQMake::AST*>::const_iterator it;
- for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
+ for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
{
TQMake::AST* ast = *it;
if ( ast->nodeType() == TQMake::AST::AssignmentAST )
@@ -352,7 +352,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
}
TQValueList<TQMake::AST*>::const_iterator it;
- for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
+ for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
{
if ( stopHere && *it == stopHere )
return ;
@@ -628,7 +628,7 @@ bool Scope::deleteFunctionScope( unsigned int num )
Scope* funcScope = m_scopes[ num ];
if ( funcScope )
{
- TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( funcScope->m_root ) ];
+ TQMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( funcScope->m_root ) ];
if( !ast )
return false;
m_scopes.remove( num );
@@ -648,7 +648,7 @@ bool Scope::deleteSimpleScope( unsigned int num )
Scope* simpleScope = m_scopes[ num ];
if ( simpleScope )
{
- TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( simpleScope->m_root ) ];
+ TQMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( simpleScope->m_root ) ];
if( !ast )
return false;
m_scopes.remove( num );
@@ -686,10 +686,10 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
return false;
TQValueList<TQMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" );
- if ( it != m_root->m_tqchildren.end() )
+ if ( it != m_root->m_children.end() )
{
TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it );
- if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() )
+ if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_children.end() )
{
Scope* project = m_scopes[ num ];
if( !project )
@@ -723,7 +723,7 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
}
}
TQValueList<TQMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" );
- if ( foundit != m_root->m_tqchildren.end() )
+ if ( foundit != m_root->m_children.end() )
{
TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *foundit );
updateValues( ast->values, TQStringList( projdir ), true, ast->indent );
@@ -804,11 +804,11 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
if( m_varCache.contains( variable ) )
m_varCache.erase( variable );
- for ( int i = m_root->m_tqchildren.count() - 1; i >= 0; --i )
+ for ( int i = m_root->m_children.count() - 1; i >= 0; --i )
{
- if ( m_root->m_tqchildren[ i ] ->nodeType() == TQMake::AST::AssignmentAST )
+ if ( m_root->m_children[ i ] ->nodeType() == TQMake::AST::AssignmentAST )
{
- TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_tqchildren[ i ] );
+ TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_children[ i ] );
if ( assignment->scopedID == variable && Scope::isCompatible( assignment->op, op ) )
{
updateValues( assignment->values, values, removeFromOp, assignment->indent );
@@ -898,7 +898,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString&
TQStringList ops;
ops << "=" << "+=";
- for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end() ; ++it )
+ for ( it = m_root->m_children.begin(); it != m_root->m_children.end() ; ++it )
{
if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
{
@@ -909,7 +909,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString&
}
}
}
- return m_root->m_tqchildren.end();
+ return m_root->m_children.end();
}
void Scope::init()
@@ -921,7 +921,7 @@ void Scope::init()
m_maxCustomVarNum = 1;
TQValueList<TQMake::AST*>::const_iterator it;
- for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
+ for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
{
if ( ( *it ) ->nodeType() == TQMake::AST::ProjectAST )
{
@@ -1088,7 +1088,7 @@ void Scope::removeCustomVariable( unsigned int id )
{
TQMake::AssignmentAST* m = m_customVariables[id];
m_customVariables.remove(id);
- m_root->m_tqchildren.remove( m );
+ m_root->m_children.remove( m );
}
}
@@ -1097,8 +1097,8 @@ bool Scope::isVariableReset( const TQString& var )
bool result = false;
if( !m_root )
return result;
- TQValueList<TQMake::AST*>::const_iterator it = m_root->m_tqchildren.begin();
- for ( ; it != m_root->m_tqchildren.end(); ++it )
+ TQValueList<TQMake::AST*>::const_iterator it = m_root->m_children.begin();
+ for ( ; it != m_root->m_children.end(); ++it )
{
if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
{
@@ -1120,16 +1120,16 @@ void Scope::removeVariable( const TQString& var, const TQString& op )
TQMake::AssignmentAST* ast = 0;
- TQValueList<TQMake::AST*>::iterator it = m_root->m_tqchildren.begin();
- for ( ; it != m_root->m_tqchildren.end(); ++it )
+ TQValueList<TQMake::AST*>::iterator it = m_root->m_children.begin();
+ for ( ; it != m_root->m_children.end(); ++it )
{
if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
{
ast = static_cast<TQMake::AssignmentAST*>( *it );
if ( ast->scopedID == var && ast->op == op )
{
- m_root->m_tqchildren.remove( ast );
- it = m_root->m_tqchildren.begin();
+ m_root->m_children.remove( ast );
+ it = m_root->m_children.begin();
}
}
}
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index dd8f85d0..8e672b4e 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -852,9 +852,9 @@ TQString TrollProjectPart::findTQtDir()
TQStringList qtdirs;
if( !isTQt4Project() )
qtdirs.push_back( ::getenv("QTDIR") );
- qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
- qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
- qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+ qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+ qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+ qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
qtdirs.push_back( TQDir::rootDirPath()+"usr" );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" );
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 65fdfcc2..000554ca 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -529,7 +529,7 @@ TQString TrollProjectWidget::getCurrentOutputFilename()
void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
{
- // If no tqchildren in detailview
+ // If no children in detailview
// it is a subdir template
if ( item && details->childCount() )
{
@@ -556,7 +556,7 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl )
{
- // Insert all GroupItems and all of their tqchildren into the view
+ // Insert all GroupItems and all of their children into the view
if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 )
return ;
@@ -974,7 +974,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
QMakeScopeItem *spitem = static_cast<QMakeScopeItem*>( item );
KPopupMenu popup( this );
- popup.insertTitle( i18n( "Subproject %1" ).tqarg( item->text( 0 ) ) );
+ popup.insertTitle( i18n( "Subproject %1" ).arg( item->text( 0 ) ) );
int idBuild = -2;
int idRebuild = -2;
@@ -1757,9 +1757,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
KPopupMenu popup( this );
if ( !( gitem->groupType == GroupItem::InstallObject ) )
- popup.insertTitle( i18n( "File: %1" ).tqarg( fitem->text( 0 ) ) );
+ popup.insertTitle( i18n( "File: %1" ).arg( fitem->text( 0 ) ) );
else
- popup.insertTitle( i18n( "Pattern: %1" ).tqarg( fitem->text( 0 ) ) );
+ popup.insertTitle( i18n( "Pattern: %1" ).arg( fitem->text( 0 ) ) );
int idRemoveFile = -2;
int idSubclassWidget = -2;
@@ -1932,7 +1932,7 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem )
if ( KMessageBox::warningYesNo( this,
"<qt>" +
i18n( "Do you want to delete the file <strong>%1</strong> from the project and your disk?" )
- .tqarg( fitem->text( 0 ) ) +
+ .arg( fitem->text( 0 ) ) +
"</qt>",
i18n( "Remove File" ),
KStdGuiItem::remove(),
@@ -2459,7 +2459,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
void TrollProjectWidget::slotProjectDirty(const TQString& path)
{
kdDebug(9024) << "File is dirty:" << path << " using method " << endl;
- if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").tqarg(path).tqarg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No )
+ if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").arg(path).arg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No )
{
m_part->dirWatch()->stopScan();
TQListViewItemIterator it(m_rootSubproject);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 15:34:20 +0000