summaryrefslogtreecommitdiffstats
path: root/buildtools
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/ada/adaproject_part.cpp4
-rw-r--r--buildtools/ada/adaprojectoptionsdlg.cpp8
-rw-r--r--buildtools/ant/antprojectpart.cpp8
-rw-r--r--buildtools/autotools/addexistingdirectoriesdlg.cpp12
-rw-r--r--buildtools/autotools/addfiledlg.cpp2
-rw-r--r--buildtools/autotools/addservicedlg.cpp2
-rw-r--r--buildtools/autotools/addsubprojectdlg.cpp6
-rw-r--r--buildtools/autotools/autodetailsview.cpp10
-rw-r--r--buildtools/autotools/autolistviewitems.cpp2
-rw-r--r--buildtools/autotools/autoprojectpart.cpp16
-rw-r--r--buildtools/autotools/autoprojectwidget.cpp6
-rw-r--r--buildtools/autotools/autosubprojectview.cpp38
-rw-r--r--buildtools/autotools/choosetargetdialog.cpp4
-rw-r--r--buildtools/autotools/configureoptionswidget.cpp6
-rw-r--r--buildtools/autotools/fileselectorwidget.cpp2
-rw-r--r--buildtools/autotools/kfiledndiconview.cpp4
-rw-r--r--buildtools/autotools/makefilehandler.cpp4
-rw-r--r--buildtools/autotools/misc.cpp40
-rw-r--r--buildtools/autotools/removetargetdlg.cpp10
-rw-r--r--buildtools/autotools/targetoptionsdlg.cpp12
-rw-r--r--buildtools/custommakefiles/custombuildoptionswidget.cpp2
-rw-r--r--buildtools/custommakefiles/custombuildoptionswidget.h2
-rw-r--r--buildtools/custommakefiles/custommakeconfigwidget.cpp6
-rw-r--r--buildtools/custommakefiles/custommanagerwidget.cpp4
-rw-r--r--buildtools/custommakefiles/custommanagerwidget.h2
-rw-r--r--buildtools/custommakefiles/customotherconfigwidget.cpp8
-rw-r--r--buildtools/custommakefiles/customotherconfigwidget.h2
-rw-r--r--buildtools/custommakefiles/customprojectpart.cpp36
-rw-r--r--buildtools/custommakefiles/customprojectpart.h2
-rw-r--r--buildtools/custommakefiles/selectnewfilesdialog.cpp2
-rw-r--r--buildtools/custommakefiles/selectnewfilesdialog.h2
-rw-r--r--buildtools/lib/parsers/autotools/autotools.ll2
-rw-r--r--buildtools/lib/parsers/autotools/autotools_lex.cpp2
-rw-r--r--buildtools/lib/parsers/qmake/location.hh2
-rw-r--r--buildtools/lib/parsers/qmake/position.hh2
-rw-r--r--buildtools/lib/parsers/qmake/qmake.yy2
-rw-r--r--buildtools/lib/parsers/qmake/qmake_lex.h2
-rw-r--r--buildtools/lib/parsers/qmake/qmake_yacc.cpp4
-rw-r--r--buildtools/lib/parsers/qmake/qmake_yacc.hpp2
-rw-r--r--buildtools/lib/parsers/qmake/qmakeast.cpp2
-rw-r--r--buildtools/lib/parsers/qmake/stack.hh2
-rw-r--r--buildtools/lib/parsers/qmake/tests/runner.cpp2
-rw-r--r--buildtools/lib/widgets/envvartools.cpp2
-rw-r--r--buildtools/pascal/pascalproject_part.cpp4
-rw-r--r--buildtools/pascal/pascalprojectoptionsdlg.cpp8
-rw-r--r--buildtools/qmake/choosesubprojectdlg.cpp6
-rw-r--r--buildtools/qmake/choosesubprojectdlg.h2
-rw-r--r--buildtools/qmake/createscopedlg.cpp4
-rw-r--r--buildtools/qmake/createscopedlg.h2
-rw-r--r--buildtools/qmake/disablesubprojectdlg.cpp2
-rw-r--r--buildtools/qmake/disablesubprojectdlg.h2
-rw-r--r--buildtools/qmake/projectconfigurationdlg.cpp190
-rw-r--r--buildtools/qmake/projectconfigurationdlg.h2
-rw-r--r--buildtools/qmake/qmakedefaultopts.cpp4
-rw-r--r--buildtools/qmake/qmakedefaultopts.h2
-rw-r--r--buildtools/qmake/qmakeoptionswidget.cpp2
-rw-r--r--buildtools/qmake/qmakeoptionswidget.h2
-rw-r--r--buildtools/qmake/qmakescopeitem.cpp44
-rw-r--r--buildtools/qmake/qmakescopeitem.h2
-rw-r--r--buildtools/qmake/scope.cpp130
-rw-r--r--buildtools/qmake/scope.h2
-rw-r--r--buildtools/qmake/trollprojectpart.cpp26
-rw-r--r--buildtools/qmake/trollprojectwidget.cpp58
-rw-r--r--buildtools/qmake/trollprojectwidget.h2
-rw-r--r--buildtools/script/scriptnewfiledlg.cpp2
65 files changed, 394 insertions, 394 deletions
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index d747eb00..427f7505 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -249,7 +249,7 @@ TQString AdaProjectPart::mainSource() const
void AdaProjectPart::setMainSource(TQString fullPath)
{
TQString olddir = activeDirectory();
- m_mainSource = fullPath.tqreplace(TQRegExp(TQString(projectDirectory() + TQString("/"))),"");
+ m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),"");
emit activeDirectoryChanged( olddir, activeDirectory() );
}
@@ -266,7 +266,7 @@ TQString AdaProjectPart::projectName() const
TQString AdaProjectPart::activeDirectory() const
{
TQFileInfo fi(mainSource());
- return fi.dirPath(true).tqreplace(TQRegExp(projectDirectory()),"");
+ return fi.dirPath(true).replace(TQRegExp(projectDirectory()),"");
}
TQString AdaProjectPart::buildDirectory() const
diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp
index f00a0bb1..1b32c5e8 100644
--- a/buildtools/ada/adaprojectoptionsdlg.cpp
+++ b/buildtools/ada/adaprojectoptionsdlg.cpp
@@ -94,7 +94,7 @@ void AdaProjectOptionsDlg::saveConfig( TQString config )
ServiceComboBox::currentText(compiler_box, service_names));
DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text());
DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text());
- DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().tqreplace(TQRegExp(m_part->projectDirectory() + TQString("/")),""));
+ DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),""));
}
void AdaProjectOptionsDlg::readConfig( TQString config )
@@ -128,8 +128,8 @@ void AdaProjectOptionsDlg::readConfig( TQString config )
void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config)
{
- bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty();
- bool canRemove = allConfigs.tqcontains(config) && config != "default";
+ bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty();
+ bool canRemove = allConfigs.contains(config) && config != "default";
addconfig_button->setEnabled(canAdd);
removeconfig_button->setEnabled(canRemove);
}
@@ -137,7 +137,7 @@ void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config)
void AdaProjectOptionsDlg::configChanged(const TQString &config)
{
- if (config == currentConfig || !allConfigs.tqcontains(config))
+ if (config == currentConfig || !allConfigs.contains(config))
return;
if (!currentConfig.isNull() && dirty)
diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp
index 84ad0a5e..4d95f523 100644
--- a/buildtools/ant/antprojectpart.cpp
+++ b/buildtools/ant/antprojectpart.cpp
@@ -229,7 +229,7 @@ TQString AntProjectPart::runDirectory() const
if ( directoryRadioString == "custom" )
return DomUtil::readEntry(dom, "/kdevantproject/run/customdirectory");
- int pos = DomMainProgram.tqfindRev('/');
+ int pos = DomMainProgram.findRev('/');
if (pos != -1)
return buildDirectory() + "/" + DomMainProgram.left(pos);
@@ -529,11 +529,11 @@ void AntProjectPart::optionsAccepted()
for (int i=0; i<m_antOptionsWidget->Properties->numRows(); ++i)
{
TQString key = m_antOptionsWidget->Properties->text(i,0);
- m_antOptions.m_properties.tqreplace(key, m_antOptionsWidget->Properties->text(i,1));
+ m_antOptions.m_properties.replace(key, m_antOptionsWidget->Properties->text(i,1));
kdDebug() << "PROP: " << key << " = " << m_antOptionsWidget->Properties->text(i,1);
TQCheckTableItem *item =(TQCheckTableItem*) m_antOptionsWidget->Properties->item(i,0);
- m_antOptions.m_defineProperties.tqreplace(key, item->isChecked());
+ m_antOptions.m_defineProperties.replace(key, item->isChecked());
}
m_classPath = m_classPathWidget->ClassPath->items();
@@ -554,7 +554,7 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context)
return;
m_contextFileName = url.fileName();
- bool inProject = project()->allFiles().tqcontains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) );
+ bool inProject = project()->allFiles().contains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) );
TQString popupstr = TQFileInfo(m_contextFileName).fileName();
if (m_contextFileName.startsWith(projectDirectory()+ "/"))
m_contextFileName.remove(0, projectDirectory().length()+1);
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index 19d400fb..eaca2161 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -186,7 +186,7 @@ void AddExistingDirectoriesDialog::slotOk()
TQString name = *it;
// Adjust SUBDIRS variable in containing Makefile.am
- if (m_spitem->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1)
+ if (m_spitem->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1)
{
TQFile subdirsfile( m_spitem->path + "/subdirs" );
if ( subdirsfile.open( IO_WriteOnly | IO_Append ) )
@@ -196,7 +196,7 @@ void AddExistingDirectoriesDialog::slotOk()
subdirsfile.close();
}
}
- else if (m_spitem->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1)
+ else if (m_spitem->variables["SUBDIRS"].find("$(AUTODIRS)") != -1)
{
}
else
@@ -243,7 +243,7 @@ void AddExistingDirectoriesDialog::slotOk()
if ( !m_part->isKDE() ) {
TQString projroot = m_part->projectDirectory() + "/";
TQString subdirectory = dir.path();
- TQString relpath = subdirectory.tqreplace(0, projroot.length(),"");
+ TQString relpath = subdirectory.replace(0, projroot.length(),"");
TQString configureFile = m_part->getAutoConfFile(projroot);
@@ -270,7 +270,7 @@ void AddExistingDirectoriesDialog::slotAddSelected()
TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url());
if (relPath[relPath.length()-1] == '/')
relPath = relPath.left(relPath.length()-1);
- if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().tqcontains( relPath )) )
+ if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().contains( relPath )) )
{
m_importList.append ( ( *it ) );
}
@@ -288,7 +288,7 @@ void AddExistingDirectoriesDialog::slotAddAll()
TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url());
if (relPath[relPath.length()-1] == '/')
relPath = relPath.left(relPath.length()-1);
- if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) )
+ if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) )
{
m_importList.append ( ( *it ) );
}
@@ -363,7 +363,7 @@ void AddExistingDirectoriesDialog::slotDropped ( TQDropEvent* ev )
TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), *it);
if (relPath[relPath.length()-1] == '/')
relPath = relPath.left(relPath.length()-1);
- if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) )
+ if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) )
{
type = KMimeType::findByURL ( ( *it ) );
diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp
index 407e5109..99e75ebf 100644
--- a/buildtools/autotools/addfiledlg.cpp
+++ b/buildtools/autotools/addfiledlg.cpp
@@ -68,7 +68,7 @@ AddFileDialog::~AddFileDialog()
void AddFileDialog::accept()
{
TQString name = fileEdit->text();
- if (name.tqfind('/') != -1) {
+ if (name.find('/') != -1) {
KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on."));
return;
}
diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp
index a53b2551..67903ebe 100644
--- a/buildtools/autotools/addservicedlg.cpp
+++ b/buildtools/autotools/addservicedlg.cpp
@@ -77,7 +77,7 @@ void AddServiceDialog::updateProperties()
TQStringList stprops = type->propertyDefNames();
TQStringList::ConstIterator stit;
for (stit = stprops.begin(); stit != stprops.end(); ++stit)
- if (props.tqfind(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment"
+ if (props.find(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment"
&& (*stit) != "Icon")
props.append(*stit);
}
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index bb0e5527..d9913af7 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -106,7 +106,7 @@ void AddSubprojectDialog::accept()
}
// Adjust SUBDIRS variable in containing Makefile.am
- if (m_subProject->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1)
+ if (m_subProject->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1)
{
TQFile subdirsfile( m_subProject->path + "/subdirs" );
if ( subdirsfile.open( IO_WriteOnly | IO_Append ) )
@@ -116,7 +116,7 @@ void AddSubprojectDialog::accept()
subdirsfile.close();
}
}
- else if (m_subProject->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1)
+ else if (m_subProject->variables["SUBDIRS"].find("$(AUTODIRS)") != -1)
{
}
else
@@ -162,7 +162,7 @@ void AddSubprojectDialog::accept()
if ( !m_part->isKDE() ) {
TQString projroot = m_part->projectDirectory() + "/";
TQString subdirectory = dir.path();
- TQString relpath = subdirectory.tqreplace(0, projroot.length(),"");
+ TQString relpath = subdirectory.replace(0, projroot.length(),"");
TQString configureFile = m_part->getAutoConfFile(projroot);
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 7002b7c8..6f1f56e8 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -587,7 +587,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
popup.tqsetWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file "
"associated with the selected .ui."));
- if (!fitem->name.tqcontains(TQRegExp("ui$")) || fitem->is_subst == true)
+ if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true)
{
popup.removeItem(idUISubclasses);
popup.removeItem(idViewUIH);
@@ -625,7 +625,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
list << DomUtil::Pair(srcfile_relpath,uifile_relpath);
DomUtil::writePairListEntry(dom, "/kdevautoproject/subclassing",
"subclass", "sourcefile", "uifile", list);
- newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(m_part->projectDirectory()+"/"),"");
+ newFileNames[i] = newFileNames[i].replace(TQRegExp(m_part->projectDirectory()+"/"),"");
}
m_subclasslist = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing",
"subclass","sourcefile", "uifile");
@@ -636,13 +636,13 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
{
TQString noext = m_widget->selectedSubproject()->path + "/" + fitem->name;
- if (noext.tqfindRev('.')>-1)
- noext = noext.left(noext.tqfindRev('.'));
+ if (noext.findRev('.')>-1)
+ noext = noext.left(noext.findRev('.'));
TQStringList dummy;
TQString uifile = fitem->uiFileLink;
- if (uifile.tqfindRev('/')>-1)
+ if (uifile.findRev('/')>-1)
{
TQStringList uisplit = TQStringList::split('/',uifile);
uifile=uisplit[uisplit.count()-1];
diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp
index 3fb0bffd..6e96bd4f 100644
--- a/buildtools/autotools/autolistviewitems.cpp
+++ b/buildtools/autotools/autolistviewitems.cpp
@@ -167,7 +167,7 @@ void FileItem::changeMakefileEntry(const TQString& new_name)
if ( SubprojectItem* subProject = lv->m_part->m_widget->selectedSubproject() )
{
TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]);
- TQStringList::iterator it = sources.tqfind(name);
+ TQStringList::iterator it = sources.find(name);
(*it) = new_name;
subProject->variables[varname] = sources.join(" ");
replaceMap.insert(varname, subProject->variables[varname]);
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index a2c500a4..15d6bc45 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -525,7 +525,7 @@ void AutoProjectPart::addFiles ( const TQStringList& fileList )
for ( it = fileList.begin(); it != fileList.end(); ++it )
{
- int pos = ( *it ).tqfindRev('/');
+ int pos = ( *it ).findRev('/');
if (pos != -1)
{
directory = ( *it ).left(pos);
@@ -597,7 +597,7 @@ TQString AutoProjectPart::currentBuildConfig() const
TQDomDocument &dom = *projectDom();
TQString config = DomUtil::readEntry(dom, "/kdevautoproject/general/useconfiguration");
- if (config.isEmpty() || !allBuildConfigs().tqcontains(config))
+ if (config.isEmpty() || !allBuildConfigs().contains(config))
config = "default";
return config;
@@ -732,13 +732,13 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr
// These are the internal libraries
dependency.remove("$(top_builddir)/");
- if( !alreadyScheduledDeps.tqcontains(*l2it) )
+ if( !alreadyScheduledDeps.contains(*l2it) )
{
alreadyScheduledDeps << *l2it;
tdir = buildDirectory();
if (!tdir.endsWith("/") && !tdir.isEmpty())
tdir += "/";
- int pos = dependency.tqfindRev('/');
+ int pos = dependency.findRev('/');
if (pos == -1)
{
tname = dependency;
@@ -782,7 +782,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr
tdir = buildDirectory();
if (!tdir.endsWith("/") && !tdir.isEmpty())
tdir += "/";
- int pos = dependency.tqfindRev('/');
+ int pos = dependency.findRev('/');
if (pos == -1)
{
tname = dependency;
@@ -1282,7 +1282,7 @@ void AutoProjectPart::slotBuildConfigAboutToShow()
{
TQStringList l = allBuildConfigs();
buildConfigAction->setItems(l);
- buildConfigAction->setCurrentItem(l.tqfindIndex(currentBuildConfig()));
+ buildConfigAction->setCurrentItem(l.findIndex(currentBuildConfig()));
}
void AutoProjectPart::restorePartialProjectSession ( const TQDomElement* el )
@@ -1356,7 +1356,7 @@ bool AutoProjectPart::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 ){
return true;
@@ -1386,7 +1386,7 @@ TQStringList recursiveATFind( const TQString &currDir, const TQString &baseDir )
kdDebug(9020) << "Dir " << currDir << endl;
TQStringList fileList;
- if( !currDir.tqcontains( "/..") && !currDir.tqcontains("/.") )
+ if( !currDir.contains( "/..") && !currDir.contains("/.") )
{
TQDir dir(currDir);
TQStringList dirList = dir.entryList(TQDir::Dirs );
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index 57b63573..ff89fe35 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -225,7 +225,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const
{
SubprojectItem* spitem = static_cast<SubprojectItem*>(it.current() );
kdDebug(9020) << "Checking: " << spitem->path << endl;
- if (spitem->targets.tqcontainsRef(titem))
+ if (spitem->targets.containsRef(titem))
{
kdDebug(9020) << "Found it!" << endl;
TQString relpath = (spitem->path).mid(prefixLen);
@@ -405,7 +405,7 @@ void AutoProjectWidget::addFiles( const TQStringList &list )
for ( it = fileList.begin(); it != fileList.end(); ++it )
{
- int pos = ( *it ).tqfindRev('/');
+ int pos = ( *it ).findRev('/');
if (pos != -1)
fileName = ( *it ).mid(pos+1);
else
@@ -652,7 +652,7 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name,
FileItem *AutoProjectWidget::createFileItem( const TQString &name, SubprojectItem *subproject )
{
bool is_subst;
- if(name.tqfind("$(") == 0 || name.tqfind("${") == 0)
+ if(name.find("$(") == 0 || name.find("${") == 0)
is_subst = true;
else
is_subst = false;
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index e1d15d90..f6d22a77 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -60,7 +60,7 @@ namespace AutoProjectPrivate
bool isHeader( const TQString& fileName )
{
- return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).tqcontains( TQFileInfo(fileName).extension(false) );
+ return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).contains( TQFileInfo(fileName).extension(false) );
}
static TQString cleanWhitespace( const TQString &str )
@@ -317,7 +317,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con
}
int id = popup.insertItem(it.key(), this, TQT_SLOT(slotCustomBuildCommand(int)));
m_commandList.append(it.data());
- popup.setItemParameter(id, m_commandList.tqfindIndex(it.data()));
+ popup.setItemParameter(id, m_commandList.findIndex(it.data()));
}
popup.insertSeparator();
@@ -440,11 +440,11 @@ void AutoSubprojectView::slotRemoveSubproject()
}
TQStringList list = TQStringList::split( TQRegExp("[ \t]"), tqparent->variables["SUBDIRS"] );
- TQStringList::Iterator it = list.tqfind( spitem->subdir );
+ TQStringList::Iterator it = list.find( spitem->subdir );
TQString subdirToRemove = spitem->subdir;
bool topsubdirs = true;
- if ((tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") == -1)
- && (tqparent->variables["SUBDIRS"].tqfind("$(AUTODIRS)") == -1))
+ if ((tqparent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") == -1)
+ && (tqparent->variables["SUBDIRS"].find("$(AUTODIRS)") == -1))
{
topsubdirs = false;
if( it == list.end() ){
@@ -483,7 +483,7 @@ void AutoSubprojectView::slotRemoveSubproject()
TQString projroot = m_part->projectDirectory() + "/";
TQString subdirectory = spitem->path;
- TQString relpath = subdirectory.tqreplace(0, projroot.length(),"");
+ TQString relpath = subdirectory.replace(0, projroot.length(),"");
TQString configureFile = m_part->getAutoConfFile(projroot);
@@ -511,7 +511,7 @@ void AutoSubprojectView::slotRemoveSubproject()
// Adjust SUBDIRS variable in containing Makefile.am
- if (tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1)
+ if (tqparent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1)
{
TQFile subdirsfile( tqparent->path + "/subdirs" );
TQStringList topdirs;
@@ -563,7 +563,7 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item,
{
// Parse line foo_bar = bla bla
- int pos = lhs.tqfindRev( '_' );
+ int pos = lhs.findRev( '_' );
TQString prefix = lhs.left( pos );
TQString primary = lhs.right( lhs.length() - pos - 1 );
// kdDebug(9020) << "Prefix:" << prefix << ",Primary:" << primary << endl;
@@ -707,7 +707,7 @@ void AutoSubprojectView::parseKDEICON( SubprojectItem *item,
{
// Parse a line foo_ICON = bla bla
- int pos = lhs.tqfind( "_ICON" );
+ int pos = lhs.find( "_ICON" );
TQString prefix = lhs.left( pos );
if ( prefix == "KDE" )
prefix = "kde_icon";
@@ -766,7 +766,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
// Take care of KDE hacks:
// TOPSUBDIRS is an alias for all directories
// listed in the subdirs file
- if ( subdirs.tqfind( "$(TOPSUBDIRS)" ) != -1 )
+ if ( subdirs.find( "$(TOPSUBDIRS)" ) != -1 )
{
TQStringList dirs;
TQFile subdirsfile( item->path + "/subdirs" );
@@ -795,18 +795,18 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
}
}
- subdirs.tqreplace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) );
+ subdirs.replace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) );
}
// AUTODIRS is an alias for all subdirectories
- if ( subdirs.tqfind( "$(AUTODIRS)" ) != -1 )
+ if ( subdirs.find( "$(AUTODIRS)" ) != -1 )
{
TQDir d( item->path );
TQStringList dirs = d.entryList( TQDir::Dirs );
dirs.remove( "." );
dirs.remove( ".." );
dirs.remove( "CVS" );
- subdirs.tqreplace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) );
+ subdirs.replace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) );
}
// If there are any variables in the subdirs line then search
@@ -822,7 +822,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
// Search the whole Makefile(.am?)
// Note that if the variable isn't found it just disappears
// (Perhaps we should add it back in this case?)
- TQMap<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname );
+ TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname );
if ( varit != item->variables.end() )
{
kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl;
@@ -832,7 +832,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
{
kdDebug( 9020 ) << "Not found Makefile var " << varname << endl;
}
- subdirs.tqreplace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue );
+ subdirs.replace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue );
}
//search for AC_SUBST variables and try to replace them with variables
@@ -847,7 +847,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
// Search the whole Makefile(.am?)
// Note that if the variable isn't found it just disappears
// (Perhaps we should add it back in this case?)
- TQMap<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname );
+ TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname );
if ( varit != item->variables.end() )
{
kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl;
@@ -857,7 +857,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item,
{
kdDebug( 9020 ) << "Not found Makefile var " << varname << endl;
}
- subdirs.tqreplace( TQRegExp( "\\@" + varname + "\\@" ), varvalue );
+ subdirs.replace( TQRegExp( "\\@" + varname + "\\@" ), varvalue );
}
TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), subdirs );
@@ -914,7 +914,7 @@ void AutoSubprojectView::parse( SubprojectItem *item )
parseKDEDOCS( item, lhs, rhs );
else if ( lhs.right( 5 ) == "_ICON" )
parseKDEICON( item, lhs, rhs );
- else if ( lhs.tqfind( '_' ) > 0 )
+ else if ( lhs.find( '_' ) > 0 )
parsePrimary( item, lhs, rhs );
else if ( lhs.right( 3 ) == "dir" )
parsePrefix( item, lhs, rhs );
@@ -937,7 +937,7 @@ void AutoSubprojectView::parse( SubprojectItem *item )
TQString fname = *fileIt;
++fileIt;
- if( AutoProjectPrivate::isHeader(fname) && !headers.tqcontains(fname) ){
+ if( AutoProjectPrivate::isHeader(fname) && !headers.contains(fname) ){
FileItem *fitem = m_widget->createFileItem( fname, item );
noinst_HEADERS_item->sources.append( fitem );
}
diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp
index d09f0a7b..154b72b4 100644
--- a/buildtools/autotools/choosetargetdialog.cpp
+++ b/buildtools/autotools/choosetargetdialog.cpp
@@ -128,7 +128,7 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP
for ( it = fileList.begin(); it != fileList.end(); ++it )
{
- int pos = ( *it ).tqfindRev('/');
+ int pos = ( *it ).findRev('/');
if (pos != -1)
fileName = ( *it ).mid(pos+1);
else
@@ -246,7 +246,7 @@ void ChooseTargetDialog::slotOk()
{
bool found = false;
- int pos = ( *it ).tqfindRev('/');
+ int pos = ( *it ).findRev('/');
if (pos != -1)
{
directory = ( *it ).left(pos);
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index 1e877a5c..afb6f9b4 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -267,8 +267,8 @@ void ConfigureOptionsWidget::topsourcedirClicked()
void ConfigureOptionsWidget::configComboTextChanged(const TQString &config)
{
- bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty();
- bool canRemove = allConfigs.tqcontains(config) && config != "default";
+ bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty();
+ bool canRemove = allConfigs.contains(config) && config != "default";
addconfig_button->setEnabled(canAdd);
removeconfig_button->setEnabled(canRemove);
}
@@ -276,7 +276,7 @@ void ConfigureOptionsWidget::configComboTextChanged(const TQString &config)
void ConfigureOptionsWidget::configChanged(const TQString &config)
{
- if (config == currentConfig || !allConfigs.tqcontains(config))
+ if (config == currentConfig || !allConfigs.contains(config))
return;
if (!currentConfig.isNull() && dirty)
diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp
index f67d9295..2a199c3a 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -148,7 +148,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
{
if (groupEl.tagName() == "group")
{
- list << groupEl.attribute("pattern").tqreplace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")";
+ list << groupEl.attribute("pattern").replace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")";
}
groupEl = groupEl.nextSibling().toElement();
}
diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp
index d230eee7..b59031df 100644
--- a/buildtools/autotools/kfiledndiconview.cpp
+++ b/buildtools/autotools/kfiledndiconview.cpp
@@ -84,7 +84,7 @@ void KFileDnDIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) {
return;
}
e->acceptAction(); // Yes
- TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) );
+ TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) );
if ( i && m_useAutoOpenTimer) { // are we over an item ?
m_dropItem = i; // set new m_dropItem
m_autoOpenTimer.start( m_autoOpenTime ); // restart timer
@@ -97,7 +97,7 @@ void KFileDnDIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) {
return;
}
e->acceptAction(); // Yes
- TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) );
+ TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) );
if( ! m_useAutoOpenTimer )
return;
if ( i ) { // are we over an item ?
diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp
index ef2354f1..7e19dd56 100644
--- a/buildtools/autotools/makefilehandler.cpp
+++ b/buildtools/autotools/makefilehandler.cpp
@@ -122,7 +122,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive )
AutoTools::ProjectAST* MakefileHandler::astForFolder( const TQString& folderPath )
{
- if ( d->folderToFileMap.tqcontains( folderPath ) )
+ if ( d->folderToFileMap.contains( folderPath ) )
{
TQString filePath = d->folderToFileMap[folderPath];
return d->projects[filePath];
@@ -152,7 +152,7 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools::
if ( ( *it )->nodeType() == AutoTools::AST::AssignmentAST )
{
AutoTools::AssignmentAST* assignment = static_cast<AutoTools::AssignmentAST*>( ( *it ) );
- if ( variable.tqfind( assignment->scopedID ) != -1 )
+ if ( variable.find( assignment->scopedID ) != -1 )
{
kdDebug(9020) << k_funcinfo << "Resolving variable '" << variable << "' to '"
<< assignment->values.join( TQString::null ).stripWhiteSpace() << "'" << endl;
diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp
index 9dfffefb..a4162a40 100644
--- a/buildtools/autotools/misc.cpp
+++ b/buildtools/autotools/misc.cpp
@@ -238,11 +238,11 @@ void AutoProjectTool::setMakefileam ( const TQString &fileName, TQMap<TQString,
if ( re.exactMatch ( s ) )
{
TQString lhs = re.cap ( 2 );
- bool notFound = ( variables.tqfind ( lhs ) == variables.end() );
+ bool notFound = ( variables.find ( lhs ) == variables.end() );
if ( notFound )
{
- if ( seenLhs.tqfind ( lhs ) == seenLhs.end() )
+ if ( seenLhs.find ( lhs ) == seenLhs.end() )
{
// not interested in this line at all
// write it out as is..
@@ -446,7 +446,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
if (re.exactMatch(s))
{
TQString lhs = re.cap(2);
- TQMap<TQString, bool>* ourRhs = interest.tqfind(lhs);
+ TQMap<TQString, bool>* ourRhs = interest.find(lhs);
if (!ourRhs)
{
@@ -478,7 +478,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
// add this line to we we want to add to remove duplicates.
for (uint index = 0; index < bits.size(); index++)
{
- TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(bits[index]);
+ TQMap<TQString, bool>::iterator findEntry = ourRhs->find(bits[index]);
if (findEntry == ourRhs->end())
{
// we haven't seen it, so add it, so we don't add it again later..
@@ -490,7 +490,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
}
// now write the line out if it is not going to be empty.
TQString newLine(lhs);
- if (seenLhs.tqfind(lhs) == seenLhs.end())
+ if (seenLhs.find(lhs) == seenLhs.end())
{
newLine += " = ";
seenLhs[lhs] = "";
@@ -537,7 +537,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
{
// check if any of these values are down to remove.
TQString newLine(lhs);
- if (seenLhs.tqfind(lhs) == seenLhs.end())
+ if (seenLhs.find(lhs) == seenLhs.end())
{
newLine += " = ";
seenLhs[lhs] = "";
@@ -551,7 +551,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
bool added = false;
for (TQStringList::Iterator posIter = bits.begin(); posIter != bits.end();posIter++)
{
- TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter);
+ TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter);
if (findEntry == ourRhs->end())
{
// we do not want to remove it..
@@ -598,7 +598,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
{
// now we have to deal with this multiLine value..
// ourRhs will always be a value, as we only get multiLine if we're interested in it..
- TQMap<TQString, bool>* ourRhs = interest.tqfind(lastLhs);
+ TQMap<TQString, bool>* ourRhs = interest.find(lastLhs);
if (add)
{
@@ -607,7 +607,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
// add this line to we we want to add to remove duplicates.
for (uint index = 0; index < lastRhs.size(); index++)
{
- TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(lastRhs[index]);
+ TQMap<TQString, bool>::iterator findEntry = ourRhs->find(lastRhs[index]);
if (findEntry == ourRhs->end())
{
// we haven't seen it, so add it, so we don't add it again later..
@@ -619,7 +619,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
}
// now write the line out if it is not going to be empty.
TQString newLine(lastLhs);
- if (seenLhs.tqfind(lastLhs) == seenLhs.end())
+ if (seenLhs.find(lastLhs) == seenLhs.end())
{
newLine += " = ";
seenLhs[lastLhs] = "";
@@ -665,7 +665,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
{
// check if any of these values are down to remove.
TQString newLine(lastLhs);
- if (seenLhs.tqfind(lastLhs) == seenLhs.end())
+ if (seenLhs.find(lastLhs) == seenLhs.end())
{
newLine += " = ";
seenLhs[lastLhs] = "";
@@ -678,7 +678,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
bool added = false;
for (TQStringList::Iterator posIter = lastRhs.begin(); posIter != lastRhs.end();posIter++)
{
- TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter);
+ TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter);
if (findEntry == ourRhs->end())
{
// we do not want to remove it..
@@ -724,7 +724,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri
TQMap<TQString, bool>* ourRhs = it.current();
TQString newLine(lhs);
- if (seenLhs.tqfind(lhs) == seenLhs.end())
+ if (seenLhs.find(lhs) == seenLhs.end())
{
newLine += " = ";
seenLhs[lastLhs] = "";
@@ -814,7 +814,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath)
{
if (close.search(line) >= 0)
{
- line = line.tqreplace(close.search(line), 1, "");
+ line = line.replace(close.search(line), 1, "");
list += TQStringList::split(" ", line);
break;
}
@@ -829,11 +829,11 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath)
}
else if (ac_regex.search(line) >= 0)
{
- line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, "");
+ line = line.replace(ac_regex.search(line), ac_match.length() - 1, "");
if (open.search(line) >= 0)
{
- line = line.tqreplace(open.search(line), 1, "");
+ line = line.replace(open.search(line), 1, "");
}
if (line.endsWith(cont))
@@ -845,7 +845,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath)
{
if (close.search(line) >= 0)
{
- line = line.tqreplace(close.search(line), 1, "");
+ line = line.replace(close.search(line), 1, "");
}
}
@@ -946,7 +946,7 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m
else if (ac_regex.search(line) >= 0)
{
line = line.stripWhiteSpace();
- line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, "");
+ line = line.replace(ac_regex.search(line), ac_match.length() - 1, "");
if (line.endsWith(cont))
{
line.setLength(line.length() - 1);
@@ -954,11 +954,11 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m
}
if (open.search(line) >= 0)
{
- line = line.tqreplace(open.search(line), 1, "");
+ line = line.replace(open.search(line), 1, "");
}
if (close.search(line) >= 0)
{
- line = line.tqreplace(close.search(line), 1, "");
+ line = line.replace(close.search(line), 1, "");
}
if (!multiLine)
diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp
index 962a386c..f40452c9 100644
--- a/buildtools/autotools/removetargetdlg.cpp
+++ b/buildtools/autotools/removetargetdlg.cpp
@@ -96,8 +96,8 @@ void RemoveTargetDialog::init()
{
TQString canonname = AutoProjectTool::canonicalize ( titem->name );
- if ( spitem->variables[canonname + "_LIBADD"].tqcontains ( m_titem->name ) > 0 ||
- spitem->variables[canonname + "_LDADD"].tqcontains ( m_titem->name ) > 0 )
+ if ( spitem->variables[canonname + "_LIBADD"].contains ( m_titem->name ) > 0 ||
+ spitem->variables[canonname + "_LDADD"].contains ( m_titem->name ) > 0 )
{
dependencyListBox->insertItem ( SmallIcon ( "target_kdevelop" ), spitem->path + " (" + titem->name + ")" );
@@ -136,7 +136,7 @@ void RemoveTargetDialog::accept ()
TQString curCanonname = AutoProjectTool::canonicalize ( titem->name );
TQStringList dependencies;
- if ( spitem->variables[curCanonname + "_LIBADD"].tqcontains ( m_titem->name ) )
+ if ( spitem->variables[curCanonname + "_LIBADD"].contains ( m_titem->name ) )
curVarname = curCanonname + "_LIBADD";
else
curVarname = curCanonname + "_LDADD";
@@ -148,7 +148,7 @@ void RemoveTargetDialog::accept ()
for ( uint i = 0; i < dependencies.size(); ++i )
{
TQString s = dependencies[i];
- if ( s.tqcontains ( m_titem->name ) > 0 )
+ if ( s.contains ( m_titem->name ) > 0 )
dependencies.remove ( s );
}
@@ -250,7 +250,7 @@ void RemoveTargetDialog::accept ()
// before removing the files, check if they are mentioned in "noinst_HEADERS = blabla1.h blabla2.h"
TQStringList noInstHeaders = TQStringList::split ( TQRegExp ( "[ \t\n]" ), m_spitem->variables["noinst_HEADERS"] );
- if ( noInstHeaders.tqcontains ( fitem->name ) )
+ if ( noInstHeaders.contains ( fitem->name ) )
{
noInstHeaders.remove ( fitem->name );
diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp
index 14e5ee96..02673c0c 100644
--- a/buildtools/autotools/targetoptionsdlg.cpp
+++ b/buildtools/autotools/targetoptionsdlg.cpp
@@ -79,26 +79,26 @@ TargetOptionsDialog::~TargetOptionsDialog()
void TargetOptionsDialog::readConfig()
{
TQString flagsstr = target->ldflags;
- flagsstr.tqreplace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)");
+ flagsstr.replace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)");
TQStringList l1 = TQStringList::split(TQRegExp("[ \t]"), flagsstr);
TQStringList::Iterator l1it;
- l1it = l1.tqfind("-all-static");
+ l1it = l1.find("-all-static");
if (l1it != l1.end()) {
allstatic_box->setChecked(true);
l1.remove(l1it);
}
- l1it = l1.tqfind("-avoid-version");
+ l1it = l1.find("-avoid-version");
if (l1it != l1.end()) {
avoidversion_box->setChecked(true);
l1.remove(l1it);
}
- l1it = l1.tqfind("-module");
+ l1it = l1.find("-module");
if (l1it != l1.end()) {
module_box->setChecked(true);
l1.remove(l1it);
}
- l1it = l1.tqfind("-no-undefined");
+ l1it = l1.find("-no-undefined");
if (l1it != l1.end()) {
noundefined_box->setChecked(true);
l1.remove(l1it);
@@ -354,4 +354,4 @@ void TargetOptionsDialog::accept()
}
#include "targetoptionsdlg.moc"
-// kate: indent-mode csands; space-indent on; indent-width 4; tqreplace-tabs on;
+// kate: indent-mode csands; space-indent on; indent-width 4; replace-tabs on;
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
diff --git a/buildtools/lib/parsers/autotools/autotools.ll b/buildtools/lib/parsers/autotools/autotools.ll
index d6f2a9bb..f05f8ff6 100644
--- a/buildtools/lib/parsers/autotools/autotools.ll
+++ b/buildtools/lib/parsers/autotools/autotools.ll
@@ -98,7 +98,7 @@ rule [\t]+[^\n]*
<list>{id_list} {
yylval.value = yytext;
- yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\"));
+ yylval.value = yylval.value.mid(0, yylval.value.findRev("\\"));
unput('\\');
BEGIN(INITIAL);
return (ID_LIST);
diff --git a/buildtools/lib/parsers/autotools/autotools_lex.cpp b/buildtools/lib/parsers/autotools/autotools_lex.cpp
index e534d74f..d20bbdb6 100644
--- a/buildtools/lib/parsers/autotools/autotools_lex.cpp
+++ b/buildtools/lib/parsers/autotools/autotools_lex.cpp
@@ -841,7 +841,7 @@ YY_RULE_SETUP
#line 99 "autotools.ll"
{
yylval.value = yytext;
- yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\"));
+ yylval.value = yylval.value.mid(0, yylval.value.findRev("\\"));
unput('\\');
BEGIN(INITIAL);
return (ID_LIST);
diff --git a/buildtools/lib/parsers/qmake/location.hh b/buildtools/lib/parsers/qmake/location.hh
index 41ec2015..d6247645 100644
--- a/buildtools/lib/parsers/qmake/location.hh
+++ b/buildtools/lib/parsers/qmake/location.hh
@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* As a special exception, you may create a larger work that tqcontains
+/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
diff --git a/buildtools/lib/parsers/qmake/position.hh b/buildtools/lib/parsers/qmake/position.hh
index 63fe2d81..6e95eb95 100644
--- a/buildtools/lib/parsers/qmake/position.hh
+++ b/buildtools/lib/parsers/qmake/position.hh
@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* As a special exception, you may create a larger work that tqcontains
+/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy
index 75d306d0..a9c0e745 100644
--- a/buildtools/lib/parsers/qmake/qmake.yy
+++ b/buildtools/lib/parsers/qmake/qmake.yy
@@ -359,7 +359,7 @@ function_call : ID_SIMPLE LBRACE function_args RBRACE
depth++;
//qWarning("%s", $<value>1.ascii());
- if ($<value>1.tqcontains("include"))
+ if ($<value>1.contains("include"))
{
IncludeAST *includeAST = new IncludeAST();
includeAST->projectName = $<value>3;
diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h
index 514631bf..fe133946 100644
--- a/buildtools/lib/parsers/qmake/qmake_lex.h
+++ b/buildtools/lib/parsers/qmake/qmake_lex.h
@@ -46,4 +46,4 @@ namespace TQMake
#endif
-// kate: space-indent on; indent-width 4; tab-width: 4; tqreplace-tabs on; auto-insert-doxygen on
+// kate: space-indent on; indent-width 4; tab-width: 4; replace-tabs on; auto-insert-doxygen on
diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
index 718cb4f5..6824f633 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* As a special exception, you may create a larger work that tqcontains
+/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
@@ -679,7 +679,7 @@ namespace TQMake
depth++;
//qWarning("%s", $<value>1.ascii());
- if ((yysemantic_stack_[(4) - (1)].value).tqcontains("include"))
+ if ((yysemantic_stack_[(4) - (1)].value).contains("include"))
{
IncludeAST *includeAST = new IncludeAST();
includeAST->projectName = (yysemantic_stack_[(4) - (3)].value);
diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.hpp
index 0b67bb14..9ca20a08 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.hpp
@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* As a special exception, you may create a larger work that tqcontains
+/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp
index c551abef..2c1e5a53 100644
--- a/buildtools/lib/parsers/qmake/qmakeast.cpp
+++ b/buildtools/lib/parsers/qmake/qmakeast.cpp
@@ -165,6 +165,6 @@ void IncludeAST::writeBack(TQString &/*buffer*/)
}
-// 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/lib/parsers/qmake/stack.hh b/buildtools/lib/parsers/qmake/stack.hh
index 07f71922..dfc6c67e 100644
--- a/buildtools/lib/parsers/qmake/stack.hh
+++ b/buildtools/lib/parsers/qmake/stack.hh
@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* As a special exception, you may create a larger work that tqcontains
+/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp
index 5dd417db..9af86fe7 100644
--- a/buildtools/lib/parsers/qmake/tests/runner.cpp
+++ b/buildtools/lib/parsers/qmake/tests/runner.cpp
@@ -95,7 +95,7 @@ private:
TQString replaceWs(TQString s)
{
- return s.tqreplace("\n", "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc");
+ return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc");
}
virtual void processAssignment( TQMake::AssignmentAST* a)
diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp
index 7c3a115f..13b1391a 100644
--- a/buildtools/lib/widgets/envvartools.cpp
+++ b/buildtools/lib/widgets/envvartools.cpp
@@ -23,7 +23,7 @@
TQString EnvVarTools::quote( const TQString & arg )
{
TQString res = arg;
- res.tqreplace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''"));
+ res.replace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''"));
res.prepend("\"");
res.append("\"");
return res;
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index 6d26ac60..bbc5037a 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -256,7 +256,7 @@ TQString PascalProjectPart::mainSource() const
void PascalProjectPart::setMainSource(TQString fullPath)
{
TQString olddir = activeDirectory();
- m_mainSource = fullPath.tqreplace(TQRegExp(TQString(projectDirectory() + TQString("/"))),"");
+ m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),"");
emit activeDirectoryChanged( olddir, activeDirectory() );
}
@@ -273,7 +273,7 @@ TQString PascalProjectPart::projectName() const
TQString PascalProjectPart::activeDirectory() const
{
TQFileInfo fi(mainSource());
- return fi.dirPath(true).tqreplace(TQRegExp(projectDirectory()),"");
+ return fi.dirPath(true).replace(TQRegExp(projectDirectory()),"");
}
TQString PascalProjectPart::buildDirectory() const
diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp
index d1ce1f5f..db5517cf 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.cpp
+++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp
@@ -96,7 +96,7 @@ void PascalProjectOptionsDlg::saveConfig( TQString config )
ServiceComboBox::currentText(compiler_box, service_names));
DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text());
DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text());
- DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().tqreplace(TQRegExp(m_part->projectDirectory() + TQString("/")),""));
+ DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),""));
}
void PascalProjectOptionsDlg::readConfig( TQString config )
@@ -130,8 +130,8 @@ void PascalProjectOptionsDlg::readConfig( TQString config )
void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config)
{
- bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty();
- bool canRemove = allConfigs.tqcontains(config) && config != "default";
+ bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty();
+ bool canRemove = allConfigs.contains(config) && config != "default";
addconfig_button->setEnabled(canAdd);
removeconfig_button->setEnabled(canRemove);
}
@@ -139,7 +139,7 @@ void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config)
void PascalProjectOptionsDlg::configChanged(const TQString &config)
{
- if (config == currentConfig || !allConfigs.tqcontains(config))
+ if (config == currentConfig || !allConfigs.contains(config))
return;
if (!currentConfig.isNull() && dirty)
diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp
index fc0cb068..a5651b27 100644
--- a/buildtools/qmake/choosesubprojectdlg.cpp
+++ b/buildtools/qmake/choosesubprojectdlg.cpp
@@ -41,7 +41,7 @@ void ChooseSubprojectDlg::accept()
ChooseItem *item = dynamic_cast<ChooseItem*>(subprojects_view->currentItem());
if (!item)
return;
- if ( item->subproject()->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
+ if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
return;
TQDialog::accept();
@@ -89,7 +89,7 @@ void ChooseSubprojectDlg::itemSelected( TQListViewItem * it )
ChooseItem *item = dynamic_cast<ChooseItem*>(it);
if (!item)
return;
- if ( item->subproject()->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
+ if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
buttonOk->setEnabled(false);
else
buttonOk->setEnabled(true);
@@ -110,5 +110,5 @@ QMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( )
#include "choosesubprojectdlg.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/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h
index 3d0ea08b..cf97671f 100644
--- a/buildtools/qmake/choosesubprojectdlg.h
+++ b/buildtools/qmake/choosesubprojectdlg.h
@@ -62,4 +62,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/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp
index c83e1b7b..2792d0ae 100644
--- a/buildtools/qmake/createscopedlg.cpp
+++ b/buildtools/qmake/createscopedlg.cpp
@@ -58,7 +58,7 @@ void CreateScopeDlg::accept()
TQString file = incUrl->url();
if ( !incUrl->url().endsWith( ".pri" ) )
file += ".pri";
- if( file.tqfind("/") == -1 )
+ if( file.find("/") == -1 )
file = m_item->scope->projectDir()+"/"+file;
// We need to create the file, because getRelativePath checks for existent paths
if( !TQFile::exists(file) )
@@ -97,4 +97,4 @@ void CreateScopeDlg::accept()
#include "createscopedlg.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/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h
index 31195c87..781522fe 100644
--- a/buildtools/qmake/createscopedlg.h
+++ b/buildtools/qmake/createscopedlg.h
@@ -42,5 +42,5 @@ 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/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp
index 161661d5..682fd906 100644
--- a/buildtools/qmake/disablesubprojectdlg.cpp
+++ b/buildtools/qmake/disablesubprojectdlg.cpp
@@ -47,4 +47,4 @@ TQStringList DisableSubprojectDlg::selectedProjects()
#include "disablesubprojectdlg.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/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h
index 4e8a4a84..296fcd14 100644
--- a/buildtools/qmake/disablesubprojectdlg.h
+++ b/buildtools/qmake/disablesubprojectdlg.h
@@ -40,4 +40,4 @@ protected slots:
#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/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp
index 0bb85870..713084fd 100644
--- a/buildtools/qmake/projectconfigurationdlg.cpp
+++ b/buildtools/qmake/projectconfigurationdlg.cpp
@@ -158,21 +158,21 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
{
if ( radioApplication->isChecked() )
{
- if( myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("app") == -1 )
+ if( myProjectItem->scope->variableValues("TEMPLATE").findIndex("app") == -1 )
{
addAppDeps();
removeSharedLibDeps();
removeStaticLibDeps();
}
myProjectItem->scope->setEqualOp( "TEMPLATE", "app" );
- if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 )
+ if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 )
myProjectItem->scope->removeFromPlusOp( "CONFIG", "staticlib" );
- if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
+ if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" );
myProjectItem->setPixmap( 0, SmallIcon( "qmake_app" ) );
TQString targetname = prjWidget->getCurrentOutputFilename();
- if( targetname.tqfindRev("/") != -1 )
- targetname = targetname.right( targetname.length() - targetname.tqfindRev("/") - 1 );
+ if( targetname.findRev("/") != -1 )
+ targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 );
DomUtil::writeEntry( *prjWidget->m_part->projectDom(),
"/kdevtrollproject/run/runarguments/"+targetname, m_editRunArguments->text() );
DomUtil::writeEntry( *prjWidget->m_part->projectDom(),
@@ -186,7 +186,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
myProjectItem->scope->setEqualOp( "TEMPLATE", "lib" );
if ( staticRadio->isOn() )
{
- if( myProjectItem->scope->variableValues("CONFIG").tqfindIndex("dll") != -1 )
+ if( myProjectItem->scope->variableValues("CONFIG").findIndex("dll") != -1 )
{
addStaticLibDeps();
removeSharedLibDeps();
@@ -203,14 +203,14 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
if ( sharedRadio->isOn() )
{
kdDebug(9024) << "Activating debug lib:" << myProjectItem->scope->variableValues("CONFIG") << endl;
- if( myProjectItem->scope->variableValues("CONFIG").tqfindIndex("dll") == -1 )
+ if( myProjectItem->scope->variableValues("CONFIG").findIndex("dll") == -1 )
{
addSharedLibDeps();
removeStaticLibDeps();
}
myProjectItem->addValue( "CONFIG", "dll" );
myProjectItem->scope->setEqualOp( "VERSION", m_targetLibraryVersion->text() );
- if ( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 )
+ if ( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 )
myProjectItem->removeValue( "CONFIG", "staticlib" );
}
if ( checkPlugin->isOn() )
@@ -227,15 +227,15 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
}
else if ( radioSubdirs->isChecked() )
{
- if( myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") == -1 )
+ if( myProjectItem->scope->variableValues("TEMPLATE").findIndex("subdirs") == -1 )
{
removeSharedLibDeps();
removeStaticLibDeps();
removeAppDeps();
}
- if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
+ if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" );
- if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 )
+ if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 )
myProjectItem->scope->removeFromPlusOp( "CONFIG", "staticlib" );
myProjectItem->scope->setEqualOp( "TEMPLATE", "subdirs" );
myProjectItem->setPixmap( 0, SmallIcon( "folder" ) );
@@ -243,8 +243,8 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
}
// Buildmode
- int releaseidx = myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "release" );
- int debugidx = myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "debug" );
+ int releaseidx = myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "release" );
+ int debugidx = myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "debug" );
if ( radioReleaseMode->isChecked() )
{
if( releaseidx != -1 && releaseidx < debugidx )
@@ -414,7 +414,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
TQStringList extraValues = TQStringList::split( " ", editConfigExtra->text() );
for ( TQStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it )
{
- if ( Scope::KnownConfigValues.tqfindIndex( *it ) == -1 && extraValues.tqfindIndex( *it ) == -1 )
+ if ( Scope::KnownConfigValues.findIndex( *it ) == -1 && extraValues.findIndex( *it ) == -1 )
{
myProjectItem->scope->removeFromPlusOp( "CONFIG", *it );
}
@@ -422,7 +422,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
for ( TQStringList::iterator it = extraValues.begin() ; it != extraValues.end() ; ++it )
{
- if ( confValues.tqfindIndex( *it ) == -1 )
+ if ( confValues.findIndex( *it ) == -1 )
myProjectItem->scope->addToPlusOp( "CONFIG", *it );
}
@@ -431,9 +431,9 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
// targetpath = URLUtil::getRelativePath( myProjectItem->scope->projectDir(), targetpath );
if( myProjectItem->scope->scopeType() == Scope::FunctionScope || myProjectItem->scope->scopeType() == Scope::SimpleScope )
{
- if( myProjectItem->scope->variableValues("TARGET").tqfindIndex( m_targetOutputFile->text() ) == -1 )
+ if( myProjectItem->scope->variableValues("TARGET").findIndex( m_targetOutputFile->text() ) == -1 )
myProjectItem->scope->setEqualOp( "TARGET", TQStringList( m_targetOutputFile->text() ) );
- if( myProjectItem->scope->variableValues("DESTDIR").tqfindIndex( targetpath ) == -1 )
+ if( myProjectItem->scope->variableValues("DESTDIR").findIndex( targetpath ) == -1 )
myProjectItem->scope->setEqualOp( "DESTDIR", TQStringList( targetpath ) );
}else
{
@@ -497,7 +497,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
{
TQString tmpLib = insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() );
- if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
+ if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
{
//add path if shared lib is linked
TQString tmpPath = insideItem->prjItem->getLibAddPath(
@@ -550,14 +550,14 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
{
if ( insideItem->isOn() )
{
- if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1
- || ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex("dll") == -1
- && insideItem->prjItem->scope->variableValues( "TEMPLATE" ).tqfindIndex("lib") != -1 ) )
+ if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1
+ || ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex("dll") == -1
+ && insideItem->prjItem->scope->variableValues( "TEMPLATE" ).findIndex("lib") != -1 ) )
{
values << insideItem->prjItem->getLibAddObject(
myProjectItem->scope->projectDir() );
}
- else if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
+ else if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
{
values << insideItem->prjItem->getSharedLibAddObject(
myProjectItem->scope->projectDir() );
@@ -576,7 +576,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
values.clear();
//change build order
lvItem = buildorder_listview->firstChild();
- if ( lvItem && lvItem->itemBelow() && myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
+ if ( lvItem && lvItem->itemBelow() && myProjectItem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
{
while ( lvItem )
@@ -648,14 +648,14 @@ void ProjectConfigurationDlg::updateControls()
TQStringList templateValues = myProjectItem->scope->variableValues( "TEMPLATE" );
//if( !myProjectItem->isScope )
//{
- if ( templateValues.tqfindIndex( "lib" ) != -1 )
+ if ( templateValues.findIndex( "lib" ) != -1 )
{
groupLibraries->setEnabled( true );
radioLibrary->setChecked( true );
staticRadio->setChecked( true ); //default
- if ( configValues.tqfindIndex( "staticlib" ) != -1 )
+ if ( configValues.findIndex( "staticlib" ) != -1 )
{
staticRadio->setChecked( true );
checkPlugin->setEnabled( false );
@@ -663,7 +663,7 @@ void ProjectConfigurationDlg::updateControls()
}
else
staticRadio->setChecked( false );
- if ( configValues.tqfindIndex( "dll" ) != -1 )
+ if ( configValues.findIndex( "dll" ) != -1 )
{
sharedRadio->setChecked( true );
checkPlugin->setEnabled( true );
@@ -684,33 +684,33 @@ void ProjectConfigurationDlg::updateControls()
checkDesigner->setEnabled( false );
}
- if ( configValues.tqfindIndex( "plugin" ) != -1 )
+ if ( configValues.findIndex( "plugin" ) != -1 )
checkPlugin->setChecked( true );
else
checkPlugin->setChecked( false );
- if ( configValues.tqfindIndex( "designer" ) != -1 )
+ if ( configValues.findIndex( "designer" ) != -1 )
checkDesigner->setChecked( true );
else
checkDesigner->setChecked( false );
- if ( configValues.tqfindIndex( "compile_libtool" ) != -1 )
+ if ( configValues.findIndex( "compile_libtool" ) != -1 )
checkLibtool->setChecked( true );
else
checkLibtool->setChecked( false );
}
- else if ( templateValues.tqfindIndex( "subdirs" ) != -1 )
+ else if ( templateValues.findIndex( "subdirs" ) != -1 )
{
radioSubdirs->setChecked( true );
}else
{
//Default is app mode
radioApplication->setChecked( true );
- if ( configValues.tqfindIndex( "console" ) != -1 )
+ if ( configValues.findIndex( "console" ) != -1 )
{
checkConsole->setChecked( true );
}
TQString targetname = prjWidget->getCurrentOutputFilename();
- if( targetname.tqfindRev("/") != -1 )
- targetname = targetname.right( targetname.length() - targetname.tqfindRev("/") - 1 );
+ 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, "" ) );
TQString dir = DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/cwd/"+targetname, "" );
@@ -731,15 +731,15 @@ void ProjectConfigurationDlg::updateControls()
TQString destdir = myProjectItem->m_widget->getCurrentDestDir();
if( !destdir.startsWith( "/" ) )
destdir = myProjectItem->m_widget->projectDirectory()+"/"+destdir;
- m_CWDEdit->setURL( destdir.left( destdir.tqfindRev("/") ) );
- m_CWDEdit->fileDialog()->setURL( KURL::fromPathOrURL( destdir.left( destdir.tqfindRev("/") ) ) );
+ m_CWDEdit->setURL( destdir.left( destdir.findRev("/") ) );
+ m_CWDEdit->fileDialog()->setURL( KURL::fromPathOrURL( destdir.left( destdir.findRev("/") ) ) );
}
m_editDebugArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/debugarguments/"+targetname, "" ) );
}
// Buildmode
- int debugidx = configValues.tqfindIndex( "debug" );
- int releaseidx = configValues.tqfindIndex( "release" );
+ int debugidx = configValues.findIndex( "debug" );
+ int releaseidx = configValues.findIndex( "release" );
if ( debugidx != -1 && debugidx > releaseidx )
{
radioDebugMode->setChecked( true );
@@ -748,59 +748,59 @@ void ProjectConfigurationDlg::updateControls()
{
radioReleaseMode->setChecked( true );
}
- if ( configValues.tqfindIndex( "debug_and_release" ) != -1 )
+ if ( configValues.findIndex( "debug_and_release" ) != -1 )
{
checkDebugReleaseMode->setChecked( true );
}
// Requirements
- if ( configValues.tqfindIndex( "qt" ) != -1 )
+ if ( configValues.findIndex( "qt" ) != -1 )
checkQt->setChecked( true );
else
checkQt->setChecked( false );
- if ( configValues.tqfindIndex( "opengl" ) != -1 )
+ if ( configValues.findIndex( "opengl" ) != -1 )
checkOpenGL->setChecked( true );
else
checkOpenGL->setChecked( false );
- if ( configValues.tqfindIndex( "thread" ) != -1 )
+ if ( configValues.findIndex( "thread" ) != -1 )
checkThread->setChecked( true );
else
checkThread->setChecked( false );
- if ( configValues.tqfindIndex( "x11" ) != -1 )
+ if ( configValues.findIndex( "x11" ) != -1 )
checkX11->setChecked( true );
else
checkX11->setChecked( false );
- if ( configValues.tqfindIndex( "ordered" ) != -1 )
+ if ( configValues.findIndex( "ordered" ) != -1 )
checkOrdered->setChecked( true );
else
checkOrdered->setChecked( false );
- if ( configValues.tqfindIndex( "exceptions" ) != -1 )
+ if ( configValues.findIndex( "exceptions" ) != -1 )
exceptionCheck->setChecked( true );
else
exceptionCheck->setChecked( false );
- if ( configValues.tqfindIndex( "stl" ) != -1 )
+ if ( configValues.findIndex( "stl" ) != -1 )
stlCheck->setChecked( true );
else
stlCheck->setChecked( false );
- if ( configValues.tqfindIndex( "rtti" ) != -1 )
+ if ( configValues.findIndex( "rtti" ) != -1 )
rttiCheck->setChecked( true );
else
rttiCheck->setChecked( false );
- if ( configValues.tqfindIndex( "precompile_header" ) != -1 )
+ if ( configValues.findIndex( "precompile_header" ) != -1 )
checkPCH->setChecked( true );
else
checkPCH->setChecked( false );
// Warnings
- if ( configValues.tqfindIndex( "warn_on" ) != -1 )
+ if ( configValues.findIndex( "warn_on" ) != -1 )
{
checkWarning->setChecked( true );
}
- if ( configValues.tqfindIndex( "warn_off" ) != -1 )
+ if ( configValues.findIndex( "warn_off" ) != -1 )
{
checkWarning->setChecked( false );
}
- if ( configValues.tqfindIndex( "windows" ) != -1 )
+ if ( configValues.findIndex( "windows" ) != -1 )
checkWindows->setChecked( true );
else
checkWindows->setChecked( false );
@@ -809,77 +809,77 @@ void ProjectConfigurationDlg::updateControls()
if ( prjWidget->m_part->isTQt4Project() )
{
- if ( configValues.tqfindIndex( "assistant" ) != -1 )
+ if ( configValues.findIndex( "assistant" ) != -1 )
checkAssistant->setChecked( true );
else
checkAssistant->setChecked( false );
- if ( configValues.tqfindIndex( "qtestlib" ) != -1 )
+ if ( configValues.findIndex( "qtestlib" ) != -1 )
checkTestlib->setChecked( true );
else
checkTestlib->setChecked( false );
- if ( configValues.tqfindIndex( "uitools" ) != -1 )
+ if ( configValues.findIndex( "uitools" ) != -1 )
checkUiTools->setChecked( true );
else
checkUiTools->setChecked( false );
- if ( configValues.tqfindIndex( "dbus" ) != -1 )
+ if ( configValues.findIndex( "dbus" ) != -1 )
checkQDBus->setChecked( true );
else
checkQDBus->setChecked( false );
- if ( configValues.tqfindIndex( "build_all" ) != -1 )
+ if ( configValues.findIndex( "build_all" ) != -1 )
checkBuildAll->setChecked( true );
else
checkBuildAll->setChecked( false );
- if ( configValues.tqfindIndex( "help" ) != -1 )
+ if ( configValues.findIndex( "help" ) != -1 )
checkQtHelp->setChecked( true );
else
checkQtHelp->setChecked( false );
TQStringList qtLibs = myProjectItem->scope->variableValues( "QT" );
- if ( qtLibs.tqfindIndex( "core" ) != -1 )
+ if ( qtLibs.findIndex( "core" ) != -1 )
checkQt4Core->setChecked( true );
else
checkQt4Core->setChecked( false );
- if ( qtLibs.tqfindIndex( "gui" ) != -1 )
+ if ( qtLibs.findIndex( "gui" ) != -1 )
checkQt4Gui->setChecked( true );
else
checkQt4Gui->setChecked( false );
- if ( qtLibs.tqfindIndex( "sql" ) != -1 )
+ if ( qtLibs.findIndex( "sql" ) != -1 )
checkQt4SQL->setChecked( true );
else
checkQt4SQL->setChecked( false );
- if ( qtLibs.tqfindIndex( "xml" ) != -1 )
+ if ( qtLibs.findIndex( "xml" ) != -1 )
checkQt4XML->setChecked( true );
else
checkQt4XML->setChecked( false );
- if ( qtLibs.tqfindIndex( "network" ) != -1 )
+ if ( qtLibs.findIndex( "network" ) != -1 )
checkQt4Network->setChecked( true );
else
checkQt4Network->setChecked( false );
- if ( qtLibs.tqfindIndex( "svg" ) != -1 )
+ if ( qtLibs.findIndex( "svg" ) != -1 )
checkQt4SVG->setChecked( true );
else
checkQt4SVG->setChecked( false );
- if ( qtLibs.tqfindIndex( "opengl" ) != -1 )
+ if ( qtLibs.findIndex( "opengl" ) != -1 )
checkQt4OpenGL->setChecked( true );
else
checkQt4OpenGL->setChecked( false );
- if ( qtLibs.tqfindIndex( "qt3support" ) != -1 )
+ if ( qtLibs.findIndex( "qt3support" ) != -1 )
checkQt3Support->setChecked( true );
else
checkQt3Support->setChecked( false );
- if ( qtLibs.tqfindIndex( "script" ) != -1 )
+ if ( qtLibs.findIndex( "script" ) != -1 )
checkQtScript->setChecked( true );
else
checkQtScript->setChecked( false );
- if ( qtLibs.tqfindIndex( "phonon" ) != -1 )
+ if ( qtLibs.findIndex( "phonon" ) != -1 )
checkPhonon->setChecked( true );
else
checkPhonon->setChecked( false );
- if ( qtLibs.tqfindIndex( "webkit" ) != -1 )
+ if ( qtLibs.findIndex( "webkit" ) != -1 )
checkQtWebKit->setChecked( true );
else
checkQtWebKit->setChecked( false );
- if ( qtLibs.tqfindIndex( "xmlpatterns" ) != -1 )
+ if ( qtLibs.findIndex( "xmlpatterns" ) != -1 )
checkQtXmlPatterns->setChecked( true );
else
checkQtXmlPatterns->setChecked( false );
@@ -895,7 +895,7 @@ void ProjectConfigurationDlg::updateControls()
TQStringList extraValues;
for ( TQStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it )
{
- if ( Scope::KnownConfigValues.tqfindIndex( *it ) == -1 )
+ if ( Scope::KnownConfigValues.findIndex( *it ) == -1 )
{
extraValues << *it;
}
@@ -914,7 +914,7 @@ void ProjectConfigurationDlg::updateControls()
}
makefile_url->setURL( dir );
- if ( myProjectItem->scope->variableValues( "INSTALLS" ).tqfindIndex( "target" ) != -1 )
+ if ( myProjectItem->scope->variableValues( "INSTALLS" ).findIndex( "target" ) != -1 )
{
checkInstallTarget->setChecked( true );
m_InstallTargetPath->setEnabled( true );
@@ -1070,8 +1070,8 @@ void ProjectConfigurationDlg::updateIncludeControl()
QMakeScopeItem *item = itemList.first();
while ( item )
{
- if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 ||
- item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "app" ) != -1 )
+ if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 ||
+ item->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) != -1 )
{
TQString tmpInc = item->getIncAddPath( myProjectItem->scope->projectDir() );
tmpInc = TQDir::cleanDirPath( tmpInc );
@@ -1079,7 +1079,7 @@ void ProjectConfigurationDlg::updateIncludeControl()
insideinc_listview->lastItem(), item, this );
items[tmpInc] = newItem;
- if ( incList.tqfindIndex( tmpInc ) != -1 )
+ if ( incList.findIndex( tmpInc ) != -1 )
{
incList.remove( tmpInc );
newItem->setOn( true );
@@ -1128,7 +1128,7 @@ void ProjectConfigurationDlg::updateLibControls()
QMakeScopeItem* item = itemList.first();
while ( item )
{
- if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 )
+ if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 )
{
if ( item != myProjectItem )
{
@@ -1141,11 +1141,11 @@ void ProjectConfigurationDlg::updateLibControls()
items[tmpLib] = newItem;
TQString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() );
kdDebug(9024) << "lib:" << tmpLib << " dir:" << tmpLibDir << "|" << libList << endl;
- if ( libList.tqfindIndex( "-L" + tmpLibDir ) != -1 )
+ if ( libList.findIndex( "-L" + tmpLibDir ) != -1 )
{
libList.remove( "-L" + tmpLibDir );
}
- if ( libList.tqfindIndex( tmpLib ) != -1 )
+ if ( libList.findIndex( tmpLib ) != -1 )
{
libList.remove( tmpLib );
newItem->setOn( true );
@@ -1199,20 +1199,20 @@ void ProjectConfigurationDlg::updateDependenciesControl( )
while ( item )
{
TQStringList templateval = item->scope->variableValues( "TEMPLATE" );
- if ( templateval.tqfindIndex( "lib" ) != -1
- || templateval.tqfindIndex( "app" ) != -1 )
+ if ( templateval.findIndex( "lib" ) != -1
+ || templateval.findIndex( "app" ) != -1 )
{
TQString tmpLib;
TQStringList values = item->scope->variableValues( "CONFIG" );
- if ( templateval.tqfindIndex( "lib" ) != -1 && values.tqfindIndex( "dll" ) != -1 )
+ if ( templateval.findIndex( "lib" ) != -1 && values.findIndex( "dll" ) != -1 )
tmpLib = item->getSharedLibAddObject( myProjectItem->scope->projectDir() );
- else if ( templateval.tqfindIndex( "lib" ) != -1 )
+ else if ( templateval.findIndex( "lib" ) != -1 )
tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() );
else
tmpLib = item->getApplicationObject( myProjectItem->scope->projectDir() );
InsideCheckListItem * newItem = new InsideCheckListItem( intDeps_view, intDeps_view->lastItem(), item, this );
items[tmpLib] = newItem;
- if ( depsList.tqfindIndex( tmpLib ) != -1 )
+ if ( depsList.findIndex( tmpLib ) != -1 )
{
depsList.remove( tmpLib );
newItem->setOn( true );
@@ -1248,7 +1248,7 @@ void ProjectConfigurationDlg::updateDependenciesControl( )
void ProjectConfigurationDlg::updateBuildOrderControl()
{
//sort build order only if subdirs
- if ( myProjectItem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) != -1 )
+ if ( myProjectItem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 )
{
TQPtrList <QMakeScopeItem> itemList;
@@ -2042,11 +2042,11 @@ void ProjectConfigurationDlg::removeSharedLibDeps()
TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
- if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["shared_lib"]) != -1 )
+ if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_lib"]) != -1 )
prjItem->scope->removeFromPlusOp("LIBS", infos["shared_lib"]);
- if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["shared_libdir"]) != -1 )
+ if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_libdir"]) != -1 )
prjItem->scope->removeFromPlusOp("LIBS", infos["shared_libdir"]);
- if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 )
+ if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 )
{
prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["shared_depend"]);
@@ -2066,8 +2066,8 @@ void ProjectConfigurationDlg::addStaticLibDeps()
TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
- if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1
- || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 )
+ if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1
+ || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 )
{
prjItem->scope->addToPlusOp("LIBS", infos["static_lib"]);
prjItem->scope->addToPlusOp("TARGETDEPS", infos["static_depend"]);
@@ -2088,9 +2088,9 @@ void ProjectConfigurationDlg::removeStaticLibDeps()
TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
- if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["static_lib"]) != -1 )
+ if( prjItem->scope->variableValues("LIBS").findIndex(infos["static_lib"]) != -1 )
prjItem->scope->removeFromPlusOp("LIBS", infos["static_lib"]);
- if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 )
+ if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 )
{
prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["static_depend"]);
prjItem->scope->saveToFile();
@@ -2108,8 +2108,8 @@ void ProjectConfigurationDlg::addSharedLibDeps()
continue;
TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
- if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1
- || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 )
+ if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1
+ || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 )
{
prjItem->scope->addToPlusOp("LIBS", infos["shared_lib"]);
prjItem->scope->addToPlusOp("LIBS", infos["shared_libdir"]);
@@ -2130,7 +2130,7 @@ void ProjectConfigurationDlg::removeAppDeps()
TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
- if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1 )
+ if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 )
{
prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["app_depend"]);
prjItem->scope->saveToFile();
@@ -2149,8 +2149,8 @@ void ProjectConfigurationDlg::addAppDeps()
TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir());
- if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1
- || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 )
+ if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1
+ || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 )
{
prjItem->scope->addToPlusOp("TARGETDEPS", infos["app_depend"]);
@@ -2171,4 +2171,4 @@ void ProjectConfigurationDlg::customVarChanged()
activateApply( 0 );
}
-// 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/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h
index d8ec5ea7..6ef112d7 100644
--- a/buildtools/qmake/projectconfigurationdlg.h
+++ b/buildtools/qmake/projectconfigurationdlg.h
@@ -142,4 +142,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/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp
index 304bd1e1..55533ef2 100644
--- a/buildtools/qmake/qmakedefaultopts.cpp
+++ b/buildtools/qmake/qmakedefaultopts.cpp
@@ -78,7 +78,7 @@ TQMakeDefaultOpts::~TQMakeDefaultOpts()
const TQStringList TQMakeDefaultOpts::variableValues( const TQString& var ) const
{
// TQStringList result;
- if ( m_variables.tqcontains(var) )
+ if ( m_variables.contains(var) )
return m_variables[var];
return TQStringList();
}
@@ -88,4 +88,4 @@ const TQStringList& TQMakeDefaultOpts::variables() const
return m_keys;
}
-// 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/qmake/qmakedefaultopts.h b/buildtools/qmake/qmakedefaultopts.h
index 121e0cd0..6fee7366 100644
--- a/buildtools/qmake/qmakedefaultopts.h
+++ b/buildtools/qmake/qmakedefaultopts.h
@@ -46,4 +46,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/qmake/qmakeoptionswidget.cpp b/buildtools/qmake/qmakeoptionswidget.cpp
index 920d2efd..01ac0f7b 100644
--- a/buildtools/qmake/qmakeoptionswidget.cpp
+++ b/buildtools/qmake/qmakeoptionswidget.cpp
@@ -60,4 +60,4 @@ void QMakeOptionsWidget::accept()
#include "qmakeoptionswidget.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/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h
index 159547f8..9db49213 100644
--- a/buildtools/qmake/qmakeoptionswidget.h
+++ b/buildtools/qmake/qmakeoptionswidget.h
@@ -35,6 +35,6 @@ 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/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp
index f3cebef2..9da11ca4 100644
--- a/buildtools/qmake/qmakescopeitem.cpp
+++ b/buildtools/qmake/qmakescopeitem.cpp
@@ -338,7 +338,7 @@ TQString QMakeScopeItem::relativePath()
return "";
if( scope->scopeType() == Scope::ProjectScope )
{
- if( scope->tqparent() && scope->tqparent()->variableValues("SUBDIRS").tqcontains( URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) )
+ if( scope->tqparent() && scope->tqparent()->variableValues("SUBDIRS").contains( URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) )
{
return URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() );
}else
@@ -360,7 +360,7 @@ TQString QMakeScopeItem::relativePath()
TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath )
{
- if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
+ if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
{
TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
if ( !scope->variableValues( "DESTDIR" ).front().isEmpty() )
@@ -422,7 +422,7 @@ TQString QMakeScopeItem::getApplicationObject( TQString basePath )
TQString QMakeScopeItem::getLibAddObject( TQString basePath )
{
- if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 )
+ if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 )
{
TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() );
if ( !target.isEmpty() )
@@ -434,8 +434,8 @@ TQString QMakeScopeItem::getLibAddObject( TQString basePath )
return ( "-l" + scope->projectName() );
}
}
- else if ( scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1
- || scope->variableValues("TEMPLATE").tqfindIndex("lib") != -1 )
+ else if ( scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1
+ || scope->variableValues("TEMPLATE").findIndex("lib") != -1 )
{
TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
@@ -474,7 +474,7 @@ TQString QMakeScopeItem::getLibAddPath( TQString basePath )
{
//PATH only add if shared lib
- if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) == -1 ) return ( "" );
+ if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) == -1 ) return ( "" );
TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() );
TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() );
@@ -541,17 +541,17 @@ void QMakeScopeItem::init()
TQStringList tmp = scope->variableValues( "TEMPLATE" );
if( scope->isEnabled() )
{
- if ( tmp.tqfindIndex( "subdirs" ) != -1 )
+ if ( tmp.findIndex( "subdirs" ) != -1 )
setPixmap( 0, SmallIcon( "folder" ) );
- else if ( tmp.tqfindIndex( "lib" ) != -1 )
+ else if ( tmp.findIndex( "lib" ) != -1 )
setPixmap( 0, SmallIcon( "qmake_lib" ) );
else
setPixmap( 0, SmallIcon( "qmake_app" ) );
}else
{
- if ( tmp.tqfindIndex( "subdirs" ) != -1 )
+ if ( tmp.findIndex( "subdirs" ) != -1 )
setPixmap( 0, SmallIcon( "folder_grey" ) );
- else if ( tmp.tqfindIndex( "lib" ) != -1 )
+ else if ( tmp.findIndex( "lib" ) != -1 )
setPixmap( 0, SmallIcon( "qmake_lib_disabled" ) );
else
setPixmap( 0, SmallIcon( "qmake_app_disabled" ) );
@@ -578,7 +578,7 @@ FileItem* QMakeScopeItem::createFileItem( const TQString& name )
TQString display = name;
if( m_widget->showFilenamesOnly() )
{
- int dirSepPos = name.tqfindRev( TQChar( TQDir::separator() ) );
+ int dirSepPos = name.findRev( TQChar( TQDir::separator() ) );
if ( dirSepPos != - 1 )
display = name.mid( dirSepPos + 1 );
}
@@ -596,7 +596,7 @@ FileItem* QMakeScopeItem::createFileItem( const TQString& name )
void QMakeScopeItem::buildGroups()
{
- if( scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
+ if( scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
return;
TQStringList values;
@@ -739,12 +739,12 @@ void QMakeScopeItem::addValues( const TQString& var, const TQStringList& values
void QMakeScopeItem::removeValue( const TQString& var, const TQString& value )
{
- if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) != -1 )
+ if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) != -1 )
{
- if( scope->variableValuesForOp( var, "+=" ).tqfindIndex(value) != -1 )
+ if( scope->variableValuesForOp( var, "+=" ).findIndex(value) != -1 )
{
scope->removeFromPlusOp( var, TQStringList( value ) );
- if( scope->variableValues( var ).tqfindIndex( value ) != -1 )
+ if( scope->variableValues( var ).findIndex( value ) != -1 )
{
scope->addToMinusOp( var, TQStringList( value ) );
}
@@ -758,9 +758,9 @@ void QMakeScopeItem::removeValue( const TQString& var, const TQString& value )
void QMakeScopeItem::addValue( const TQString& var, const TQString& value )
{
- if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) == -1 )
+ if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) == -1 )
{
- if( scope->variableValuesForOp( var, "-=" ).tqfindIndex(value) != -1 )
+ if( scope->variableValuesForOp( var, "-=" ).findIndex(value) != -1 )
scope->removeFromMinusOp( var, TQStringList( value ) );
else
scope->addToPlusOp( var, TQStringList( value ) );
@@ -776,9 +776,9 @@ void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& valu
TQStringList scopeValues = scope->variableValuesForOp( var, "+=" );
for( TQStringList::const_iterator it = curValues.begin(); it != curValues.end(); ++it )
{
- if ( values.tqfindIndex( *it ) == -1 )
+ if ( values.findIndex( *it ) == -1 )
{
- if( scopeValues.tqfindIndex( *it ) != -1 )
+ if( scopeValues.findIndex( *it ) != -1 )
{
scope->removeFromPlusOp( var, TQStringList( *it ) );
scopeValues.remove( *it );
@@ -788,7 +788,7 @@ void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& valu
}
for( TQStringList::const_iterator it = values.begin(); it != values.end(); ++it )
{
- if ( scopeValues.tqfindIndex( *it ) != -1 )
+ if ( scopeValues.findIndex( *it ) != -1 )
{
scopeValues.remove(*it);
}
@@ -843,7 +843,7 @@ void QMakeScopeItem::disableSubprojects( const TQStringList& dirs )
TQStringList::const_iterator it = dirs.begin();
for( ; it != dirs.end() ; ++it)
{
- if( scope->variableValues("SUBDIRS").tqfindIndex(*it) != -1 )
+ if( scope->variableValues("SUBDIRS").findIndex(*it) != -1 )
{
Scope* s = scope->disableSubproject(*it);
if( !s )
@@ -926,4 +926,4 @@ TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath )
return result;
}
-// 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/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h
index 4dc1dca2..ec45877e 100644
--- a/buildtools/qmake/qmakescopeitem.h
+++ b/buildtools/qmake/qmakescopeitem.h
@@ -125,4 +125,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/qmake/scope.cpp b/buildtools/qmake/scope.cpp
index e332edd2..17c360dc 100644
--- a/buildtools/qmake/scope.cpp
+++ b/buildtools/qmake/scope.cpp
@@ -121,8 +121,8 @@ Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqp
{
TQString absfilename;
TQString tmp = incfile.stripWhiteSpace();
- if( tmp.tqcontains(")" ) )
- tmp = tmp.mid(0, tmp.tqfind(")") );
+ if( tmp.contains(")" ) )
+ tmp = tmp.mid(0, tmp.find(")") );
if( tmp.startsWith( "\"" ) )
tmp = tmp.mid( 1, tmp.length()-2 );
@@ -315,7 +315,7 @@ TQStringList Scope::variableValues( const TQString& variable, bool checkIncParen
if ( !m_root )
return result;
- if( m_varCache.tqcontains( variable ) && fetchFromParent && ( checkIncParent || scopeType() != Scope::IncludeScope ) )
+ if( m_varCache.contains( variable ) && fetchFromParent && ( checkIncParent || scopeType() != Scope::IncludeScope ) )
{
return m_varCache[variable];
}
@@ -336,8 +336,8 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
/* For variables that we don't know and which are not QT/CONFIG find the default value */
if( setDefault && m_defaultopts
- && m_defaultopts->variables().tqfindIndex(variable) != -1
- && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.tqfindIndex(variable) == -1 || variable == "CONFIG" ) )
+ && m_defaultopts->variables().findIndex(variable) != -1
+ && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.findIndex(variable) == -1 || variable == "CONFIG" ) )
{
result = m_defaultopts->variableValues(variable);
}
@@ -370,7 +370,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
{
for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit )
{
- if ( result.tqfindIndex( *sit ) == -1 )
+ if ( result.findIndex( *sit ) == -1 )
result.append( *sit );
}
}
@@ -378,7 +378,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
{
for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit )
{
- if ( result.tqfindIndex( *sit ) != -1 )
+ if ( result.findIndex( *sit ) != -1 )
result.remove( *sit );
}
}
@@ -392,7 +392,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
for( unsigned int i = 0; i < l.count(); ++i )
{
int num = l[ i ];
- if( m_scopes.tqcontains( num ) )
+ if( m_scopes.contains( num ) )
{
Scope* s = m_scopes[num];
if( s && s->scopeType() == IncludeScope && s->m_incast == iast )
@@ -412,7 +412,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
for( unsigned int i = 0; i < l.count(); ++i )
{
int num = l[ i ];
- if( m_scopes.tqcontains( num ) )
+ if( m_scopes.contains( num ) )
{
Scope* s = m_scopes[num];
if( s && s->m_root == past && s->m_root->scopedID == past->scopedID )
@@ -571,17 +571,17 @@ Scope* Scope::createSubProject( const TQString& projname )
if( !m_root )
return 0;
- if( variableValuesForOp( "SUBDIRS", "-=").tqfindIndex( projname ) != -1 )
+ if( variableValuesForOp( "SUBDIRS", "-=").findIndex( projname ) != -1 )
removeFromMinusOp( "SUBDIRS", projname );
TQString realprojname = resolveVariables(projname);
- if( variableValuesForOp( "SUBDIRS", "-=").tqfindIndex( realprojname ) != -1 )
+ if( variableValuesForOp( "SUBDIRS", "-=").findIndex( realprojname ) != -1 )
removeFromMinusOp( "SUBDIRS", realprojname );
TQDir curdir( projectDir() );
- if ( variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 )
+ if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 )
{
TQString filename;
if( !realprojname.endsWith(".pro") )
@@ -592,7 +592,7 @@ Scope* Scope::createSubProject( const TQString& projname )
curdir.cd( realprojname );
TQStringList entries = curdir.entryList("*.pro", TQDir::Files);
- if ( !entries.isEmpty() && entries.tqfindIndex( curdir.dirName()+".pro" ) == -1 )
+ if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) == -1 )
filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first();
else
filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro";
@@ -622,13 +622,13 @@ Scope* Scope::createSubProject( const TQString& projname )
bool Scope::deleteFunctionScope( unsigned int num )
{
- if ( !m_root || !m_scopes.tqcontains( num ) )
+ if ( !m_root || !m_scopes.contains( num ) )
return false;
Scope* funcScope = m_scopes[ num ];
if ( funcScope )
{
- TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.tqfindIndex( funcScope->m_root ) ];
+ TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( funcScope->m_root ) ];
if( !ast )
return false;
m_scopes.remove( num );
@@ -642,13 +642,13 @@ bool Scope::deleteFunctionScope( unsigned int num )
bool Scope::deleteSimpleScope( unsigned int num )
{
- if ( !m_root || !m_scopes.tqcontains( num ) )
+ if ( !m_root || !m_scopes.contains( num ) )
return false;
Scope* simpleScope = m_scopes[ num ];
if ( simpleScope )
{
- TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.tqfindIndex( simpleScope->m_root ) ];
+ TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( simpleScope->m_root ) ];
if( !ast )
return false;
m_scopes.remove( num );
@@ -663,7 +663,7 @@ bool Scope::deleteSimpleScope( unsigned int num )
bool Scope::deleteIncludeScope( unsigned int num )
{
- if ( !m_root || !m_scopes.tqcontains( num ) )
+ if ( !m_root || !m_scopes.contains( num ) )
return false;
Scope * incScope = m_scopes[ num ];
@@ -682,14 +682,14 @@ bool Scope::deleteIncludeScope( unsigned int num )
bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
{
- if ( !m_root || !m_scopes.tqcontains( num ) )
+ if ( !m_root || !m_scopes.contains( num ) )
return false;
TQValueList<TQMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" );
if ( it != m_root->m_tqchildren.end() )
{
TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it );
- if ( tempast->values.tqfindIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() )
+ if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() )
{
Scope* project = m_scopes[ num ];
if( !project )
@@ -727,7 +727,7 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
{
TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *foundit );
updateValues( ast->values, TQStringList( projdir ), true, ast->indent );
- if( m_varCache.tqcontains( "SUBDIRS" ) )
+ if( m_varCache.contains( "SUBDIRS" ) )
m_varCache.erase( "SUBDIRS" );
}else
return false;
@@ -746,7 +746,7 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue
for ( TQStringList::const_iterator it = newValues.begin(); it != newValues.end() ; ++it )
{
- if ( origValues.tqfindIndex( *it ) == -1 && !remove )
+ if ( origValues.findIndex( *it ) == -1 && !remove )
{
while ( !origValues.isEmpty() && origValues.last() == getLineEndingString() )
origValues.pop_back();
@@ -769,17 +769,17 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue
origValues.append(" ");
TQString newval = *it;
TQRegExp re("([^$])\\$([^$\\(\\)\\{\\} /]*)( |\\)|/)");
- newval.tqreplace(re, "\\1$(\\2)\\3");
- if( (newval).tqcontains(" ") || (newval).tqcontains("\t") || (newval).tqcontains( getLineEndingString() ) || (newval).tqcontains("#") )
+ newval.replace(re, "\\1$(\\2)\\3");
+ if( (newval).contains(" ") || (newval).contains("\t") || (newval).contains( getLineEndingString() ) || (newval).contains("#") )
origValues.append( "\""+newval+"\"" );
else
origValues.append( newval );
origValues.append( getLineEndingString() );
- } else if ( origValues.tqfindIndex( *it ) != -1 && remove )
+ } else if ( origValues.findIndex( *it ) != -1 && remove )
{
- TQStringList::iterator posit = origValues.tqfind( *it );
+ TQStringList::iterator posit = origValues.find( *it );
posit = origValues.remove( posit );
- while( posit != origValues.end() && ( (*posit).tqfind( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1
+ while( posit != origValues.end() && ( (*posit).find( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1
|| (*posit).stripWhiteSpace() == "" ) )
{
posit = origValues.remove( posit );
@@ -790,9 +790,9 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue
|| origValues.last() == getLineEndingString()
|| origValues.last().stripWhiteSpace() == "" ) && !origValues.isEmpty() )
origValues.pop_back();
- if( !origValues.isEmpty() && origValues.last().tqfind( TQRegExp("\\\\[ \t]*#") ) != -1 )
- origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].tqfind( "#") );
- if( !origValues.isEmpty() && origValues.last().tqfind( getLineEndingString() ) == -1 )
+ if( !origValues.isEmpty() && origValues.last().find( TQRegExp("\\\\[ \t]*#") ) != -1 )
+ origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].find( "#") );
+ if( !origValues.isEmpty() && origValues.last().find( getLineEndingString() ) == -1 )
origValues.append(getLineEndingString());
}
@@ -801,7 +801,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
if ( !m_root || listIsEmpty( values ) )
return ;
- if( m_varCache.tqcontains( variable ) )
+ if( m_varCache.contains( variable ) )
m_varCache.erase( variable );
for ( int i = m_root->m_tqchildren.count() - 1; i >= 0; --i )
@@ -823,7 +823,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
{
for ( TQStringList::const_iterator it = values.begin() ; it != values.end() ; ++it )
{
- if ( op == "+=" && !removeFromOp && assignment->values.tqfindIndex( *it ) != -1 )
+ if ( op == "+=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 )
{
if ( assignment->op == "=" )
{
@@ -841,7 +841,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
}
}
}
- else if ( op == "-=" && !removeFromOp && assignment->values.tqfindIndex( *it ) != -1 )
+ else if ( op == "-=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 )
{
updateValues( assignment->values, TQStringList( *it ), true, assignment->indent );
if ( listIsEmpty( assignment->values ) )
@@ -858,7 +858,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
m_root->removeChildAST( assignment );
delete assignment;
}
- else if ( assignment->op == "+=" && assignment->values.tqfindIndex( *it ) != -1 )
+ else if ( assignment->op == "+=" && assignment->values.findIndex( *it ) != -1 )
{
updateValues( assignment->values, TQStringList( *it ), true, assignment->indent );
if ( listIsEmpty( assignment->values ) )
@@ -885,7 +885,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
else
ast->setDepth( m_root->depth()+1 );
m_root->addChildAST( ast );
- if ( values.tqfindIndex( getLineEndingString() ) == -1 )
+ if ( values.findIndex( getLineEndingString() ) == -1 )
{
ast->values.append( getLineEndingString() );
}
@@ -903,7 +903,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString&
if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
{
TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( *it );
- if ( assignment->scopedID == variable && ops.tqfindIndex( assignment->op ) != -1 )
+ if ( assignment->scopedID == variable && ops.findIndex( assignment->op ) != -1 )
{
return it;
}
@@ -942,7 +942,7 @@ void Scope::init()
{
TQMake::AssignmentAST * m = static_cast<TQMake::AssignmentAST*>( *it );
// Check wether TEMPLATE==subdirs here too!
- if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
+ if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").findIndex("subdirs") != -1 )
{
for ( TQStringList::const_iterator sit = m->values.begin() ; sit != m->values.end(); ++sit )
{
@@ -977,7 +977,7 @@ void Scope::init()
}else
continue;
}
- if ( subproject.entryList().isEmpty() || subproject.entryList().tqfindIndex( str + ".pro" ) != -1 )
+ if ( subproject.entryList().isEmpty() || subproject.entryList().findIndex( str + ".pro" ) != -1 )
projectfile = (str) + ".pro";
else
projectfile = subproject.entryList().first();
@@ -992,16 +992,16 @@ void Scope::init()
else
{
if ( !(
- KnownVariables.tqfindIndex( m->scopedID ) != -1
+ KnownVariables.findIndex( m->scopedID ) != -1
&& ( m->op == "=" || m->op == "+=" || m->op == "-=")
)
&& !(
- ( m->scopedID.tqcontains( ".files" ) || m->scopedID.tqcontains( ".path" ) )
- && variableValues("INSTALLS").tqfindIndex(m->scopedID.left( m->scopedID.tqfindRev(".") != -1 ) )
+ ( m->scopedID.contains( ".files" ) || m->scopedID.contains( ".path" ) )
+ && variableValues("INSTALLS").findIndex(m->scopedID.left( m->scopedID.findRev(".") != -1 ) )
)
&& !(
- ( m->scopedID.tqcontains( ".subdir" ) )
- && variableValues("SUBDIRS").tqfindIndex(m->scopedID.left( m->scopedID.tqfindRev(".") != -1 ) )
+ ( m->scopedID.contains( ".subdir" ) )
+ && variableValues("SUBDIRS").findIndex(m->scopedID.left( m->scopedID.findRev(".") != -1 ) )
)
)
{
@@ -1056,11 +1056,11 @@ void Scope::updateCustomVariable( unsigned int id, const TQString& name, const T
{
if( !m_root )
return;
- if ( id > 0 && m_customVariables.tqcontains( id ) )
+ if ( id > 0 && m_customVariables.contains( id ) )
{
m_customVariables[ id ] ->values.clear();
updateValues( m_customVariables[ id ] ->values, newvalues.stripWhiteSpace() );
- if( m_varCache.tqcontains( m_customVariables[ id ]->scopedID ) )
+ if( m_varCache.contains( m_customVariables[ id ]->scopedID ) )
m_varCache.erase( m_customVariables[ id ]->scopedID );
m_customVariables[ id ] ->op = newop;
m_customVariables[ id ] ->scopedID = name;
@@ -1084,7 +1084,7 @@ unsigned int Scope::addCustomVariable( const TQString& var, const TQString& op,
void Scope::removeCustomVariable( unsigned int id )
{
- if( m_customVariables.tqcontains(id) )
+ if( m_customVariables.contains(id) )
{
TQMake::AssignmentAST* m = m_customVariables[id];
m_customVariables.remove(id);
@@ -1220,20 +1220,20 @@ Scope* Scope::disableSubproject( const TQString& dir)
if( !m_root || ( m_root->isProject() && !m_incast ) )
return 0;
- if( scopeType() != Scope::IncludeScope && variableValuesForOp( "SUBDIRS", "+=").tqfindIndex( dir ) != -1 )
+ if( scopeType() != Scope::IncludeScope && variableValuesForOp( "SUBDIRS", "+=").findIndex( dir ) != -1 )
removeFromPlusOp( "SUBDIRS", dir );
else if( scopeType() != Scope::IncludeScope )
removeFromPlusOp( "SUBDIRS", dir );
TQDir curdir( projectDir() );
- if ( variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 )
+ if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 )
{
curdir.cd(dir);
TQString filename;
TQStringList entries = curdir.entryList("*.pro", TQDir::Files);
- if ( !entries.isEmpty() && entries.tqfindIndex( curdir.dirName()+".pro" ) != -1 )
+ if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) != -1 )
filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first();
else
filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro";
@@ -1285,7 +1285,7 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s
pos = re.search( (*it), pos );
if( pos > -1 )
{
- if( !variables.tqcontains( re.cap(1) ) )
+ if( !variables.contains( re.cap(1) ) )
{
variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) );
if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" )
@@ -1303,7 +1303,7 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s
pos = re.search( (*it), pos );
if( pos > -1 )
{
- if( !variables.tqcontains( re.cap(1) ) )
+ if( !variables.contains( re.cap(1) ) )
{
variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) );
if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" )
@@ -1322,8 +1322,8 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s
pos = re.search( (*it), pos );
if( pos > -1 )
{
- if( !envvars.tqcontains( re.cap(1) ) )
- if( m_environment.tqcontains( re.cap(1) ) != -1 )
+ if( !envvars.contains( re.cap(1) ) )
+ if( m_environment.contains( re.cap(1) ) != -1 )
envvars[re.cap(1)] = m_environment[ re.cap(1) ];
else if ( ::getenv( re.cap(1).local8Bit() ) != 0 )
envvars[re.cap(1)] = TQString::fromLocal8Bit( ::getenv( re.cap(1).local8Bit() ) );
@@ -1332,14 +1332,14 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s
}
for( TQMap<TQString, TQString>::const_iterator it2 = envvars.begin(); it2 != envvars.end(); ++it2 )
{
- (*it).tqreplace("$$("+it2.key()+")", it2.data() );
+ (*it).replace("$$("+it2.key()+")", it2.data() );
}
for( TQMap<TQString, TQStringList>::const_iterator it2 = variables.begin(); it2 != variables.end(); ++it2 )
{
for( TQStringList::const_iterator it3 = it2.data().begin(); it3 != it2.data().end(); ++it3 )
{
- (*it).tqreplace("$$"+it2.key(), *it3 );
- (*it).tqreplace("$${"+it2.key()+"}", *it3 );
+ (*it).replace("$$"+it2.key(), *it3 );
+ (*it).replace("$${"+it2.key()+"}", *it3 );
}
}
}
@@ -1353,7 +1353,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
TQString file;
TQStringList values;
TQString header = "";
- if( variableValues("TEMPLATE",false ).tqfindIndex("subdirs") == -1 )
+ if( variableValues("TEMPLATE",false ).findIndex("subdirs") == -1 )
{
values = variableValues( "INSTALLS" ,false, false );
TQStringList::const_iterator it;
@@ -1368,7 +1368,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
{
file = myRelPath + TQString(TQChar(TQDir::separator())) + *filesit;
file = resolveVariables( file );
- if( file.tqcontains("*") )
+ if( file.contains("*") )
{
TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file );
TQDir absDir = fi.dir( true );
@@ -1408,7 +1408,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
{
file = myRelPath + TQString(TQChar(TQDir::separator())) + *it;
file = resolveVariables( file );
- if( file.tqcontains("*") )
+ if( file.contains("*") )
{
TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file );
TQDir absDir = fi.dir( true );
@@ -1493,7 +1493,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
else
{
header = projectDir()+TQString(TQChar(TQDir::separator())) + "ui_" +*it;
- header.tqreplace(TQRegExp("\\.ui$"),".h");
+ header.replace(TQRegExp("\\.ui$"),".h");
if( TQFileInfo(header).exists() )
res.insert( TQDir::cleanDirPath( header ) );
}
@@ -1595,13 +1595,13 @@ TQString Scope::getLineEndingString() const
TQString Scope::replaceWs(TQString s)
{
- return s.tqreplace( getLineEndingString(), "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc");
+ return s.replace( getLineEndingString(), "%nl").replace("\t", "%tab").replace(" ", "%spc");
}
bool Scope::containsContinue(const TQString& s ) const
{
- return( s.tqfind( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1
- || s.tqfind( TQRegExp( "\\\\\\s*#" ) ) != -1 );
+ return( s.find( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1
+ || s.find( TQRegExp( "\\\\\\s*#" ) ) != -1 );
}
bool Scope::isComment( const TQString& s) const
@@ -1670,7 +1670,7 @@ void Scope::PrintAST::leaveFunctionScope( TQMake::ProjectAST* p )
TQString Scope::PrintAST::replaceWs(TQString s)
{
- return s.tqreplace("\n", "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc");
+ return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc");
}
void Scope::PrintAST::processAssignment( TQMake::AssignmentAST* a)
@@ -1707,4 +1707,4 @@ TQString Scope::PrintAST::getIndent()
}
#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/qmake/scope.h b/buildtools/qmake/scope.h
index a01adaad..8140b5e6 100644
--- a/buildtools/qmake/scope.h
+++ b/buildtools/qmake/scope.h
@@ -304,5 +304,5 @@ 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/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 54d31735..5cb9260a 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -479,8 +479,8 @@ TQString TrollProjectPart::runDirectory() const
}else
{
TQString name = m_widget->getCurrentOutputFilename();
- if( name.tqfindRev("/") != -1 )
- name = name.right( name.length()-name.tqfindRev("/")-1 );
+ if( name.findRev("/") != -1 )
+ name = name.right( name.length()-name.findRev("/")-1 );
cwd = DomUtil::readEntry( dom, "/kdevtrollproject/run/cwd/" + name );
}
if( cwd.isEmpty() )
@@ -490,7 +490,7 @@ TQString TrollProjectPart::runDirectory() const
{
destpath = m_widget->subprojectDirectory() + TQString( TQChar( TQDir::separator() ) ) + destpath;
}
- destpath = destpath.left( destpath.tqfindRev("/") );
+ destpath = destpath.left( destpath.findRev("/") );
cwd = destpath;
}
@@ -538,7 +538,7 @@ TQString TrollProjectPart::mainProgram() const
return TQString();
}
- if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").tqfindIndex("app") == -1 )
+ if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").findIndex("app") == -1 )
{
KMessageBox::error( m_widget, "Selected Subproject \""+m_widget->currentSubproject()->scope->projectName()+"\"isn't binary ( " + m_widget->currentSubproject()->scope->variableValues("TEMPLATE").join(" ") + " ) !\n"
"Unable to determine the main program. If you want this\n"
@@ -715,9 +715,9 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive)
TQDir d(dir);
TQStringList l = d.entryList("*.pro");
- if( l.isEmpty() || ( l.count() && l.tqfindIndex( projectName() + ".pro" ) != -1 ) )
+ if( l.isEmpty() || ( l.count() && l.findIndex( projectName() + ".pro" ) != -1 ) )
cmdline += projectName()+".pro";
- else if( l.isEmpty() || (l.count() && l.tqfindIndex( fi.baseName() + ".pro" ) != -1 ) )
+ else if( l.isEmpty() || (l.count() && l.findIndex( fi.baseName() + ".pro" ) != -1 ) )
cmdline += fi.baseName() + ".pro";
else
cmdline += l[0];
@@ -778,7 +778,7 @@ bool TrollProjectPart::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 ){
return true;
@@ -813,14 +813,14 @@ void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const
TQStringList paths = TQStringList::split(":",::getenv("PATH"));
dirs += paths;
TQString binpath = TQDir::rootDirPath() + "bin";
- if( dirs.tqfindIndex( binpath ) != -1 )
+ if( dirs.findIndex( binpath ) != -1 )
dirs << binpath;
binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin";
- if( dirs.tqfindIndex( binpath ) != -1 )
+ if( dirs.findIndex( binpath ) != -1 )
dirs << binpath;
binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin";
- if( dirs.tqfindIndex( binpath ) != -1 )
+ if( dirs.findIndex( binpath ) != -1 )
dirs << binpath;
}
@@ -874,8 +874,8 @@ TQStringList recursiveProFind( const TQString &currDir, const TQString &baseDir
{
TQStringList fileList;
- if( !currDir.tqcontains( TQString( TQChar ( TQDir::separator() ) ) +".." )
- && !currDir.tqcontains( TQString( TQChar( TQDir::separator() ) )+".") )
+ if( !currDir.contains( TQString( TQChar ( TQDir::separator() ) ) +".." )
+ && !currDir.contains( TQString( TQChar( TQDir::separator() ) )+".") )
{
TQDir dir(currDir);
TQStringList dirList = dir.entryList(TQDir::Dirs );
@@ -926,6 +926,6 @@ void TrollProjectPart::slotBuild()
#include "trollprojectpart.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/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 148f8b22..4baf0b6b 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -339,9 +339,9 @@ void TrollProjectWidget::openProject( const TQString &dirName )
TQStringList l = dir.entryList( "*.pro" );
TQString profile;
- if( l.count() && l.tqfindIndex( m_part->projectName() + ".pro") != -1 )
+ if( l.count() && l.findIndex( m_part->projectName() + ".pro") != -1 )
profile = m_part->projectName()+".pro";
- else if( l.isEmpty() || ( l.count() && l.tqfindIndex( fi.baseName() + ".pro") != -1 ) )
+ else if( l.isEmpty() || ( l.count() && l.findIndex( fi.baseName() + ".pro") != -1 ) )
profile = fi.baseName()+".pro";
else
profile = l[0];
@@ -362,7 +362,7 @@ void TrollProjectWidget::openProject( const TQString &dirName )
m_rootSubproject->setOpen( true );
- if ( m_rootSubproject->firstChild() && m_rootSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex("subdirs") != -1 )
+ if ( m_rootSubproject->firstChild() && m_rootSubproject->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 )
{
overview->setSelected( m_rootSubproject->firstChild(), true );
}
@@ -433,11 +433,11 @@ void TrollProjectWidget::setupContext()
TQStringList tmpl = m_shownSubproject->scope->variableValues( "TEMPLATE" );
- if ( tmpl.tqfindIndex( "lib" ) != -1 )
+ if ( tmpl.findIndex( "lib" ) != -1 )
{
runable = false;
}
- else if ( tmpl.tqfindIndex( "subdirs" ) != -1 )
+ else if ( tmpl.findIndex( "subdirs" ) != -1 )
{
hasSubdirs = true;
runable = false;
@@ -519,7 +519,7 @@ TQString TrollProjectWidget::getCurrentOutputFilename()
if ( m_shownSubproject->scope->variableValues( "TARGET", true, true, true ).isEmpty() )
{
TQString exe = m_shownSubproject->scope->resolveVariables(m_shownSubproject->scope->fileName());
- return exe.tqreplace( TQRegExp( "\\.pro$" ), "" );
+ return exe.replace( TQRegExp( "\\.pro$" ), "" );
}
else
{
@@ -557,7 +557,7 @@ void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView
{
// Insert all GroupItems and all of their tqchildren into the view
- if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).tqfindIndex("subdirs") != -1 )
+ if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 )
return ;
TQMapIterator<GroupItem::GroupType, GroupItem*> it2 = item->groups.begin();
@@ -669,7 +669,7 @@ void TrollProjectWidget::slotExecuteTarget()
// Only run application projects
- if ( !m_shownSubproject->scope->variableValues( "TEMPLATE" ).isEmpty() && m_shownSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex( "app" ) == -1 )
+ if ( !m_shownSubproject->scope->variableValues( "TEMPLATE" ).isEmpty() && m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) == -1 )
return ;
//only run once
@@ -913,7 +913,7 @@ void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQSt
{
spitem->scope->removeFromMinusOp( "SUBDIRS", subdirname );
delete item;
- if( spitem->scope->variableValues( "SUBDIRS" ).tqfindIndex( subdirname ) != -1 )
+ if( spitem->scope->variableValues( "SUBDIRS" ).findIndex( subdirname ) != -1 )
return;
}
}
@@ -1026,7 +1026,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. "
"This action is allowed only if a type of the subproject is 'subdirectories'. The type of the subproject can be "
"defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) );
- if ( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 )
+ if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
popup.setItemEnabled( idAddSubproject, false );
idRemoveSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Remove Subproject..." ) );
popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) );
@@ -1051,11 +1051,11 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. "
"This action is allowed only if the type of the subproject is 'subdirectories'. The type of the subproject can be "
"defined in the <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) );
- if ( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 )
+ if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
popup.setItemEnabled( idAddSubproject, false );
idDisableSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Disable Subproject..." ) );
popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) );
- if( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 && spitem->scope->tqparent()->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 )
+ if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->tqparent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
popup.setItemEnabled( idDisableSubproject, false );
popup.insertSeparator();
idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Scope Settings" ) );
@@ -1144,7 +1144,7 @@ void TrollProjectWidget::addFileToCurrentSubProject( GroupItem::GroupType gtype,
GroupItem *gitem = 0;
- if ( m_shownSubproject->groups.tqcontains( gtype ) )
+ if ( m_shownSubproject->groups.contains( gtype ) )
gitem = m_shownSubproject->groups[ gtype ];
if ( !gitem )
@@ -1170,12 +1170,12 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo
TQString fileName = *it;
kdDebug(9024) << "Adding file:" << fileName << " " << relativeToProjectRoot << endl;
- if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") )
+ if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") )
{
ChooseSubprojectDlg dlg( this, false );
if ( dlg.exec() == TQDialog::Accepted )
{
- if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 )
+ if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 )
{
fileName = URLUtil::getRelativePath( dlg.selectedSubproject()->scope->projectDir() ,
TQDir::cleanDirPath(
@@ -1213,7 +1213,7 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo
kdDebug(9024) << "calc filename:" << noPathFileName << endl;
// GroupItem *gitem = 0;
// GroupItem::GroupType gtype = GroupItem::groupTypeForExtension( ext );
-// if ( m_shownSubproject->groups.tqcontains( gtype ) )
+// if ( m_shownSubproject->groups.contains( gtype ) )
// gitem = m_shownSubproject->groups[ gtype ];
@@ -1307,7 +1307,7 @@ void TrollProjectWidget::slotAddFiles()
*proc << files[ i ];
*proc << cleanSubprojectDir;
proc->start(KProcess::Block);
- TQString filename = files[ i ].right( files[ i ].length() - files[ i ].tqfindRev( '/' ) - 1 );
+ TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 );
// and add them to the filelist
TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename );
if ( testExist.exists() )
@@ -1333,7 +1333,7 @@ void TrollProjectWidget::slotAddFiles()
GroupItem* TrollProjectWidget::getInstallRoot( QMakeScopeItem* item )
{
- if ( item->groups.tqcontains( GroupItem::InstallRoot ) )
+ if ( item->groups.contains( GroupItem::InstallRoot ) )
return item->groups[ GroupItem::InstallRoot ];
return 0;
}
@@ -1651,7 +1651,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
*proc << files[ i ];
*proc << cleanSubprojectPath;
proc->start(KProcess::Block);
- TQString filename = files[ i ].right( files[ i ].length() - files[ i ].tqfindRev( '/' ) - 1 );
+ TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 );
// and add them to the filelist
TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename );
if ( testExist.exists() )
@@ -1776,7 +1776,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
popup.tqsetWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard "
"and prompts to implement missing in childclass slots and functions." ) );
}
- if ( fitem->text( 0 ).tqcontains( ".ui" ) )
+ if ( fitem->text( 0 ).contains( ".ui" ) )
{
idSubclassWidget = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Subclassing Wizard..." ) );
popup.tqsetWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. "
@@ -1827,9 +1827,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
}
else if ( r == idViewUIH )
{
- kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).tqreplace(".ui","") << endl;
+ kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).replace(".ui","") << endl;
m_part->partController() ->editDocument( KURL( m_shownSubproject->scope->projectDir() + TQChar( TQDir::separator() ) +
- fitem->localFilePath.tqreplace(".ui","") + ".h" ) );
+ fitem->localFilePath.replace(".ui","") + ".h" ) );
}
else if ( r == idSubclassWidget )
@@ -1850,7 +1850,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
list << DomUtil::Pair( srcfile_relpath, uifile_relpath );
DomUtil::writePairListEntry( dom, "/kdevtrollproject/subclassing", "subclass", "sourcefile", "uifile", list );
- // newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(projectDirectory()+"/"),"");
+ // newFileNames[i] = newFileNames[i].replace(TQRegExp(projectDirectory()+"/"),"");
qWarning( "new file: %s", newFileNames[ i ].latin1() );
}
m_subclasslist = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" ,
@@ -1862,11 +1862,11 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
else if ( r == idUpdateWidgetclass )
{
TQString noext = fitem->text( 0 );
- if ( noext.tqfindRev( '.' ) > -1 )
- noext = noext.left( noext.tqfindRev( '.' ) );
+ if ( noext.findRev( '.' ) > -1 )
+ noext = noext.left( noext.findRev( '.' ) );
TQStringList dummy;
TQString uifile = fitem->uiFileLink;
- if ( uifile.tqfindRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 )
+ if ( uifile.findRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 )
{
TQStringList uisplit = TQStringList::split( TQString( TQChar( TQDir::separator() ) ), uifile );
uifile = uisplit[ uisplit.count() - 1 ];
@@ -2426,7 +2426,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
m_filesCached = false;
m_allFilesCache.clear();
- if( spitem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 )
+ if( spitem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 )
{
TQStringList subdirs = spitem->scope->variableValues( "SUBDIRS" );
DisableSubprojectDlg dlg( subdirs );
@@ -2436,7 +2436,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
TQListViewItem* item = spitem->firstChild();
while( item )
{
- if( values.tqfindIndex( item->text(0) ) != -1 )
+ if( values.findIndex( item->text(0) ) != -1 )
delete item;
item = item->nextSibling();
}
@@ -2543,5 +2543,5 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const
#include "trollprojectwidget.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/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h
index d5e86a17..5d07c798 100644
--- a/buildtools/qmake/trollprojectwidget.h
+++ b/buildtools/qmake/trollprojectwidget.h
@@ -216,4 +216,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/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp
index 41683113..0697f5f1 100644
--- a/buildtools/script/scriptnewfiledlg.cpp
+++ b/buildtools/script/scriptnewfiledlg.cpp
@@ -76,7 +76,7 @@ ScriptNewFileDialog::~ScriptNewFileDialog()
void ScriptNewFileDialog::accept()
{
TQString fileName = filename_edit->text();
- if (fileName.tqfind('/') != -1) {
+ if (fileName.find('/') != -1) {
KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on."));
return;
}