From 8e8d1383b7f7cc2a1500b9c283805c4da015986b Mon Sep 17 00:00:00 2001
From: Linus Groh <mail@linusgroh.de>
Date: Sat, 24 Jul 2021 20:51:42 +0100
Subject: LibIMAP: Clean up Parser.h a bit

Move members after methods, remove useless parameter names ('x', 's'),
more sensible method grouping.
---
 Userland/Libraries/LibIMAP/Parser.h | 45 ++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

(limited to 'Userland')

diff --git a/Userland/Libraries/LibIMAP/Parser.h b/Userland/Libraries/LibIMAP/Parser.h
index de739f819f..4ba1432336 100644
--- a/Userland/Libraries/LibIMAP/Parser.h
+++ b/Userland/Libraries/LibIMAP/Parser.h
@@ -23,57 +23,50 @@ public:
     ParseStatus parse(ByteBuffer&& buffer, bool expecting_tag);
 
 private:
-    // To retain state if parsing is not finished
-    ByteBuffer m_buffer;
-    SolidResponse m_response;
-    unsigned position { 0 };
-    bool m_incomplete { false };
-    bool m_parsing_failed { false };
+    static MailboxFlag parse_mailbox_flag(StringView);
 
+    void consume(StringView);
     bool try_consume(StringView);
-    bool at_end() { return position >= m_buffer.size(); };
-
-    void parse_response_done();
-
-    void consume(StringView x);
     StringView consume_while(Function<bool(u8)> should_consume);
 
+    bool at_end() { return position >= m_buffer.size(); };
+
     unsigned parse_number();
     Optional<unsigned> try_parse_number();
 
+    void parse_response_done();
     void parse_untagged();
+    void parse_capability_response();
 
     StringView parse_atom();
     StringView parse_quoted_string();
+    StringView parse_literal_string();
     StringView parse_string();
+    StringView parse_astring();
     Optional<StringView> parse_nstring();
 
     ResponseStatus parse_status();
-
-    template<typename T>
-    Vector<T> parse_list(T (*converter)(StringView));
-
-    static MailboxFlag parse_mailbox_flag(StringView s);
-
-
-    void parse_capability_response();
-
     ListItem parse_list_item();
-
     FetchCommand::DataItem parse_fetch_data_item();
-
     FetchResponseData parse_fetch_response();
-
-    StringView parse_literal_string();
     Optional<Vector<Address>> parse_address_list();
     Address parse_address();
-    StringView parse_astring();
     HashMap<String, String> parse_body_fields_params();
     BodyStructure parse_body_structure();
     BodyStructure parse_one_part_body();
+    BodyExtension parse_body_extension();
     Tuple<String, HashMap<String, String>> parse_disposition();
     Vector<String> parse_langs();
-    BodyExtension parse_body_extension();
     Envelope parse_envelope();
+
+    template<typename T>
+    Vector<T> parse_list(T (*converter)(StringView));
+
+    // To retain state if parsing is not finished
+    ByteBuffer m_buffer;
+    SolidResponse m_response;
+    unsigned position { 0 };
+    bool m_incomplete { false };
+    bool m_parsing_failed { false };
 };
 }
-- 
cgit v1.2.3