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

5 files changed, 13 insertions, 11 deletions

diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp
index 78749465..6314306e 100644
--- a/parts/scripting/scriptingglobalconfig.cpp
+++ b/parts/scripting/scriptingglobalconfig.cpp
@@ -24,8 +24,8 @@
 #include <keditlistbox.h>
 #include <kapplication.h>
 #include <kconfig.h>
-scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *parent, const char *name)
-    : scriptingGlobalConfigBase(parent, name), m_part(part)
+scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *tqparent, const char *name)
+    : scriptingGlobalConfigBase(tqparent, name), m_part(part)
 {
     // read kconfig and post list to the m_dirs
     KConfig *cfg = kapp->config();
diff --git a/parts/scripting/scriptingglobalconfig.h b/parts/scripting/scriptingglobalconfig.h
index 85343e33..3d132d58 100644
--- a/parts/scripting/scriptingglobalconfig.h
+++ b/parts/scripting/scriptingglobalconfig.h
@@ -28,8 +28,9 @@ class scriptingPart;
 class scriptingGlobalConfig: public scriptingGlobalConfigBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    scriptingGlobalConfig(scriptingPart *part, TQWidget *parent = 0, const char *name = 0);
+    scriptingGlobalConfig(scriptingPart *part, TQWidget *tqparent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/parts/scripting/scriptingglobalconfigbase.ui b/parts/scripting/scriptingglobalconfigbase.ui
index 19647501..155925f5 100644
--- a/parts/scripting/scriptingglobalconfigbase.ui
+++ b/parts/scripting/scriptingglobalconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>scriptingGlobalConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>scriptingGlobalConfigBase</cstring>
     </property>
@@ -33,7 +33,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -43,7 +43,7 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index 496746b2..7a332fd8 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -47,8 +47,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) )
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L)
+scriptingPart::scriptingPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
+    : KDevPlugin(&data, tqparent, name ? name : "scriptingPart"), m_scripts(0L)
 {
     setInstance(scriptingFactory::instance());
     setXMLFile("kdevscripting.rc");
@@ -86,8 +86,8 @@ void scriptingPart::setupActions()
     KConfig *cfg = kapp->config();
     searchDirs += cfg->readListEntry("SearchDirs");
     
-    unplugActionList(TQString::fromLatin1( "script_actions" ));
-    plugActionList( TQString::fromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs));
+    unplugActionList(TQString::tqfromLatin1( "script_actions" ));
+    plugActionList( TQString::tqfromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs));
 }
 
 void scriptingPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo)
diff --git a/parts/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h
index 5d1c2c6c..8465764d 100644
--- a/parts/scripting/scriptingpart.h
+++ b/parts/scripting/scriptingpart.h
@@ -37,8 +37,9 @@ Please read the README.dox file for more info about this part
 class scriptingPart: public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    scriptingPart(TQObject *parent, const char *name, const TQStringList &args);
+    scriptingPart(TQObject *tqparent, const char *name, const TQStringList &args);
     ~scriptingPart();
 
     public slots: