Browse Source

Removed a few references to var::null

tags/2021-05-28
jules 9 years ago
parent
commit
d9e3cdac16
8 changed files with 17 additions and 17 deletions
  1. +1
    -1
      extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h
  2. +2
    -2
      extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h
  3. +3
    -3
      extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp
  4. +4
    -4
      extras/Projucer/Source/Project/jucer_Project.cpp
  5. +1
    -1
      extras/Projucer/Source/Utility/jucer_ColourPropertyComponent.h
  6. +1
    -1
      modules/juce_core/containers/juce_DynamicObject.h
  7. +1
    -1
      modules/juce_core/javascript/juce_JSON.cpp
  8. +4
    -4
      modules/juce_core/javascript/juce_JSON.h

+ 1
- 1
extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h View File

@@ -408,7 +408,7 @@ protected:
{ {
static const char* characterSetNames[] = { "Default", "MultiByte", "Unicode", nullptr }; static const char* characterSetNames[] = { "Default", "MultiByte", "Unicode", nullptr };
const var charSets[] = { var::null, "MultiByte", "Unicode", };
const var charSets[] = { var(), "MultiByte", "Unicode", };
props.add (new ChoicePropertyComponent (getCharacterSetValue(), "Character Set", props.add (new ChoicePropertyComponent (getCharacterSetValue(), "Character Set",
StringArray (characterSetNames), Array<var> (charSets, numElementsInArray (charSets)))); StringArray (characterSetNames), Array<var> (charSets, numElementsInArray (charSets))));


+ 2
- 2
extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h View File

@@ -419,7 +419,7 @@ protected:
const char* cppLanguageStandardNames[] = { "Use Default", "C++98", "GNU++98", "C++11", "GNU++11", "C++14", "GNU++14", nullptr }; const char* cppLanguageStandardNames[] = { "Use Default", "C++98", "GNU++98", "C++11", "GNU++11", "C++14", "GNU++14", nullptr };
Array<var> cppLanguageStandardValues; Array<var> cppLanguageStandardValues;
cppLanguageStandardValues.add (var::null);
cppLanguageStandardValues.add (var());
cppLanguageStandardValues.add ("c++98"); cppLanguageStandardValues.add ("c++98");
cppLanguageStandardValues.add ("gnu++98"); cppLanguageStandardValues.add ("gnu++98");
cppLanguageStandardValues.add ("c++11"); cppLanguageStandardValues.add ("c++11");
@@ -433,7 +433,7 @@ protected:
const char* cppLibNames[] = { "Use Default", "LLVM libc++", "GNU libstdc++", nullptr }; const char* cppLibNames[] = { "Use Default", "LLVM libc++", "GNU libstdc++", nullptr };
Array<var> cppLibValues; Array<var> cppLibValues;
cppLibValues.add (var::null);
cppLibValues.add (var());
cppLibValues.add ("libc++"); cppLibValues.add ("libc++");
cppLibValues.add ("libstdc++"); cppLibValues.add ("libstdc++");


+ 3
- 3
extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp View File

@@ -276,9 +276,9 @@ void ProjectExporter::createIconProperties (PropertyListBuilder& props)
Array<var> ids; Array<var> ids;
choices.add ("<None>"); choices.add ("<None>");
ids.add (var::null);
choices.add (String::empty);
ids.add (var::null);
ids.add (var());
choices.add (String());
ids.add (var());
for (int i = 0; i < images.size(); ++i) for (int i = 0; i < images.size(); ++i)
{ {


+ 4
- 4
extras/Projucer/Source/Project/jucer_Project.cpp View File

@@ -127,7 +127,7 @@ void Project::setMissingDefaultValues()
if (getBundleIdentifier().toString().isEmpty()) if (getBundleIdentifier().toString().isEmpty())
getBundleIdentifier() = getDefaultBundleIdentifier(); getBundleIdentifier() = getDefaultBundleIdentifier();
if (shouldIncludeBinaryInAppConfig() == var::null)
if (shouldIncludeBinaryInAppConfig() == var())
shouldIncludeBinaryInAppConfig() = true; shouldIncludeBinaryInAppConfig() = true;
ProjucerApplication::getApp().updateNewlyOpenedProject (*this); ProjucerApplication::getApp().updateNewlyOpenedProject (*this);
@@ -469,10 +469,10 @@ void Project::createPropertyEditors (PropertyListBuilder& props)
Array<var> maxSizeCodes; Array<var> maxSizeCodes;
maxSizeNames.add (TRANS("Default")); maxSizeNames.add (TRANS("Default"));
maxSizeCodes.add (var::null);
maxSizeCodes.add (var());
maxSizeNames.add (String::empty);
maxSizeCodes.add (var::null);
maxSizeNames.add (String());
maxSizeCodes.add (var());
for (int i = 0; i < numElementsInArray (maxSizes); ++i) for (int i = 0; i < numElementsInArray (maxSizes); ++i)
{ {


+ 1
- 1
extras/Projucer/Source/Utility/jucer_ColourPropertyComponent.h View File

@@ -88,7 +88,7 @@ private:
if (getColour() != newColour) if (getColour() != newColour)
{ {
if (newColour == defaultColour && canResetToDefault) if (newColour == defaultColour && canResetToDefault)
colourValue = var::null;
colourValue = var();
else else
colourValue = newColour.toDisplayString (true); colourValue = newColour.toDisplayString (true);
} }


+ 1
- 1
modules/juce_core/containers/juce_DynamicObject.h View File

@@ -58,7 +58,7 @@ public:
virtual bool hasProperty (const Identifier& propertyName) const; virtual bool hasProperty (const Identifier& propertyName) const;
/** Returns a named property. /** Returns a named property.
This returns var::null if no such property exists.
This returns var() if no such property exists.
*/ */
virtual const var& getProperty (const Identifier& propertyName) const; virtual const var& getProperty (const Identifier& propertyName) const;


+ 1
- 1
modules/juce_core/javascript/juce_JSON.cpp View File

@@ -612,7 +612,7 @@ public:
beginTest ("JSON"); beginTest ("JSON");
Random r = getRandom(); Random r = getRandom();
expect (JSON::parse (String::empty) == var::null);
expect (JSON::parse (String::empty) == var());
expect (JSON::parse ("{}").isObject()); expect (JSON::parse ("{}").isObject());
expect (JSON::parse ("[]").isArray()); expect (JSON::parse ("[]").isArray());
expect (JSON::parse ("[ 1234 ]")[0].isInt()); expect (JSON::parse ("[ 1234 ]")[0].isInt());


+ 4
- 4
modules/juce_core/javascript/juce_JSON.h View File

@@ -52,7 +52,7 @@ public:
it will contain an error message. it will contain an error message.
If you're not interested in the error message, you can use one of the other If you're not interested in the error message, you can use one of the other
shortcut parse methods, which simply return a var::null if the parsing fails.
shortcut parse methods, which simply return a var() if the parsing fails.
Note that this will only parse valid JSON, which means that the item given must Note that this will only parse valid JSON, which means that the item given must
be either an object or an array definition. If you want to also be able to parse be either an object or an array definition. If you want to also be able to parse
@@ -62,7 +62,7 @@ public:
/** Attempts to parse some JSON-formatted text, and returns the result as a var object. /** Attempts to parse some JSON-formatted text, and returns the result as a var object.
If the parsing fails, this simply returns var::null - if you need to find out more
If the parsing fails, this simply returns var() - if you need to find out more
detail about the parse error, use the alternative parse() method which returns a Result. detail about the parse error, use the alternative parse() method which returns a Result.
Note that this will only parse valid JSON, which means that the item given must Note that this will only parse valid JSON, which means that the item given must
@@ -77,7 +77,7 @@ public:
Note that this is just a short-cut for reading the entire file into a string and Note that this is just a short-cut for reading the entire file into a string and
parsing the result. parsing the result.
If the parsing fails, this simply returns var::null - if you need to find out more
If the parsing fails, this simply returns var() - if you need to find out more
detail about the parse error, use the alternative parse() method which returns a Result. detail about the parse error, use the alternative parse() method which returns a Result.
*/ */
static var parse (const File& file); static var parse (const File& file);
@@ -88,7 +88,7 @@ public:
Note that this is just a short-cut for reading the entire stream into a string and Note that this is just a short-cut for reading the entire stream into a string and
parsing the result. parsing the result.
If the parsing fails, this simply returns var::null - if you need to find out more
If the parsing fails, this simply returns var() - if you need to find out more
detail about the parse error, use the alternative parse() method which returns a Result. detail about the parse error, use the alternative parse() method which returns a Result.
*/ */
static var parse (InputStream& input); static var parse (InputStream& input);


Loading…
Cancel
Save