src/helper/kcmsystemd.actions | 16 15 1 - 0 !
1 file changed, 15 insertions( ), 1 deletion(-)

 [patch 03/17] svn_silent made messages (.desktop file) - always
 resolve ours

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"

src/confoption.cpp | 44 22 22 - 0 !
src/helper/helper.cpp | 2 1 1 - 0 !
src/kcmsystemd.cpp | 20 10 10 - 0 !
src/unitmodel.cpp | 4 2 2 - 0 !
4 files changed, 35 insertions( ), 35 deletions(-)

 [patch 04/17] use single quotes when appending single-chars to
 QStrings etc.

As suggested by Krazy2. It is more efficient to use single-quotes than
double-quotes when appending single-chars to QStrings, etc.

src/confdelegate.h | 2 1 1 - 0 !
src/confmodel.h | 2 1 1 - 0 !
src/confoption.h | 4 2 2 - 0 !
src/sortfilterunitmodel.h | 2 1 1 - 0 !
src/unitmodel.h | 4 2 2 - 0 !
5 files changed, 7 insertions( ), 7 deletions(-)

 [patch 05/17] make constructors explicit where applicable

As suggested by Krazy2.

src/confoption.cpp | 5 3 2 - 0 !
src/confparms.cpp | 6 3 3 - 0 !
src/kcmsystemd.cpp | 18 9 9 - 0 !
3 files changed, 15 insertions( ), 14 deletions(-)

 [patch 06/17] use const-ref in foreach loops

As suggested by Krazy2.

src/confdelegate.cpp | 4 2 2 - 0 !
src/confmodel.cpp | 4 2 2 - 0 !
src/confoption.cpp | 4 2 2 - 0 !
src/confparms.cpp | 6 3 3 - 0 !
src/kcmsystemd.cpp | 2 1 1 - 0 !
src/unitmodel.cpp | 4 2 2 - 0 !
6 files changed, 12 insertions( ), 12 deletions(-)

 [patch 07/17] include own header files first

As suggested by Krazy2.

src/systemdunit.h | 17 17 0 - 0 !
1 file changed, 17 insertions( )

 [patch 08/17] add license text to systemdunit.h

As suggested by Krazy2.

src/kcmsystemd.cpp | 4 2 2 - 0 !
1 file changed, 2 insertions( ), 2 deletions(-)

 [patch 09/17] use normalized signal/slot signatures

As suggested by Krazy2.

See also:
https://marcmutz.wordpress.com/effective-qt/prefer-to-use-normalised-signalslot-signatures/

src/kcm-systemd-features.h.cmake | 2 1 1 - 0 !
src/kcmsystemd.cpp | 10 7 3 - 0 !
2 files changed, 8 insertions( ), 4 deletions(-)

 [patch 10/17] miscellaneous minor fixes (qlatin1string usage,
 newline)

As suggested by Krazy2.

src/kcmsystemd.cpp | 8 5 3 - 0 !
1 file changed, 5 insertions( ), 3 deletions(-)

 [patch 11/17] use qpointer for modal qdialog

As suggested by Krazy2.

See also:
https://blogs.kde.org/node/3919

src/confoption.cpp | 6 3 3 - 0 !
1 file changed, 3 insertions( ), 3 deletions(-)

 [patch 12/17] use single quotes when appending single-chars to
 QStrings

As suggested by Krazy2.

src/helper/kcmsystemd.actions | 4 4 0 - 0 !
1 file changed, 4 insertions( )

 [patch 13/17] svn_silent made messages (.desktop file) - always
 resolve ours

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"