From 99a2774ca6f1cab334de5d43fe36fc44ae889a4c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 12 Jun 2011 01:36:19 +0000 Subject: TQt4 convert kdesdk This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- umbrello/umbrello/hierarchicalcodeblock.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'umbrello/umbrello/hierarchicalcodeblock.cpp') diff --git a/umbrello/umbrello/hierarchicalcodeblock.cpp b/umbrello/umbrello/hierarchicalcodeblock.cpp index eff7f463..7d31bf1d 100644 --- a/umbrello/umbrello/hierarchicalcodeblock.cpp +++ b/umbrello/umbrello/hierarchicalcodeblock.cpp @@ -114,7 +114,7 @@ bool HierarchicalCodeBlock::insertTextBlock(TextBlock * newBlock, TextBlock * ex return false; TQString tag = existingBlock->getTag(); - // FIX: just do a quick check if the parent DOCUMENT has this. + // FIX: just do a quick check if the tqparent DOCUMENT has this. // IF it does, then the lack of an index will force us into // a search of any child hierarchical codeblocks we may have // Its not efficient, but works. I don't think speed is a problem @@ -123,7 +123,7 @@ bool HierarchicalCodeBlock::insertTextBlock(TextBlock * newBlock, TextBlock * ex if(!getParentDocument()->findTextBlockByTag(tag, true)) return false; - int index = m_textblockVector.findRef(existingBlock); + int index = m_textblockVector.tqfindRef(existingBlock); if(index < 0) { // may be hiding in child hierarchical codeblock @@ -149,7 +149,7 @@ bool HierarchicalCodeBlock::insertTextBlock(TextBlock * newBlock, TextBlock * ex newBlock->setTag(new_tag); } - if(m_textBlockTagMap.contains(new_tag)) + if(m_textBlockTagMap.tqcontains(new_tag)) return false; // return false, we already have some object with this tag in the list else { m_textBlockTagMap.insert(new_tag, newBlock); @@ -202,7 +202,7 @@ void HierarchicalCodeBlock::setStartText ( const TQString &text ) { } /** - * @return QString + * @return TQString */ TQString HierarchicalCodeBlock::getStartText ( ) { return m_startText; @@ -310,7 +310,7 @@ void HierarchicalCodeBlock::setAttributesFromObject (TextBlock * obj) { /** - * @return QString + * @return TQString */ TQString HierarchicalCodeBlock::toString ( ) { @@ -365,7 +365,7 @@ TextBlock * HierarchicalCodeBlock::findCodeClassFieldTextBlockByTag ( const TQSt if(cdoc) return cdoc->findCodeClassFieldTextBlockByTag(tag); else - kError()<<" HierarchicalCodeBlock: findCodeClassFieldTextBlockByTag() finds NO parent document! Badly constructed textblock?!?"<