GitLab

*use default preference name.
*header cleanup

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

QString::null is depriated as of QT 5.9. Use QString() instead. Non-breaking change. Tecnically the second parameter iof KHelpClient::invokeHelp isn't even needed as will defualt to QString(). Leaving it for clarity sake.
Signed-off-by: Michael Reeves <reporter123@users.noreply.github.com>

Seriously how did this ever work.
*Scrat unneeded KReplacement check.

*use QFontDatabase::systemFont universally
 rm one #ifdef and hard coded fonts.

*fix missing headers
*scrat obsolete since who knows when storage specifier
--finally being offically removed from specs
*fix warning about delete vs delete[]
*QDialog porting

*use KDialog::spacingHint for now.

*add missing Q_OBJECT

*preemptively uncomment all #include *.moc lines
--already had one esoteric error related to this

- Don't require fixed width fonts in KDE version.
Signed-off-by: joachim99 <joachim.eibl@gmx.de>

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

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@165 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@164 c8aa9fed-2811-0410-8543-893ada326672

Added default directory anti patterns ".hg" and ".git" and file anti patterns ".rej" and ".bak" for better mercurial and git integration.
(Idea by Angel Ezquerra)

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@162 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@160 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@157 c8aa9fed-2811-0410-8543-893ada326672

These patches add two new directory diff settings, useful when running kdiff3 from a VCS [1]:
1. Unfold all subdirectories on startup, matching the "Expand subfolders when loading session" setting in Beyond Compare.
2. Skip the Directory Comparison Status report.



git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@148 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@145 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@134 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@117 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@104 c8aa9fed-2811-0410-8543-893ada326672

- Fixed writing to KIO.
- Fix crash on A/B-overview (infinite recursion)


git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@99 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@96 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@84 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@81 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@79 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@77 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@74 c8aa9fed-2811-0410-8543-893ada326672

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@72 c8aa9fed-2811-0410-8543-893ada326672