GitLab

# Conflicts:
#	src/optiondialog.h

Fix some bugs and improve code (new connect syntax, foreach loop, etc).

# Conflicts:
#	kdiff3fileitemactionplugin/kdiff3fileitemaction.cpp

*use default preference name.
*header cleanup

# Conflicts:
#	CMakeLists.txt

Merdge changes from Thomsen/Joachim*Fix QUrl handling*Fix preferance access*Use QKeySequence::Refresh*add missed code for print cancellation

Applying various changes suggested by clazy, including:
- const references in foreach loops
- 'midRef' instead of 'mid'
- Removing/disabling unused variables

Updating/renaming/creating .desktop files for both
main application and part as well as creating an
.appdata.xml file based on the translations from
the application's .desktop file.

# Conflicts:
#	src/smalldialogs.cpp

# Conflicts:
#	CMakeLists.txt

This was caused by QTextCodec::codecForName("System") returning a null
pointer.

Signed-off-by: joachim99 <joachim.eibl@gmx.de>

# Conflicts:
#	src/progress.cpp

Signed-off-by: joachim99 <joachim.eibl@gmx.de>

Signed-off-by: joachim99 <joachim.eibl@gmx.de>

Signed-off-by: joachim99 <joachim.eibl@gmx.de>

Signed-off-by: joachim99 <joachim.eibl@gmx.de>

Signed-off-by: joachim99 <joachim.eibl@gmx.de>

This reverts commit edc1422c7e023b71e766d4ac368433c9e4064e73.

# Conflicts:
#	src/common.cpp
#	src/directorymergewindow.cpp
#	src/fileaccess.cpp
#	src/kdiff3.cpp
#	src/kdiff3_part.cpp
#	src/kdiff3_shell.cpp
#	src/main.cpp
#	src/optiondialog.cpp
#	src/smalldialogs.cpp

- Some steps towards Qt5 compilability - Improving interruptability while recalculating word wrap - Fixed diff-ext makefile
Signed-off-by: Joachim Eibl <joachim.eibl@gmx.de>