From cac84277cca819298cc4feae3bb96447ecb77fce Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 13 Jul 2020 01:36:30 +0100 Subject: [PATCH] Don't use water namespace in CarlaDssiUtils.cpp Signed-off-by: falkTX --- source/utils/CarlaDssiUtils.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/source/utils/CarlaDssiUtils.cpp b/source/utils/CarlaDssiUtils.cpp index e1ec045ad..ce33c858d 100644 --- a/source/utils/CarlaDssiUtils.cpp +++ b/source/utils/CarlaDssiUtils.cpp @@ -28,13 +28,11 @@ const char* find_dssi_ui(const char* const filename, const char* const label) no carla_debug("find_dssi_ui(\"%s\", \"%s\")", filename, label); try { - using namespace water; + water::String guiFilename; + water::String pluginDir(water::String(filename).upToLastOccurrenceOf(".", false, false)); - String guiFilename; - String pluginDir(String(filename).upToLastOccurrenceOf(".", false, false)); - - String checkLabel(label); - String checkSName(File(pluginDir).getFileName()); + water::String checkLabel(label); + water::String checkSName(water::File(pluginDir).getFileName()); if (checkSName.endsWithIgnoreCase("dssi")) { @@ -47,12 +45,13 @@ const char* find_dssi_ui(const char* const filename, const char* const label) no if (! checkLabel.endsWithChar('_')) checkLabel += "_"; if (! checkSName.endsWithChar('_')) checkSName += "_"; - Array results; + water::Array results; - for (int i=File(pluginDir).findChildFiles(results, File::findFiles|File::ignoreHiddenFiles, false); --i >= 0;) + for (int i=water::File(pluginDir).findChildFiles(results, + water::File::findFiles|water::File::ignoreHiddenFiles, false); --i >= 0;) { - const File& gui(results[i]); - const String& guiShortName(gui.getFileName()); + const water::File& gui(results[i]); + const water::String& guiShortName(gui.getFileName()); if (guiShortName.startsWith(checkLabel) || guiShortName.startsWith(checkSName)) {