From 7c226fcf92aaa40e6c3a21ad9c3aa62012287361 Mon Sep 17 00:00:00 2001 From: Timur Doumler Date: Mon, 17 Aug 2015 09:53:36 +0100 Subject: [PATCH] Introjucer: C++98 compile fixes. --- .../jucer_ProjectExport_Android.h | 8 +++---- .../jucer_ProjectExport_CodeBlocks.h | 18 +++++++------- .../Project Saving/jucer_ProjectExport_MSVC.h | 24 +++++++++---------- .../Project Saving/jucer_ProjectExport_Make.h | 12 +++++----- .../jucer_ProjectExport_XCode.h | 24 +++++++++---------- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h index b84dbbc2f1..324db7175a 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h @@ -753,17 +753,17 @@ private: void initialiseDependencyPathValues() { - sdkPath = Value (new DependencyPathValueSource ( + sdkPath.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::androidSDKPath), DependencyPath::androidSdkKeyName, DependencyPath::getThisOS() - )); + ))); - ndkPath = Value (new DependencyPathValueSource ( + ndkPath.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::androidNDKPath), DependencyPath::androidNdkKeyName, DependencyPath::getThisOS() - )); + ))); } //============================================================================== diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h index 615246be17..40b9265bb3 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h @@ -405,33 +405,33 @@ private: void initialiseDependencyPathValues() { - DependencyPathOS pathOS = isLinux() ? DependencyPathOS::linux : DependencyPathOS::windows; + DependencyPathOS pathOS = isLinux() ? DependencyPath::linux : DependencyPath::windows; - vst2Path = Value (new DependencyPathValueSource ( + vst2Path.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::vstFolder), DependencyPath::vst2KeyName, pathOS - )); + ))); - vst3Path = Value (new DependencyPathValueSource ( + vst3Path.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::vst3Folder), DependencyPath::vst3KeyName, pathOS - )); + ))); if (! isLinux()) { - aaxPath = Value (new DependencyPathValueSource ( + aaxPath.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::aaxFolder), DependencyPath::aaxKeyName, pathOS - )); + ))); - rtasPath = Value (new DependencyPathValueSource ( + rtasPath.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::rtasFolder), DependencyPath::rtasKeyName, pathOS - )); + ))); } } diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h index 84701428e5..422488631c 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h @@ -559,29 +559,29 @@ protected: void initialiseDependencyPathValues() { - vst2Path = Value (new DependencyPathValueSource ( + vst2Path.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::vstFolder), DependencyPath::vst2KeyName, - DependencyPathOS::windows - )); + DependencyPath::windows + ))); - vst3Path = Value (new DependencyPathValueSource ( + vst3Path.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::vst3Folder), DependencyPath::vst3KeyName, - DependencyPathOS::windows - )); + DependencyPath::windows + ))); - aaxPath = Value (new DependencyPathValueSource ( + aaxPath.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::aaxFolder), DependencyPath::aaxKeyName, - DependencyPathOS::windows - )); + DependencyPath::windows + ))); - rtasPath = Value (new DependencyPathValueSource ( + rtasPath.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::rtasFolder), DependencyPath::rtasKeyName, - DependencyPathOS::windows - )); + DependencyPath::windows + ))); } JUCE_DECLARE_NON_COPYABLE (MSVCProjectExporterBase) diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h index 80cb78068b..16a463dd74 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h @@ -350,17 +350,17 @@ private: void initialiseDependencyPathValues() { - vst2Path = Value (new DependencyPathValueSource ( + vst2Path.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::vstFolder), DependencyPath::vst2KeyName, - DependencyPathOS::linux - )); + DependencyPath::linux + ))); - vst3Path = Value (new DependencyPathValueSource ( + vst3Path.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::vst3Folder), DependencyPath::vst3KeyName, - DependencyPathOS::linux - )); + DependencyPath::linux + ))); } JUCE_DECLARE_NON_COPYABLE (MakefileProjectExporter) diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h index a0d69fa050..ff9222cd80 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h @@ -1504,28 +1504,28 @@ private: void initialiseDependencyPathValues() { - vst2Path = Value (new DependencyPathValueSource ( + vst2Path.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::vstFolder), DependencyPath::vst2KeyName, - DependencyPathOS::osx - )); + DependencyPath::osx + ))); - vst3Path = Value (new DependencyPathValueSource ( + vst3Path.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::vst3Folder), DependencyPath::vst3KeyName, - DependencyPathOS::osx - )); + DependencyPath::osx + ))); - aaxPath = Value (new DependencyPathValueSource ( + aaxPath.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::aaxFolder), DependencyPath::aaxKeyName, - DependencyPathOS::osx - )); + DependencyPath::osx + ))); - rtasPath = Value (new DependencyPathValueSource ( + rtasPath.referTo (Value (new DependencyPathValueSource ( getSetting (Ids::rtasFolder), DependencyPath::rtasKeyName, - DependencyPathOS::osx - )); + DependencyPath::osx + ))); } };