From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: 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 --- languages/cpp/app_templates/kdevpart2/globalconfig.cpp | 4 ++-- languages/cpp/app_templates/kdevpart2/globalconfig.h | 3 ++- languages/cpp/app_templates/kdevpart2/globalconfigbase.ui | 4 ++-- languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp | 4 ++-- languages/cpp/app_templates/kdevpart2/kdevpart_part.h | 3 ++- languages/cpp/app_templates/kdevpart2/kdevpart_widget.h | 3 ++- languages/cpp/app_templates/kdevpart2/projectconfig.cpp | 4 ++-- languages/cpp/app_templates/kdevpart2/projectconfig.h | 3 ++- languages/cpp/app_templates/kdevpart2/projectconfigbase.ui | 4 ++-- 9 files changed, 18 insertions(+), 14 deletions(-) (limited to 'languages/cpp/app_templates/kdevpart2') diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp index cddf3e7e..54e56426 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) - : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) + : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h index aea1cbea..f08bd1bd 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h @@ -9,8 +9,9 @@ class %{APPNAME}Part; class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui index c16bd90d..7cba9a36 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui @@ -1,6 +1,6 @@ %{APPNAME}GlobalConfigBase - + %{APPNAME}GlobalConfigBase @@ -16,5 +16,5 @@ %{APPNAME} - + diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 082549c4..96ddb6ca 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") +%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdev%{APPNAMELC}.rc"); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index b73e61da..ddedde17 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -19,8 +19,9 @@ Please read the README.dox file for more info about this part class %{APPNAME}Part: public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); + %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h index 308c3e7e..f7c0290f 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h @@ -8,9 +8,10 @@ class KDevProject; class %{APPNAME}Part; -class %{APPNAME}Widget: public QWidget +class %{APPNAME}Widget: public TQWidget { Q_OBJECT + TQ_OBJECT public: %{APPNAME}Widget(%{APPNAME}Part *part); ~%{APPNAME}Widget(); diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp index 42a9f3e7..a3bc8b8c 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) - : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) + : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h index 0ab0cb35..2d13ce14 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h @@ -9,8 +9,9 @@ class %{APPNAME}Part; class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui index c733a774..140e8df4 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui @@ -1,6 +1,6 @@ %{APPNAME}ProjectConfigBase - + %{APPNAME}ProjectConfigBase @@ -16,5 +16,5 @@ %{APPNAME} - + -- cgit v1.2.1