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, 9 insertions, 9 deletions

diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp
index 6bbff084..d1ce1f5f 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.cpp
+++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp
@@ -26,10 +26,10 @@
 #include "pascalproject_part.h"
 #include "pascalprojectoptionsdlg.h"
 
-PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* parent, const char* name, WFlags fl)
-    : PascalProjectOptionsDlgBase(parent,name, fl), m_part(part)
+PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidget* tqparent, const char* name, WFlags fl)
+    : PascalProjectOptionsDlgBase(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] == 'Pascal'");
 
@@ -44,7 +44,7 @@ PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidg
     dirty = false;
 
     TQDomDocument &dom = *(m_part->projectDom());
-    currentConfig = TQString::null;
+    currentConfig = TQString();
     configChanged(DomUtil::readEntry(dom, "/kdevpascalproject/general/useconfiguration", "default"));
 }
 
@@ -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().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),""));
+    DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().tqreplace(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.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);
 }
@@ -139,7 +139,7 @@ void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config)
 
 void PascalProjectOptionsDlg::configChanged(const TQString &config)
 {
-    if (config == currentConfig || !allConfigs.contains(config))
+    if (config == currentConfig || !allConfigs.tqcontains(config))
         return;
 
     if (!currentConfig.isNull() && dirty)
@@ -180,7 +180,7 @@ void PascalProjectOptionsDlg::configRemoved()
     config_combo->clear();
     config_combo->insertStringList(allConfigs);
 
-    currentConfig = TQString::null;
+    currentConfig = TQString();
     configChanged("default");
 }