From 395a904bff7b4d6ead445c342f7ac0c5fbf29121 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 18 Jun 2011 17:00:31 +0000 Subject: TQt4 port kdeaddons This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kate/htmltools/plugin_katehtmltools.cpp | 8 ++++---- kate/htmltools/plugin_katehtmltools.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'kate/htmltools') diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp index f66ef8e..a71c91c 100644 --- a/kate/htmltools/plugin_katehtmltools.cpp +++ b/kate/htmltools/plugin_katehtmltools.cpp @@ -36,8 +36,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateHtmlTools::PluginKateHtmlTools( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +PluginKateHtmlTools::PluginKateHtmlTools( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { } @@ -103,7 +103,7 @@ TQString PluginKateHtmlTools::KatePrompt // TODO: Make this a "memory edit" field with a combo box // containing prior entries - KLineEditDlg dlg(strPrompt, TQString::null, that); + KLineEditDlg dlg(strPrompt, TQString(), that); dlg.setCaption(strTitle); if (dlg.exec()) @@ -142,7 +142,7 @@ void PluginKateHtmlTools::slipInHTMLtag (Kate::View & view, TQString text) // // when we try to reselect. TODO: fix those bugs, and we can // un-break this if... - if (preDeleteLine == line && -1 == marked.find ('\n')) + if (preDeleteLine == line && -1 == marked.tqfind ('\n')) if (preDeleteLine == line && preDeleteCol == col) { view.setCursorPosition (line, col + pre.length () + marked.length () - 1); diff --git a/kate/htmltools/plugin_katehtmltools.h b/kate/htmltools/plugin_katehtmltools.h index 695211c..f517b99 100644 --- a/kate/htmltools/plugin_katehtmltools.h +++ b/kate/htmltools/plugin_katehtmltools.h @@ -31,9 +31,10 @@ class PluginKateHtmlTools : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateHtmlTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateHtmlTools( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateHtmlTools(); void addView (Kate::MainWindow *win); -- cgit v1.2.1