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/kpybrowser/kpybrowser.cpp | 24 ++++++++++++------------ kate/kpybrowser/kpybrowser.h | 7 ++++--- kate/kpybrowser/pybrowse_part.cpp | 10 +++++----- kate/kpybrowser/pybrowse_part.h | 4 +++- kate/kpybrowser/pybrowsenode.cpp | 16 ++++++++-------- kate/kpybrowser/pybrowsenode.h | 4 ++-- 6 files changed, 34 insertions(+), 31 deletions(-) (limited to 'kate/kpybrowser') diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index 183e1e7..5d2c268 100644 --- a/kate/kpybrowser/kpybrowser.cpp +++ b/kate/kpybrowser/kpybrowser.cpp @@ -181,8 +181,8 @@ getOpenNodes (TQValueList < TQString > *open_nodes, PyBrowseNode * node) } -KPyBrowser::KPyBrowser (TQWidget * parent, const char *name): -KListView (parent, name) +KPyBrowser::KPyBrowser (TQWidget * tqparent, const char *name): +KListView (tqparent, name) { addColumn(i18n("Name")); @@ -286,11 +286,11 @@ KPyBrowser::parseText (TQString & pytext) line = &(*iter); if (class_rx.search(*line) >= 0) { - //KMessageBox::information(this, *line, TQString("Found class on line %1").arg(line_no)); + //KMessageBox::information(this, *line, TQString("Found class on line %1").tqarg(line_no)); //strip out the beginning class and ending colon class_sig = line->stripWhiteSpace ().mid (6); class_sig = class_sig.left (class_sig.length () - 1); - paren_i = class_sig.find ("("); + paren_i = class_sig.tqfind ("("); class_name = class_sig.left (paren_i); last_class_node = @@ -305,8 +305,8 @@ KPyBrowser::parseText (TQString & pytext) { //strip off the leading def and the ending colon method_sig = line->stripWhiteSpace ().mid (4); - method_sig = method_sig.left (method_sig.find (":")); - paren_i = method_sig.find ("("); + method_sig = method_sig.left (method_sig.tqfind (":")); + paren_i = method_sig.tqfind ("("); method_name = method_sig.left (paren_i); last_method_node = new PyBrowseNode (last_class_node, method_name, method_sig, @@ -318,10 +318,10 @@ KPyBrowser::parseText (TQString & pytext) } if ((function_rx.search(*line) >= 0)) { - //KMessageBox::information(this, *line, TQString("Found function on line %1").arg(line_no)); + //KMessageBox::information(this, *line, TQString("Found function on line %1").tqarg(line_no)); function_sig = line->stripWhiteSpace ().mid (4); - function_sig = function_sig.left (function_sig.find (":")); - paren_i = function_sig.find ("("); + function_sig = function_sig.left (function_sig.tqfind (":")); + paren_i = function_sig.tqfind ("("); function_name = function_sig.left (paren_i); last_function_node = new PyBrowseNode (function_root, function_name, function_sig, @@ -359,7 +359,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str) str = ""; return; } - r = itemRect (item); + r = tqitemRect (item); //r.setY(r.y() + 10); PyBrowseNode *browse_node = dynamic_cast < PyBrowseNode * >(item); @@ -380,7 +380,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str) ///////////////////////////////////////////////////////////////////// // KateFileList::KFLToolTip implementation -KPyBrowser::KPBToolTip::KPBToolTip (TQWidget * parent):TQToolTip (parent) +KPyBrowser::KPBToolTip::KPBToolTip (TQWidget * tqparent):TQToolTip (tqparent) { } @@ -390,7 +390,7 @@ KPyBrowser::KPBToolTip::maybeTip (const TQPoint & p) TQString str; TQRect r; - ((KPyBrowser *) parentWidget ())->tip (p, r, str); + ((KPyBrowser *) tqparentWidget ())->tip (p, r, str); if (!str.isEmpty () && r.isValid ()) tip (r, str); diff --git a/kate/kpybrowser/kpybrowser.h b/kate/kpybrowser/kpybrowser.h index 5f73c31..ea0c43f 100644 --- a/kate/kpybrowser/kpybrowser.h +++ b/kate/kpybrowser/kpybrowser.h @@ -35,9 +35,10 @@ class KPyBrowser : public KListView { Q_OBJECT + TQ_OBJECT public: /** construtor */ - KPyBrowser(TQWidget* parent=0, const char *name=0); + KPyBrowser(TQWidget* tqparent=0, const char *name=0); /** destructor */ ~KPyBrowser(); void parseText(TQString &pytext); @@ -56,10 +57,10 @@ class KPyBrowser : public KListView signals: void selected(TQString, int); private: - class KPBToolTip : public QToolTip + class KPBToolTip : public TQToolTip { public: - KPBToolTip(TQWidget *parent); + KPBToolTip(TQWidget *tqparent); protected: void maybeTip( const TQPoint & ); }; diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index 4b8490c..bd9f791 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -82,7 +82,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) done = 1; if (forward_line < numlines) { - if (doc->textLine(forward_line).find(name) > -1) + if (doc->textLine(forward_line).tqfind(name) > -1) { apiline = forward_line; break; @@ -92,7 +92,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) } if (backward_line > -1) { - if (doc->textLine(backward_line).find(name) > -1) + if (doc->textLine(backward_line).tqfind(name) > -1) { apiline = backward_line; break; @@ -104,7 +104,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) if (apiline == -1) { KMessageBox::information(0, - i18n("Could not find method/class %1.").arg(name), i18n("Selection")); + i18n("Could not find method/class %1.").tqarg(name), i18n("Selection")); } else { @@ -130,8 +130,8 @@ void PluginViewPyBrowse::slotShowPyBrowser() //TO DO implement this later so that you can turn the browser off and on } -KatePluginPyBrowse::KatePluginPyBrowse( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)parent, name ) +KatePluginPyBrowse::KatePluginPyBrowse( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)tqparent, name ) { } diff --git a/kate/kpybrowser/pybrowse_part.h b/kate/kpybrowser/pybrowse_part.h index 3769661..f649170 100644 --- a/kate/kpybrowser/pybrowse_part.h +++ b/kate/kpybrowser/pybrowse_part.h @@ -36,6 +36,7 @@ class PluginViewPyBrowse : public TQObject, KXMLGUIClient { Q_OBJECT + TQ_OBJECT friend class KatePluginPyBrowse; @@ -57,9 +58,10 @@ class PluginViewPyBrowse : public TQObject, KXMLGUIClient class KatePluginPyBrowse : public Kate::Plugin, public Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KatePluginPyBrowse( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginPyBrowse( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); ~KatePluginPyBrowse(); void addView(Kate::MainWindow *win); diff --git a/kate/kpybrowser/pybrowsenode.cpp b/kate/kpybrowser/pybrowsenode.cpp index 81c59e5..9310478 100644 --- a/kate/kpybrowser/pybrowsenode.cpp +++ b/kate/kpybrowser/pybrowsenode.cpp @@ -99,16 +99,16 @@ static const char *py_function_xpm[] = { }; -PyBrowseNode::PyBrowseNode (TQListViewItem * parent, const TQString &name, +PyBrowseNode::PyBrowseNode (TQListViewItem * tqparent, const TQString &name, const TQString &signature, int nodeType): -TQListViewItem (parent, signature) +TQListViewItem (tqparent, signature) { init (name, signature, nodeType); } -PyBrowseNode::PyBrowseNode (TQListView * parent, const TQString &name, +PyBrowseNode::PyBrowseNode (TQListView * tqparent, const TQString &name, const TQString &signature, int nodeType): -TQListViewItem (parent, signature) +TQListViewItem (tqparent, signature) { init (name, signature, nodeType); } @@ -140,7 +140,7 @@ PyBrowseNode::setName (const TQString &a_name) setText (0, name); } -QString +TQString PyBrowseNode::getName ()const { return name; @@ -153,7 +153,7 @@ PyBrowseNode::setSig (const TQString &a_signature) } -QString +TQString PyBrowseNode::getSig ()const { return signature; @@ -190,13 +190,13 @@ PyBrowseNode::setClass (const TQString &a_method_class) node_class = a_method_class; } -QString +TQString PyBrowseNode::getClass ()const { return node_class; } -QString +TQString PyBrowseNode::getQualifiedName ()const { if (node_type == PYCLASS) diff --git a/kate/kpybrowser/pybrowsenode.h b/kate/kpybrowser/pybrowsenode.h index 373547c..8b18fc1 100644 --- a/kate/kpybrowser/pybrowsenode.h +++ b/kate/kpybrowser/pybrowsenode.h @@ -37,8 +37,8 @@ class PyBrowseNode : public TQListViewItem { public: TQPixmap *pyClassPixmap; - PyBrowseNode(TQListView *parent, const TQString &a_name, const TQString &a_signature, int type); - PyBrowseNode(TQListViewItem *parent, const TQString &a_name, const TQString &a_signature, int type); + PyBrowseNode(TQListView *tqparent, const TQString &a_name, const TQString &a_signature, int type); + PyBrowseNode(TQListViewItem *tqparent, const TQString &a_name, const TQString &a_signature, int type); ~PyBrowseNode(); void init(const TQString &a_name, const TQString &a_signature, int nodeType); -- cgit v1.2.1