summaryrefslogtreecommitdiffstats
path: root/buildtools/autotools/misc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools/autotools/misc.cpp')
-rw-r--r--buildtools/autotools/misc.cpp40
1 files changed, 20 insertions, 20 deletions
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)
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-01 16:19:21 +0000