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 --- parts/classview/navigator.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'parts/classview/navigator.cpp') diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index fa83a4ff..78415d8c 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -46,7 +46,7 @@ namespace { template - TQValueList QValueList_reversed ( const TQValueList & list ) + TQValueList TQValueList_reversed ( const TQValueList & list ) { TQValueList rList; typename TQValueList::ConstIterator it = list.begin(); @@ -85,10 +85,10 @@ private: public: enum Type { Declaration, Definition }; - FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListView *parent, TQString name, Type type) - :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {} - FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListViewItem *parent, TQString name, Type type) - :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {} + FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListView *tqparent, TQString name, Type type) + :FancyListViewItem(styles, tqparent, name, ""), m_part(part), m_type(type) {} + FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListViewItem *tqparent, TQString name, Type type) + :FancyListViewItem(styles, tqparent, name, ""), m_part(part), m_type(type) {} ~FunctionNavItem() {} virtual void setup() @@ -104,8 +104,8 @@ private: }; -Navigator::Navigator(ClassViewPart *parent, const char *name) - : TQObject(parent, name), m_part(parent) +Navigator::Navigator(ClassViewPart *tqparent, const char *name) + : TQObject(tqparent, name), m_part(tqparent) { m_state = GoToDefinitions; m_navNoDefinition = true; @@ -289,7 +289,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear) { TQMap::iterator it2 = it; ++it; - if ( !toLeave.contains( it2.key() ) ) + if ( !toLeave.tqcontains( it2.key() ) ) { if (it2.data()) { @@ -331,7 +331,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear) { TQMap::iterator it2 = itt; ++itt; - if ( !toLeave.contains( it2.key() ) ) + if ( !toLeave.tqcontains( it2.key() ) ) { if (it2.data()) { @@ -397,14 +397,14 @@ TextPaintItem highlightFunctionName(TQString function, int type, TextPaintStyleS TQString fScope; int cutpos; - if((cutpos = function.find('(')) != -1) { + if((cutpos = function.tqfind('(')) != -1) { args = function.right( function.length() - cutpos ); function = function.left( cutpos ); } else { ret.addItem( function ); return ret; } - if((cutpos = function.findRev(':')) != -1 || (cutpos = function.findRev('.')) != -1) { + if((cutpos = function.tqfindRev(':')) != -1 || (cutpos = function.tqfindRev('.')) != -1) { fScope = function.left( cutpos + 1 ); function = function.right( function.length() - cutpos - 1); } @@ -499,7 +499,7 @@ void Navigator::slotJumpToPreviousFunction() unsigned int currentLine, currentCol; m_part->m_activeViewCursor->cursorPositionReal ( ¤tLine, ¤tCol ); - TQValueList lines = QValueList_reversed ( functionStartLines() ); + TQValueList lines = TQValueList_reversed ( functionStartLines() ); if ( lines.isEmpty() ) return; TQValueList::iterator it = lines.begin(); -- cgit v1.2.3