Merge branch '3.0'

KDAB · Sep 19, 2023 · 4fbf633 · 4fbf633
2 parents cff73ce + 2be25a2
commit 4fbf633
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,21 +13,21 @@ repos:
     args: [--allow-multiple-documents]
   - id: check-json
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v15.0.4
+  rev: v16.0.6
   hooks:
   - id: clang-format
 - repo: https://github.com/PyCQA/pylint
-  rev: v2.15.6
+  rev: v3.0.0a7
   hooks:
   - id: pylint
     exclude: ^(.cmake-format.py|conan/.*/conanfile.py)
 - repo: https://github.com/pre-commit/mirrors-autopep8
-  rev: v2.0.2
+  rev: v2.0.4
   hooks:
   - id: autopep8
     exclude: ^(.cmake-format.py|conan/.*/conanfile.py)
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.2.4
+  rev: v2.2.5
   hooks:
   - id: codespell
 - repo: https://github.com/cheshirekow/cmake-format-precommit
@@ -45,6 +45,6 @@ repos:
     language: ruby
     files: \.(md|mdown|markdown)$
 - repo: https://github.com/fsfe/reuse-tool
-  rev: v1.1.2
+  rev: v2.1.0
   hooks:
   - id: reuse
diff --git a/plugins/styleinspector/complexcontrolmodel.cpp b/plugins/styleinspector/complexcontrolmodel.cpp
@@ -32,11 +32,11 @@ struct complex_control_element_t
 
 #define MAKE_CC2(control, factory)                                              \
     {                                                                           \
-#control, &StyleOption::factory, QStyle::control, QStyle::SubControls() \
+        #control, &StyleOption::factory, QStyle::control, QStyle::SubControls() \
     }
 #define MAKE_CC3(control, factory, subControls)                       \
     {                                                                 \
-#control, &StyleOption::factory, QStyle::control, subControls \
+        #control, &StyleOption::factory, QStyle::control, subControls \
     }
 
 static const complex_control_element_t complexControlElements[] = {

diff --git a/plugins/styleinspector/controlmodel.cpp b/plugins/styleinspector/controlmodel.cpp
@@ -31,11 +31,11 @@ struct control_element_t
 
 #define MAKE_CE(control)                                         \
     {                                                            \
-#control, QStyle::control, &StyleOption::makeStyleOption \
+        #control, QStyle::control, &StyleOption::makeStyleOption \
     }
 #define MAKE_CE_X(control, factory)                      \
     {                                                    \
-#control, QStyle::control, &StyleOption::factory \
+        #control, QStyle::control, &StyleOption::factory \
     }
 
 static const control_element_t controlElements[] = {

diff --git a/plugins/styleinspector/pixelmetricmodel.cpp b/plugins/styleinspector/pixelmetricmodel.cpp
@@ -26,7 +26,7 @@ struct pixel_metric_t
 
 #define MAKE_PM(metric)         \
     {                           \
-#metric, QStyle::metric \
+        #metric, QStyle::metric \
     }
 
 static const pixel_metric_t pixelMetrics[] = {

diff --git a/plugins/styleinspector/primitivemodel.cpp b/plugins/styleinspector/primitivemodel.cpp
@@ -31,11 +31,11 @@ struct primitive_element_t
 
 #define MAKE_PE(primitive)                                           \
     {                                                                \
-#primitive, QStyle::primitive, &StyleOption::makeStyleOption \
+        #primitive, QStyle::primitive, &StyleOption::makeStyleOption \
     }
 #define MAKE_PE_X(primitive, factory)                        \
     {                                                        \
-#primitive, QStyle::primitive, &StyleOption::factory \
+        #primitive, QStyle::primitive, &StyleOption::factory \
     }
 
 static const primitive_element_t primititveElements[] = {

diff --git a/plugins/styleinspector/styleoption.cpp b/plugins/styleinspector/styleoption.cpp
@@ -45,7 +45,7 @@ struct style_state_t
 
 #define MAKE_STATE(state)     \
     {                         \
-#state, QStyle::state \
+        #state, QStyle::state \
     }
 
 static const style_state_t styleStates[] = {