mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename to valid_field_name

Browse Source
This commit is contained in:
qPCR4vir 2019-04-14 01:12:19 +02:00
parent 6b3c02b558
commit 064d59de13
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/gui/place.hpp
View File

@ -141,7 +141,7 @@ namespace nana
void div(std::string div_text); ///< Divides the attached widget into fields. void div(std::string div_text); ///< Divides the attached widget into fields.
const std::string& div() const noexcept; ///< Returns div-text that depends on fields status. const std::string& div() const noexcept; ///< Returns div-text that depends on fields status.
static bool check_field_name(const char* name) ///< must begin with _a-zA-Z static bool valid_field_name(const char* name) ///< must begin with _a-zA-Z
{ {
return name && (*name == '_' || (('a' <= *name && *name <= 'z') || ('A' <= *name && *name <= 'Z'))); return name && (*name == '_' || (('a' <= *name && *name <= 'z') || ('A' <= *name && *name <= 'Z')));
} }

14
source/gui/place.cpp
View File

@ -3274,7 +3274,7 @@ namespace nana
if (nullptr == div_text) if (nullptr == div_text)
throw error("nana::place.modify(): invalid div-text (nullptr)", *this); throw error("nana::place.modify(): invalid div-text (nullptr)", *this);
if (! place::check_field_name(name) ) if (! valid_field_name(name) )
throw badname("nana::place.modify()", *this, name); throw badname("nana::place.modify()", *this, name);
auto div_ptr = impl_->search_div_name(impl_->root_division.get(), name); auto div_ptr = impl_->search_div_name(impl_->root_division.get(), name);
@ -3347,7 +3347,7 @@ namespace nana
place::field_reference place::field(const char* name) place::field_reference place::field(const char* name)
{ {
if (!place::check_field_name(name)) if (!valid_field_name(name))
throw badname("nana::place.field()", *this, name); throw badname("nana::place.field()", *this, name);
//get the field with the specified name. If no such field with specified name //get the field with the specified name. If no such field with specified name
@ -3442,7 +3442,7 @@ namespace nana
void place::field_visible(const char* name, bool vsb) void place::field_visible(const char* name, bool vsb)
{ {
if (!place::check_field_name(name)) if (!valid_field_name(name))
throw badname("set nana::place.field_visible()", *this, name); throw badname("set nana::place.field_visible()", *this, name);
auto div = impl_->search_div_name(impl_->root_division.get(), name); auto div = impl_->search_div_name(impl_->root_division.get(), name);
@ -3455,7 +3455,7 @@ namespace nana
bool place::field_visible(const char* name) const bool place::field_visible(const char* name) const
{ {
if (!place::check_field_name(name)) if (!valid_field_name(name))
throw badname("get nana::place.field_visible()", *this, name); throw badname("get nana::place.field_visible()", *this, name);
auto div = impl_->search_div_name(impl_->root_division.get(), name); auto div = impl_->search_div_name(impl_->root_division.get(), name);
@ -3464,7 +3464,7 @@ namespace nana
void place::field_display(const char* name, bool dsp) void place::field_display(const char* name, bool dsp)
{ {
if (!place::check_field_name(name)) if (!valid_field_name(name))
throw badname("set nana::place.field_display()", *this, name); throw badname("set nana::place.field_display()", *this, name);
auto div = impl_->search_div_name(impl_->root_division.get(), name); auto div = impl_->search_div_name(impl_->root_division.get(), name);
@ -3478,7 +3478,7 @@ namespace nana
bool place::field_display(const char* name) const bool place::field_display(const char* name) const
{ {
if (!place::check_field_name(name)) if (!valid_field_name(name))
throw badname("get nana::place.field_display()", *this, name); throw badname("get nana::place.field_display()", *this, name);
auto div = impl_->search_div_name(impl_->root_division.get(), name); auto div = impl_->search_div_name(impl_->root_division.get(), name);
@ -3516,7 +3516,7 @@ namespace nana
place& place::dock(const std::string& name, std::string factory_name, std::function<std::unique_ptr<widget>(window)> factory) place& place::dock(const std::string& name, std::string factory_name, std::function<std::unique_ptr<widget>(window)> factory)
{ {
if (!place::check_field_name(name.data())) if (!valid_field_name(name.data()))
throw badname("get nana::place.field_display()", *this, name.data()); throw badname("get nana::place.field_display()", *this, name.data());
auto & dock_ptr = impl_->docks[name]; auto & dock_ptr = impl_->docks[name];