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

1 files changed, 8 insertions, 8 deletions

diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp
index d40c55d2..b3430e62 100644
--- a/buildtools/custommakefiles/customotherconfigwidget.cpp
+++ b/buildtools/custommakefiles/customotherconfigwidget.cpp
@@ -29,8 +29,8 @@
 
 #include <environmentvariableswidget.h>
 
-CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* parent)
- : CustomOtherConfigWidgetBase(parent),
+CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const TQString& configGroup, TQWidget* tqparent)
+ : CustomOtherConfigWidgetBase(tqparent),
     m_part(part), m_configGroup(configGroup), m_dom( *part->projectDom() )
 {
     prio_box->setValue(DomUtil::readIntEntry(m_dom, m_configGroup + "/other/prio"));
@@ -38,7 +38,7 @@ CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const
     defaultTarget_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/defaulttarget"));
     makeoptions_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/other/otheroptions"));
 
-    envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), this));
+    envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this)));
     m_allEnvironments = m_part->allMakeEnvironments();
     m_currentEnvironment = m_part->currentMakeEnvironment();
     env_var_group->setColumnLayout( 1, Qt::Vertical );
@@ -56,8 +56,8 @@ CustomOtherConfigWidget::~CustomOtherConfigWidget()
 void CustomOtherConfigWidget::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);
@@ -65,7 +65,7 @@ void CustomOtherConfigWidget::envNameChanged(const TQString& envName)
 
 void CustomOtherConfigWidget::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
@@ -95,7 +95,7 @@ void CustomOtherConfigWidget::envRemoved()
     m_allEnvironments.remove(env);
     envs_combo->clear();
     envs_combo->insertStringList(m_allEnvironments);
-    m_currentEnvironment = TQString::null;
+    m_currentEnvironment = TQString();
     envChanged( m_allEnvironments[0] );
 }
 
@@ -121,5 +121,5 @@ void CustomOtherConfigWidget::accept()
 }
 
 #include "customotherconfigwidget.moc"
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
+// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on