summaryrefslogtreecommitdiffstats
path: root/lilo-config/common/String.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-18 20:34:22 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-18 20:34:22 +0000
commitb09bffed6b43262948018dfb0f11890850ddf7c1 (patch)
tree138696bfcc7ac01070d0e8ecaa1cdf94611a2bd8 /lilo-config/common/String.cc
parent6d43944a7130b9d1b4ae3fba37b774aced8612cf (diff)
downloadtdeadmin-b09bffed6b43262948018dfb0f11890850ddf7c1.tar.gz
tdeadmin-b09bffed6b43262948018dfb0f11890850ddf7c1.zip
TQt4 port kdeadmin
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1237416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lilo-config/common/String.cc')
-rw-r--r--lilo-config/common/String.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/lilo-config/common/String.cc b/lilo-config/common/String.cc
index f8a0e35..6fda1fa 100644
--- a/lilo-config/common/String.cc
+++ b/lilo-config/common/String.cc
@@ -98,7 +98,7 @@ bool String::casecmp(char const * const s) const
return false;
return (strncasecmp(data(), s, size())==0);
}
-bool String::contains(String const &s, bool cs) const
+bool String::tqcontains(String const &s, bool cs) const
{
if(cs)
if(strstr(cstr(), s.cstr()))
@@ -226,10 +226,10 @@ String &String::regex(String const &expr, bool cs) const
}
return *ret;
}
-String &String::replace(String const &what, String const &with, bool all) const
+String &String::tqreplace(String const &what, String const &with, bool all) const
{
String *result;
- if(!contains(what)) {
+ if(!tqcontains(what)) {
result=new String(*this);
return *result;
}
@@ -331,7 +331,7 @@ void StringList::operator +=(StringList const * const s)
for(const_iterator it=s->begin(); it!=s->end(); it++)
insert(end(), *it);
}
-bool StringList::contains(String const &s) const
+bool StringList::tqcontains(String const &s) const
{
for(const_iterator it=begin(); it!=end(); it++)
if(*it == s)