diff options
Diffstat (limited to 'buildtools/custommakefiles')
11 files changed, 34 insertions, 34 deletions
diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp index b06ced18..f3111d86 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.cpp +++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp @@ -96,4 +96,4 @@ void CustomBuildOptionsWidget::makeToggled(bool b) #include "custombuildoptionswidget.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custombuildoptionswidget.h b/buildtools/custommakefiles/custombuildoptionswidget.h index 492cc8ea..40384f4a 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.h +++ b/buildtools/custommakefiles/custombuildoptionswidget.h @@ -44,4 +44,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp index 6b27994e..d07e6dbe 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.cpp +++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp @@ -61,8 +61,8 @@ CustomMakeConfigWidget::~CustomMakeConfigWidget() void CustomMakeConfigWidget::envNameChanged(const TQString& envName) { TQStringList allEnvNames = m_part->allMakeEnvironments(); - bool canAdd = !allEnvNames.tqcontains(envName) && !envName.tqcontains("/") && !envName.isEmpty(); - bool canRemove = allEnvNames.tqcontains(envName) && allEnvNames.count() > 1; + bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty(); + bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1; addenvs_button->setEnabled(canAdd); copyenvs_button->setEnabled(canAdd); removeenvs_button->setEnabled(canRemove); @@ -70,7 +70,7 @@ void CustomMakeConfigWidget::envNameChanged(const TQString& envName) void CustomMakeConfigWidget::envChanged(const TQString& envName) { - if (envName == m_currentEnvironment || !m_allEnvironments.tqcontains(envName)) + if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName)) return; // save settings of previously active environment diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index bb31b025..55115a69 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -54,7 +54,7 @@ void CustomManagerWidget::checkUrl(const TQString& url) { kdDebug(9025) << "seems to be non-relative" << endl; TQString relpath = m_part->relativeToProject( url ); - TQListBoxItem* item = m_blacklistBox->listBox()->tqfindItem( url ); + TQListBoxItem* item = m_blacklistBox->listBox()->findItem( url ); m_blacklistBox->listBox()->takeItem( item ); kdDebug(9025) << "relative path:" << relpath << endl; if( !relpath.isEmpty() ) @@ -77,4 +77,4 @@ void CustomManagerWidget::accept() #include "custommanagerwidget.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custommanagerwidget.h b/buildtools/custommakefiles/custommanagerwidget.h index 5f63d006..696f06fe 100644 --- a/buildtools/custommakefiles/custommanagerwidget.h +++ b/buildtools/custommakefiles/custommanagerwidget.h @@ -39,4 +39,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp index b3430e62..3f6ca0dc 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.cpp +++ b/buildtools/custommakefiles/customotherconfigwidget.cpp @@ -56,8 +56,8 @@ CustomOtherConfigWidget::~CustomOtherConfigWidget() void CustomOtherConfigWidget::envNameChanged(const TQString& envName) { TQStringList allEnvNames = m_part->allMakeEnvironments(); - bool canAdd = !allEnvNames.tqcontains(envName) && !envName.tqcontains("/") && !envName.isEmpty(); - bool canRemove = allEnvNames.tqcontains(envName) && allEnvNames.count() > 1; + bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty(); + bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1; addenvs_button->setEnabled(canAdd); copyenvs_button->setEnabled(canAdd); removeenvs_button->setEnabled(canRemove); @@ -65,7 +65,7 @@ void CustomOtherConfigWidget::envNameChanged(const TQString& envName) void CustomOtherConfigWidget::envChanged(const TQString& envName) { - if (envName == m_currentEnvironment || !m_allEnvironments.tqcontains(envName)) + if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName)) return; // save settings of previously active environment @@ -121,5 +121,5 @@ void CustomOtherConfigWidget::accept() } #include "customotherconfigwidget.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/customotherconfigwidget.h b/buildtools/custommakefiles/customotherconfigwidget.h index a432d3e6..8338e05e 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.h +++ b/buildtools/custommakefiles/customotherconfigwidget.h @@ -54,5 +54,5 @@ protected: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index 4511769b..67a56ce0 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -910,7 +910,7 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t cmdline = DomUtil::readEntry( dom, "/kdevcustomproject/other/otherbin" ); if ( cmdline.isEmpty() ) cmdline = "echo"; - else if ( cmdline.tqfind( "/" ) == -1 ) + else if ( cmdline.find( "/" ) == -1 ) cmdline = "./" + cmdline; cmdline += " " + DomUtil::readEntry( dom, "/kdevcustomproject/other/otheroptions" ); } @@ -1186,7 +1186,7 @@ void CustomProjectPart::putEnvVarsInVarMap() void CustomProjectPart::parseMakefile( const TQString& filename ) { - if ( m_parsedMakefiles.tqcontains( filename ) ) + if ( m_parsedMakefiles.contains( filename ) ) return; m_parsedMakefiles.insert( filename, 1 ); @@ -1218,9 +1218,9 @@ void CustomProjectPart::parseMakefile( const TQString& filename ) while (( offset = variablesRe.search( str, offset + 1 ) ) != -1 ) { TQString variableName = variablesRe.cap( 1 ).simplifyWhiteSpace(); - if ( m_makefileVars.tqcontains( variableName ) ) + if ( m_makefileVars.contains( variableName ) ) { - str.tqreplace( variablesRe.cap( 0 ), m_makefileVars[variableName] ); + str.replace( variablesRe.cap( 0 ), m_makefileVars[variableName] ); } } @@ -1245,17 +1245,17 @@ void CustomProjectPart::parseMakefile( const TQString& filename ) TQString tmpTarget = targetRe.cap( 1 ).simplifyWhiteSpace(); if ( tmpTarget.endsWith( ".o" ) ) { - if ( m_targetsObjectFiles.tqfind( tmpTarget ) == m_targetsObjectFiles.end() ) + if ( m_targetsObjectFiles.find( tmpTarget ) == m_targetsObjectFiles.end() ) m_targetsObjectFiles += tmpTarget; } - else if ( tmpTarget.tqcontains( '.' ) ) + else if ( tmpTarget.contains( '.' ) ) { - if ( m_targetsOtherFiles.tqfind( tmpTarget ) == m_targetsOtherFiles.end() ) + if ( m_targetsOtherFiles.find( tmpTarget ) == m_targetsOtherFiles.end() ) m_targetsOtherFiles += tmpTarget; } else { - if ( m_targets.tqfind( tmpTarget ) == m_targets.end() ) + if ( m_targets.find( tmpTarget ) == m_targets.end() ) m_targets += tmpTarget; } } @@ -1289,7 +1289,7 @@ void CustomProjectPart::updateMakeEnvironmentsMenu() { TQStringList l = allMakeEnvironments(); m_makeEnvironmentsSelector->setItems( l ); - m_makeEnvironmentsSelector->setCurrentItem( l.tqfindIndex( currentMakeEnvironment() ) ); + m_makeEnvironmentsSelector->setCurrentItem( l.findIndex( currentMakeEnvironment() ) ); } else { @@ -1361,7 +1361,7 @@ bool CustomProjectPart::isDirty() TQString fileName = *it; ++it; - TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( fileName ); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName ); TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if ( it == m_timestamp.end() || *it != t ) { @@ -1401,7 +1401,7 @@ TQString CustomProjectPart::currentMakeEnvironment() const TQStringList allEnvs = allMakeEnvironments(); TQDomDocument &dom = *projectDom(); TQString environment = DomUtil::readEntry( dom, "/kdevcustomproject/make/selectedenvironment" ); - if ( environment.isEmpty() || !allEnvs.tqcontains( environment ) ) + if ( environment.isEmpty() || !allEnvs.contains( environment ) ) environment = allEnvs[0]; return environment; } @@ -1510,11 +1510,11 @@ bool CustomProjectPart::isProjectFileType( const TQString& filename ) const re.setPattern( *it ); int pos = re.search( filename ); uint len = re.matchedLength(); - if ((( *it ).tqfind( "*" ) != -1 || ( *it ).tqfind( "?" ) != -1 ) && pos + len == filename.length() ) + if ((( *it ).find( "*" ) != -1 || ( *it ).find( "?" ) != -1 ) && pos + len == filename.length() ) return true; - else if ( filename.tqfind( "/" ) != -1 && filename.tqfind( *it ) != -1 ) + else if ( filename.find( "/" ) != -1 && filename.find( *it ) != -1 ) return true; - else if ( filename.tqfind( "/" ) == -1 && filename == *it ) + else if ( filename.find( "/" ) == -1 && filename == *it ) return true; } return false; @@ -1555,14 +1555,14 @@ bool CustomProjectPart::isInBlacklist( const TQString& path ) const TQStringList blacklist = this->blacklist(); if ( !TQFileInfo( relpath ).isRelative() ) relpath = relativeToProject( path ); - if ( blacklist.tqfind( relpath ) != blacklist.end() ) + if ( blacklist.find( relpath ) != blacklist.end() ) return true; TQStringList paths = TQStringList::split( "/", relpath ); TQString parentpath; for ( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) { parentpath += *it; - if ( blacklist.tqfind( parentpath ) != blacklist.end() ) + if ( blacklist.find( parentpath ) != blacklist.end() ) return true; parentpath = parentpath + "/"; } @@ -1607,7 +1607,7 @@ void CustomProjectPart::addNewFilesToProject( const TQStringList& filelist ) { for ( ProjectFilesSet::ConstIterator it2 = m_sourceFilesSet.constBegin(); it2 != m_sourceFilesSet.constEnd(); ++it2 ) { - if ( it2.key().tqfind( *it ) != -1 ) + if ( it2.key().find( *it ) != -1 ) { removeFromExcludes << *it; } @@ -1637,7 +1637,7 @@ void CustomProjectPart::setFiletypes( const TQStringList& l ) */ bool CustomProjectPart::isInProject( const TQString& fileName ) const { - return m_sourceFilesSet.tqcontains( fileName ); + return m_sourceFilesSet.contains( fileName ); } diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h index a31276f4..7f4775ad 100644 --- a/buildtools/custommakefiles/customprojectpart.h +++ b/buildtools/custommakefiles/customprojectpart.h @@ -156,4 +156,4 @@ private: }; #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp index 622d6012..988bae07 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.cpp +++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp @@ -128,4 +128,4 @@ TQStringList SelectNewFilesDialog::includedPaths() const #include "selectnewfilesdialog.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/selectnewfilesdialog.h b/buildtools/custommakefiles/selectnewfilesdialog.h index db0eee3d..c38fd761 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.h +++ b/buildtools/custommakefiles/selectnewfilesdialog.h @@ -51,4 +51,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on |