summaryrefslogtreecommitdiffstats
path: root/parts/distpart
diff options
context:
space:
mode:
Diffstat (limited to 'parts/distpart')
-rw-r--r--parts/distpart/distpart_widget.cpp8
-rw-r--r--parts/distpart/specsupport.cpp18
2 files changed, 13 insertions, 13 deletions
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index 177bd966..60316c25 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -192,7 +192,7 @@ void DistpartDialog::slotuploadSubmitPushButtonPressed() {
else {
for(unsigned int i=0; i< uploadFileListBox->count(); i++)
KIO::NetAccess::copy(KURL::fromPathOrURL( uploadFileListBox->text(i) ),
- KURL::fromPathOrURL( getuploadURLLineEditText() + uploadFileListBox->text(i).tqreplace(TQRegExp("[^/]*/"),"") ));
+ KURL::fromPathOrURL( getuploadURLLineEditText() + uploadFileListBox->text(i).replace(TQRegExp("[^/]*/"),"") ));
}
}
@@ -455,9 +455,9 @@ void DistpartDialog::setprojectChangelogMultilineEditText(TQString text) {
TQString DistpartDialog::getSourceName() {
TQString name = (getcustomProjectCheckBoxState()) ? getarchNameFormatLineEditText() : TQString("%n-%v");
name += (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? ".tar.bz2" : ".tar.gz";
- return name.tqreplace(TQRegExp("%n"),getappNameFormatLineEditText())
- .tqreplace(TQRegExp("%v"),getversionLineEditText())
- .tqreplace(TQRegExp("%d"),TQDate::tqcurrentDate().toString("yyyyMMdd"));
+ return name.replace(TQRegExp("%n"),getappNameFormatLineEditText())
+ .replace(TQRegExp("%v"),getversionLineEditText())
+ .replace(TQRegExp("%d"),TQDate::tqcurrentDate().toString("yyyyMMdd"));
}
void DistpartDialog::loadSettings() {
diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp
index 985c7c0f..63bfa59a 100644
--- a/parts/distpart/specsupport.cpp
+++ b/parts/distpart/specsupport.cpp
@@ -72,7 +72,7 @@ SpecSupport::~SpecSupport() {
void SpecSupport::slotbuildAllPushButtonPressed() {
TQMap<TQString,TQString>::Iterator it;
TQFile file1(dir + "/" + getAppSource());
- TQFile file2(*(map.tqfind("_sourcedir")) + "/" + getAppSource());
+ TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource());
if (!file2.exists()) {
if (!file1.exists()) {
TQMessageBox::critical(0 ,i18n("Error"),i18n("You need to create a source archive first."));
@@ -81,17 +81,17 @@ void SpecSupport::slotbuildAllPushButtonPressed() {
else
if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) +
- " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.tqfind("_sourcedir"))));
+ " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir"))));
}
if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
- makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.tqfind("_specdir")) != map.end()) ? (*it) : dir)) +
+ makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
" && rpmbuild -ba " + m_part->project()->projectName() + ".spec");
}
// TQPushButton* exportSPECPushButton;
void SpecSupport::slotexportSPECPushButtonPressed() {
TQMap<TQString,TQString>::Iterator it;
- TQString specname = ((it = map.tqfind("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory());
+ TQString specname = ((it = map.find("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory());
specname += ("/" + m_part->project()->projectName() + ".spec");
TQFile file(specname);
@@ -171,7 +171,7 @@ void SpecSupport::slotsrcPackagePushButtonPressed() {
TQMap<TQString,TQString>::Iterator it;
TQFile file1(dir + "/" + getAppSource());
- TQFile file2(*(map.tqfind("_sourcedir")) + "/" + getAppSource());
+ TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource());
if (!file2.exists()) {
if (!file1.exists()) {
TQMessageBox::critical(0,i18n("Error"),i18n("You need to create a source archive first."));
@@ -180,10 +180,10 @@ void SpecSupport::slotsrcPackagePushButtonPressed() {
else
if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) +
- " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.tqfind("_sourcedir"))));
+ " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir"))));
}
if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
- makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.tqfind("_specdir")) != map.end()) ? (*it) : dir)) +
+ makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
" && rpmbuild -bs " + m_part->project()->projectName() + ".spec");
}
@@ -212,7 +212,7 @@ void SpecSupport::parseDotRpmmacros() {
TQString value = re.cap(2).stripWhiteSpace();
while(subst.search(value) != -1) {
- value.tqreplace(TQRegExp("%\\{"+ TQRegExp_escape( subst.cap(1) ) +"\\}"),*map.tqfind(subst.cap(1)));
+ value.replace(TQRegExp("%\\{"+ TQRegExp_escape( subst.cap(1) ) +"\\}"),*map.find(subst.cap(1)));
}
map.insert(re.cap(1),value);
}
@@ -231,7 +231,7 @@ void SpecSupport::parseDotRpmmacros() {
bool SpecSupport::createRpmDirectoryFromMacro(const TQString & name) {
TQMap<TQString,TQString>::Iterator it;
- if((it = map.tqfind(name)) != map.end()) {
+ if((it = map.find(name)) != map.end()) {
TQDir dir(*it);
if (!dir.exists()) return dir.mkdir(*it);
}