|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r55977 - in sandbox/pinhole: boost/pinhole libs/pinhole/test
From: jmcintyre_at_[hidden]
Date: 2009-09-02 11:25:46
Author: jared
Date: 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
New Revision: 55977
URL: http://svn.boost.org/trac/boost/changeset/55977
Log:
Pinhole - remove description (this should be in metadata)
Text files modified:
sandbox/pinhole/boost/pinhole/action_info.hpp | 1 -
sandbox/pinhole/boost/pinhole/property_group.hpp | 21 ++++-----------------
sandbox/pinhole/boost/pinhole/property_info.hpp | 1 -
sandbox/pinhole/libs/pinhole/test/test_actions.cpp | 4 ++--
sandbox/pinhole/libs/pinhole/test/test_bool_properties.cpp | 4 ++--
sandbox/pinhole/libs/pinhole/test/test_category_iterator.cpp | 2 +-
sandbox/pinhole/libs/pinhole/test/test_depth_first_iterator.cpp | 2 +-
sandbox/pinhole/libs/pinhole/test/test_double_properties.cpp | 4 ++--
sandbox/pinhole/libs/pinhole/test/test_find.cpp | 2 +-
sandbox/pinhole/libs/pinhole/test/test_float_properties.cpp | 4 ++--
sandbox/pinhole/libs/pinhole/test/test_integer_properties.cpp | 4 ++--
sandbox/pinhole/libs/pinhole/test/test_path_filtered_iterator.cpp | 2 +-
sandbox/pinhole/libs/pinhole/test/test_property_groups.cpp | 36 ++++++++++++++++++------------------
sandbox/pinhole/libs/pinhole/test/test_string_properties.cpp | 8 ++++----
sandbox/pinhole/libs/pinhole/test/test_value.cpp | 4 ++--
15 files changed, 42 insertions(+), 57 deletions(-)
Modified: sandbox/pinhole/boost/pinhole/action_info.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/action_info.hpp (original)
+++ sandbox/pinhole/boost/pinhole/action_info.hpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -33,7 +33,6 @@
action_type m_action;
std::string m_name;
- std::string m_description;
/**
* Calls the appropriate action function for this parameter.
Modified: sandbox/pinhole/boost/pinhole/property_group.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/property_group.hpp (original)
+++ sandbox/pinhole/boost/pinhole/property_group.hpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -622,41 +622,36 @@
/**
* Adds a property to the property list.
* @param name The name of the property.
- * @param description A brief description of the property for the user interface.
* @param setter The function used to set the property.
* @param getter The function used to get the property.
*/
template<typename Setter, typename Getter>
void add_property( std::string name,
- std::string description,
Setter setter,
Getter getter)
{
boost::any no_metadata;
- internal_add_property< typename Getter::result_type >( name, description, setter, getter, no_metadata);
+ internal_add_property< typename Getter::result_type >( name, setter, getter, no_metadata);
}
/**
* Adds a property to the property list.
* @param name The name of the property.
- * @param description A brief description of the property for the user interface.
* @param setter The function used to set the property.
* @param getter The function used to get the property.
*/
template<typename Getter>
void add_property( std::string name,
- std::string description,
no_setter_struct setter,
Getter getter)
{
boost::any no_metadata;
- internal_add_property< typename Getter::result_type >( name, description, NULL, getter, no_metadata);
+ internal_add_property< typename Getter::result_type >( name, NULL, getter, no_metadata);
}
/**
* Adds a property to the property list.
* @param name The name of the property.
- * @param description A brief description of the property for the user interface.
* @param setter The function used to set the property.
* @param getter The function used to get the property.
* @param metadata A pointer to the editor to be used with this property, or null
@@ -664,18 +659,16 @@
*/
template< typename Setter, typename Getter>
void add_property( std::string name,
- std::string description,
Setter setter,
Getter getter,
boost::any metadata )
{
- internal_add_property< typename Getter::result_type >( name, description, setter, getter, metadata);
+ internal_add_property< typename Getter::result_type >( name, setter, getter, metadata);
}
/**
* Adds a property to the property list.
* @param name The name of the property.
- * @param description A brief description of the property for the user interface.
* @param setter The function used to set the property.
* @param getter The function used to get the property.
* @param metadata A pointer to the editor to be used with this property, or null
@@ -683,28 +676,24 @@
*/
template< typename Getter>
void add_property( std::string name,
- std::string description,
no_setter_struct,
Getter getter,
boost::any metadata )
{
- internal_add_property< typename Getter::result_type >( name, description, NULL, getter, metadata);
+ internal_add_property< typename Getter::result_type >( name, NULL, getter, metadata);
}
/**
* Adds an action to the action list.
* @param The name of the action.
- * @param description A brief description of the action for the user interface.
* @param action The function used to trigger the action.
*/
void add_action( std::string name,
- std::string description,
boost::function<void ()> action )
{
detail::action_info *action_info = new detail::action_info();
action_info->m_name = name;
- action_info->m_description = description;
action_info->m_action = action;
action_collection::iterator previousInstance = m_actions.find(name);
@@ -747,7 +736,6 @@
protected:
template<typename Value_Type>
void internal_add_property( const std::string &name,
- const std::string &description,
boost::function<void (const Value_Type&)> setter,
boost::function<Value_Type ()> getter,
boost::any &metadata )
@@ -758,7 +746,6 @@
// Fill out property information
prop->m_name = name;
- prop->m_description = description;
if( NULL != setter )
{
prop->setter = setter;
Modified: sandbox/pinhole/boost/pinhole/property_info.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/property_info.hpp (original)
+++ sandbox/pinhole/boost/pinhole/property_info.hpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -273,7 +273,6 @@
virtual ~property_info_base(){;}
std::string m_name;
- std::string m_description;
boost::any m_metadata;
const std::type_info &m_type;
Modified: sandbox/pinhole/libs/pinhole/test/test_actions.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_actions.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_actions.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -32,8 +32,8 @@
bTriggeredAction1 = false;
bTriggeredAction2 = false;
- add_action(ACTION_1, "First BOOST_ACTION", BOOST_ACTION(&TestActionsFixture::Action1));
- add_action(ACTION_2, "Second BOOST_ACTION", BOOST_ACTION(&TestActionsFixture::Action2));
+ add_action(ACTION_1, BOOST_ACTION(&TestActionsFixture::Action1));
+ add_action(ACTION_2, BOOST_ACTION(&TestActionsFixture::Action2));
}
#if defined(BOOST_MSVC)
#pragma warning(pop)
Modified: sandbox/pinhole/libs/pinhole/test/test_bool_properties.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_bool_properties.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_bool_properties.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -29,8 +29,8 @@
m_bool_Func = false;
m_bool_Var = false;
- add_property("Bool_Func", "Bool1 description", BOOST_SETTER(&TestGroup::SetBool), BOOST_GETTER(&TestGroup::GetBool) );
- add_property("Bool_Var", "Bool2 description", BOOST_SETTER_VAR(m_bool_Var), BOOST_GETTER_VAR(m_bool_Var) );
+ add_property("Bool_Func", BOOST_SETTER(&TestGroup::SetBool), BOOST_GETTER(&TestGroup::GetBool) );
+ add_property("Bool_Var", BOOST_SETTER_VAR(m_bool_Var), BOOST_GETTER_VAR(m_bool_Var) );
}
#if defined(BOOST_MSVC)
#pragma warning(pop)
Modified: sandbox/pinhole/libs/pinhole/test/test_category_iterator.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_category_iterator.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_category_iterator.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -26,7 +26,7 @@
property_group( lexical_cast<string>(level), pParentGroup ),
m_int(id)
{
- add_property("ID", "ID", BOOST_SETTER_NONE, BOOST_GETTER_VAR(m_int));
+ add_property("ID", BOOST_SETTER_NONE, BOOST_GETTER_VAR(m_int));
}
int m_int;
Modified: sandbox/pinhole/libs/pinhole/test/test_depth_first_iterator.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_depth_first_iterator.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_depth_first_iterator.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -26,7 +26,7 @@
property_group( lexical_cast<string>(level), pParentGroup ),
m_int(id)
{
- add_property("ID", "ID", BOOST_SETTER_NONE, BOOST_GETTER_VAR(m_int));
+ add_property("ID", BOOST_SETTER_NONE, BOOST_GETTER_VAR(m_int));
}
int m_int;
Modified: sandbox/pinhole/libs/pinhole/test/test_double_properties.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_double_properties.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_double_properties.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -29,8 +29,8 @@
m_double_Func = 1.1;
m_double_Var = 1.1;
- add_property("Double_Func", "Double1 description", BOOST_SETTER(&TestGroup::SetDouble), BOOST_GETTER(&TestGroup::GetDouble) );
- add_property("Double_Var", "Double2 description", BOOST_SETTER_VAR(m_double_Var), BOOST_GETTER_VAR(m_double_Var) );
+ add_property("Double_Func", BOOST_SETTER(&TestGroup::SetDouble), BOOST_GETTER(&TestGroup::GetDouble) );
+ add_property("Double_Var", BOOST_SETTER_VAR(m_double_Var), BOOST_GETTER_VAR(m_double_Var) );
}
#if defined(BOOST_MSVC)
#pragma warning(pop)
Modified: sandbox/pinhole/libs/pinhole/test/test_find.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_find.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_find.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -25,7 +25,7 @@
property_group( lexical_cast<string>(level), pParentGroup ),
m_int(id)
{
- add_property("ID", "ID", BOOST_SETTER_NONE, BOOST_GETTER_VAR(m_int));
+ add_property("ID", BOOST_SETTER_NONE, BOOST_GETTER_VAR(m_int));
}
int m_int;
Modified: sandbox/pinhole/libs/pinhole/test/test_float_properties.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_float_properties.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_float_properties.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -29,8 +29,8 @@
m_float_Func = 1.1f;
m_float_Var = 1.1f;
- add_property("Float_Func", "Float description", BOOST_SETTER(&TestGroup::SetFloat), BOOST_GETTER(&TestGroup::GetFloat) );
- add_property("Float_Var", "Float description", BOOST_SETTER_VAR(m_float_Var), BOOST_GETTER_VAR(m_float_Var) );
+ add_property("Float_Func", BOOST_SETTER(&TestGroup::SetFloat), BOOST_GETTER(&TestGroup::GetFloat) );
+ add_property("Float_Var", BOOST_SETTER_VAR(m_float_Var), BOOST_GETTER_VAR(m_float_Var) );
}
#if defined(BOOST_MSVC)
#pragma warning(pop)
Modified: sandbox/pinhole/libs/pinhole/test/test_integer_properties.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_integer_properties.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_integer_properties.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -29,8 +29,8 @@
m_int_Func = 0;
m_int_Var = 0;
- add_property("Int_Func", "Int1 description", BOOST_SETTER(&TestGroup::SetInt), BOOST_GETTER(&TestGroup::GetInt) );
- add_property("Int_Var", "Int2 description", BOOST_SETTER_VAR(m_int_Var), BOOST_GETTER_VAR(m_int_Var) );
+ add_property("Int_Func", BOOST_SETTER(&TestGroup::SetInt), BOOST_GETTER(&TestGroup::GetInt) );
+ add_property("Int_Var", BOOST_SETTER_VAR(m_int_Var), BOOST_GETTER_VAR(m_int_Var) );
}
#if defined(BOOST_MSVC)
#pragma warning(pop)
Modified: sandbox/pinhole/libs/pinhole/test/test_path_filtered_iterator.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_path_filtered_iterator.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_path_filtered_iterator.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -26,7 +26,7 @@
property_group( lexical_cast<string>(level), pParentGroup ),
m_int(id)
{
- add_property("ID", "ID", BOOST_SETTER_NONE, BOOST_GETTER_VAR(m_int));
+ add_property("ID", BOOST_SETTER_NONE, BOOST_GETTER_VAR(m_int));
}
int m_int;
Modified: sandbox/pinhole/libs/pinhole/test/test_property_groups.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_property_groups.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_property_groups.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -44,9 +44,9 @@
public:
TestPropertyChildGroup( property_group *pParentGroup) : property_group( PROPERTY_GROUP_CHILD_NAME, pParentGroup )
{
- add_property(PROP_FLOAT, "PropFloat description", BOOST_SETTER(&TestPropertyChildGroup::SetFloat), BOOST_GETTER(&TestPropertyChildGroup::GetFloat));
- add_property(PROP_INT, "PropInt description", BOOST_SETTER(&TestPropertyChildGroup::SetInt), BOOST_GETTER(&TestPropertyChildGroup::GetInt));
- add_property(PROP_STRING, "PropString description", BOOST_SETTER(&TestPropertyChildGroup::SetString), BOOST_GETTER(&TestPropertyChildGroup::GetString));
+ add_property(PROP_FLOAT, BOOST_SETTER(&TestPropertyChildGroup::SetFloat), BOOST_GETTER(&TestPropertyChildGroup::GetFloat));
+ add_property(PROP_INT, BOOST_SETTER(&TestPropertyChildGroup::SetInt), BOOST_GETTER(&TestPropertyChildGroup::GetInt));
+ add_property(PROP_STRING, BOOST_SETTER(&TestPropertyChildGroup::SetString), BOOST_GETTER(&TestPropertyChildGroup::GetString));
add_category(PROPERTY_GROUP_CATEGORY1);
add_category(PROPERTY_GROUP_CATEGORY2);
@@ -77,10 +77,10 @@
m_bool_var = false;
- add_property(PROP_STRING, "PropString description", BOOST_SETTER(&TestPropertyGroup::SetString), BOOST_GETTER(&TestPropertyGroup::GetString));
- add_property(PROP_FLOAT, "PropFloat description", BOOST_SETTER(&TestPropertyGroup::SetFloat), BOOST_GETTER(&TestPropertyGroup::GetFloat));
- add_property(PROP_INT, "PropInt description", BOOST_SETTER(&TestPropertyGroup::SetInt), BOOST_GETTER(&TestPropertyGroup::GetInt));
- add_property(PROPERTY_BOOL, "PropBool description", BOOST_SETTER(&TestPropertyGroup::SetBool), BOOST_GETTER(&TestPropertyGroup::GetBool));
+ add_property(PROP_STRING, BOOST_SETTER(&TestPropertyGroup::SetString), BOOST_GETTER(&TestPropertyGroup::GetString));
+ add_property(PROP_FLOAT, BOOST_SETTER(&TestPropertyGroup::SetFloat), BOOST_GETTER(&TestPropertyGroup::GetFloat));
+ add_property(PROP_INT, BOOST_SETTER(&TestPropertyGroup::SetInt), BOOST_GETTER(&TestPropertyGroup::GetInt));
+ add_property(PROPERTY_BOOL, BOOST_SETTER(&TestPropertyGroup::SetBool), BOOST_GETTER(&TestPropertyGroup::GetBool));
add_category(PROPERTY_GROUP_CATEGORY1);
add_category(PROPERTY_GROUP_CATEGORY2);
@@ -213,19 +213,19 @@
BOOST_CHECK_EQUAL( testGroup.prop_count(), 0u );
- testGroup.add_property("Test1", "", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
+ testGroup.add_property("Test1", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
BOOST_CHECK_EQUAL( testGroup.prop_count(), 1u );
- testGroup.add_property("Test2", "", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
+ testGroup.add_property("Test2", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
BOOST_CHECK_EQUAL( testGroup.prop_count(), 2u );
- testGroup.add_property("Test3", "", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
+ testGroup.add_property("Test3", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
BOOST_CHECK_EQUAL( testGroup.prop_count(), 3u );
- testGroup.add_property("Test4", "", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
+ testGroup.add_property("Test4", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
BOOST_CHECK_EQUAL( testGroup.prop_count(), 4u );
- testGroup.add_property("Test5", "", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
+ testGroup.add_property("Test5", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
BOOST_CHECK_EQUAL( testGroup.prop_count(), 5u );
}
@@ -352,8 +352,8 @@
// For this test, testGroup shouldn't have a copy constructor
property_group testGroup("TEST_GROUP", NULL);
- testGroup.add_property("Test1", "", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
- testGroup.add_property("Test2", "", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
+ testGroup.add_property("Test1", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
+ testGroup.add_property("Test2", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
BOOST_CHECK_EQUAL( testGroup.prop_count(), 2u );
property_group copiedGroup( testGroup );
@@ -372,8 +372,8 @@
{
// For this test, testGroup shouldn't have a copy constructor
property_group testGroup("TEST_GROUP", NULL);
- testGroup.add_action("Test1", "", boost::bind(NullOpFunction));
- testGroup.add_action("Test2", "", boost::bind(NullOpFunction));
+ testGroup.add_action("Test1", boost::bind(NullOpFunction));
+ testGroup.add_action("Test2", boost::bind(NullOpFunction));
BOOST_CHECK_EQUAL( testGroup.action_count(), 2u );
property_group copiedGroup( testGroup );
@@ -404,8 +404,8 @@
bool test_bool(false);
property_group testGroup("TEST_GROUP", NULL);
- testGroup.add_property("read_only", "", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
- testGroup.add_property("writable", "", BOOST_SETTER_VAR(test_bool), BOOST_GETTER_VAR(test_bool));
+ testGroup.add_property("read_only", BOOST_SETTER_NONE, BOOST_GETTER_VAR(test_bool));
+ testGroup.add_property("writable", BOOST_SETTER_VAR(test_bool), BOOST_GETTER_VAR(test_bool));
BOOST_CHECK_EQUAL( testGroup.is_read_only("read_only"), true );
BOOST_CHECK_EQUAL( testGroup.is_read_only("writable"), false );
Modified: sandbox/pinhole/libs/pinhole/test/test_string_properties.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_string_properties.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_string_properties.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -26,10 +26,10 @@
#endif
TestGroup() : property_group( "PropertyGroupName", NULL )
{
- add_property("String_Func", "String1 description", BOOST_SETTER(&TestGroup::SetString), BOOST_GETTER(&TestGroup::GetString) );
- add_property("String_Var", "String2 description", BOOST_SETTER_VAR(m_string_Var), BOOST_GETTER_VAR(m_string_Var) );
- add_property("WString_Func", "Wstring1 description", BOOST_SETTER(&TestGroup::SetWString), BOOST_GETTER(&TestGroup::GetWString) );
- add_property("WString_Var", "Wstring2 description", BOOST_SETTER_VAR(m_wstring_Var), BOOST_GETTER_VAR(m_wstring_Var) );
+ add_property("String_Func", BOOST_SETTER(&TestGroup::SetString), BOOST_GETTER(&TestGroup::GetString) );
+ add_property("String_Var", BOOST_SETTER_VAR(m_string_Var), BOOST_GETTER_VAR(m_string_Var) );
+ add_property("WString_Func", BOOST_SETTER(&TestGroup::SetWString), BOOST_GETTER(&TestGroup::GetWString) );
+ add_property("WString_Var", BOOST_SETTER_VAR(m_wstring_Var), BOOST_GETTER_VAR(m_wstring_Var) );
}
#if defined(BOOST_MSVC)
#pragma warning(pop)
Modified: sandbox/pinhole/libs/pinhole/test/test_value.cpp
==============================================================================
--- sandbox/pinhole/libs/pinhole/test/test_value.cpp (original)
+++ sandbox/pinhole/libs/pinhole/test/test_value.cpp 2009-09-02 11:25:44 EDT (Wed, 02 Sep 2009)
@@ -25,7 +25,7 @@
property_group( lexical_cast<string>(name), pParentGroup ),
m_int(id)
{
- add_property("ID", "ID", BOOST_SETTER_VAR(m_int), BOOST_GETTER_VAR(m_int));
+ add_property("ID", BOOST_SETTER_VAR(m_int), BOOST_GETTER_VAR(m_int));
}
int m_int;
@@ -38,7 +38,7 @@
property_group( lexical_cast<string>(name), pParentGroup ),
m_int(id)
{
- add_property("ID", "ID", BOOST_SETTER_NONE, BOOST_GETTER_VAR(m_int));
+ add_property("ID", BOOST_SETTER_NONE, BOOST_GETTER_VAR(m_int));
}
int m_int;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk