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/kpartplugin/plugin_app.cpp | 14 +++++++------- languages/cpp/app_templates/kpartplugin/plugin_app.h | 6 ++++-- languages/cpp/app_templates/kpartplugin/src-Makefile.am | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) (limited to 'languages/cpp/app_templates/kpartplugin') diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index 61e3ca0e..dac6dc20 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -8,8 +8,8 @@ #include #include -Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) - : Plugin( parent, name ) +Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* tqparent, const char* name ) + : Plugin( tqparent, name ) { // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. @@ -27,7 +27,7 @@ void Plugin%{APPNAME}::slotAction() // This plugin assumes KHTMLPart. If your plugin can handle more // than this or a different Part than this, simply delete or // change the following block. - if ( !parent()->inherits("KHTMLPart") ) + if ( !tqparent()->inherits("KHTMLPart") ) { TQString title( i18n( "Cannot Translate Source" ) ); TQString text( i18n( "You cannot translate anything except web pages " @@ -37,9 +37,9 @@ void Plugin%{APPNAME}::slotAction() return; } - // Get a handle on our parent so we may get the necessary data for + // Get a handle on our tqparent so we may get the necessary data for // processing - KHTMLPart *part = dynamic_cast(parent()); + KHTMLPart *part = dynamic_cast(tqparent()); // This plugin only uses the URL. You may use whatever data you // need. @@ -83,9 +83,9 @@ void Plugin%{APPNAME}::slotAction() s_instance = 0; } -TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) +TQObject* %{APPNAME}Factory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - return new Plugin%{APPNAME}( parent, name ); + return new Plugin%{APPNAME}( tqparent, name ); } KInstance *%{APPNAME}Factory::instance() diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index 7c7bfc0c..3d637d1b 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -8,8 +8,9 @@ class Plugin%{APPNAME} : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Plugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); + Plugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); virtual ~Plugin%{APPNAME}(); public slots: @@ -19,11 +20,12 @@ public slots: class %{APPNAME}Factory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: %{APPNAME}Factory(); virtual ~%{APPNAME}Factory(); - 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() ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am index 52e29c09..81242777 100644 --- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am @@ -18,5 +18,5 @@ pluginsdir = $(kde_datadir)/khtml/kpartplugins plugins_DATA = plugin_%{APPNAMELC}.rc 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 -- cgit v1.2.3