diff options
Diffstat (limited to 'kpackage/rpmInterface.cpp')
| -rw-r--r-- | kpackage/rpmInterface.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp index 8096a78..b9d6e5c 100644 --- a/kpackage/rpmInterface.cpp +++ b/kpackage/rpmInterface.cpp @@ -93,7 +93,7 @@ RPM::RPM():pkgInterface() infoList.append("buildtime/%{BUILDTIME:date}"); infoList.append("size/%{SIZE}"); infoList.append("provides/[%{PROVIDES}, ]"); - infoList.append("requires/[%{REQUIRENAME} (%{REQUIREFLAGS:depflags} %{REQUIREVERSION}), ]"); + infoList.append("requires/[%{RETQUIRENAME} (%{RETQUIREFLAGS:depflags} %{RETQUIREVERSION}), ]"); infoList.append("description/[%{DESCRIPTION}]"); hasProgram = ifExe("rpm"); @@ -118,13 +118,13 @@ bool RPM::parseName(const TQString &name, TQString *n, TQString *v) { int d1, d2, s1, s2; - s2 = name.findRev('.'); + s2 = name.tqfindRev('.'); if (s2 > 0) { - s1 = name.findRev('.',s2-1); + s1 = name.tqfindRev('.',s2-1); if (s1 > 0) { - d2 = name.findRev('-',s1-1); + d2 = name.tqfindRev('-',s1-1); if (d2 > 0) { - d1 = name.findRev('-',d2-1); + d1 = name.tqfindRev('-',d2-1); if (d1 < 0) d1 = d2; *n = name.left(d1); @@ -160,11 +160,11 @@ void RPM::listInstalledPackages(TQPtrList<packageInfo> *pki) TQString cmd = "rpm -q -a"; cmd += packageQuery(); - kpackage->setStatus(i18n("Querying RPM package list")); + kpackage->settqStatus(i18n("Querying RPM package list")); kpackage->setPercent(0); TQStringList list = kpty->run(cmd); - kpackage->setStatus(i18n("Processing RPM package list")); + kpackage->settqStatus(i18n("Processing RPM package list")); // kdDebug() << "P=" << list.count() <<"\n"; kpackage->setPercent(50); @@ -197,7 +197,7 @@ void RPM::listInstalledPackages(TQPtrList<packageInfo> *pki) } list.clear(); - kpackage->setStatus(i18n("DEB APT")); + kpackage->settqStatus(i18n("DEB APT")); kpackage->setPercent(100); } @@ -231,8 +231,8 @@ packageInfo* RPM::collectInfo(TQStringList &ln) { } else if (name == "buildtime") { a.insert("build-time", value); } else if (name == "requires") { - value = value.replace(TQRegExp("\\(\\)"),""); - value = value.replace(TQRegExp("\\( \\)"),""); + value = value.tqreplace(TQRegExp("\\(\\)"),""); + value = value.tqreplace(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.find("name")).isEmpty()) { - while ((n = value.find(",",s)) > 0) { + if (!(*a.tqfind("name")).isEmpty()) { + while ((n = value.tqfind(",",s)) > 0) { t = value.mid(s,n-s); t = t.stripWhiteSpace(); if (!t.isEmpty()) - provides.insert(t,new TQString(*a.find("name"))); + provides.insert(t,new TQString(*a.tqfind("name"))); s = n+1; } t = value.mid(s); t = t.stripWhiteSpace(); if (!t.isEmpty()) - provides.insert(t,new TQString(*a.find("name"))); + provides.insert(t,new TQString(*a.tqfind("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).find(":"); + int pt = (*it).tqfind(":"); 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).find(" "); - int nm = (*it).find(name,p); + int p = (*it).tqfind(" "); + int nm = (*it).tqfind(name,p); if (nm >= 0) { - (*it).replace(p, 1, "\t"); + (*it).tqreplace(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.replace(" ","\\ "); + s = s.tqreplace(" ","\\ "); return ( "'" + s + "'" ); } |