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

3 files changed, 13 insertions, 10 deletions

diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 18595d10..9ee7b8b5 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -37,15 +37,15 @@ KatePluginFactory::~KatePluginFactory()
     delete s_instance;
 }
 
-TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
+TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & )
 {
-    return new KatePlugin%{APPNAME}( parent, name );
+    return new KatePlugin%{APPNAME}( tqparent, name );
 }
 
 KInstance* KatePluginFactory::s_instance = 0L;
 
-KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name )
-    : Kate::Plugin ( (Kate::Application*)parent, name )
+KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name )
+    : Kate::Plugin ( (Kate::Application*)tqparent, name )
 {
 }
 
@@ -114,8 +114,8 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p )
 /**
  * %{APPNAME}ConfigPage
  */
-%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* parent /*= 0L*/, TQWidget *parentWidget /*= 0L*/)
-    : Kate::PluginConfigPage( parentWidget )
+%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/)
+    : Kate::PluginConfigPage( tqparentWidget )
 {
     TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" );
     lo->setSpacing(KDialogBase::spacingHint());
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h
index 6ad068d4..3082884e 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h
@@ -21,12 +21,13 @@ class %{APPNAME}ConfigPage;
 class KatePluginFactory : public KLibFactory
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     KatePluginFactory();
     virtual ~KatePluginFactory();
 
-    virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() );
+    virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
 private:
     static KInstance* s_instance;
@@ -35,9 +36,10 @@ private:
 class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kate::PluginConfigInterfaceExtension
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 );
+    KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 );
     virtual ~KatePlugin%{APPNAME}();
 
     void addView (Kate::MainWindow *win);
@@ -65,10 +67,11 @@ private:
 class %{APPNAME}ConfigPage : public Kate::PluginConfigPage
 {
     Q_OBJECT
+  TQ_OBJECT
     friend class KatePlugin%{APPNAME};
 
 public:
-    %{APPNAME}ConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L);
+    %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L);
     ~%{APPNAME}ConfigPage ();
 
     /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ).  */
diff --git a/languages/cpp/app_templates/kateplugin2/src-Makefile.am b/languages/cpp/app_templates/kateplugin2/src-Makefile.am
index 2dbd9367..14a5dd2a 100644
--- a/languages/cpp/app_templates/kateplugin2/src-Makefile.am
+++ b/languages/cpp/app_templates/kateplugin2/src-Makefile.am
@@ -16,6 +16,6 @@ plugins_DATA = plugin_%{APPNAMELC}.rc
 kde_services_DATA = %{APPNAMELC}.desktop
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot