diff options
Diffstat (limited to 'buildtools/pascal')
| -rw-r--r-- | buildtools/pascal/pascalproject_part.cpp | 4 | ||||
| -rw-r--r-- | buildtools/pascal/pascalprojectoptionsdlg.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 6d26ac60..bbc5037a 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -256,7 +256,7 @@ TQString PascalProjectPart::mainSource() const void PascalProjectPart::setMainSource(TQString fullPath) { TQString olddir = activeDirectory(); - m_mainSource = fullPath.tqreplace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); + m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); emit activeDirectoryChanged( olddir, activeDirectory() ); } @@ -273,7 +273,7 @@ TQString PascalProjectPart::projectName() const TQString PascalProjectPart::activeDirectory() const { TQFileInfo fi(mainSource()); - return fi.dirPath(true).tqreplace(TQRegExp(projectDirectory()),""); + return fi.dirPath(true).replace(TQRegExp(projectDirectory()),""); } TQString PascalProjectPart::buildDirectory() const diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp index d1ce1f5f..db5517cf 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.cpp +++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp @@ -96,7 +96,7 @@ void PascalProjectOptionsDlg::saveConfig( TQString config ) ServiceComboBox::currentText(compiler_box, service_names)); DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text()); DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text()); - DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().tqreplace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); + DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); } void PascalProjectOptionsDlg::readConfig( TQString config ) @@ -130,8 +130,8 @@ void PascalProjectOptionsDlg::readConfig( TQString config ) void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config) { - bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty(); - bool canRemove = allConfigs.tqcontains(config) && config != "default"; + bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); + bool canRemove = allConfigs.contains(config) && config != "default"; addconfig_button->setEnabled(canAdd); removeconfig_button->setEnabled(canRemove); } @@ -139,7 +139,7 @@ void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config) void PascalProjectOptionsDlg::configChanged(const TQString &config) { - if (config == currentConfig || !allConfigs.tqcontains(config)) + if (config == currentConfig || !allConfigs.contains(config)) return; if (!currentConfig.isNull() && dirty) |