From b6b8809eec8ad3818f172c37bed45ace1e07122f Mon Sep 17 00:00:00 2001 From: reuk Date: Tue, 2 Jun 2020 17:52:54 +0100 Subject: [PATCH] CMake: Update pip templates with explicit namespaces --- extras/Build/CMake/PIPAudioProcessor.cpp.in | 2 +- extras/Build/CMake/PIPComponent.cpp.in | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/extras/Build/CMake/PIPAudioProcessor.cpp.in b/extras/Build/CMake/PIPAudioProcessor.cpp.in index 52c79a0c4e..2dd950ff8f 100644 --- a/extras/Build/CMake/PIPAudioProcessor.cpp.in +++ b/extras/Build/CMake/PIPAudioProcessor.cpp.in @@ -10,7 +10,7 @@ #include "${JUCE_PIP_HEADER}" //============================================================================== -AudioProcessor* JUCE_CALLTYPE createPluginFilter() +juce::AudioProcessor* JUCE_CALLTYPE createPluginFilter() { return new ${JUCE_PIP_MAIN_CLASS}(); } diff --git a/extras/Build/CMake/PIPComponent.cpp.in b/extras/Build/CMake/PIPComponent.cpp.in index 6c6953ef9e..662c11d290 100644 --- a/extras/Build/CMake/PIPComponent.cpp.in +++ b/extras/Build/CMake/PIPComponent.cpp.in @@ -9,16 +9,16 @@ #include #include "${JUCE_PIP_HEADER}" -class Application : public JUCEApplication +class Application : public juce::JUCEApplication { public: //============================================================================== - Application() {} + Application() = default; - const String getApplicationName() override { return "${JUCE_PIP_NAME}"; } - const String getApplicationVersion() override { return "${PROJECT_VERSION}"; } + const juce::String getApplicationName() override { return "${JUCE_PIP_NAME}"; } + const juce::String getApplicationVersion() override { return "${PROJECT_VERSION}"; } - void initialise (const String&) override + void initialise (const juce::String&) override { mainWindow.reset (new MainWindow ("${JUCE_PIP_NAME}", new ${JUCE_PIP_MAIN_CLASS}, *this)); } @@ -26,13 +26,13 @@ public: void shutdown() override { mainWindow = nullptr; } private: - class MainWindow : public DocumentWindow + class MainWindow : public juce::DocumentWindow { public: - MainWindow (const String& name, Component* c, JUCEApplication& a) - : DocumentWindow (name, Desktop::getInstance().getDefaultLookAndFeel() - .findColour (ResizableWindow::backgroundColourId), - DocumentWindow::allButtons), + MainWindow (const juce::String& name, juce::Component* c, JUCEApplication& a) + : DocumentWindow (name, juce::Desktop::getInstance().getDefaultLookAndFeel() + .findColour (ResizableWindow::backgroundColourId), + juce::DocumentWindow::allButtons), app (a) { setUsingNativeTitleBar (true);