GitLab

1.9.4 has been released.

Use ranged for and const where posssiable in MergeResultWindow::deleteSelection

Signed-off-by: Snehit Sah <snehitsah@protonmail.com>

Fix AppStream release info so that the information that people see
on e.g. https://apps.kde.org/kdiff3/ is correct.

Revision: !36

cppcheck is not run routinely on this project due to lack of proper compile_commands.json support.
False parsing errors are common when attempting to run it. This noise masks any real messages there maybe.
Further a number of checks will not pass cleanly do to design/stylistic choices.
The suppression file it this commit only blocks the main offenders.

Manually disconnect from QApplication::focusChanged to prevent spurious focus change signals from reaching us during teardown.

BUG:444654
FIXED-IN:1.9.4

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Avoids fun compile-time error on some compilers

Alexander Lohnau authored Oct 25, 2021 and Michael Reeves committed Oct 25, 2021

As mentioned in 8aa66b68 the loading did not work.
By filling in all parameters for the KParts constructor it works properly.

By having an explicit assertion one gets an actually useful error
instead of a confusing stacktrace.

QtSizeType is better relfects the true origin and purpose of mOffset in LineData.
This is memmory based offset into a unicode buffer not a raw file data offset.

BUG:442199
FIXE-IN:1.9.4

The auto test now uses the  custom comparison operators to insure no important field is missed.
This removes impelementation details from the test.
DiffList and Diff3LineList can now be fully checked with one QVERIFY.

d3l is not used in all cases so don't define it unless needed.
Nominal time savings from not constructing a Diff3Line on each pass through these loops.

Define d3l in side each of the new loops so it gets reset each time as before.

Very hard to track with what 0, 1 and 2 mean.
Define FilesFound enum inside MergeFileInfos::compareFilesAndCalcAges  as its used nowhere else.

Let Qt handle this part for us as needed.