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

9 files changed, 34 insertions, 32 deletions

diff --git a/languages/perl/README.dox b/languages/perl/README.dox
index f8608a41..09d1f0f0 100644
--- a/languages/perl/README.dox
+++ b/languages/perl/README.dox
@@ -12,7 +12,7 @@ and images.
 \maintainer <a href="mailto:willems.luc AT pandora.be">Luc Willems</a>
 
 \feature perl programming language support
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
 ..
diff --git a/languages/perl/doc/perl.toc b/languages/perl/doc/perl.toc
index 84cb8145..05bab529 100644
--- a/languages/perl/doc/perl.toc
+++ b/languages/perl/doc/perl.toc
@@ -14,7 +14,7 @@
 <tocsect1 name="Modules: how to write and use" url="man:perlmodlib"/>
 <tocsect1 name="Modules: how to install from CPAN" url="man:perlmodinstall"/>
 <tocsect1 name="Formats" url="man:perlform"/>
-<tocsect1 name="Unicode Support" url="man:perlunicode"/>
+<tocsect1 name="Unicode Support" url="man:perltqunicode"/>
 <tocsect1 name="Locale Support" url="man:perllocale"/>
 <tocsect1 name="References Introduction" url="man:perlreftut"/>
 <tocsect1 name="References, the rest of the story" url="man:perlref"/>
diff --git a/languages/perl/perlconfigwidget.cpp b/languages/perl/perlconfigwidget.cpp
index e41def0c..58730d05 100644
--- a/languages/perl/perlconfigwidget.cpp
+++ b/languages/perl/perlconfigwidget.cpp
@@ -17,8 +17,8 @@
 
 
 PerlConfigWidget::PerlConfigWidget(TQDomDocument &projectDom,
-                                       TQWidget *parent, const char *name)
-    : PerlConfigWidgetBase(parent, name), dom(projectDom)
+                                       TQWidget *tqparent, const char *name)
+    : PerlConfigWidgetBase(tqparent, name), dom(projectDom)
 {
     interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevperlsupport/run/interpreter"));
     terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/kdevperlsupport/run/terminal"));
diff --git a/languages/perl/perlconfigwidget.h b/languages/perl/perlconfigwidget.h
index 9fbcc804..11b4503d 100644
--- a/languages/perl/perlconfigwidget.h
+++ b/languages/perl/perlconfigwidget.h
@@ -19,9 +19,10 @@
 class PerlConfigWidget : public PerlConfigWidgetBase
 { 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PerlConfigWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 );
+    PerlConfigWidget( TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0 );
     ~PerlConfigWidget();
 
 public slots:
diff --git a/languages/perl/perlconfigwidgetbase.ui b/languages/perl/perlconfigwidgetbase.ui
index 8becd0f4..521531fd 100644
--- a/languages/perl/perlconfigwidgetbase.ui
+++ b/languages/perl/perlconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>PerlConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>perl_config_widget</cstring>
     </property>
@@ -20,7 +20,7 @@
             <cstring>unnamed</cstring>
         </property>
 
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>interpreter_label</cstring>
             </property>
@@ -31,7 +31,7 @@
                 <cstring>interpreter_edit</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -43,7 +43,7 @@
                     <number>0</number>
                 </property>
 
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>interpreter_edit</cstring>
                     </property>
@@ -72,7 +72,7 @@
                 <enum>Minimum</enum>
             </property>
         </spacer>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>terminal_box</cstring>
             </property>
@@ -96,6 +96,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/perl/perlparser.cpp b/languages/perl/perlparser.cpp
index 60cca8f5..4ab48333 100644
--- a/languages/perl/perlparser.cpp
+++ b/languages/perl/perlparser.cpp
@@ -161,11 +161,11 @@ void perlparser::parseLines(TQStringList* lines,const TQString &fileName)
 
     //base matching
     if ((basere.search(line)>=0) && (!m_inscript)) {
-         TQString parent = basere.cap(1);
-         //create child & parent classes
-         kdDebug(9016) << "basere match [" << parent << "]" << endl;
+         TQString tqparent = basere.cap(1);
+         //create child & tqparent classes
+         kdDebug(9016) << "basere match [" << tqparent << "]" << endl;
          addClass(fileName,lineNo);
-         addParentClass(parent);
+         addParentClass(tqparent);
          continue;
     } else {
       if (libre.search(line)>=0) {
@@ -186,11 +186,11 @@ void perlparser::parseLines(TQStringList* lines,const TQString &fileName)
     } //base
 
     if ((isare.search(line)>=0) && (!m_inscript)) {
-         TQString parent = isare.cap(1);
-         //create child & parent classes
-         kdDebug(9016) << "isare match [" << parent << "]" << endl;
+         TQString tqparent = isare.cap(1);
+         //create child & tqparent classes
+         kdDebug(9016) << "isare match [" << tqparent << "]" << endl;
          addClass(fileName,lineNo);
-         addParentClass(parent);
+         addParentClass(tqparent);
          continue;
     } //isa
 
@@ -424,11 +424,11 @@ void perlparser::addPackageSub(const TQString& fileName ,int lineNr ,const TQStr
  m_lastsub=name;
 }
 
-void perlparser::addParentClass(const TQString& parent)
+void perlparser::addParentClass(const TQString& tqparent)
 {
- kdDebug(9016) << "addParentClass[ " << parent << "]" << endl;
+ kdDebug(9016) << "addParentClass[ " << tqparent << "]" << endl;
  if (m_lastclass) {
-        m_lastclass->addBaseClass(parent);
+        m_lastclass->addBaseClass(tqparent);
  } else {
     kdDebug(9016) << "addParentClass[ no m_lastclass]" << endl;
  }
@@ -437,7 +437,7 @@ void perlparser::addParentClass(const TQString& parent)
 void perlparser::addUseLib(const TQString& lib)
 {
  if (!m_model->hasFile(lib)) {
-   if (m_usefiles.findIndex(lib) == -1) {
+   if (m_usefiles.tqfindIndex(lib) == -1) {
       //only add if not already parsed or in the list
       kdDebug(9016) << "add lib for later parsing [" << lib << "]" << endl;
       m_usefiles.append(lib);
@@ -478,7 +478,7 @@ TQString perlparser::findLib( const TQString& lib)
   TQString result;
 
   TQString file=lib;
-  file.replace( TQRegExp("::"), TQString("/"));
+  file.tqreplace( TQRegExp("::"), TQString("/"));
 
   //find the correct path by using the INC list
   TQStringList::Iterator inc = m_INClist.begin();
diff --git a/languages/perl/perlparser.h b/languages/perl/perlparser.h
index b536596b..e2ec4d7e 100644
--- a/languages/perl/perlparser.h
+++ b/languages/perl/perlparser.h
@@ -49,7 +49,7 @@ class perlparser {
   void addScriptSub(const TQString& fileName ,int lineNr , const TQString& name, bool privatesub);
   void addClassMethod(const TQString& fileName ,int lineNr , const TQString& name , bool privatesub);
   void addPackageSub(const TQString& fileName ,int lineNr , const TQString& name, bool privatesub);
-  void addParentClass(const TQString& parent);
+  void addParentClass(const TQString& tqparent);
   void addScript(const TQString& fileName ,int lineNr , const TQString& name);
   void addUseLib(const TQString& lib);
   void getPerlINC();
@@ -59,7 +59,7 @@ class perlparser {
   bool    m_inclass;
 
   TQString m_lastsub;
-  TQString m_lastparentclass;
+  TQString m_lasttqparentclass;
   TQString m_lastattr;
   TQString m_lastpackagename;
   TQString m_lastscriptname;
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index d5b0868f..b131af11 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -48,8 +48,8 @@ typedef KDevGenericFactory<PerlSupportPart> PerlSupportFactory;
 static const KDevPluginInfo data("kdevperlsupport");
 K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) )
 
-PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart")
+PerlSupportPart::PerlSupportPart(TQObject *tqparent, const char *name, const TQStringList &)
+    : KDevLanguageSupport(&data, tqparent, name ? name : "PerlSupportPart")
 {
     setInstance(PerlSupportFactory::instance());
 
@@ -166,7 +166,7 @@ void PerlSupportPart::savedFile(const KURL &fileName)
 #if 0  // not needed anymore
     kdDebug(9016) << "savedFile()" << endl;
 
-    if (project()->allFiles().contains(fileName.mid ( project()->projectDirectory().length() + 1 ))) {
+    if (project()->allFiles().tqcontains(fileName.mid ( project()->projectDirectory().length() + 1 ))) {
         maybeParse(fileName);
         emit updatedSourceInfo();
     }
@@ -215,7 +215,7 @@ void PerlSupportPart::slotStartInterpreter()
 void PerlSupportPart::slotExecuteString()
 {
     bool ok;
-    TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString::null, &ok, 0);
+    TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString(), &ok, 0);
     if (ok) {
         cmd.prepend("'");
         cmd.append("'");
diff --git a/languages/perl/perlsupportpart.h b/languages/perl/perlsupportpart.h
index 11a5f417..dd3a7bfa 100644
--- a/languages/perl/perlsupportpart.h
+++ b/languages/perl/perlsupportpart.h
@@ -19,9 +19,10 @@
 class PerlSupportPart : public KDevLanguageSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PerlSupportPart( TQObject *parent, const char *name, const TQStringList & );
+    PerlSupportPart( TQObject *tqparent, const char *name, const TQStringList & );
     ~PerlSupportPart();
 
 protected: