mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-03 03:30:06 +00:00
Code Activity

Fix for checkerboard rendering. Minor clean-ups.

Browse source
This commit is contained in:
Julian Storer 2010-07-01 20:00:20 +01:00
parent a9b1c0cd4e
commit 258414bad2
7 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/containers/juce_Variant.cpp
View file

@ -40,7 +40,6 @@ public:
virtual int toInt (const ValueUnion&) const { return 0; }
virtual double toDouble (const ValueUnion&) const { return 0; }
virtual float toFloat (const ValueUnion&) const { return 0; }
virtual const String toString (const ValueUnion&) const { return String::empty; }
virtual bool toBool (const ValueUnion&) const { return false; }
virtual DynamicObject* toObject (const ValueUnion&) const { return 0; }
@ -78,7 +77,6 @@ public:
int toInt (const ValueUnion& data) const { return data.intValue; };
double toDouble (const ValueUnion& data) const { return (double) data.intValue; }
float toFloat (const ValueUnion& data) const { return (float) data.intValue; }
const String toString (const ValueUnion& data) const { return String (data.intValue); }
bool toBool (const ValueUnion& data) const { return data.intValue != 0; }
@ -105,7 +103,6 @@ public:
int toInt (const ValueUnion& data) const { return (int) data.doubleValue; };
double toDouble (const ValueUnion& data) const { return data.doubleValue; }
float toFloat (const ValueUnion& data) const { return (float) data.doubleValue; }
const String toString (const ValueUnion& data) const { return String (data.doubleValue); }
bool toBool (const ValueUnion& data) const { return data.doubleValue != 0; }
@ -132,7 +129,6 @@ public:
int toInt (const ValueUnion& data) const { return data.boolValue ? 1 : 0; };
double toDouble (const ValueUnion& data) const { return data.boolValue ? 1.0 : 0.0; }
float toFloat (const ValueUnion& data) const { return data.boolValue ? 1.0f : 0.0f; }
const String toString (const ValueUnion& data) const { return String::charToString (data.boolValue ? '1' : '0'); }
bool toBool (const ValueUnion& data) const { return data.boolValue; }
@ -161,7 +157,6 @@ public:
int toInt (const ValueUnion& data) const { return data.stringValue->getIntValue(); };
double toDouble (const ValueUnion& data) const { return data.stringValue->getDoubleValue(); }
float toFloat (const ValueUnion& data) const { return data.stringValue->getFloatValue(); }
const String toString (const ValueUnion& data) const { return *data.stringValue; }
bool toBool (const ValueUnion& data) const { return data.stringValue->getIntValue() != 0
|| data.stringValue->trim().equalsIgnoreCase ("true")
@ -250,7 +245,7 @@ var::~var() throw()
const var var::null;
//==============================================================================
var::var (const var& valueToCopy) : type (valueToCopy.type)
var::var (const var& valueToCopy) : type (valueToCopy.type)
{
type->createCopy (value, valueToCopy.value);
}
@ -280,7 +275,7 @@ var::var (const char* const value_) : type (VariantType_String::getInstance())
value.stringValue = new String (value_);
}
var::var (const juce_wchar* const value_) : type (VariantType_String::getInstance())
var::var (const juce_wchar* const value_) : type (VariantType_String::getInstance())
{
value.stringValue = new String (value_);
}
@ -309,7 +304,7 @@ bool var::isMethod() const throw() { return type->isMethod(); }
var::operator int() const { return type->toInt (value); }
var::operator bool() const { return type->toBool (value); }
var::operator float() const { return type->toFloat (value); }
var::operator float() const { return (float) type->toDouble (value); }
var::operator double() const { return type->toDouble (value); }
const String var::toString() const { return type->toString (value); }
var::operator const String() const { return type->toString (value); }