From f461050759ddf787d94ad6bdc1bd24dae84cd2f8 Mon Sep 17 00:00:00 2001 From: Arthur Sonzogni Date: Sun, 7 Aug 2022 14:44:33 +0200 Subject: [PATCH] Run IWYU (#450) --- examples/component/modal_dialog.cpp | 2 +- iwyu.imp | 28 ++++++++++++------- src/ftxui/component/animation_test.cpp | 8 ++---- src/ftxui/component/button_test.cpp | 6 ++-- src/ftxui/component/collapsible_test.cpp | 4 +-- src/ftxui/component/component_test.cpp | 4 +-- src/ftxui/component/container_test.cpp | 4 +-- src/ftxui/component/input_test.cpp | 4 +-- src/ftxui/component/menu_test.cpp | 6 ++-- src/ftxui/component/modal_test.cpp | 4 +-- src/ftxui/component/radiobox_test.cpp | 4 +-- src/ftxui/component/receiver_test.cpp | 8 ++---- src/ftxui/component/resizable_split_test.cpp | 4 +-- .../component/screen_interactive_test.cpp | 6 ++-- .../component/terminal_input_parser_test.cpp | 5 +--- .../terminal_input_parser_test_fuzzer.cpp | 2 -- src/ftxui/component/toggle_test.cpp | 12 ++++---- src/ftxui/dom/blink_test.cpp | 4 +-- src/ftxui/dom/bold_test.cpp | 4 +-- src/ftxui/dom/border_test.cpp | 6 ++-- src/ftxui/dom/canvas_test.cpp | 8 ++---- src/ftxui/dom/color_test.cpp | 6 ++-- src/ftxui/dom/dbox_test.cpp | 6 ++-- src/ftxui/dom/dim_test.cpp | 4 +-- src/ftxui/dom/flexbox_helper_test.cpp | 4 +-- src/ftxui/dom/flexbox_test.cpp | 6 ++-- src/ftxui/dom/gauge_test.cpp | 6 ++-- src/ftxui/dom/gridbox_test.cpp | 14 ++++------ src/ftxui/dom/hbox_test.cpp | 10 +++---- src/ftxui/dom/scroll_indicator_test.cpp | 10 +++---- src/ftxui/dom/separator_test.cpp | 6 ++-- src/ftxui/dom/spinner_test.cpp | 6 ++-- src/ftxui/dom/table_test.cpp | 6 ++-- src/ftxui/dom/text_test.cpp | 6 ++-- src/ftxui/dom/underlined_test.cpp | 4 +-- src/ftxui/dom/vbox_test.cpp | 12 ++++---- src/ftxui/screen/color_test.cpp | 4 +-- src/ftxui/screen/string_test.cpp | 7 ++--- 38 files changed, 92 insertions(+), 158 deletions(-) diff --git a/examples/component/modal_dialog.cpp b/examples/component/modal_dialog.cpp index aa58b414..c8cffe9d 100644 --- a/examples/component/modal_dialog.cpp +++ b/examples/component/modal_dialog.cpp @@ -1,8 +1,8 @@ #include // for ButtonOption +#include // for ftxui #include // for function #include // for allocator, shared_ptr -#include "ftxui/component/captured_mouse.hpp" // for ftxui #include "ftxui/component/component.hpp" // for Button, operator|=, Renderer, Vertical, Modal #include "ftxui/component/screen_interactive.hpp" // for ScreenInteractive, Component #include "ftxui/dom/elements.hpp" // for operator|, separator, text, size, Element, vbox, border, GREATER_THAN, WIDTH, center, HEIGHT diff --git a/iwyu.imp b/iwyu.imp index ff946c19..e637ddb5 100644 --- a/iwyu.imp +++ b/iwyu.imp @@ -4,14 +4,22 @@ { include: ["", "private", "", "public"]}, { include: ["", "private", "", "public"]}, { include: ["", "private", "", "public"] }, - { symbol: [ "ftxui", "private", "", "public" ] }, - { symbol: [ "char_traits", "private", "", "public" ] }, - { symbol: [ "ECHO", "private", "", "public" ] }, - { symbol: [ "ICANON", "private", "", "public" ] }, - { symbol: [ "TCSANOW", "private", "", "public" ] }, - { symbol: [ "VMIN", "private", "", "public" ] }, - { symbol: [ "VTIME", "private", "", "public" ] }, - { symbol: [ "__shared_ptr_access", "private", "", "public" ] }, - { symbol: [ "termios", "private", "", "public" ] }, - { symbol: ["__alloc_traits<>:value_type", "private", "", "public" ] }, + { include: ["", "private", "", "public" ] }, + { include: ["", "private", "", "public" ] }, + { include: ["", "private", "", "public" ] }, + { include: ["", "private", "", "public" ] }, + { include: ["", "private", "", "public" ] }, + { include: ["", "private", "", "public" ] }, + { include: ["", "private", "", "public" ] }, + { include: ["", "private", "", "public" ] }, + { symbol: ["ftxui", "private", "", "public" ] }, + { symbol: ["char_traits", "private", "", "public" ] }, + { symbol: ["ECHO", "private", "", "public" ] }, + { symbol: ["ICANON", "private", "", "public" ] }, + { symbol: ["TCSANOW", "private", "", "public" ] }, + { symbol: ["VMIN", "private", "", "public" ] }, + { symbol: ["VTIME", "private", "", "public" ] }, + { symbol: ["__shared_ptr_access", "private", "", "public" ] }, + { symbol: ["termios", "private", "", "public" ] }, + { symbol: ["__alloc_traits<>:value_type", "private", "", "public" ] } ] diff --git a/src/ftxui/component/animation_test.cpp b/src/ftxui/component/animation_test.cpp index 88fb6f4e..9a33ef52 100644 --- a/src/ftxui/component/animation_test.cpp +++ b/src/ftxui/component/animation_test.cpp @@ -1,10 +1,8 @@ -#include // for Message -#include // for SuiteApiResolver, TestPartResult, TestFactoryImpl -#include // for function -#include // for allocator, vector +#include +#include // for function +#include // for allocator, vector #include "ftxui/component/animation.hpp" // for Function, BackIn, BackInOut, BackOut, BounceIn, BounceInOut, BounceOut, CircularIn, CircularInOut, CircularOut, CubicIn, CubicInOut, CubicOut, ElasticIn, ElasticInOut, ElasticOut, ExponentialIn, ExponentialInOut, ExponentialOut, Linear, QuadraticIn, QuadraticInOut, QuadraticOut, QuarticIn, QuarticInOut, QuarticOut, QuinticIn, QuinticInOut, QuinticOut, SineIn, SineInOut, SineOut -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_NEAR, TEST namespace ftxui { diff --git a/src/ftxui/component/button_test.cpp b/src/ftxui/component/button_test.cpp index 57dade2f..df040311 100644 --- a/src/ftxui/component/button_test.cpp +++ b/src/ftxui/component/button_test.cpp @@ -1,6 +1,5 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl -#include // for operator""s, chrono_literals +#include +#include // for operator""s, chrono_literals #include // for __shared_ptr_access, shared_ptr, allocator #include // for string @@ -13,7 +12,6 @@ #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen #include "ftxui/screen/terminal.hpp" // for SetColorSupport, Color, TrueColor -#include "gtest/gtest_pred_impl.h" // for AssertionResult, EXPECT_EQ, Test, EXPECT_FALSE, EXPECT_TRUE, TEST namespace ftxui { diff --git a/src/ftxui/component/collapsible_test.cpp b/src/ftxui/component/collapsible_test.cpp index 7eb7323a..bd1a970d 100644 --- a/src/ftxui/component/collapsible_test.cpp +++ b/src/ftxui/component/collapsible_test.cpp @@ -1,5 +1,4 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl +#include #include // for __shared_ptr_access, shared_ptr, allocator #include "ftxui/component/component.hpp" // for Collapsible, Renderer @@ -8,7 +7,6 @@ #include "ftxui/dom/elements.hpp" // for text, Element #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for AssertionResult, Test, EXPECT_EQ, EXPECT_FALSE, EXPECT_TRUE, TEST namespace ftxui { diff --git a/src/ftxui/component/component_test.cpp b/src/ftxui/component/component_test.cpp index 52c888b8..5a8b6aad 100644 --- a/src/ftxui/component/component_test.cpp +++ b/src/ftxui/component/component_test.cpp @@ -1,10 +1,8 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl +#include #include // for shared_ptr, __shared_ptr_access, allocator, __shared_ptr_access<>::element_type, make_shared #include "ftxui/component/component.hpp" // for Make #include "ftxui/component/component_base.hpp" // for ComponentBase, Component -#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, AssertionResult, TEST, EXPECT_FALSE namespace ftxui { diff --git a/src/ftxui/component/container_test.cpp b/src/ftxui/component/container_test.cpp index b358a721..6974c480 100644 --- a/src/ftxui/component/container_test.cpp +++ b/src/ftxui/component/container_test.cpp @@ -1,11 +1,9 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl +#include #include // for __shared_ptr_access, shared_ptr, allocator #include "ftxui/component/component.hpp" // for Horizontal, Vertical, Button, Tab #include "ftxui/component/component_base.hpp" // for ComponentBase, Component #include "ftxui/component/event.hpp" // for Event, Event::Tab, Event::TabReverse, Event::ArrowDown, Event::ArrowLeft, Event::ArrowRight, Event::ArrowUp -#include "gtest/gtest_pred_impl.h" // for AssertionResult, EXPECT_EQ, EXPECT_FALSE, EXPECT_TRUE, Test, TEST namespace ftxui { diff --git a/src/ftxui/component/input_test.cpp b/src/ftxui/component/input_test.cpp index 635a9fc8..21d8fddf 100644 --- a/src/ftxui/component/input_test.cpp +++ b/src/ftxui/component/input_test.cpp @@ -1,5 +1,4 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl +#include #include // for __shared_ptr_access, shared_ptr, allocator #include // for string @@ -12,7 +11,6 @@ #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Fixed, Screen, Pixel #include "ftxui/util/ref.hpp" // for Ref -#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, TEST namespace ftxui { diff --git a/src/ftxui/component/menu_test.cpp b/src/ftxui/component/menu_test.cpp index 05d5aff2..daf69d61 100644 --- a/src/ftxui/component/menu_test.cpp +++ b/src/ftxui/component/menu_test.cpp @@ -1,6 +1,5 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl -#include // for operator""s, chrono_literals +#include +#include // for operator""s, chrono_literals #include // for __shared_ptr_access, shared_ptr, allocator #include // for string #include // for vector @@ -13,7 +12,6 @@ #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen #include "ftxui/util/ref.hpp" // for Ref -#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, TEST namespace ftxui { diff --git a/src/ftxui/component/modal_test.cpp b/src/ftxui/component/modal_test.cpp index 92320bcc..26b9a6c4 100644 --- a/src/ftxui/component/modal_test.cpp +++ b/src/ftxui/component/modal_test.cpp @@ -1,5 +1,4 @@ -#include // for Message -#include // for SuiteApiResolver, TestPartResult, TestFactoryImpl +#include #include // for Element, operator|, text, border #include // for shared_ptr, allocator, __shared_ptr_access @@ -7,7 +6,6 @@ #include "ftxui/component/component_base.hpp" // for ComponentBase #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { diff --git a/src/ftxui/component/radiobox_test.cpp b/src/ftxui/component/radiobox_test.cpp index d8863f58..ee9d12b8 100644 --- a/src/ftxui/component/radiobox_test.cpp +++ b/src/ftxui/component/radiobox_test.cpp @@ -1,5 +1,4 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl +#include #include // for __shared_ptr_access, shared_ptr, allocator #include // for string #include // for vector @@ -9,7 +8,6 @@ #include "ftxui/component/component_options.hpp" // for RadioboxOption #include "ftxui/component/event.hpp" // for Event, Event::Return, Event::ArrowDown, Event::ArrowUp, Event::Tab, Event::TabReverse #include "ftxui/util/ref.hpp" // for Ref -#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, TEST namespace ftxui { diff --git a/src/ftxui/component/receiver_test.cpp b/src/ftxui/component/receiver_test.cpp index a327ac8c..50fb07d1 100644 --- a/src/ftxui/component/receiver_test.cpp +++ b/src/ftxui/component/receiver_test.cpp @@ -1,10 +1,8 @@ -#include // for Message -#include // for TestPartResult -#include // for thread -#include // for move +#include +#include // for thread +#include // for move #include "ftxui/component/receiver.hpp" -#include "gtest/gtest_pred_impl.h" // for AssertionResult, Test, EXPECT_EQ namespace ftxui { diff --git a/src/ftxui/component/resizable_split_test.cpp b/src/ftxui/component/resizable_split_test.cpp index 28595bab..3716148c 100644 --- a/src/ftxui/component/resizable_split_test.cpp +++ b/src/ftxui/component/resizable_split_test.cpp @@ -1,5 +1,4 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl +#include #include // for __shared_ptr_access, shared_ptr, allocator #include "ftxui/component/component.hpp" // for Renderer, ResizableSplitBottom, ResizableSplitLeft, ResizableSplitRight, ResizableSplitTop @@ -9,7 +8,6 @@ #include "ftxui/dom/elements.hpp" // for text, Element #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for AssertionResult, Test, EXPECT_EQ, EXPECT_TRUE, TEST namespace ftxui { diff --git a/src/ftxui/component/screen_interactive_test.cpp b/src/ftxui/component/screen_interactive_test.cpp index 63b1aeef..4dd65776 100644 --- a/src/ftxui/component/screen_interactive_test.cpp +++ b/src/ftxui/component/screen_interactive_test.cpp @@ -1,12 +1,10 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult +#include #include // for raise, SIGABRT, SIGFPE, SIGILL, SIGINT, SIGSEGV, SIGTERM #include // for Event, Event::Custom #include "ftxui/component/component.hpp" // for Renderer #include "ftxui/component/screen_interactive.hpp" -#include "ftxui/dom/elements.hpp" // for text, Element -#include "gtest/gtest_pred_impl.h" // for Test, TEST, EXPECT_EQ +#include "ftxui/dom/elements.hpp" // for text, Element namespace ftxui { diff --git a/src/ftxui/component/terminal_input_parser_test.cpp b/src/ftxui/component/terminal_input_parser_test.cpp index 679962c8..24f611d4 100644 --- a/src/ftxui/component/terminal_input_parser_test.cpp +++ b/src/ftxui/component/terminal_input_parser_test.cpp @@ -1,6 +1,4 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl -#include // for max +#include // for AssertionResult, Test, Message, TestPartResult, SuiteApiResolver, TestInfo (ptr only), EXPECT_EQ, EXPECT_TRUE, TEST, TestFactoryImpl, EXPECT_FALSE #include // for Mouse, Mouse::Left, Mouse::Middle, Mouse::Pressed, Mouse::Released, Mouse::Right #include // for Task #include // for initializer_list @@ -10,7 +8,6 @@ #include "ftxui/component/event.hpp" // for Event, Event::Return, Event::ArrowDown, Event::ArrowLeft, Event::ArrowRight, Event::ArrowUp, Event::Backspace, Event::Custom, Event::Delete, Event::End, Event::F10, Event::F11, Event::F12, Event::F5, Event::F6, Event::F7, Event::F8, Event::F9, Event::Home, Event::PageDown, Event::PageUp, Event::Tab, Event::TabReverse, Event::Escape #include "ftxui/component/receiver.hpp" // for MakeReceiver, ReceiverImpl #include "ftxui/component/terminal_input_parser.hpp" -#include "gtest/gtest_pred_impl.h" // for AssertionResult, Test, EXPECT_EQ, EXPECT_TRUE, TEST, EXPECT_FALSE namespace ftxui { diff --git a/src/ftxui/component/terminal_input_parser_test_fuzzer.cpp b/src/ftxui/component/terminal_input_parser_test_fuzzer.cpp index 6aa94220..870a3035 100644 --- a/src/ftxui/component/terminal_input_parser_test_fuzzer.cpp +++ b/src/ftxui/component/terminal_input_parser_test_fuzzer.cpp @@ -1,5 +1,3 @@ -//#include "ftxui/component/event.hpp" -//#include "ftxui/component/receiver.hpp" #include #include "ftxui/component/terminal_input_parser.hpp" diff --git a/src/ftxui/component/toggle_test.cpp b/src/ftxui/component/toggle_test.cpp index f4071c19..51521895 100644 --- a/src/ftxui/component/toggle_test.cpp +++ b/src/ftxui/component/toggle_test.cpp @@ -1,9 +1,8 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl -#include // for function -#include // for __shared_ptr_access, shared_ptr, allocator -#include // for string, basic_string -#include // for vector +#include +#include // for function +#include // for __shared_ptr_access, shared_ptr, allocator +#include // for string, basic_string +#include // for vector #include "ftxui/component/captured_mouse.hpp" // for ftxui #include "ftxui/component/component.hpp" // for Toggle @@ -11,7 +10,6 @@ #include "ftxui/component/component_options.hpp" // for ToggleOption #include "ftxui/component/event.hpp" // for Event, Event::ArrowLeft, Event::ArrowRight, Event::Return, Event::Tab, Event::TabReverse #include "ftxui/util/ref.hpp" // for Ref -#include "gtest/gtest_pred_impl.h" // for AssertionResult, EXPECT_EQ, Test, EXPECT_TRUE, EXPECT_FALSE, TEST using namespace ftxui; diff --git a/src/ftxui/dom/blink_test.cpp b/src/ftxui/dom/blink_test.cpp index 8bbe4234..7b7207fc 100644 --- a/src/ftxui/dom/blink_test.cpp +++ b/src/ftxui/dom/blink_test.cpp @@ -1,6 +1,4 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST +#include #include // for allocator #include "ftxui/dom/elements.hpp" // for operator|, text, blink, Element diff --git a/src/ftxui/dom/bold_test.cpp b/src/ftxui/dom/bold_test.cpp index fac4431a..340ba499 100644 --- a/src/ftxui/dom/bold_test.cpp +++ b/src/ftxui/dom/bold_test.cpp @@ -1,6 +1,4 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST +#include #include // for allocator #include "ftxui/dom/elements.hpp" // for operator|, text, bold, Element diff --git a/src/ftxui/dom/border_test.cpp b/src/ftxui/dom/border_test.cpp index e6ff25e8..07435720 100644 --- a/src/ftxui/dom/border_test.cpp +++ b/src/ftxui/dom/border_test.cpp @@ -1,11 +1,9 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for allocator, string +#include +#include // for allocator, string #include "ftxui/dom/elements.hpp" // for text, operator|, Element, borderStyled, borderWith, window, border, borderDouble, borderEmpty, borderHeavy, borderLight, borderRounded, DOUBLE #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen, Pixel -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { diff --git a/src/ftxui/dom/canvas_test.cpp b/src/ftxui/dom/canvas_test.cpp index 3c890c9c..1f8180c7 100644 --- a/src/ftxui/dom/canvas_test.cpp +++ b/src/ftxui/dom/canvas_test.cpp @@ -1,7 +1,6 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for uint32_t -#include // for allocator, string +#include +#include // for uint32_t +#include // for allocator, string #include "ftxui/dom/canvas.hpp" // for Canvas #include "ftxui/dom/elements.hpp" // for canvas @@ -9,7 +8,6 @@ #include "ftxui/screen/color.hpp" // for Color, Color::Black, Color::Blue, Color::Red, Color::White, Color::Yellow, Color::Cyan, Color::Green #include "ftxui/screen/screen.hpp" // for Screen #include "ftxui/screen/terminal.hpp" // for SetColorSupport, Color, TrueColor -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { diff --git a/src/ftxui/dom/color_test.cpp b/src/ftxui/dom/color_test.cpp index 2c772d63..0ff72c35 100644 --- a/src/ftxui/dom/color_test.cpp +++ b/src/ftxui/dom/color_test.cpp @@ -1,12 +1,10 @@ -#include // for Message -#include // for SuiteApiResolver, TestPartResult, TestFactoryImpl -#include // for allocator +#include +#include // for allocator #include "ftxui/dom/elements.hpp" // for operator|, text, bgcolor, color, Element #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/color.hpp" // for Color, Color::Red #include "ftxui/screen/screen.hpp" // for Screen, Pixel -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { diff --git a/src/ftxui/dom/dbox_test.cpp b/src/ftxui/dom/dbox_test.cpp index d12871e7..a12a625d 100644 --- a/src/ftxui/dom/dbox_test.cpp +++ b/src/ftxui/dom/dbox_test.cpp @@ -1,11 +1,9 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for allocator +#include +#include // for allocator #include "ftxui/dom/elements.hpp" // for filler, operator|, text, border, dbox, hbox, vbox, Element #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { diff --git a/src/ftxui/dom/dim_test.cpp b/src/ftxui/dom/dim_test.cpp index 312c1fe0..811fe3a1 100644 --- a/src/ftxui/dom/dim_test.cpp +++ b/src/ftxui/dom/dim_test.cpp @@ -1,6 +1,4 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST +#include #include // for allocator #include "ftxui/dom/elements.hpp" // for operator|, text, dim, Element diff --git a/src/ftxui/dom/flexbox_helper_test.cpp b/src/ftxui/dom/flexbox_helper_test.cpp index 5f74562d..ab3f5502 100644 --- a/src/ftxui/dom/flexbox_helper_test.cpp +++ b/src/ftxui/dom/flexbox_helper_test.cpp @@ -1,10 +1,8 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl +#include #include // for FlexboxConfig, FlexboxConfig::Direction, FlexboxConfig::Direction::Column, FlexboxConfig::Direction::ColumnInversed, FlexboxConfig::Direction::Row, FlexboxConfig::Direction::RowInversed #include // for allocator_traits<>::value_type #include "ftxui/dom/flexbox_helper.hpp" -#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, TEST namespace ftxui { diff --git a/src/ftxui/dom/flexbox_test.cpp b/src/ftxui/dom/flexbox_test.cpp index 59252116..31535ac9 100644 --- a/src/ftxui/dom/flexbox_test.cpp +++ b/src/ftxui/dom/flexbox_test.cpp @@ -1,12 +1,10 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for allocator +#include +#include // for allocator #include "ftxui/dom/elements.hpp" // for text, flexbox #include "ftxui/dom/flexbox_config.hpp" // for FlexboxConfig, FlexboxConfig::Direction, FlexboxConfig::AlignContent, FlexboxConfig::JustifyContent, FlexboxConfig::Direction::Column, FlexboxConfig::AlignItems, FlexboxConfig::JustifyContent::SpaceAround, FlexboxConfig::AlignContent::Center, FlexboxConfig::AlignContent::FlexEnd, FlexboxConfig::AlignContent::SpaceAround, FlexboxConfig::AlignContent::SpaceBetween, FlexboxConfig::AlignContent::SpaceEvenly, FlexboxConfig::AlignItems::Center, FlexboxConfig::AlignItems::FlexEnd, FlexboxConfig::Direction::ColumnInversed, FlexboxConfig::Direction::Row, FlexboxConfig::Direction::RowInversed, FlexboxConfig::JustifyContent::Center, FlexboxConfig::JustifyContent::SpaceBetween #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { diff --git a/src/ftxui/dom/gauge_test.cpp b/src/ftxui/dom/gauge_test.cpp index e8a8b9d5..b240ae04 100644 --- a/src/ftxui/dom/gauge_test.cpp +++ b/src/ftxui/dom/gauge_test.cpp @@ -1,11 +1,9 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for allocator +#include +#include // for allocator #include "ftxui/dom/elements.hpp" // for gauge, gaugeUp #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { diff --git a/src/ftxui/dom/gridbox_test.cpp b/src/ftxui/dom/gridbox_test.cpp index 3e67c252..17aad9b6 100644 --- a/src/ftxui/dom/gridbox_test.cpp +++ b/src/ftxui/dom/gridbox_test.cpp @@ -1,15 +1,13 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for size_t -#include // for remove -#include // for shared_ptr -#include // for allocator, basic_string, string -#include // for vector +#include +#include // for size_t +#include // for remove +#include // for shared_ptr +#include // for allocator, basic_string, string +#include // for vector #include "ftxui/dom/elements.hpp" // for text, operator|, Element, flex, Elements, flex_grow, flex_shrink, vtext, gridbox, vbox, focus, operator|=, border, frame #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for Test, TEST, EXPECT_EQ namespace ftxui { diff --git a/src/ftxui/dom/hbox_test.cpp b/src/ftxui/dom/hbox_test.cpp index f78a8130..17dfd2db 100644 --- a/src/ftxui/dom/hbox_test.cpp +++ b/src/ftxui/dom/hbox_test.cpp @@ -1,14 +1,12 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for size_t -#include // for string, allocator -#include // for vector +#include +#include // for size_t +#include // for string, allocator +#include // for vector #include "ftxui/dom/elements.hpp" // for text, operator|, hbox, Element, flex_grow, flex_shrink #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/color.hpp" // for ftxui #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST using namespace ftxui; using namespace ftxui; diff --git a/src/ftxui/dom/scroll_indicator_test.cpp b/src/ftxui/dom/scroll_indicator_test.cpp index 665ec758..5747c21d 100644 --- a/src/ftxui/dom/scroll_indicator_test.cpp +++ b/src/ftxui/dom/scroll_indicator_test.cpp @@ -1,13 +1,11 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl -#include // for shared_ptr -#include // for allocator, to_string, string -#include // for move +#include +#include // for shared_ptr +#include // for allocator, to_string, string +#include // for move #include "ftxui/dom/elements.hpp" // for operator|, Element, operator|=, text, vbox, Elements, border, focus, frame, vscroll_indicator #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, TEST namespace ftxui { diff --git a/src/ftxui/dom/separator_test.cpp b/src/ftxui/dom/separator_test.cpp index fe3f51ca..ffb4c14d 100644 --- a/src/ftxui/dom/separator_test.cpp +++ b/src/ftxui/dom/separator_test.cpp @@ -1,11 +1,9 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for allocator, string +#include +#include // for allocator, string #include "ftxui/dom/elements.hpp" // for text, vbox, separator, separatorDouble, separatorEmpty, separatorHeavy, separatorLight, separatorStyled, DOUBLE #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen, Pixel -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { diff --git a/src/ftxui/dom/spinner_test.cpp b/src/ftxui/dom/spinner_test.cpp index d7769310..d65c0660 100644 --- a/src/ftxui/dom/spinner_test.cpp +++ b/src/ftxui/dom/spinner_test.cpp @@ -1,11 +1,9 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for allocator +#include +#include // for allocator #include "ftxui/dom/elements.hpp" // for spinner #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { diff --git a/src/ftxui/dom/table_test.cpp b/src/ftxui/dom/table_test.cpp index c9b28c3b..3313923e 100644 --- a/src/ftxui/dom/table_test.cpp +++ b/src/ftxui/dom/table_test.cpp @@ -1,12 +1,10 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for allocator +#include +#include // for allocator #include "ftxui/dom/elements.hpp" // for LIGHT, flex, center, EMPTY, DOUBLE #include "ftxui/dom/node.hpp" // for Render #include "ftxui/dom/table.hpp" #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { diff --git a/src/ftxui/dom/text_test.cpp b/src/ftxui/dom/text_test.cpp index 50f24bfe..cfa199e2 100644 --- a/src/ftxui/dom/text_test.cpp +++ b/src/ftxui/dom/text_test.cpp @@ -1,11 +1,9 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for allocator, string +#include +#include // for allocator, string #include "ftxui/dom/elements.hpp" // for text, operator|, border, Element #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { diff --git a/src/ftxui/dom/underlined_test.cpp b/src/ftxui/dom/underlined_test.cpp index 0c713414..50b93094 100644 --- a/src/ftxui/dom/underlined_test.cpp +++ b/src/ftxui/dom/underlined_test.cpp @@ -1,6 +1,4 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST +#include #include // for allocator #include "ftxui/dom/elements.hpp" // for operator|, text, underlined, Element diff --git a/src/ftxui/dom/vbox_test.cpp b/src/ftxui/dom/vbox_test.cpp index aca59a80..09780d04 100644 --- a/src/ftxui/dom/vbox_test.cpp +++ b/src/ftxui/dom/vbox_test.cpp @@ -1,14 +1,12 @@ -#include // for Message -#include // for SuiteApiResolver, TestFactoryImpl, TestPartResult -#include // for size_t -#include // for remove -#include // for string, allocator, basic_string -#include // for vector +#include +#include // for size_t +#include // for remove +#include // for string, allocator, basic_string +#include // for vector #include "ftxui/dom/elements.hpp" // for vtext, operator|, vbox, Element, flex_grow, flex_shrink #include "ftxui/dom/node.hpp" // for Render #include "ftxui/screen/screen.hpp" // for Screen -#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST namespace ftxui { namespace { diff --git a/src/ftxui/screen/color_test.cpp b/src/ftxui/screen/color_test.cpp index 25fbcbf4..12dbb283 100644 --- a/src/ftxui/screen/color_test.cpp +++ b/src/ftxui/screen/color_test.cpp @@ -1,8 +1,6 @@ #include "ftxui/screen/color.hpp" -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl +#include #include "ftxui/screen/terminal.hpp" -#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, TEST namespace ftxui { diff --git a/src/ftxui/screen/string_test.cpp b/src/ftxui/screen/string_test.cpp index 76da3512..3b13782f 100644 --- a/src/ftxui/screen/string_test.cpp +++ b/src/ftxui/screen/string_test.cpp @@ -1,9 +1,6 @@ -#include // for Message -#include // for TestPartResult, SuiteApiResolver, TestFactoryImpl -#include // for allocator, string - #include "ftxui/screen/string.hpp" -#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, TEST +#include +#include // for allocator, string namespace ftxui {