GitLab

Pass QVector<LineData> if that's needed don't make assumtions
about the memmory layout of classes especial ones we don't control.

This fixes a bug masked by the incorret reset of m_bIsText.

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"

Prevent line count from exceeding maximum value in
SourceData::FileData::preprocess

QtNumberType is now used to help sort out depenacies on Qt's
"int-for-all" decision.

Do not expose the internal operations of a class to outside code.

std<list>.size() is now garenteed by c++11 to be constant time.
total size was explicitly indicated to be redudant removed.

Move remaining setPixmaps functionallity to MergeFileInfos.
rename to updateAge no longer does aything else

C++ does not require struct when referancing a defined type.

reformat and removed unused/undefined function prototypes

Add invalidate, isValid to LineRef.
use pointer syntax when dealing with iterators

Using int everywhere makes the code difficult to fallow.