summaryrefslogtreecommitdiffstats
path: root/kpackage/rpmInterface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kpackage/rpmInterface.cpp')
-rw-r--r--kpackage/rpmInterface.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp
index b9d6e5c..9b0401f 100644
--- a/kpackage/rpmInterface.cpp
+++ b/kpackage/rpmInterface.cpp
@@ -118,13 +118,13 @@ bool RPM::parseName(const TQString &name, TQString *n, TQString *v)
{
int d1, d2, s1, s2;
- s2 = name.tqfindRev('.');
+ s2 = name.findRev('.');
if (s2 > 0) {
- s1 = name.tqfindRev('.',s2-1);
+ s1 = name.findRev('.',s2-1);
if (s1 > 0) {
- d2 = name.tqfindRev('-',s1-1);
+ d2 = name.findRev('-',s1-1);
if (d2 > 0) {
- d1 = name.tqfindRev('-',d2-1);
+ d1 = name.findRev('-',d2-1);
if (d1 < 0)
d1 = d2;
*n = name.left(d1);
@@ -231,8 +231,8 @@ packageInfo* RPM::collectInfo(TQStringList &ln) {
} else if (name == "buildtime") {
a.insert("build-time", value);
} else if (name == "requires") {
- value = value.tqreplace(TQRegExp("\\(\\)"),"");
- value = value.tqreplace(TQRegExp("\\( \\)"),"");
+ value = value.replace(TQRegExp("\\(\\)"),"");
+ value = value.replace(TQRegExp("\\( \\)"),"");
value = value.stripWhiteSpace();
if (value.endsWith(",")) {
value.truncate(value.length()-1);
@@ -242,18 +242,18 @@ packageInfo* RPM::collectInfo(TQStringList &ln) {
int s = 0, n;
TQString t;
- if (!(*a.tqfind("name")).isEmpty()) {
- while ((n = value.tqfind(",",s)) > 0) {
+ if (!(*a.find("name")).isEmpty()) {
+ while ((n = value.find(",",s)) > 0) {
t = value.mid(s,n-s);
t = t.stripWhiteSpace();
if (!t.isEmpty())
- provides.insert(t,new TQString(*a.tqfind("name")));
+ provides.insert(t,new TQString(*a.find("name")));
s = n+1;
}
t = value.mid(s);
t = t.stripWhiteSpace();
if (!t.isEmpty())
- provides.insert(t,new TQString(*a.tqfind("name")));
+ provides.insert(t,new TQString(*a.find("name")));
value = value.stripWhiteSpace();
if (value.endsWith(",")) {
@@ -464,7 +464,7 @@ void RPM::collectDepends(packageInfo *p, const TQString &name, int src)
if (list.count() > 0) {
TQStringList::Iterator it = list.begin();
- int pt = (*it).tqfind(":");
+ int pt = (*it).find(":");
if (pt > 0) {
TQString s = (*it).mid(pt+1);
if (!s.isEmpty()) {
@@ -602,10 +602,10 @@ TQStringList RPM::FindFile(const TQString &name, bool) {
list.clear();
} else {
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
- int p = (*it).tqfind(" ");
- int nm = (*it).tqfind(name,p);
+ int p = (*it).find(" ");
+ int nm = (*it).find(name,p);
if (nm >= 0) {
- (*it).tqreplace(p, 1, "\t");
+ (*it).replace(p, 1, "\t");
retlist.append(*it);
}
}
@@ -617,7 +617,7 @@ TQStringList RPM::FindFile(const TQString &name, bool) {
//////////////////////////////////////////////////////////////////////////////
TQString RPM::quotePath( const TQString &path) {
TQString s = path;
- s = s.tqreplace(" ","\\ ");
+ s = s.replace(" ","\\ ");
return ( "'" + s + "'" );
}