Add clang-format config and enable pre-commit (#40)

maplibre · Oct 14, 2023 · 4a5c563 · 4a5c563
1 parent df4582b
commit 4a5c563
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 20 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,17 @@
+---
+BasedOnStyle: Google
+AccessModifierOffset: -4
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortLambdasOnASingleLine: Inline
+BinPackArguments: false
+BinPackParameters: false
+ColumnLimit: 120
+IncludeBlocks: Preserve
+IndentWidth: 4
+Language: Cpp
+PackConstructorInitializers: Never
+PenaltyBreakAssignment: 80
+SortIncludes: true
+SpacesBeforeTrailingComments: 1
+Standard: c++17
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,25 @@
+repos:
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v17.0.2
+    hooks:
+      - id: clang-format
+        files: '.*\.(hpp|cpp|h)'
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-executables-have-shebangs
+      - id: check-json
+      - id: check-shebang-scripts-are-executable
+      - id: check-merge-conflict
+      - id: check-vcs-permalinks
+      - id: check-yaml
+      - id: destroyed-symlinks
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+      - id: trailing-whitespace
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+      - id: check-useless-excludes
diff --git a/examples/minimal/main.cpp b/examples/minimal/main.cpp
@@ -8,8 +8,7 @@
 #include <QQuickWindow>
 #endif
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
 #endif

diff --git a/src/core/geojson_p.hpp b/src/core/geojson_p.hpp
@@ -8,8 +8,8 @@
 #include "types.hpp"
 
 #include <mapbox/geojson.hpp>
-#include <mbgl/util/geometry.hpp>
 #include <mbgl/util/feature.hpp>
+#include <mbgl/util/geometry.hpp>
 
 #include <QVariant>
 

diff --git a/src/core/map_renderer_p.hpp b/src/core/map_renderer_p.hpp
@@ -12,9 +12,10 @@
 #include <mbgl/renderer/renderer_observer.hpp>
 #include <mbgl/util/util.hpp>
 
-#include <QtGlobal>
 #include <QObject>
 
+#include <QtGlobal>
+
 #include <memory>
 #include <mutex>
 

diff --git a/src/core/renderer_backend.cpp b/src/core/renderer_backend.cpp
@@ -8,9 +8,10 @@
 #include <mbgl/gfx/backend_scope.hpp>
 #include <mbgl/gl/renderable_resource.hpp>
 
-#include <QtGlobal>
 #include <QOpenGLContext>
 
+#include <QtGlobal>
+
 namespace QMapLibre {
 
 class RenderableResource final : public mbgl::gl::RenderableResource {

diff --git a/src/core/utils.cpp b/src/core/utils.cpp
@@ -7,8 +7,8 @@
 
 #include <mbgl/storage/network_status.hpp>
 #include <mbgl/util/geometry.hpp>
-#include <mbgl/util/traits.hpp>
 #include <mbgl/util/projection.hpp>
+#include <mbgl/util/traits.hpp>
 
 // mbgl::NetworkStatus::Status
 static_assert(mbgl::underlying_type(QMapLibre::Online) == mbgl::underlying_type(mbgl::NetworkStatus::Status::Online),

diff --git a/src/location/plugins/qml_types.hpp b/src/location/plugins/qml_types.hpp
@@ -5,12 +5,12 @@
 #ifndef QMAPLIBREQMLTYPES_H
 #define QMAPLIBREQMLTYPES_H
 
-#include <QtCore/QObject>
-#include <QtQml/qqml.h>
-#include <QtLocation/private/qdeclarativegeomap_p.h>
-
 #include "../qgeomap.hpp"
 
+#include <QtLocation/private/qdeclarativegeomap_p.h>
+#include <QtQml/qqml.h>
+#include <QtCore/QObject>
+
 class MapLibreStyleAttached : public QObject {
     Q_OBJECT
     QML_ANONYMOUS

diff --git a/src/location/qgeomap.cpp b/src/location/qgeomap.cpp
@@ -23,9 +23,9 @@
 #include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
 #include <QtLocation/private/qdeclarativerectanglemapitem_p.h>
 #include <QtLocation/private/qgeoprojection_p.h>
+#include <QtQuick/private/qsgcontext_p.h> // for debugging the context name
 #include <QtQuick/QQuickWindow>
 #include <QtQuick/QSGImageNode>
-#include <QtQuick/private/qsgcontext_p.h> // for debugging the context name
 
 #include <QMapLibre/Types>
 

diff --git a/src/location/qgeomap_p.hpp b/src/location/qgeomap_p.hpp
@@ -6,13 +6,14 @@
 
 #pragma once
 
+#include <QtLocation/private/qgeomap_p_p.h>
+
 #include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QRectF>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QTimer>
 #include <QtCore/QVariant>
-#include <QtLocation/private/qgeomap_p_p.h>
 
 namespace QMapLibre {
 class Map;

diff --git a/src/location/qt_mapping_engine.cpp b/src/location/qt_mapping_engine.cpp
@@ -7,8 +7,8 @@
 #include "qt_mapping_engine.hpp"
 #include "qgeomap.hpp"
 
+#include <QtCore/qdir.h>
 #include <QtCore/qstandardpaths.h>
-#include <QDir>
 #include <QtLocation/private/qabstractgeotilecache_p.h>
 #include <QtLocation/private/qgeocameracapabilities_p.h>
 #include <QtLocation/private/qgeomaptype_p.h>

diff --git a/src/location/qt_mapping_engine.hpp b/src/location/qt_mapping_engine.hpp
@@ -10,8 +10,8 @@
 
 #include <QMapLibre/Settings>
 
-#include <QtLocation/QGeoServiceProvider>
 #include <QtLocation/private/qgeomappingmanagerengine_p.h>
+#include <QtLocation/QGeoServiceProvider>
 
 namespace QMapLibre {
 

diff --git a/src/location/stylechange.cpp b/src/location/stylechange.cpp
@@ -5,14 +5,15 @@
 
 #include "stylechange_p.h"
 
+#include <QtLocation/private/qdeclarativecirclemapitem_p_p.h>
+
 #include <QtCore/QDebug>
 #include <QtCore/QMetaProperty>
 #include <QtCore/QRegularExpression>
 #include <QtCore/QStringList>
 #include <QtPositioning/QGeoPath>
 #include <QtPositioning/QGeoPolygon>
 #include <QtQml/QJSValue>
-#include <QtLocation/private/qdeclarativecirclemapitem_p_p.h>
 
 #include <QMapLibre/Map>
 

diff --git a/src/location/stylechange_p.h b/src/location/stylechange_p.h
@@ -5,17 +5,18 @@
 
 #pragma once
 
+#include <QtLocation/private/qdeclarativecirclemapitem_p.h>
+#include <QtLocation/private/qdeclarativegeomapitembase_p.h>
+#include <QtLocation/private/qdeclarativepolygonmapitem_p.h>
+#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
+#include <QtLocation/private/qdeclarativerectanglemapitem_p.h>
+
 #include <QtCore/QList>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QString>
 #include <QtCore/QVariant>
 #include <QtCore/QVariantMap>
 #include <QtGui/QImage>
-#include <QtLocation/private/qdeclarativecirclemapitem_p.h>
-#include <QtLocation/private/qdeclarativegeomapitembase_p.h>
-#include <QtLocation/private/qdeclarativepolygonmapitem_p.h>
-#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
-#include <QtLocation/private/qdeclarativerectanglemapitem_p.h>
 
 #include <QMapLibre/Types>