summaryrefslogtreecommitdiffstats
path: root/src/mergeresultwindow.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename obsolete tq methods to standard namesTimothy Pearson2012-06-051-2/+2
| | | | (cherry picked from commit d654b1079f7801b0a65c8de8936d0d174656702b)
* Remove additional unneeded tq method conversionsTimothy Pearson2012-06-051-13/+13
| | | | (cherry picked from commit 9b57232f1beb774a8a4bab4ae1f85999e193d037)
* Rename old tq methods that no longer need a unique nameTimothy Pearson2012-06-051-20/+20
| | | | (cherry picked from commit c7e29c4606e72cf1d3d0052eec08805c8cf3fce7)
* rename the following methods:tpearson2011-08-101-4/+4
| | | | | | | | | tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Remove the tq in front of these incorrectly TQt4-converted methods/data members:tpearson2011-07-091-7/+7
| | | | | | | | | | | | 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
* TQt4 port kdiff3tpearson2011-06-271-228/+228
| | | | | | | This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1238464 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Added abandoned KDE3 version of kdiff3tpearson2010-02-101-0/+3222
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da