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/kxt/app.h | 1 + languages/cpp/app_templates/kxt/appview.cpp | 6 +++--- languages/cpp/app_templates/kxt/appview.h | 3 ++- languages/cpp/app_templates/kxt/appview_base.ui | 6 +++--- languages/cpp/app_templates/kxt/prefs-base.ui | 18 +++++++++--------- languages/cpp/app_templates/kxt/src-Makefile.am | 4 ++-- 6 files changed, 20 insertions(+), 18 deletions(-) (limited to 'languages/cpp/app_templates/kxt') diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h index 09f031c4..6ed2ab3d 100644 --- a/languages/cpp/app_templates/kxt/app.h +++ b/languages/cpp/app_templates/kxt/app.h @@ -27,6 +27,7 @@ class KURL; class %{APPNAMELC} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp index 30d627fe..0c82dd25 100644 --- a/languages/cpp/app_templates/kxt/appview.cpp +++ b/languages/cpp/app_templates/kxt/appview.cpp @@ -6,8 +6,8 @@ #include #include -%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) - : %{APPNAMELC}view_base(parent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent) + : %{APPNAMELC}view_base(tqparent) { settingsChanged(); } @@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged() sillyLabel->setPaletteForegroundColor( Settings::col_foreground() ); // i18n : internationalization - sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) ); + sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) ); emit signalChangeStatusbar( i18n("Settings changed") ); } diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h index e0738ebe..897072a6 100644 --- a/languages/cpp/app_templates/kxt/appview.h +++ b/languages/cpp/app_templates/kxt/appview.h @@ -22,11 +22,12 @@ class KURL; class %{APPNAMELC}View : public %{APPNAMELC}view_base { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - %{APPNAMELC}View(TQWidget *parent); + %{APPNAMELC}View(TQWidget *tqparent); /** * Destructor diff --git a/languages/cpp/app_templates/kxt/appview_base.ui b/languages/cpp/app_templates/kxt/appview_base.ui index 626d95df..5852f806 100644 --- a/languages/cpp/app_templates/kxt/appview_base.ui +++ b/languages/cpp/app_templates/kxt/appview_base.ui @@ -1,6 +1,6 @@ %{APPNAMELC}view_base - + %{APPNAMELC}view_base @@ -19,7 +19,7 @@ unnamed - + sillyLabel @@ -29,5 +29,5 @@ - + diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui index 5c0fc860..8c8b9012 100644 --- a/languages/cpp/app_templates/kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kxt/prefs-base.ui @@ -1,6 +1,6 @@ Prefs_base - + Prefs_base @@ -16,7 +16,7 @@ unnamed - + textLabel2_2 @@ -32,7 +32,7 @@ - + textLabel1 @@ -40,7 +40,7 @@ Project age: - + textLabel2 @@ -66,7 +66,7 @@ Expanding - + 41 20 @@ -83,14 +83,14 @@ Expanding - + 41 20 - + kcfg_val_time @@ -111,7 +111,7 @@ Expanding - + 41 20 @@ -120,7 +120,7 @@ - + kcolorbutton.h diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am index 5f7936da..2a04da7e 100644 --- a/languages/cpp/app_templates/kxt/src-Makefile.am +++ b/languages/cpp/app_templates/kxt/src-Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = %{APPNAMELC} # set the include path for X, qt and KDE INCLUDES = $(all_includes) -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO # the library search path. @@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h 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 -- cgit v1.2.1