aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2023-01-25 11:24:38 +0200
committerRiku Isokoski <riksu9000@gmail.com>2023-02-16 09:13:58 +0200
commit6dc49e5bdb86ffd5730eb10eb9c477276e79923c (patch)
treeb1241ee8c63c42ef8589bdce88566476519cd5df
parent512ebf07043510930256e3c12498046b510ef8a1 (diff)
clang-format: Always break template declarations
I find this format easier to read, because the definitions are at the expected indentation, making it easier to find what I'm looking for.
-rw-r--r--.clang-format2
-rw-r--r--src/StaticStack.h15
-rw-r--r--src/components/utility/LinearApproximation.h3
-rw-r--r--src/displayapp/screens/Screen.h3
-rw-r--r--src/displayapp/screens/ScreenList.h3
5 files changed, 17 insertions, 9 deletions
diff --git a/.clang-format b/.clang-format
index b5c102d5..18f134dc 100644
--- a/.clang-format
+++ b/.clang-format
@@ -20,7 +20,7 @@ AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: MultiLine
+AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
diff --git a/src/StaticStack.h b/src/StaticStack.h
index 64886604..598febce 100644
--- a/src/StaticStack.h
+++ b/src/StaticStack.h
@@ -1,7 +1,8 @@
#include <array>
#include <cstddef>
-template <typename T, size_t N> class StaticStack {
+template <typename T, size_t N>
+class StaticStack {
public:
T Pop();
void Push(T element);
@@ -15,24 +16,28 @@ private:
};
// Returns random data when popping from empty array.
-template <typename T, size_t N> T StaticStack<T, N>::Pop() {
+template <typename T, size_t N>
+T StaticStack<T, N>::Pop() {
if (stackPointer > 0) {
stackPointer--;
}
return elementArray[stackPointer];
}
-template <typename T, size_t N> void StaticStack<T, N>::Push(T element) {
+template <typename T, size_t N>
+void StaticStack<T, N>::Push(T element) {
if (stackPointer < elementArray.size()) {
elementArray[stackPointer] = element;
stackPointer++;
}
}
-template <typename T, size_t N> void StaticStack<T, N>::Reset() {
+template <typename T, size_t N>
+void StaticStack<T, N>::Reset() {
stackPointer = 0;
}
-template <typename T, size_t N> T StaticStack<T, N>::Top() {
+template <typename T, size_t N>
+T StaticStack<T, N>::Top() {
return elementArray[stackPointer - 1];
}
diff --git a/src/components/utility/LinearApproximation.h b/src/components/utility/LinearApproximation.h
index f7104ced..1fe58d44 100644
--- a/src/components/utility/LinearApproximation.h
+++ b/src/components/utility/LinearApproximation.h
@@ -7,7 +7,8 @@ namespace Pinetime {
namespace Utility {
// based on: https://github.com/SHristov92/LinearApproximation/blob/main/Linear.h
- template <typename Key, typename Value, std::size_t Size> class LinearApproximation {
+ template <typename Key, typename Value, std::size_t Size>
+ class LinearApproximation {
using Point = struct {
Key key;
Value value;
diff --git a/src/displayapp/screens/Screen.h b/src/displayapp/screens/Screen.h
index 4cf134d2..73f80191 100644
--- a/src/displayapp/screens/Screen.h
+++ b/src/displayapp/screens/Screen.h
@@ -10,7 +10,8 @@ namespace Pinetime {
namespace Screens {
- template <class T> class DirtyValue {
+ template <class T>
+ class DirtyValue {
public:
DirtyValue() = default; // Use NSDMI
diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h
index 6c9a2218..255544b6 100644
--- a/src/displayapp/screens/ScreenList.h
+++ b/src/displayapp/screens/ScreenList.h
@@ -12,7 +12,8 @@ namespace Pinetime {
enum class ScreenListModes { UpDown, RightLeft, LongPress };
- template <size_t N> class ScreenList : public Screen {
+ template <size_t N>
+ class ScreenList : public Screen {
public:
ScreenList(DisplayApp* app,
uint8_t initScreen,