From 9de4d27bbf66967e95d751879a685361c4f83a48 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Date: Fri, 17 Oct 2014 15:12:54 +0200 Subject: [PATCH] fix spacing and capitalization Change-Id: Ibf68632ea8a8d9216235b64bda1757d110cf24ad Reviewed-by: Orgad Shaneh <orgads@gmail.com> --- git-hooks/sanitize-commit | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit index d6d4d44..260c276 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -137,7 +137,7 @@ sub complain_spelling($) foreach my $line (@lines) { foreach my $error (@{$errors->{$line}}) { - complain("$line: possible spelling error: $error", "spell"); + complain("$line: Possible spelling error: $error", "spell"); } } } @@ -175,8 +175,8 @@ sub check_apple_terminology() { if ($clike) { if (/\bQ_OS_MAC\b.*&&.*!.*\bQ_OS_IOS\b/) { - complain("$lineno: use of deprecated idiom 'defined(Q_OS_MAC) && !defined(Q_OS_IOS)';" . - "use Q_OS_OSX instead", "terminology"); + complain("$lineno: Use of deprecated idiom 'defined(Q_OS_MAC) && !defined(Q_OS_IOS)';" . + " use Q_OS_OSX instead", "terminology"); } # Not invalid, but remind people about how the unfortunately named Q_OS_MAC must be used @@ -186,24 +186,24 @@ sub check_apple_terminology() } if (/\bQ_OS_MACX\b/) { - complain("$lineno: using deprecated define Q_OS_MACX; use Q_OS_OSX instead", "terminology"); + complain("$lineno: Using deprecated define Q_OS_MACX; use Q_OS_OSX instead", "terminology"); } } elsif ($qmake) { # check qmake scopes if (/\bmac\s*:\s*!\s*ios\b/) { - complain("$lineno: use of deprecated idiom 'mac:!ios', use 'osx' instead", + complain("$lineno: Use of deprecated idiom 'mac:!ios', use 'osx' instead", "terminology"); } # Not invalid, but remind people about how the unfortunately named 'mac' must be used if (/\bmac\b/) { - complain("$lineno: possible use of qmake scope 'mac': this covers both OS X and iOS;" . + complain("$lineno: Possible use of qmake scope 'mac': this covers both OS X and iOS;" . " if you meant only OS X, use 'osx'", "", -1); } # Match the word macx but avoid matching macx- and macx* since these are valid for mkspecs if (/\bmacx\b(?![-*])/) { - complain("$lineno: using deprecated qmake scope 'macx'; use 'osx' instead", + complain("$lineno: Using deprecated qmake scope 'macx'; use 'osx' instead", "terminology"); } } @@ -212,7 +212,7 @@ sub check_apple_terminology() # valid for use, however users are likely to use Mac(intosh)? to incorrectly refer to the OS so # we'll still flag it if (/\bmac(([\s_-]*os)([\s_-]*x)?)?\b/i or /\bmacintosh\b/i) { - complain("$lineno: possible incorrect use of Apple-related terminology", "", -1); + complain("$lineno: Possible incorrect use of Apple-related terminology", "", -1); } } -- GitLab