From 7e9d2e5f7492d3c8a96150557bef04a055c18fdd Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 19 Jun 2018 22:13:48 +0200 Subject: [PATCH] [DEV] update etk null --- doc/tutorial/010_ObjectModel.md | 4 +- doc/tutorial/012_ObjectMessage.md | 2 +- doc/tutorial/021_Resources.md | 2 +- doc/tutorial/030_ConplexeXmlGui.md | 8 +-- ewol/compositing/Area.cpp | 12 ++-- ewol/compositing/Drawing.cpp | 8 +-- ewol/compositing/Image.cpp | 56 +++++++++---------- ewol/compositing/Shaper.cpp | 50 ++++++++--------- ewol/compositing/Text.cpp | 36 ++++++------ ewol/compositing/TextBase.cpp | 8 +-- ewol/compositing/TextDF.cpp | 28 +++++----- ewol/context/Context.cpp | 38 ++++++------- ewol/context/InputManager.cpp | 36 ++++++------ ewol/ewol.hpp | 2 +- ewol/object/Manager.cpp | 12 ++-- ewol/object/Manager.hpp | 2 +- ewol/object/Object.cpp | 10 ++-- ewol/object/Object.hpp | 40 ++++++------- ewol/resource/Colored3DObject.cpp | 10 ++-- ewol/resource/ConfigFile.hpp | 2 +- ewol/resource/DistanceFieldFont.cpp | 14 ++--- ewol/resource/DistanceFieldFont.hpp | 4 +- ewol/resource/FontFreeType.cpp | 2 +- ewol/resource/ImageDF.cpp | 18 +++--- ewol/resource/ImageDF.hpp | 2 +- ewol/resource/TextureFile.cpp | 18 +++--- ewol/resource/TextureFile.hpp | 2 +- ewol/resource/TexturedFont.cpp | 18 +++--- ewol/resource/TexturedFont.hpp | 2 +- ewol/tools/message.cpp | 4 +- ewol/widget/Button.cpp | 28 +++++----- ewol/widget/ButtonColor.cpp | 6 +- ewol/widget/Composer.cpp | 16 +++--- ewol/widget/Container.cpp | 40 ++++++------- ewol/widget/Container2.cpp | 44 +++++++-------- ewol/widget/Container2.hpp | 2 +- ewol/widget/ContainerN.cpp | 44 +++++++-------- ewol/widget/ContextMenu.cpp | 8 +-- ewol/widget/Gird.cpp | 30 +++++----- ewol/widget/Image.cpp | 6 +- ewol/widget/Joystick.cpp | 14 ++--- ewol/widget/Label.cpp | 6 +- ewol/widget/Layer.cpp | 8 +-- ewol/widget/List.cpp | 10 ++-- ewol/widget/ListFileSystem.cpp | 16 +++--- ewol/widget/Manager.cpp | 32 +++++------ ewol/widget/Manager.hpp | 4 +- ewol/widget/Menu.cpp | 22 ++++---- ewol/widget/PopUp.cpp | 12 ++-- ewol/widget/Scroll.cpp | 28 +++++----- ewol/widget/Select.cpp | 16 +++--- ewol/widget/Sizer.cpp | 18 +++--- ewol/widget/Spacer.hpp | 2 +- ewol/widget/Spin.cpp | 8 +-- ewol/widget/WSlider.cpp | 50 ++++++++--------- ewol/widget/Widget.cpp | 4 +- ewol/widget/Widget.hpp | 4 +- ewol/widget/Windows.cpp | 46 +++++++-------- ewol/widget/meta/ColorChooser.cpp | 26 ++++----- ewol/widget/meta/FileChooser.hpp | 4 +- ewol/widget/meta/Parameter.cpp | 52 ++++++++--------- ewol/widget/meta/ParameterList.cpp | 14 ++--- ewol/widget/meta/SpinBase.cpp | 20 +++---- ewol/widget/meta/StdPopUp.cpp | 22 ++++---- sample/CustomWidgets/appl/Windows.cpp | 8 +-- sample/HelloWord/appl/Windows.cpp | 2 +- sample/wallpaper/appl/Windows.cpp | 2 +- test/testApplication.cpp | 2 +- test/testWindows.cpp | 2 +- tools/platform_test/appl/MainWindows.hpp | 2 +- tools/platform_test/appl/init.cpp | 4 +- .../platform_test/appl/widget/SizerColor.cpp | 4 +- tools/visual_test/appl/MainWindows.cpp | 50 ++++++++--------- tools/visual_test/appl/init.cpp | 4 +- tools/visual_test/appl/widget/SizerColor.cpp | 4 +- 75 files changed, 598 insertions(+), 598 deletions(-) diff --git a/doc/tutorial/010_ObjectModel.md b/doc/tutorial/010_ObjectModel.md index db30a3c3..6680cf4e 100644 --- a/doc/tutorial/010_ObjectModel.md +++ b/doc/tutorial/010_ObjectModel.md @@ -87,7 +87,7 @@ Find a global Object (ouside an Object) #include ewol::ObjectShared tmpObject = ewol::getContext().getEObjectManager().getObjectNamed("obj Name"); - if (tmpObject == nullptr) { + if (tmpObject == null) { APPL_ERROR("The Object does not exist"); } ``` @@ -97,7 +97,7 @@ Find a global Object (inside an Object) ```{.cpp} ewol::ObjectShared tmpObject = getObjectNamed("obj Name"); - if (tmpObject == nullptr) { + if (tmpObject == null) { APPL_ERROR("The Object does not exist"); } ``` diff --git a/doc/tutorial/012_ObjectMessage.md b/doc/tutorial/012_ObjectMessage.md index b054791a..ec52e030 100644 --- a/doc/tutorial/012_ObjectMessage.md +++ b/doc/tutorial/012_ObjectMessage.md @@ -54,7 +54,7 @@ namespace appl { void init() { ewol::Object::init(); m_button = ewol::widget::Button::create(); - if (m_button == nullptr) { + if (m_button == null) { APPL_ERROR("Can not create button..."); return; } diff --git a/doc/tutorial/021_Resources.md b/doc/tutorial/021_Resources.md index a32a59b9..09b02b0f 100644 --- a/doc/tutorial/021_Resources.md +++ b/doc/tutorial/021_Resources.md @@ -57,7 +57,7 @@ namespace appl { public: void onChangePropertyFile() { m_config = ewol::resource::ConfigFile::create(*propertyConfig); - if (m_config != nullptr) { + if (m_config != null) { m_configValId = m_config->request("exampleConfigName"); } } diff --git a/doc/tutorial/030_ConplexeXmlGui.md b/doc/tutorial/030_ConplexeXmlGui.md index 16003ace..b6cf4715 100644 --- a/doc/tutorial/030_ConplexeXmlGui.md +++ b/doc/tutorial/030_ConplexeXmlGui.md @@ -32,7 +32,7 @@ First create the widget: ```{.cpp} ewol::widget::ButtonShared tmpWidget = ewol::widget::Button::create(); - if (tmpWidget == nullptr) { + if (tmpWidget == null) { APPL_CRITICAL("The widget can not be created"); } ``` @@ -60,7 +60,7 @@ We can configure the wiget before the init() is called. "name", etk::String("my name"), "expand", bvec2(true,false), "fill", bvec2(true,true)); - if (tmpWidget == nullptr) { + if (tmpWidget == null) { APPL_CRITICAL("The widget can not be created"); } ``` @@ -78,7 +78,7 @@ Call generic factory system (compositing) ```{.cpp} #include ewol::widget::WidgetShared tmpWidget = ewol::widget::composerGenerateString("