kdiff3/src/directorymergewindow.cpp, branch v3.5.13 KDiff3 – a diff and merge program https://scm.trinitydesktop.org/cgit/kdiff3/atom?h=v3.5.13 2011-08-31T04:15:04Z Fix remaining instances of tqStatus embedded in user visible strings 2011-08-31T04:15:04Z tpearson tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da 2011-08-31T04:15:04Z urn:sha1:b6bbc61302695d00dec061f65d34ce3a5e98abe8 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 conversions 2011-08-27T21:38:57Z tpearson tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da 2011-08-27T21:38:57Z urn:sha1:e0ec84b82a609a73cc82c6727e9a9e54769d60f6 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da rename the following methods: 2011-08-10T22:19:39Z tpearson tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da 2011-08-10T22:19:39Z urn:sha1:721c5c4ee3dcee163a2b0f7fd94cb3689154c1bd 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: 2011-08-10T06:08:18Z tpearson tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da 2011-08-10T06:08:18Z urn:sha1:5173e6fcb16310e130fba4143e334563b4f8460e 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: 2011-07-09T02:23:29Z tpearson tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da 2011-07-09T02:23:29Z urn:sha1:3d7cc5d294c8da55ecaefe7a9f5631a72adc610e 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[...] 2011-07-07T21:14:06Z tpearson tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da 2011-07-07T21:14:06Z urn:sha1:e239d13ed0d22108025907f02d0b659555b137a7 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1240369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da TQt4 port kdiff3 2011-06-27T05:58:16Z tpearson tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da 2011-06-27T05:58:16Z urn:sha1:f636ba5ba2df9d34d56b1c85f24c6598fa1cb645 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 kdiff3 2010-02-10T01:27:27Z tpearson tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da 2010-02-10T01:27:27Z urn:sha1:76718abdb2138623102398a10f3228e576dd0ae8 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da