[gjs: 4/5] CI: Remove customizations from cpplint config

[Philip Chimento <pchimento src gnome org>]

commit f3e104f071507f66923a20b689903ac43a620965
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Jun 19 17:46:42 2018 -0700

    CI: Remove customizations from cpplint config
    
    We're going to just use the Google C++ coding style, so remove our
    customizations. (We do still allow lines a little bit longer than the
    limit that we give to clang-format, since sometimes clang-format will
    format a line longer than 80 characters if the alternative is worse.)
    
    [skip cpplint] since this will of course introduce many more linter
    errors.

 .clang-format | 3 +++
 CPPLINT.cfg   | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/.clang-format b/.clang-format
index 46bb09ec..1dc29a2e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -5,10 +5,13 @@ ColumnLimit: 80
 ---
 Language: Cpp
 BasedOnStyle: Google
+AccessModifierOffset: -3  # to match cpplint
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
+DerivePointerAlignment: false
 ForEachMacros: []
 IndentWidth: 4
+PointerAlignment: Left  # Google style allows both, but clang-format doesn't
 ---
 # We rely mostly on eslint for JavaScript linting, but this is a lax collection
 # of rules that will auto-fix some JS things. We really should use eslint --fix
diff --git a/CPPLINT.cfg b/CPPLINT.cfg
index edef0aec..30edcbf2 100644
--- a/CPPLINT.cfg
+++ b/CPPLINT.cfg
@@ -1,7 +1,6 @@
 # This is the toplevel CPPLINT.cfg file
 set noparent
 
+# We give a limit to clang-format of 80, but we allow 100 here for cases where
+# it really is more readable to have a longer line
 linelength=100
-
-filter=-build/include_subdir
-filter=-whitespace/braces