Meta: Tweak .clang-format to not wrap braces after enums.

akimdi · Jun 7, 2019 · 39d1a9a · 39d1a9a
1 parent 9145917
commit 39d1a9a
Show file tree

Hide file tree

Showing 97 changed files with 186 additions and 312 deletions.
diff --git a/.clang-format b/.clang-format
@@ -10,4 +10,3 @@ IndentPPDirectives: AfterHash
 BreakBeforeBraces: Custom
 BraceWrapping:
  AfterFunction: true
- AfterEnum: true
diff --git a/AK/AKString.h b/AK/AKString.h
@@ -84,8 +84,7 @@ class String {
  {
  }
 
- enum class CaseSensitivity
- {
+ enum class CaseSensitivity {
  CaseInsensitive,
  CaseSensitive,
  };

diff --git a/AK/ByteBuffer.h b/AK/ByteBuffer.h
@@ -60,8 +60,7 @@ class ByteBufferImpl : public Retainable<ByteBufferImpl> {
  void grow(int size);
 
 private:
- enum ConstructionMode
- {
+ enum ConstructionMode {
  Uninitialized,
  Copy,
  Wrap,

diff --git a/AK/RetainPtr.h b/AK/RetainPtr.h
@@ -8,8 +8,7 @@ namespace AK {
 template<typename T>
 class RetainPtr {
 public:
- enum AdoptTag
- {
+ enum AdoptTag {
  Adopt
  };
 

diff --git a/AK/Retained.h b/AK/Retained.h
@@ -34,8 +34,7 @@ inline void release_if_not_null(T* ptr)
 template<typename T>
 class CONSUMABLE(unconsumed) Retained {
 public:
- enum AdoptTag
- {
+ enum AdoptTag {
  Adopt
  };
 

diff --git a/AK/StdLibExtras.h b/AK/StdLibExtras.h
@@ -271,16 +271,14 @@ struct RemovePointer<T* const volatile> {
 
 template<typename T, typename U>
 struct IsSame {
- enum
- {
+ enum {
  value = 0
  };
 };
 
 template<typename T>
 struct IsSame<T, T> {
- enum
- {
+ enum {
  value = 1
  };
 };

diff --git a/AK/StringImpl.h b/AK/StringImpl.h
@@ -6,8 +6,7 @@
 
 namespace AK {
 
-enum ShouldChomp
-{
+enum ShouldChomp {
  NoChomp,
  Chomp
 };
@@ -40,17 +39,15 @@ class StringImpl : public Retainable<StringImpl> {
  }
 
 private:
- enum ConstructTheEmptyStringImplTag
- {
+ enum ConstructTheEmptyStringImplTag {
  ConstructTheEmptyStringImpl
  };
  explicit StringImpl(ConstructTheEmptyStringImplTag)
  : m_characters("")
  {
  }
 
- enum ConstructWithInlineBufferTag
- {
+ enum ConstructWithInlineBufferTag {
  ConstructWithInlineBuffer
  };
  StringImpl(ConstructWithInlineBufferTag, ssize_t length);

diff --git a/AK/Types.h b/AK/Types.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <AK/IterationDecision.h>
+
 #ifdef __serenity__
 typedef unsigned char byte;
 typedef unsigned short word;
@@ -48,12 +50,6 @@ constexpr unsigned KB = 1024;
 constexpr unsigned MB = KB * KB;
 constexpr unsigned GB = KB * KB * KB;
 
-enum class IterationDecision
-{
- Continue,
- Abort
-};
-
 namespace std {
 typedef decltype(nullptr) nullptr_t;
 }
diff --git a/Applications/FileManager/DirectoryView.h b/Applications/FileManager/DirectoryView.h
@@ -26,8 +26,7 @@ class DirectoryView final : public GStackWidget {
  Function<void(const StringView&)> on_status_message;
  Function<void(int done, int total)> on_thumbnail_progress;
 
- enum ViewMode
- {
+ enum ViewMode {
  Invalid,
  List,
  Icon

diff --git a/Applications/IRCClient/IRCChannelMemberListModel.h b/Applications/IRCClient/IRCChannelMemberListModel.h
@@ -7,8 +7,7 @@ class IRCChannel;
 
 class IRCChannelMemberListModel final : public GModel {
 public:
- enum Column
- {
+ enum Column {
  Name
  };
  static Retained<IRCChannelMemberListModel> create(IRCChannel& channel) { return adopt(*new IRCChannelMemberListModel(channel)); }

diff --git a/Applications/IRCClient/IRCClient.cpp b/Applications/IRCClient/IRCClient.cpp
@@ -14,8 +14,7 @@
 
 #define IRC_DEBUG
 
-enum IRCNumeric
-{
+enum IRCNumeric {
  RPL_WHOISUSER = 311,
  RPL_WHOISSERVER = 312,
  RPL_WHOISOPERATOR = 313,
@@ -106,8 +105,7 @@ void IRCClient::process_line(ByteBuffer&& line)
  Vector<char, 32> prefix;
  Vector<char, 32> command;
  Vector<char, 256> current_parameter;
- enum
- {
+ enum {
  Start,
  InPrefix,
  InCommand,

diff --git a/Applications/IRCClient/IRCLogBufferModel.h b/Applications/IRCClient/IRCLogBufferModel.h
@@ -6,8 +6,7 @@ class IRCLogBuffer;
 
 class IRCLogBufferModel final : public GModel {
 public:
- enum Column
- {
+ enum Column {
  Timestamp = 0,
  Name,
  Text,

diff --git a/Applications/IRCClient/IRCWindow.h b/Applications/IRCClient/IRCWindow.h
@@ -11,8 +11,7 @@ class GTextEditor;
 
 class IRCWindow : public GWidget {
 public:
- enum Type
- {
+ enum Type {
  Server,
  Channel,
  Query,

diff --git a/Applications/IRCClient/IRCWindowListModel.h b/Applications/IRCClient/IRCWindowListModel.h
@@ -8,8 +8,7 @@ class IRCWindow;
 
 class IRCWindowListModel final : public GModel {
 public:
- enum Column
- {
+ enum Column {
  Name,
  };
 

diff --git a/Applications/ProcessManager/ProcessModel.h b/Applications/ProcessManager/ProcessModel.h
@@ -11,8 +11,7 @@ class GraphWidget;
 
 class ProcessModel final : public GModel {
 public:
- enum Column
- {
+ enum Column {
  Icon = 0,
  Name,
  CPU,

diff --git a/Applications/Terminal/Terminal.h b/Applications/Terminal/Terminal.h
@@ -98,8 +98,7 @@ class Terminal final : public GFrame {
  byte foreground_color;
  byte background_color;
 
- enum Flags
- {
+ enum Flags {
  NoAttributes = 0x00,
  Bold = 0x01,
  Italic = 0x02,
@@ -160,8 +159,7 @@ class Terminal final : public GFrame {
  void execute_escape_sequence(byte final);
  void execute_xterm_command();
 
- enum EscapeState
- {
+ enum EscapeState {
  Normal,
  ExpectBracket,
  ExpectParameter,

diff --git a/DevTools/VisualBuilder/VBWidget.h b/DevTools/VisualBuilder/VBWidget.h
@@ -15,8 +15,7 @@ class VBForm;
 class VBProperty;
 class VBWidgetPropertyModel;
 
-enum class Direction
-{
+enum class Direction {
  None,
  Left,
  UpLeft,

diff --git a/DevTools/VisualBuilder/VBWidgetPropertyModel.h b/DevTools/VisualBuilder/VBWidgetPropertyModel.h
@@ -7,8 +7,7 @@ class VBProperty;
 
 class VBWidgetPropertyModel : public GModel {
 public:
- enum Column
- {
+ enum Column {
  Name = 0,
  Value,
  __Count

diff --git a/DevTools/VisualBuilder/VBWidgetType.h b/DevTools/VisualBuilder/VBWidgetType.h
@@ -1,7 +1,6 @@
 #pragma once
 
-enum class VBWidgetType
-{
+enum class VBWidgetType {
  None = 0,
  GWidget,
  GButton,

diff --git a/Games/Minesweeper/Field.h b/Games/Minesweeper/Field.h
@@ -71,8 +71,7 @@ class Field final : public GFrame {
  template<typename Callback>
  void for_each_square(Callback);
 
- enum class Face
- {
+ enum class Face {
  Default,
  Good,
  Bad

diff --git a/Kernel/File.h b/Kernel/File.h
@@ -5,8 +5,8 @@
 #include <AK/Retained.h>
 #include <AK/Types.h>
 #include <Kernel/KResult.h>
-#include <Kernel/VirtualAddress.h>
 #include <Kernel/UnixTypes.h>
+#include <Kernel/VirtualAddress.h>
 
 class FileDescription;
 class Process;

diff --git a/Kernel/FileSystem/FIFO.h b/Kernel/FileSystem/FIFO.h
@@ -8,8 +8,7 @@ class FileDescription;
 
 class FIFO final : public File {
 public:
- enum class Direction : byte
- {
+ enum class Direction : byte {
  Neither,
  Reader,
  Writer

diff --git a/Kernel/FileSystem/FileDescription.h b/Kernel/FileSystem/FileDescription.h
@@ -8,8 +8,8 @@
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/FileSystem/InodeMetadata.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
-#include <Kernel/VirtualAddress.h>
 #include <Kernel/Net/Socket.h>
+#include <Kernel/VirtualAddress.h>
 
 class File;
 class TTY;

diff --git a/Kernel/FileSystem/ProcFS.cpp b/Kernel/FileSystem/ProcFS.cpp
@@ -14,17 +14,15 @@
 #include <Kernel/kmalloc.h>
 #include <LibC/errno_numbers.h>
 
-enum ProcParentDirectory
-{
+enum ProcParentDirectory {
  PDI_AbstractRoot = 0,
  PDI_Root,
  PDI_Root_sys,
  PDI_PID,
  PDI_PID_fd,
 };
 
-enum ProcFileType
-{
+enum ProcFileType {
  FI_Invalid = 0,
 
  FI_Root = 1, // directory
@@ -601,8 +599,7 @@ ByteBuffer procfs$inodes(InodeIdentifier)
 struct SysVariableData final : public ProcFSInodeCustomData {
  virtual ~SysVariableData() override {}
 
- enum Type
- {
+ enum Type {
  Invalid,
  Boolean,
  String,

diff --git a/Kernel/KResult.h b/Kernel/KResult.h
@@ -3,8 +3,7 @@
 #include <AK/Assertions.h>
 #include <LibC/errno_numbers.h>
 
-enum KSuccessTag
-{
+enum KSuccessTag {
  KSuccess
 };
 

diff --git a/Kernel/KeyCode.h b/Kernel/KeyCode.h
@@ -2,8 +2,7 @@
 
 #include <AK/Types.h>
 
-enum KeyCode : byte
-{
+enum KeyCode : byte {
  Key_Invalid = 0,
  Key_Escape,
  Key_Tab,
@@ -114,8 +113,7 @@ enum KeyCode : byte
  Key_Shift = Key_LeftShift,
 };
 
-enum KeyModifier
-{
+enum KeyModifier {
  Mod_None = 0x00,
  Mod_Alt = 0x01,
  Mod_Ctrl = 0x02,

diff --git a/Kernel/Net/ARP.h b/Kernel/Net/ARP.h
@@ -5,16 +5,14 @@
 #include <Kernel/Net/MACAddress.h>
 
 struct ARPOperation {
- enum : word
- {
+ enum : word {
  Request = 1,
  Response = 2,
  };
 };
 
 struct ARPHardwareType {
- enum : word
- {
+ enum : word {
  Ethernet = 1,
  };
 };

diff --git a/Kernel/Net/EtherType.h b/Kernel/Net/EtherType.h
@@ -3,8 +3,7 @@
 #include <AK/Types.h>
 
 struct EtherType {
- enum : word
- {
+ enum : word {
  ARP = 0x0806,
  IPv4 = 0x0800,
  };

diff --git a/Kernel/Net/ICMP.h b/Kernel/Net/ICMP.h
@@ -4,8 +4,7 @@
 #include <Kernel/Net/MACAddress.h>
 
 struct ICMPType {
- enum
- {
+ enum {
  EchoReply = 0,
  EchoRequest = 8,
  };

diff --git a/Kernel/Net/IPv4.h b/Kernel/Net/IPv4.h
@@ -5,8 +5,7 @@
 #include <AK/NetworkOrdered.h>
 #include <AK/Types.h>
 
-enum class IPv4Protocol : word
-{
+enum class IPv4Protocol : word {
  ICMP = 1,
  TCP = 6,
  UDP = 17,