Alonso Schaich <alonsoscha...@fastmail.fm> writes:
> SVN commit 9421 by aschai:
>
> RocsCore/Modifiers/ValueModifier.cpp is written in what is clearly not C++.
> I tried patching it but clang wouldn't link, so force gcc instead.
Does the attached patch fix the issue for you?
diff --git a/RocsCore/Modifiers/ValueModifier.cpp b/RocsCore/Modifiers/ValueModifier.cpp
index 0fccf15..9ef7e35 100644
--- a/RocsCore/Modifiers/ValueModifier.cpp
+++ b/RocsCore/Modifiers/ValueModifier.cpp
@@ -35,7 +35,7 @@ ValueModifier::ValueModifier()
template<typename T>
-void ValueModifier::enumerate(const QList<T> &list, const QString &property, int start, const QString &baseString, bool overrideValues = true)
+void ValueModifier::enumerate(const QList<T> &list, const QString &property, int start, const QString &baseString, bool overrideValues)
{
for (int i = 0; i < list.size(); i++) {
if (!overrideValues && !list[i]->property(property.toLatin1()).isNull()) {
@@ -49,7 +49,7 @@ template void ValueModifier::enumerate<PointerPtr>(const QList<PointerPtr> &list
template<typename T>
-void ValueModifier::enumerateAlpha(const QList< T >& list, const QString &property, const QString &start, bool overrideValues = true)
+void ValueModifier::enumerateAlpha(const QList< T >& list, const QString &property, const QString &start, bool overrideValues)
{
QString identifier = start;
for (int i = start.length()-1; i >= 0; --i) {
@@ -86,7 +86,7 @@ template void ValueModifier::enumerateAlpha<PointerPtr>(const QList<PointerPtr>
template<typename T>
-void ValueModifier::assignRandomIntegers(const QList<T> &list, const QString &property, int lowerLimit, int upperLimit, int seed, bool overrideValues = true)
+void ValueModifier::assignRandomIntegers(const QList<T> &list, const QString &property, int lowerLimit, int upperLimit, int seed, bool overrideValues)
{
if (lowerLimit > upperLimit) {
return;
@@ -110,7 +110,7 @@ template void ValueModifier::assignRandomIntegers<PointerPtr>(const QList<Pointe
template<typename T>
-void ValueModifier::assignRandomReals(const QList<T> &list, const QString &property, qreal lowerLimit, qreal upperLimit, int seed, bool overrideValues = true)
+void ValueModifier::assignRandomReals(const QList<T> &list, const QString &property, qreal lowerLimit, qreal upperLimit, int seed, bool overrideValues)
{
if (lowerLimit > upperLimit) {
return;
@@ -133,7 +133,7 @@ template void ValueModifier::assignRandomReals<DataPtr>(const QList<DataPtr> &li
template void ValueModifier::assignRandomReals<PointerPtr>(const QList<PointerPtr> &list, const QString &property, qreal lowerLimit, qreal upperLimit, int seed, bool overrideValues);
template<typename T>
-void ValueModifier::assignConstantValue(const QList<T> &list, const QString &property, const QString &constant, bool overrideValues = true)
+void ValueModifier::assignConstantValue(const QList<T> &list, const QString &property, const QString &constant, bool overrideValues)
{
for (int i = 0; i < list.size(); i++) {
if (!overrideValues && !list[i]->property(property.toLatin1()).isNull()) {
diff --git a/RocsCore/Modifiers/ValueModifier.h b/RocsCore/Modifiers/ValueModifier.h
index bd522db..3eddde3 100644
--- a/RocsCore/Modifiers/ValueModifier.h
+++ b/RocsCore/Modifiers/ValueModifier.h
@@ -42,7 +42,7 @@ public:
* \param overrideValues if true, current property values are overwritten; otherwise not
*/
template<typename T>
- void enumerate(const QList<T>& list, const QString &property, int start, const QString &baseString, bool overrideValues);
+ void enumerate(const QList<T>& list, const QString &property, int start, const QString &baseString, bool overrideValues = true);
/**
* Assign strings in increasing order starting at 'start' to all nodes.
@@ -53,7 +53,7 @@ public:
* \param overrideValues if true, current property values are overwritten; otherwise not
*/
template<typename T>
- void enumerateAlpha(const QList<T> &list, const QString &property, const QString &start, bool overrideValues);
+ void enumerateAlpha(const QList<T> &list, const QString &property, const QString &start, bool overrideValues = true);
/**
* Assign integers uniformly at random from range [lowerLimit,upperLimit] to data elements. Using Mersenne-Twister
@@ -67,7 +67,7 @@ public:
* \param overrideValues if true, current property values are overwritten; otherwise not
*/
template<typename T>
- void assignRandomIntegers(const QList<T> &list, const QString &property, int lowerLimit, int upperLimit, int seed, bool overrideValues);
+ void assignRandomIntegers(const QList<T> &list, const QString &property, int lowerLimit, int upperLimit, int seed, bool overrideValues = true);
/**
* Assign float values uniformly at random from range [lowerLimit,upperLimit] to nodes. Using Mersenne-Twister
@@ -81,7 +81,7 @@ public:
* \param overrideValues if true, current property values are overwritten; otherwise not
*/
template<typename T>
- void assignRandomReals(const QList<T> &list, const QString &property, qreal lowerLimit, qreal upperLimit, int seed, bool overrideValues);
+ void assignRandomReals(const QList<T> &list, const QString &property, qreal lowerLimit, qreal upperLimit, int seed, bool overrideValues = true);
/**
* Assign a constant string value to nodes/pointers
@@ -92,7 +92,7 @@ public:
* \param overrideValues if true, current property values are overwritten; otherwise not
*/
template<typename T>
- void assignConstantValue(const QList<T> &list, const QString &property, const QString &constant, bool overrideValues);
+ void assignConstantValue(const QList<T> &list, const QString &property, const QString &constant, bool overrideValues = true);
};
#endif // VALUEMODIFIER_H
_______________________________________________
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information
