summaryrefslogtreecommitdiffstats
path: root/buildtools/ada/adaprojectoptionsdlg.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
commit48d4a26399959121f33d2bc3bfe51c7827b654fc (patch)
tree5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /buildtools/ada/adaprojectoptionsdlg.cpp
parent7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff)
downloadtdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz
tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'buildtools/ada/adaprojectoptionsdlg.cpp')
-rw-r--r--buildtools/ada/adaprojectoptionsdlg.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp
index ee08da6d..f00a0bb1 100644
--- a/buildtools/ada/adaprojectoptionsdlg.cpp
+++ b/buildtools/ada/adaprojectoptionsdlg.cpp
@@ -24,10 +24,10 @@
#include "adaproject_part.h"
#include "adaprojectoptionsdlg.h"
-AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* parent, const char* name, WFlags fl)
- : AdaProjectOptionsDlgBase(parent,name, fl), m_part(part)
+AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl)
+ : AdaProjectOptionsDlgBase(tqparent,name, fl), m_part(part)
{
- config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this));
+ config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this)));
offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'");
@@ -42,7 +42,7 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* paren
dirty = false;
TQDomDocument &dom = *(m_part->projectDom());
- currentConfig = TQString::null;
+ currentConfig = TQString();
configChanged(DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default"));
}
@@ -94,7 +94,7 @@ void AdaProjectOptionsDlg::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().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),""));
+ DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().tqreplace(TQRegExp(m_part->projectDirectory() + TQString("/")),""));
}
void AdaProjectOptionsDlg::readConfig( TQString config )
@@ -128,8 +128,8 @@ void AdaProjectOptionsDlg::readConfig( TQString config )
void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config)
{
- bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty();
- bool canRemove = allConfigs.contains(config) && config != "default";
+ bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty();
+ bool canRemove = allConfigs.tqcontains(config) && config != "default";
addconfig_button->setEnabled(canAdd);
removeconfig_button->setEnabled(canRemove);
}
@@ -137,7 +137,7 @@ void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config)
void AdaProjectOptionsDlg::configChanged(const TQString &config)
{
- if (config == currentConfig || !allConfigs.contains(config))
+ if (config == currentConfig || !allConfigs.tqcontains(config))
return;
if (!currentConfig.isNull() && dirty)
@@ -178,7 +178,7 @@ void AdaProjectOptionsDlg::configRemoved()
config_combo->clear();
config_combo->insertStringList(allConfigs);
- currentConfig = TQString::null;
+ currentConfig = TQString();
configChanged("default");
}