mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 11:09:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Jenkins compile fix

Browse Source
This commit is contained in:
Alexander Bock
2016-11-24 08:54:42 +01:00
parent b00595af40
commit 6fad08dfda
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/openspace/properties/numericalproperty.h
View File

@@ -34,14 +34,15 @@ template <typename T>
class NumericalProperty : public TemplateProperty<T> {
public:
NumericalProperty(std::string identifier, std::string guiName,
Visibility visibility = Visibility::User);
Property::Visibility visibility = Property::Visibility::User);
NumericalProperty(std::string identifier, std::string guiName, T value,
Visibility visibility = Visibility::User);
Property::Visibility visibility = Property::Visibility::User);
NumericalProperty(std::string identifier, std::string guiName, T value,
T minimumValue, T maximumValue, Visibility visibility = Visibility::User);
T minimumValue, T maximumValue,
Property::Visibility visibility = Property::Visibility::User);
NumericalProperty(std::string identifier, std::string guiName, T value,
T minimumValue, T maximumValue, T steppingValue,
Visibility visibility = Visibility::User);
Property::Visibility visibility = Property::Visibility::User);
bool getLuaValue(lua_State* state) const override;
bool setLuaValue(lua_State* state) override;

8
include/openspace/properties/numericalproperty.inl
View File

@@ -234,7 +234,7 @@ const std::string NumericalProperty<T>::SteppingValueKey = "SteppingValue";
template <typename T>
NumericalProperty<T>::NumericalProperty(std::string identifier, std::string guiName,
Visibility visibility)
Property::Visibility visibility)
: NumericalProperty<T>(
std::move(identifier), std::move(guiName),
PropertyDelegate<NumericalProperty<T>>::template defaultValue<T>(),
@@ -248,7 +248,7 @@ NumericalProperty<T>::NumericalProperty(std::string identifier, std::string guiN
template <typename T>
NumericalProperty<T>::NumericalProperty(std::string identifier,
std::string guiName, T value,
Visibility visibility)
Property::Visibility visibility)
: NumericalProperty<T>(
std::move(identifier), std::move(guiName), std::move(value),
PropertyDelegate<NumericalProperty<T>>::template defaultMinimumValue<T>(),
@@ -261,7 +261,7 @@ NumericalProperty<T>::NumericalProperty(std::string identifier,
template <typename T>
NumericalProperty<T>::NumericalProperty(std::string identifier, std::string guiName,
T value, T minimumValue, T maximumValue,
Visibility visibility)
Property::Visibility visibility)
: NumericalProperty<T>(
std::move(identifier) , std::move(guiName), std::move(value),
std::move(minimumValue), std::move(maximumValue),
@@ -274,7 +274,7 @@ template <typename T>
NumericalProperty<T>::NumericalProperty(std::string identifier,
std::string guiName, T value,
T minimumValue, T maximumValue, T steppingValue,
Visibility visibility)
Property::Visibility visibility)
: TemplateProperty<T>(std::move(identifier), std::move(guiName), std::move(value),
visibility)
, _minimumValue(std::move(minimumValue))

4
include/openspace/properties/optionproperty.h
View File

@@ -62,7 +62,7 @@ public:
* \param guiName The GUI name that should be used to represent this property
*/
OptionProperty(std::string identifier, std::string guiName,
Visibility visibility = Visibility::User);
Property::Visibility visibility = Property::Visibility::User);
/**
* The constructor delegating the <code>identifier</code> and the <code>guiName</code>
@@ -72,7 +72,7 @@ public:
* \param displayType Optional DisplayType for GUI (default RADIO)
*/
OptionProperty(std::string identifier, std::string guiName, DisplayType displayType,
Visibility visibility = Visibility::User);
Property::Visibility visibility = Property::Visibility::User);
/**
* Returns the name of the class for reflection purposes.

2
include/openspace/properties/selectionproperty.h
View File

@@ -40,7 +40,7 @@ public:
};
SelectionProperty(std::string identifier, std::string guiName,
Visibility visibility = Visibility::User);
Property::Visibility visibility = Property::Visibility::User);
void addOption(Option option);
void removeOptions();

4
include/openspace/properties/templateproperty.h
View File

@@ -64,7 +64,7 @@ public:
* \param guiName The human-readable GUI name for this TemplateProperty
*/
TemplateProperty(std::string identifier, std::string guiName,
Visibility visibility = Visibility::User);
Property::Visibility visibility = Visibility::User);
/**
* The constructor initializing the TemplateProperty with the provided
@@ -72,7 +72,7 @@ public:
* <code>value</code>.
*/
TemplateProperty(std::string identifier, std::string guiName, T value,
Visibility visibility = Visibility::User);
Property::Visibility visibility = Visibility::User);
/**
* Returns the class name for this TemplateProperty. The default implementation makes

9
include/openspace/properties/templateproperty.inl
View File

@@ -150,21 +150,20 @@ namespace properties {
template <typename T>
TemplateProperty<T>::TemplateProperty(std::string identifier, std::string guiName,
Visibility visibility)
Property::Visibility visibility)
: TemplateProperty<T>(
std::move(identifier), std::move(guiName),
PropertyDelegate<TemplateProperty<T>>::template defaultValue<T>(),
visibility)
{
}
template <typename T>
TemplateProperty<T>::TemplateProperty(std::string identifier, std::string guiName,
T value, Visibility visibility)
T value, Property::Visibility visibility)
: Property(std::move(identifier), std::move(guiName), visibility)
, _value(std::move(value)) {
}
, _value(std::move(value))
{}
template <typename T>
std::string TemplateProperty<T>::className() const {

2
include/openspace/properties/triggerproperty.h
View File

@@ -43,7 +43,7 @@ public:
* \param guiName The human-readable name of this Property
*/
TriggerProperty(std::string identifier, std::string guiName,
Visibility visibility = Visibility::User);
Property::Visibility visibility = Property::Visibility::User);
/**
* Returns the class name <code>TriggerProperty</code>.

4
src/properties/optionproperty.cpp
View File

@@ -34,13 +34,13 @@ namespace properties {
const std::string OptionProperty::OptionsKey = "Options";
OptionProperty::OptionProperty(std::string identifier, std::string guiName,
Visibility visibility)
Property::Visibility visibility)
: IntProperty(std::move(identifier), std::move(guiName), visibility)
, _displayType(DisplayType::Radio)
{}
OptionProperty::OptionProperty(std::string identifier, std::string guiName,
DisplayType displayType, Visibility visibility)
DisplayType displayType, Property::Visibility visibility)
: IntProperty(std::move(identifier), std::move(guiName), visibility)
, _displayType(displayType)
{}

2
src/properties/selectionproperty.cpp
View File

@@ -36,7 +36,7 @@ namespace properties {
const std::string SelectionProperty::OptionsKey = "Options";
SelectionProperty::SelectionProperty(std::string identifier, std::string guiName,
Visibility visibility)
Property::Visibility visibility)
: TemplateProperty(std::move(identifier), std::move(guiName), std::vector<int>(),
visibility)
{}

2
src/properties/triggerproperty.cpp
View File

@@ -28,7 +28,7 @@ namespace openspace {
namespace properties {
TriggerProperty::TriggerProperty(std::string identifier, std::string guiName,
Visibility visibility)
Property::Visibility visibility)
: Property(std::move(identifier), std::move(guiName), visibility)
{}