mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-19 01:04:20 +00:00
New class StringPool. Removed the class var::identifier from its parent class, and renamed it "Identifier" - I've left a typedef in var to allow old code to still work, but I'll remove this at some point, so please switch to using the new classname directly. Jucer development.
This commit is contained in:
Julian Storer
parent
ed97872c1a
commit
b46e94cffd
90 changed files with 2839 additions and 1733 deletions
|
|
@ -35,7 +35,7 @@ BEGIN_JUCE_NAMESPACE
|
|||
class ValueTree::SetPropertyAction : public UndoableAction
|
||||
{
|
||||
public:
|
||||
SetPropertyAction (const SharedObjectPtr& target_, const var::identifier& name_,
|
||||
SetPropertyAction (const SharedObjectPtr& target_, const Identifier& name_,
|
||||
const var& newValue_, const var& oldValue_,
|
||||
const bool isAddingNewProperty_, const bool isDeletingProperty_)
|
||||
: target (target_), name (name_), newValue (newValue_), oldValue (oldValue_),
|
||||
|
|
@ -90,7 +90,7 @@ public:
|
|||
|
||||
private:
|
||||
const SharedObjectPtr target;
|
||||
const var::identifier name;
|
||||
const Identifier name;
|
||||
const var newValue;
|
||||
var oldValue;
|
||||
const bool isAddingNewProperty : 1, isDeletingProperty : 1;
|
||||
|
|
@ -207,7 +207,7 @@ private:
|
|||
|
||||
|
||||
//==============================================================================
|
||||
ValueTree::SharedObject::SharedObject (const String& type_)
|
||||
ValueTree::SharedObject::SharedObject (const Identifier& type_)
|
||||
: type (type_), parent (0)
|
||||
{
|
||||
}
|
||||
|
|
@ -237,7 +237,7 @@ ValueTree::SharedObject::~SharedObject()
|
|||
}
|
||||
|
||||
//==============================================================================
|
||||
void ValueTree::SharedObject::sendPropertyChangeMessage (ValueTree& tree, const var::identifier& property)
|
||||
void ValueTree::SharedObject::sendPropertyChangeMessage (ValueTree& tree, const Identifier& property)
|
||||
{
|
||||
for (int i = valueTreesWithListeners.size(); --i >= 0;)
|
||||
{
|
||||
|
|
@ -247,7 +247,7 @@ void ValueTree::SharedObject::sendPropertyChangeMessage (ValueTree& tree, const
|
|||
}
|
||||
}
|
||||
|
||||
void ValueTree::SharedObject::sendPropertyChangeMessage (const var::identifier& property)
|
||||
void ValueTree::SharedObject::sendPropertyChangeMessage (const Identifier& property)
|
||||
{
|
||||
ValueTree tree (this);
|
||||
ValueTree::SharedObject* t = this;
|
||||
|
|
@ -302,17 +302,17 @@ void ValueTree::SharedObject::sendParentChangeMessage()
|
|||
}
|
||||
|
||||
//==============================================================================
|
||||
const var& ValueTree::SharedObject::getProperty (const var::identifier& name) const
|
||||
const var& ValueTree::SharedObject::getProperty (const Identifier& name) const
|
||||
{
|
||||
return properties [name];
|
||||
}
|
||||
|
||||
const var ValueTree::SharedObject::getProperty (const var::identifier& name, const var& defaultReturnValue) const
|
||||
const var ValueTree::SharedObject::getProperty (const Identifier& name, const var& defaultReturnValue) const
|
||||
{
|
||||
return properties.getWithDefault (name, defaultReturnValue);
|
||||
}
|
||||
|
||||
void ValueTree::SharedObject::setProperty (const var::identifier& name, const var& newValue, UndoManager* const undoManager)
|
||||
void ValueTree::SharedObject::setProperty (const Identifier& name, const var& newValue, UndoManager* const undoManager)
|
||||
{
|
||||
if (undoManager == 0)
|
||||
{
|
||||
|
|
@ -335,12 +335,12 @@ void ValueTree::SharedObject::setProperty (const var::identifier& name, const va
|
|||
}
|
||||
}
|
||||
|
||||
bool ValueTree::SharedObject::hasProperty (const var::identifier& name) const
|
||||
bool ValueTree::SharedObject::hasProperty (const Identifier& name) const
|
||||
{
|
||||
return properties.contains (name);
|
||||
}
|
||||
|
||||
void ValueTree::SharedObject::removeProperty (const var::identifier& name, UndoManager* const undoManager)
|
||||
void ValueTree::SharedObject::removeProperty (const Identifier& name, UndoManager* const undoManager)
|
||||
{
|
||||
if (undoManager == 0)
|
||||
{
|
||||
|
|
@ -360,7 +360,7 @@ void ValueTree::SharedObject::removeAllProperties (UndoManager* const undoManage
|
|||
{
|
||||
while (properties.size() > 0)
|
||||
{
|
||||
const var::identifier name (properties.getName (properties.size() - 1));
|
||||
const Identifier name (properties.getName (properties.size() - 1));
|
||||
properties.remove (name);
|
||||
sendPropertyChangeMessage (name);
|
||||
}
|
||||
|
|
@ -372,7 +372,7 @@ void ValueTree::SharedObject::removeAllProperties (UndoManager* const undoManage
|
|||
}
|
||||
}
|
||||
|
||||
ValueTree ValueTree::SharedObject::getChildWithName (const String& typeToMatch) const
|
||||
ValueTree ValueTree::SharedObject::getChildWithName (const Identifier& typeToMatch) const
|
||||
{
|
||||
for (int i = 0; i < children.size(); ++i)
|
||||
if (children.getUnchecked(i)->type == typeToMatch)
|
||||
|
|
@ -381,7 +381,7 @@ ValueTree ValueTree::SharedObject::getChildWithName (const String& typeToMatch)
|
|||
return ValueTree::invalid;
|
||||
}
|
||||
|
||||
ValueTree ValueTree::SharedObject::getChildWithProperty (const var::identifier& propertyName, const var& propertyValue) const
|
||||
ValueTree ValueTree::SharedObject::getChildWithProperty (const Identifier& propertyName, const var& propertyValue) const
|
||||
{
|
||||
for (int i = 0; i < children.size(); ++i)
|
||||
if (children.getUnchecked(i)->getProperty (propertyName) == propertyValue)
|
||||
|
|
@ -508,10 +508,10 @@ ValueTree::ValueTree() throw()
|
|||
|
||||
const ValueTree ValueTree::invalid;
|
||||
|
||||
ValueTree::ValueTree (const String& type_)
|
||||
ValueTree::ValueTree (const Identifier& type_)
|
||||
: object (new ValueTree::SharedObject (type_))
|
||||
{
|
||||
jassert (type_.isNotEmpty()); // All objects should be given a sensible type name!
|
||||
jassert (type_.toString().isNotEmpty()); // All objects should be given a sensible type name!
|
||||
}
|
||||
|
||||
ValueTree::ValueTree (SharedObject* const object_)
|
||||
|
|
@ -561,14 +561,14 @@ ValueTree ValueTree::createCopy() const
|
|||
return ValueTree (object != 0 ? new SharedObject (*object) : 0);
|
||||
}
|
||||
|
||||
bool ValueTree::hasType (const String& typeName) const
|
||||
bool ValueTree::hasType (const Identifier& typeName) const
|
||||
{
|
||||
return object != 0 && object->type == typeName;
|
||||
}
|
||||
|
||||
const String ValueTree::getType() const
|
||||
{
|
||||
return object != 0 ? object->type : String::empty;
|
||||
return object != 0 ? object->type.toString() : String::empty;
|
||||
}
|
||||
|
||||
ValueTree ValueTree::getParent() const
|
||||
|
|
@ -576,35 +576,35 @@ ValueTree ValueTree::getParent() const
|
|||
return ValueTree (object != 0 ? object->parent : (SharedObject*) 0);
|
||||
}
|
||||
|
||||
const var& ValueTree::operator[] (const var::identifier& name) const
|
||||
const var& ValueTree::operator[] (const Identifier& name) const
|
||||
{
|
||||
return object == 0 ? var::null : object->getProperty (name);
|
||||
}
|
||||
|
||||
const var& ValueTree::getProperty (const var::identifier& name) const
|
||||
const var& ValueTree::getProperty (const Identifier& name) const
|
||||
{
|
||||
return object == 0 ? var::null : object->getProperty (name);
|
||||
}
|
||||
|
||||
const var ValueTree::getProperty (const var::identifier& name, const var& defaultReturnValue) const
|
||||
const var ValueTree::getProperty (const Identifier& name, const var& defaultReturnValue) const
|
||||
{
|
||||
return object == 0 ? defaultReturnValue : object->getProperty (name, defaultReturnValue);
|
||||
}
|
||||
|
||||
void ValueTree::setProperty (const var::identifier& name, const var& newValue, UndoManager* const undoManager)
|
||||
void ValueTree::setProperty (const Identifier& name, const var& newValue, UndoManager* const undoManager)
|
||||
{
|
||||
jassert (name.name.isNotEmpty());
|
||||
jassert (name.toString().isNotEmpty());
|
||||
|
||||
if (object != 0 && name.name.isNotEmpty())
|
||||
if (object != 0 && name.toString().isNotEmpty())
|
||||
object->setProperty (name, newValue, undoManager);
|
||||
}
|
||||
|
||||
bool ValueTree::hasProperty (const var::identifier& name) const
|
||||
bool ValueTree::hasProperty (const Identifier& name) const
|
||||
{
|
||||
return object != 0 && object->hasProperty (name);
|
||||
}
|
||||
|
||||
void ValueTree::removeProperty (const var::identifier& name, UndoManager* const undoManager)
|
||||
void ValueTree::removeProperty (const Identifier& name, UndoManager* const undoManager)
|
||||
{
|
||||
if (object != 0)
|
||||
object->removeProperty (name, undoManager);
|
||||
|
|
@ -621,9 +621,9 @@ int ValueTree::getNumProperties() const
|
|||
return object == 0 ? 0 : object->properties.size();
|
||||
}
|
||||
|
||||
const var::identifier ValueTree::getPropertyName (const int index) const
|
||||
const Identifier ValueTree::getPropertyName (const int index) const
|
||||
{
|
||||
return object == 0 ? var::identifier()
|
||||
return object == 0 ? Identifier()
|
||||
: object->properties.getName (index);
|
||||
}
|
||||
|
||||
|
|
@ -633,7 +633,7 @@ class ValueTreePropertyValueSource : public Value::ValueSource,
|
|||
{
|
||||
public:
|
||||
ValueTreePropertyValueSource (const ValueTree& tree_,
|
||||
const var::identifier& property_,
|
||||
const Identifier& property_,
|
||||
UndoManager* const undoManager_)
|
||||
: tree (tree_),
|
||||
property (property_),
|
||||
|
|
@ -657,7 +657,7 @@ public:
|
|||
tree.setProperty (property, newValue, undoManager);
|
||||
}
|
||||
|
||||
void valueTreePropertyChanged (ValueTree& treeWhosePropertyHasChanged, const var::identifier& changedProperty)
|
||||
void valueTreePropertyChanged (ValueTree& treeWhosePropertyHasChanged, const Identifier& changedProperty)
|
||||
{
|
||||
if (tree == treeWhosePropertyHasChanged && property == changedProperty)
|
||||
sendChangeMessage (false);
|
||||
|
|
@ -668,13 +668,13 @@ public:
|
|||
|
||||
private:
|
||||
ValueTree tree;
|
||||
const var::identifier property;
|
||||
const Identifier property;
|
||||
UndoManager* const undoManager;
|
||||
|
||||
ValueTreePropertyValueSource& operator= (const ValueTreePropertyValueSource&);
|
||||
};
|
||||
|
||||
Value ValueTree::getPropertyAsValue (const var::identifier& name, UndoManager* const undoManager) const
|
||||
Value ValueTree::getPropertyAsValue (const Identifier& name, UndoManager* const undoManager) const
|
||||
{
|
||||
return Value (new ValueTreePropertyValueSource (*this, name, undoManager));
|
||||
}
|
||||
|
|
@ -690,12 +690,12 @@ ValueTree ValueTree::getChild (int index) const
|
|||
return ValueTree (object != 0 ? (SharedObject*) object->children [index] : (SharedObject*) 0);
|
||||
}
|
||||
|
||||
ValueTree ValueTree::getChildWithName (const String& type) const
|
||||
ValueTree ValueTree::getChildWithName (const Identifier& type) const
|
||||
{
|
||||
return object != 0 ? object->getChildWithName (type) : ValueTree::invalid;
|
||||
}
|
||||
|
||||
ValueTree ValueTree::getChildWithProperty (const var::identifier& propertyName, const var& propertyValue) const
|
||||
ValueTree ValueTree::getChildWithProperty (const Identifier& propertyName, const var& propertyValue) const
|
||||
{
|
||||
return object != 0 ? object->getChildWithProperty (propertyName, propertyValue) : ValueTree::invalid;
|
||||
}
|
||||
|
|
@ -763,17 +763,17 @@ void ValueTree::removeListener (Listener* listener)
|
|||
//==============================================================================
|
||||
XmlElement* ValueTree::SharedObject::createXml() const
|
||||
{
|
||||
XmlElement* xml = new XmlElement (type);
|
||||
XmlElement* xml = new XmlElement (type.toString());
|
||||
|
||||
int i;
|
||||
for (i = 0; i < properties.size(); ++i)
|
||||
{
|
||||
var::identifier name (properties.getName(i));
|
||||
Identifier name (properties.getName(i));
|
||||
const var& v = properties [name];
|
||||
|
||||
jassert (! v.isObject()); // DynamicObjects can't be stored as XML!
|
||||
|
||||
xml->setAttribute (name.name, v.toString());
|
||||
xml->setAttribute (name.toString(), v.toString());
|
||||
}
|
||||
|
||||
for (i = 0; i < children.size(); ++i)
|
||||
|
|
@ -815,8 +815,8 @@ void ValueTree::writeToStream (OutputStream& output)
|
|||
int i;
|
||||
for (i = 0; i < numProps; ++i)
|
||||
{
|
||||
const var::identifier name (getPropertyName(i));
|
||||
output.writeString (name.name);
|
||||
const Identifier name (getPropertyName(i));
|
||||
output.writeString (name.toString());
|
||||
getProperty(name).writeToStream (output);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue