summaryrefslogtreecommitdiffstats
path: root/src/directorymergewindow.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove additional unneeded tq method conversionsTimothy Pearson2011-12-191-22/+22
|
* Rename old tq methods that no longer need a unique nameTimothy Pearson2011-12-181-15/+15
|
* Revert "Rename a number of old tq methods that are no longer tq specific"Timothy Pearson2011-12-161-39/+39
| | | | This reverts commit f3372e7bea9bbc288e039d85d660450220a637d8.
* Rename a number of old tq methods that are no longer tq specificTimothy Pearson2011-12-151-39/+39
|
* Fix remaining instances of tqStatus embedded in user visible stringstpearson2011-08-311-1/+1
| | | | git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1250385 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Fix a number of accidental tqStatus string conversionstpearson2011-08-271-1/+1
| | | | git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* rename the following methods:tpearson2011-08-101-9/+9
| | | | | | | | tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* 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-8/+8
| | | | | | | | | | | | 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
* Rename incorrect instances of tqrepaint[...] to repaint[...]tpearson2011-07-071-6/+6
| | | | git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1240369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* TQt4 port kdiff3tpearson2011-06-271-377/+373
| | | | | | | 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/+3048
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da