Skip to content

Commit 6e20e3f

Browse files
committed
Remove tabs
1 parent 01ba3ca commit 6e20e3f

File tree

3 files changed

+66
-66
lines changed

3 files changed

+66
-66
lines changed

modules/juce_core/containers/juce_Variant.cpp

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -910,71 +910,71 @@ var::NativeFunctionArgs::NativeFunctionArgs (const var& t, const var* args, int
910910

911911
//==============================================================================
912912
VarIterator::VarIterator (const var& v_, bool isEnd)
913-
: v (v_)
914-
{
915-
if (isEnd)
916-
{
917-
if (v.isArray())
918-
index = v.getArray()->size();
919-
else if (auto o = v.getDynamicObject())
920-
itr = o->getProperties().end();
921-
}
922-
else
923-
{
924-
if (v.isArray())
925-
index = 0;
926-
else if (auto o = v.getDynamicObject())
927-
itr = o->getProperties().begin();
928-
}
913+
: v (v_)
914+
{
915+
if (isEnd)
916+
{
917+
if (v.isArray())
918+
index = v.getArray()->size();
919+
else if (auto o = v.getDynamicObject())
920+
itr = o->getProperties().end();
921+
}
922+
else
923+
{
924+
if (v.isArray())
925+
index = 0;
926+
else if (auto o = v.getDynamicObject())
927+
itr = o->getProperties().begin();
928+
}
929929
}
930930

931931
VarIterator& VarIterator::operator++()
932932
{
933-
if (v.isArray())
934-
{
935-
index++;
936-
}
937-
else if (v.getDynamicObject())
938-
{
939-
auto i = (const NamedValueSet::NamedValue*)itr;
940-
i++;
941-
itr = i;
942-
}
943-
return *this;
933+
if (v.isArray())
934+
{
935+
index++;
936+
}
937+
else if (v.getDynamicObject())
938+
{
939+
auto i = (const NamedValueSet::NamedValue*)itr;
940+
i++;
941+
itr = i;
942+
}
943+
return *this;
944944
}
945945

946946
bool VarIterator::operator== (const VarIterator& other) const
947947
{
948-
return index == other.index && itr == other.itr;
948+
return index == other.index && itr == other.itr;
949949
}
950950

951951
bool VarIterator::operator!= (const VarIterator& other) const
952952
{
953-
return ! (*this == other);
953+
return ! (*this == other);
954954
}
955955

956956
VarIterator::NamedValue VarIterator::operator*() const
957957
{
958-
if (v.isArray())
959-
{
960-
return { index, (*v.getArray())[index] };
961-
}
962-
else if (v.getDynamicObject())
963-
{
964-
auto i = (const NamedValueSet::NamedValue*)itr;
965-
return { i->name.toString(), i->value };
966-
}
967-
return {};
958+
if (v.isArray())
959+
{
960+
return { index, (*v.getArray())[index] };
961+
}
962+
else if (v.getDynamicObject())
963+
{
964+
auto i = (const NamedValueSet::NamedValue*)itr;
965+
return { i->name.toString(), i->value };
966+
}
967+
return {};
968968
}
969969

970970
VarIterator begin (const var& v)
971971
{
972-
return VarIterator (v, false);
972+
return VarIterator (v, false);
973973
}
974974

975975
VarIterator end (const var& v)
976976
{
977-
return VarIterator (v, true);
977+
return VarIterator (v, true);
978978
}
979979

980980
//==============================================================================

modules/juce_core/containers/juce_Variant.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -358,34 +358,34 @@ JUCE_API bool operator!= (const var&, const char*);
358358

359359
//==============================================================================
360360
/** Iterator for a var.
361-
You shouldn't ever need to use this class directly - it's used internally by begin()
362-
and end() to allow range-based-for loops on a var.
361+
You shouldn't ever need to use this class directly - it's used internally by begin()
362+
and end() to allow range-based-for loops on a var.
363363
*/
364364
struct VarIterator
365365
{
366-
struct NamedValue
367-
{
368-
var name;
369-
var value;
370-
};
366+
struct NamedValue
367+
{
368+
var name;
369+
var value;
370+
};
371371

372-
VarIterator (const var&, bool isEnd);
373-
VarIterator& operator++();
372+
VarIterator (const var&, bool isEnd);
373+
VarIterator& operator++();
374374

375-
bool operator== (const VarIterator&) const;
376-
bool operator!= (const VarIterator&) const;
377-
NamedValue operator*() const;
375+
bool operator== (const VarIterator&) const;
376+
bool operator!= (const VarIterator&) const;
377+
NamedValue operator*() const;
378378

379-
using difference_type = std::ptrdiff_t;
380-
using value_type = NamedValue;
381-
using reference = NamedValue&;
382-
using pointer = NamedValue*;
383-
using iterator_category = std::forward_iterator_tag;
379+
using difference_type = std::ptrdiff_t;
380+
using value_type = NamedValue;
381+
using reference = NamedValue&;
382+
using pointer = NamedValue*;
383+
using iterator_category = std::forward_iterator_tag;
384384

385385
private:
386-
const var& v;
387-
int index = 0;
388-
const void* itr = nullptr;
386+
const var& v;
387+
int index = 0;
388+
const void* itr = nullptr;
389389
};
390390

391391
VarIterator begin (const var&);

modules/juce_core/json/juce_JSONUtils.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,11 @@ class JSONUtilsTests final : public UnitTest
224224
, "pitchEnvelope": { "rates": [94,67,95,60], "levels": [50,50,50,50] }
225225
})");
226226

227-
expect (JSONUtils::getPointer (obj, "/name", {}) == "PIANO 4");
228-
expect (JSONUtils::getPointer (obj, "/lfoSpeed", {}) == var (30));
229-
expect (JSONUtils::getPointer (obj, "/pitchEnvelope/rates/1", {}) == var (67));
230-
expect (JSONUtils::getPointer (obj, "/pitchEnvelope/levels/2", {}) == var (50));
231-
expect (JSONUtils::getPointer (obj, "/pitchEnvelope/levels/10", {}) == var());
227+
expect (JSONUtils::getPointer (obj, "/name", {}) == "PIANO 4");
228+
expect (JSONUtils::getPointer (obj, "/lfoSpeed", {}) == var (30));
229+
expect (JSONUtils::getPointer (obj, "/pitchEnvelope/rates/1", {}) == var (67));
230+
expect (JSONUtils::getPointer (obj, "/pitchEnvelope/levels/2", {}) == var (50));
231+
expect (JSONUtils::getPointer (obj, "/pitchEnvelope/levels/10", {}) == var());
232232

233233
expectDeepEqual (JSONUtils::setPointer (obj, "", "hello world"), var ("hello world"));
234234
expectDeepEqual (JSONUtils::setPointer (obj, "/lfoWaveform/foobar", "str"), std::nullopt);

0 commit comments

Comments
 (0)