summaryrefslogtreecommitdiffstats
path: root/buildtools/custommakefiles/custommakeconfigwidget.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/custommakefiles/custommakeconfigwidget.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/custommakefiles/custommakeconfigwidget.cpp')
-rw-r--r--buildtools/custommakefiles/custommakeconfigwidget.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp
index b47ef3ff..6b27994e 100644
--- a/buildtools/custommakefiles/custommakeconfigwidget.cpp
+++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp
@@ -28,8 +28,8 @@
#include <environmentvariableswidget.h>
-CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent)
- : CustomMakeConfigWidgetBase(parent),
+CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent)
+ : CustomMakeConfigWidgetBase(tqparent),
m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() )
{
abort_box->setChecked(DomUtil::readBoolEntry(m_dom, m_configGroup + "/make/abortonerror"));
@@ -43,7 +43,7 @@ CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQ
defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/defaulttarget"));
makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/makeoptions"));
- envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), this));
+ envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), TQT_TQOBJECT(this)));
m_allEnvironments = m_part->allMakeEnvironments();
m_currentEnvironment = m_part->currentMakeEnvironment();
env_var_group->setColumnLayout( 1, Qt::Vertical );
@@ -61,8 +61,8 @@ CustomMakeConfigWidget::~CustomMakeConfigWidget()
void CustomMakeConfigWidget::envNameChanged(const TQString& envName)
{
TQStringList allEnvNames = m_part->allMakeEnvironments();
- bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty();
- bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1;
+ bool canAdd = !allEnvNames.tqcontains(envName) && !envName.tqcontains("/") && !envName.isEmpty();
+ bool canRemove = allEnvNames.tqcontains(envName) && allEnvNames.count() > 1;
addenvs_button->setEnabled(canAdd);
copyenvs_button->setEnabled(canAdd);
removeenvs_button->setEnabled(canRemove);
@@ -70,7 +70,7 @@ void CustomMakeConfigWidget::envNameChanged(const TQString& envName)
void CustomMakeConfigWidget::envChanged(const TQString& envName)
{
- if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName))
+ if (envName == m_currentEnvironment || !m_allEnvironments.tqcontains(envName))
return;
// save settings of previously active environment
@@ -100,7 +100,7 @@ void CustomMakeConfigWidget::envRemoved()
m_allEnvironments.remove(env);
envs_combo->clear();
envs_combo->insertStringList(m_allEnvironments);
- m_currentEnvironment = TQString::null;
+ m_currentEnvironment = TQString();
envChanged( m_allEnvironments[0] );
}