Commit 1111db32 authored by Mathias Goldau's avatar Mathias Goldau
Browse files

[MERGE]

parents b49b6b8a 2fb7ccec
......@@ -40,7 +40,7 @@ WProperties::~WProperties()
{
}
boost::signal1< void, std::string >* WProperties::addBool( std::string name, bool value, std::string shortDesc, std::string longDesc )
boost::signals2::signal1< void, std::string >* WProperties::addBool( std::string name, bool value, std::string shortDesc, std::string longDesc )
{
WProperty* prop = new WProperty( name, value, shortDesc, longDesc );
m_propertyList[name] = prop;
......@@ -48,7 +48,7 @@ boost::signal1< void, std::string >* WProperties::addBool( std::string name, boo
return prop->getSignalValueChanged();
}
boost::signal1< void, std::string >* WProperties::addChar( std::string name, char value, std::string shortDesc, std::string longDesc )
boost::signals2::signal1< void, std::string >* WProperties::addChar( std::string name, char value, std::string shortDesc, std::string longDesc )
{
WProperty* prop = new WProperty( name, value, shortDesc, longDesc );
m_propertyList[name] = prop;
......@@ -57,7 +57,7 @@ boost::signal1< void, std::string >* WProperties::addChar( std::string name, cha
}
boost::signal1< void, std::string >* WProperties::addInt( std::string name, int value, std::string shortDesc, std::string longDesc )
boost::signals2::signal1< void, std::string >* WProperties::addInt( std::string name, int value, std::string shortDesc, std::string longDesc )
{
WProperty* prop = new WProperty( name, value, shortDesc, longDesc );
m_propertyList[name] = prop;
......@@ -66,7 +66,7 @@ boost::signal1< void, std::string >* WProperties::addInt( std::string name, int
}
boost::signal1< void, std::string >* WProperties::addFloat( std::string name, float value, std::string shortDesc, std::string longDesc )
boost::signals2::signal1< void, std::string >* WProperties::addFloat( std::string name, float value, std::string shortDesc, std::string longDesc )
{
WProperty* prop = new WProperty( name, value, shortDesc, longDesc );
m_propertyList[name] = prop;
......@@ -75,7 +75,7 @@ boost::signal1< void, std::string >* WProperties::addFloat( std::string name, fl
}
boost::signal1< void, std::string >* WProperties::addDouble( std::string name, double value, std::string shortDesc, std::string longDesc )
boost::signals2::signal1< void, std::string >* WProperties::addDouble( std::string name, double value, std::string shortDesc, std::string longDesc )
{
WProperty* prop = new WProperty( name, value, shortDesc, longDesc );
m_propertyList[name] = prop;
......@@ -84,7 +84,8 @@ boost::signal1< void, std::string >* WProperties::addDouble( std::string name, d
}
boost::signal1< void, std::string >* WProperties::addString( std::string name, std::string value, std::string shortDesc, std::string longDesc )
boost::signals2::signal1< void, std::string >*
WProperties::addString( std::string name, std::string value, std::string shortDesc, std::string longDesc )
{
WProperty* prop = new WProperty( name, value, shortDesc, longDesc );
m_propertyList[name] = prop;
......@@ -92,7 +93,7 @@ boost::signal1< void, std::string >* WProperties::addString( std::string name, s
return prop->getSignalValueChanged();
}
boost::signal1< void, std::string >* WProperties::addColor( std::string name, WColor value, std::string shortDesc, std::string longDesc )
boost::signals2::signal1< void, std::string >* WProperties::addColor( std::string name, WColor value, std::string shortDesc, std::string longDesc )
{
WProperty* prop = new WProperty( name, value, shortDesc, longDesc );
m_propertyList[name] = prop;
......
......@@ -67,13 +67,20 @@ public:
*/
std::vector< WProperty* >& getPropertyVector();
boost::signal1< void, std::string >* addBool( std::string name, bool value = false, std::string shortDesc = "", std::string longDesc = "" );
boost::signal1< void, std::string >* addChar( std::string name, char value = 0, std::string shortDesc = "", std::string longDesc = "" );
boost::signal1< void, std::string >* addInt( std::string name, int value = 0, std::string shortDesc = "", std::string longDesc = "" );
boost::signal1< void, std::string >* addFloat( std::string name, float value = 0.0, std::string shortDesc = "", std::string longDesc = "" );
boost::signal1< void, std::string >* addDouble( std::string name, double value = 0.0, std::string shortDesc = "", std::string longDesc = "" );
boost::signal1< void, std::string >* addString( std::string name, std::string value = "", std::string shortDesc = "", std::string longDesc = "" );
boost::signal1< void, std::string >* addColor( std::string name, WColor value, std::string shortDesc = "", std::string longDesc = "" );
boost::signals2::signal1< void, std::string >*
addBool( std::string name, bool value = false, std::string shortDesc = "", std::string longDesc = "" );
boost::signals2::signal1< void, std::string >*
addChar( std::string name, char value = 0, std::string shortDesc = "", std::string longDesc = "" );
boost::signals2::signal1< void, std::string >*
addInt( std::string name, int value = 0, std::string shortDesc = "", std::string longDesc = "" );
boost::signals2::signal1< void, std::string >*
addFloat( std::string name, float value = 0.0, std::string shortDesc = "", std::string longDesc = "" );
boost::signals2::signal1< void, std::string >*
addDouble( std::string name, double value = 0.0, std::string shortDesc = "", std::string longDesc = "" );
boost::signals2::signal1< void, std::string >*
addString( std::string name, std::string value = "", std::string shortDesc = "", std::string longDesc = "" );
boost::signals2::signal1< void, std::string >*
addColor( std::string name, WColor value, std::string shortDesc = "", std::string longDesc = "" );
std::string getValueString( const std::string prop );
......
......@@ -165,7 +165,7 @@ bool WProperty::isHidden()
return m_isHidden;
}
boost::signal1< void, std::string >* WProperty::getSignalValueChanged()
boost::signals2::signal1< void, std::string >* WProperty::getSignalValueChanged()
{
return &m_signalValueChanged;
}
......@@ -28,7 +28,8 @@
#include <string>
#include <boost/lexical_cast.hpp>
#include "../gui/qt4/signalslib.hpp"
#include "boost/signals2/signal.hpp"
#include "boost/signals2/connection.hpp"
#include "WColor.h"
......@@ -81,7 +82,7 @@ public:
std::string getShortDesc();
std::string getLongDesc();
boost::signal1< void, std::string >* getSignalValueChanged();
boost::signals2::signal1< void, std::string >* getSignalValueChanged();
template < typename T > void setValue( const T& arg )
......@@ -151,7 +152,7 @@ private:
bool m_isHidden;
boost::signal1< void, std::string >m_signalValueChanged;
boost::signals2::signal1< void, std::string >m_signalValueChanged;
};
#endif // WPROPERTY_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment