summaryrefslogtreecommitdiffstats
path: root/src/mergeresultwindow.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commit3d7cc5d294c8da55ecaefe7a9f5631a72adc610e (patch)
tree8e35d69acd1a1c54d9d1b55724c3e72aa69df9e5 /src/mergeresultwindow.cpp
parente239d13ed0d22108025907f02d0b659555b137a7 (diff)
downloadkdiff3-3d7cc5d294c8da55ecaefe7a9f5631a72adc610e.tar.gz
kdiff3-3d7cc5d294c8da55ecaefe7a9f5631a72adc610e.zip
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/mergeresultwindow.cpp')
-rw-r--r--src/mergeresultwindow.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
index c0a3a8a..ac377d6 100644
--- a/src/mergeresultwindow.cpp
+++ b/src/mergeresultwindow.cpp
@@ -1067,10 +1067,10 @@ bool findParenthesesGroups( const TQString& s, TQStringList& sl )
sl.push_back( s.mid( startPos+1, i-startPos-1 ) );
}
}
- return startPosStack.empty(); // false if tqparentheses don't match
+ return startPosStack.empty(); // false if parentheses don't match
}
-TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr, const TQStringList& tqparenthesesGroupList )
+TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr, const TQStringList& parenthesesGroupList )
{
TQStringList keyOrderList = TQStringList::split(',', keyOrder );
TQString key;
@@ -1080,7 +1080,7 @@ TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr,
continue;
bool bOk=false;
int groupIdx = (*keyIt).toInt(&bOk);
- if (!bOk || groupIdx<0 || groupIdx >(int)tqparenthesesGroupList.size() )
+ if (!bOk || groupIdx<0 || groupIdx >(int)parenthesesGroupList.size() )
continue;
TQString s = matchedRegExpr.cap( groupIdx );
if ( groupIdx == 0 )
@@ -1089,7 +1089,7 @@ TQString calcHistorySortKey( const TQString& keyOrder, TQRegExp& matchedRegExpr,
continue;
}
- TQString groupRegExp = tqparenthesesGroupList[groupIdx-1];
+ TQString groupRegExp = parenthesesGroupList[groupIdx-1];
if( groupRegExp.tqfind('|')<0 || groupRegExp.tqfind('(')>=0 )
{
bool bOk = false;
@@ -1137,8 +1137,8 @@ void MergeResultWindow::collectHistoryInformation(
TQRegExp historyStart = m_pOptionDialog->m_historyStartRegExp;
++id3l; // Skip line with "$Log ... $"
TQRegExp newHistoryEntry = m_pOptionDialog->m_historyEntryStartRegExp;
- TQStringList tqparenthesesGroups;
- findParenthesesGroups( m_pOptionDialog->m_historyEntryStartRegExp, tqparenthesesGroups );
+ TQStringList parenthesesGroups;
+ findParenthesesGroups( m_pOptionDialog->m_historyEntryStartRegExp, parenthesesGroups );
TQString key;
MergeEditLineList melList;
bool bPrevLineIsEmpty = true;
@@ -1171,7 +1171,7 @@ void MergeResultWindow::collectHistoryInformation(
if ( ! bUseRegExp )
key = sLine;
else
- key = calcHistorySortKey(m_pOptionDialog->m_historyEntryStartSortKeyOrder,newHistoryEntry,tqparenthesesGroups);
+ key = calcHistorySortKey(m_pOptionDialog->m_historyEntryStartSortKeyOrder,newHistoryEntry,parenthesesGroups);
melList.clear();
melList.push_back( MergeEditLine(id3l,src) );