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/khello2/app.h | 1 + languages/cpp/app_templates/khello2/src-Makefile.am | 4 ++-- languages/cpp/app_templates/khello2/widget.cpp | 4 ++-- languages/cpp/app_templates/khello2/widget.h | 3 ++- languages/cpp/app_templates/khello2/widgetbase.ui | 12 ++++++------ 5 files changed, 13 insertions(+), 11 deletions(-) (limited to 'languages/cpp/app_templates/khello2') diff --git a/languages/cpp/app_templates/khello2/app.h b/languages/cpp/app_templates/khello2/app.h index 678df7a3..fd0ca00b 100644 --- a/languages/cpp/app_templates/khello2/app.h +++ b/languages/cpp/app_templates/khello2/app.h @@ -17,6 +17,7 @@ class %{APPNAME} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/khello2/src-Makefile.am b/languages/cpp/app_templates/khello2/src-Makefile.am index 4664fe84..7f9d7125 100644 --- a/languages/cpp/app_templates/khello2/src-Makefile.am +++ b/languages/cpp/app_templates/khello2/src-Makefile.am @@ -4,11 +4,11 @@ INCLUDES = $(all_includes) # these are the headers for your project noinst_HEADERS = %{APPNAMELC}.h -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO 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 KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/khello2/widget.cpp b/languages/cpp/app_templates/khello2/widget.cpp index 266e894f..40e2d2bb 100644 --- a/languages/cpp/app_templates/khello2/widget.cpp +++ b/languages/cpp/app_templates/khello2/widget.cpp @@ -4,8 +4,8 @@ #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* parent, const char* name, WFlags fl) - : %{APPNAME}WidgetBase(parent,name,fl) +%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* tqparent, const char* name, WFlags fl) + : %{APPNAME}WidgetBase(tqparent,name,fl) {} %{APPNAME}Widget::~%{APPNAME}Widget() diff --git a/languages/cpp/app_templates/khello2/widget.h b/languages/cpp/app_templates/khello2/widget.h index 50d7a721..3773456b 100644 --- a/languages/cpp/app_templates/khello2/widget.h +++ b/languages/cpp/app_templates/khello2/widget.h @@ -8,9 +8,10 @@ class %{APPNAME}Widget : public %{APPNAME}WidgetBase { Q_OBJECT + TQ_OBJECT public: - %{APPNAME}Widget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}Widget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}Widget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui index e6f5be3d..4540c922 100644 --- a/languages/cpp/app_templates/khello2/widgetbase.ui +++ b/languages/cpp/app_templates/khello2/widgetbase.ui @@ -1,6 +1,6 @@ %{APPNAME}WidgetBase - + %{APPNAMELC}widgetbase @@ -19,7 +19,7 @@ unnamed - + button @@ -27,7 +27,7 @@ Click Me! - + label @@ -45,8 +45,8 @@ button_clicked() - + button_clicked() - - + + -- cgit v1.2.1