Flatten the namespaces.

Remove:
* ftxui::screen
* ftxui::dom
* ftxui::component

Keep:
* ftxui
This commit is contained in:
Arthur Sonzogni
2019-01-12 15:00:08 +01:00
parent cf63aefa02
commit 21644eea6b
78 changed files with 219 additions and 274 deletions

View File

@@ -7,8 +7,7 @@
#include "ftxui/component/screen_interactive.hpp"
#include "ftxui/util/string.hpp"
using namespace ftxui::component;
using namespace ftxui::dom;
using namespace ftxui;
class MyComponent : ComponentVertical {
public:

View File

@@ -6,8 +6,7 @@
#include "ftxui/component/screen_interactive.hpp"
int main(int argc, const char* argv[]) {
using namespace ftxui::component;
using namespace ftxui::screen;
using namespace ftxui;
auto screen = ScreenInteractive::FixedSize(30, 3);
Menu menu(screen.delegate());
menu.entries = {L"entry 1", L"entry 2", L"entry 3"};

View File

@@ -8,8 +8,7 @@
#include "ftxui/component/screen_interactive.hpp"
#include "ftxui/util/string.hpp"
using namespace ftxui::component;
using namespace ftxui::dom;
using namespace ftxui;
class MyComponent : ComponentHorizontal {
public:

View File

@@ -6,8 +6,7 @@
#include "ftxui/component/screen_interactive.hpp"
#include "ftxui/util/string.hpp"
using namespace ftxui::component;
using namespace ftxui::dom;
using namespace ftxui;
class MyComponent : ComponentHorizontal {
public:

View File

@@ -7,8 +7,7 @@
#include "ftxui/component/toggle.hpp"
#include "ftxui/util/string.hpp"
using namespace ftxui::component;
using namespace ftxui::dom;
using namespace ftxui;
class MyComponent : ComponentVertical {
public:

View File

@@ -8,8 +8,7 @@
#include "ftxui/component/toggle.hpp"
#include "ftxui/util/string.hpp"
using namespace ftxui::component;
using namespace ftxui::dom;
using namespace ftxui;
class MyComponent : ComponentVertical {
public:

View File

@@ -4,8 +4,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::screen;
using namespace ftxui::dom;
using namespace ftxui;
auto document =
hbox(
text(L"This text is "),

View File

@@ -4,8 +4,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::screen;
using namespace ftxui::dom;
using namespace ftxui;
auto document =
hbox(
text(L"This text is "),

View File

@@ -4,8 +4,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::screen;
using namespace ftxui::dom;
using namespace ftxui;
auto document =
hbox(
vbox(

View File

@@ -4,8 +4,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::dom;
using namespace ftxui::screen;
using namespace ftxui;
auto document =
dbox(
frame(

View File

@@ -4,8 +4,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::screen;
using namespace ftxui::dom;
using namespace ftxui;
auto document =
hbox(
text(L"This text is "),

View File

@@ -7,8 +7,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::dom;
using namespace ftxui::screen;
using namespace ftxui;
auto document =
hbox(
window(text(L" main frame ") | hcenter,

View File

@@ -7,8 +7,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::dom;
using namespace ftxui::screen;
using namespace ftxui;
using namespace std::chrono_literals;
std::string reset_position;

View File

@@ -4,8 +4,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::screen;
using namespace ftxui::dom;
using namespace ftxui;
auto document =
hbox(
text(L"This text is "),

View File

@@ -10,8 +10,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::screen;
using namespace ftxui::dom;
using namespace ftxui;
struct Task {
std::wstring name;

View File

@@ -4,8 +4,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::dom;
using namespace ftxui::screen;
using namespace ftxui;
auto document =
hbox(
text(L"left-column"),

View File

@@ -9,8 +9,6 @@
int main(int argc, const char *argv[])
{
using namespace ftxui;
using namespace ftxui::dom;
using namespace ftxui::screen;
using namespace std::chrono_literals;
std::string reset_position;

View File

@@ -4,8 +4,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::screen;
using namespace ftxui::dom;
using namespace ftxui;
auto document =
hbox(
text(L"normal") , text(L" ") ,

View File

@@ -4,8 +4,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::screen;
using namespace ftxui::dom;
using namespace ftxui;
auto document =
hbox(
text(L"This text is "),

View File

@@ -5,8 +5,7 @@
int main(int argc, const char *argv[])
{
using namespace ftxui::screen;
using namespace ftxui::dom;
using namespace ftxui;
auto document =
vbox(
hbox(

View File

@@ -6,15 +6,14 @@
#include "ftxui/component/screen_interactive.hpp"
#include "ftxui/util/string.hpp"
using namespace ftxui::component;
using namespace ftxui;
class DrawKey : public Component {
public:
DrawKey(Delegate* delegate)
DrawKey(Component::Delegate* delegate)
: Component(delegate) {}
ftxui::dom::Element Render() override {
using namespace ftxui::dom;
Element Render() override {
Children children;
for (size_t i = std::max(0, (int)keys.size() - 10); i < keys.size(); ++i) {
std::string code = "";