mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Whitespace

Browse source
This commit is contained in:
jules 2018-07-03 11:51:36 +01:00
parent 1e6bbb8da9
commit 95a3f0b039
7 changed files with 103 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

58
modules/juce_data_structures/values/juce_ValueTree.cpp
View file

@ -389,7 +389,7 @@ public:
}
output.writeCompressedInt (children.size());
for (auto* c : children)
writeObjectToStream (output, c);
}
@ -598,9 +598,9 @@ ValueTree::ValueTree (const Identifier& type,
addChild (tree, -1, nullptr);
}
ValueTree::ValueTree (SharedObject::Ptr so) noexcept : object (static_cast<SharedObject::Ptr&&> (so)) {}
ValueTree::ValueTree (SharedObject& so) noexcept : object (so) {}
ValueTree::ValueTree (SharedObject::Ptr so) noexcept : object (static_cast<SharedObject::Ptr&&> (so)) {}
ValueTree::ValueTree (SharedObject& so) noexcept : object (so) {}
ValueTree::ValueTree (const ValueTree& other) noexcept : object (other.object)
{
}
@ -661,10 +661,10 @@ bool ValueTree::isEquivalentTo (const ValueTree& other) const
}
ValueTree ValueTree::createCopy() const
{
if (object != nullptr)
return ValueTree (*new SharedObject (*object));
{
if (object != nullptr)
return ValueTree (*new SharedObject (*object));
return {};
}
@ -701,29 +701,29 @@ Identifier ValueTree::getType() const noexcept
}
ValueTree ValueTree::getParent() const noexcept
{
if (object != nullptr)
if (auto p = object->parent)
return ValueTree (*p);
{
if (object != nullptr)
if (auto p = object->parent)
return ValueTree (*p);
return {};
}
ValueTree ValueTree::getRoot() const noexcept
{
if (object != nullptr)
return ValueTree (object->getRoot());
if (object != nullptr)
return ValueTree (object->getRoot());
return {};
}
ValueTree ValueTree::getSibling (int delta) const noexcept
{
if (object == nullptr)
if (auto p = object->parent)
if (auto c = p->children.getObjectPointer (p->indexOf (*this) + delta))
return ValueTree (*c);
if (object == nullptr)
if (auto p = object->parent)
if (auto c = p->children.getObjectPointer (p->indexOf (*this) + delta))
return ValueTree (*c);
return {};
}
@ -855,11 +855,11 @@ int ValueTree::getNumChildren() const noexcept
}
ValueTree ValueTree::getChild (int index) const
{
if (object != nullptr)
if (auto c = object->children.getObjectPointer (index))
return ValueTree (*c);
{
if (object != nullptr)
if (auto c = object->children.getObjectPointer (index))
return ValueTree (*c);
return {};
}
@ -954,10 +954,10 @@ void ValueTree::createListOfChildren (OwnedArray<ValueTree>& list) const
{
jassert (object != nullptr);
for (auto* o : object->children)
{
for (auto* o : object->children)
{
jassert (o != nullptr);
list.add (new ValueTree (*o));
list.add (new ValueTree (*o));
}
}

4
modules/juce_data_structures/values/juce_ValueTree.h
View file

@ -632,8 +632,8 @@ private:
void createListOfChildren (OwnedArray<ValueTree>&) const;
void reorderChildren (const OwnedArray<ValueTree>&, UndoManager*);
explicit ValueTree (ReferenceCountedObjectPtr<SharedObject>) noexcept;
explicit ValueTree (SharedObject&) noexcept;
explicit ValueTree (ReferenceCountedObjectPtr<SharedObject>) noexcept;
explicit ValueTree (SharedObject&) noexcept;
};
} // namespace juce