From e6db895452a417a4f8000ed16afd7f6c20c28c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 11 Feb 2019 10:24:16 +0100
Subject: [PATCH] Adapted to Corrade changes.

---
 doc/snippets/MagnumTrade.cpp                                  | 2 +-
 src/Magnum/Audio/AbstractImporter.cpp                         | 2 +-
 src/Magnum/GL/Shader.cpp                                      | 2 +-
 src/Magnum/Text/AbstractFont.cpp                              | 2 +-
 src/Magnum/Text/AbstractFontConverter.cpp                     | 2 +-
 src/Magnum/Trade/AbstractImporter.cpp                         | 2 +-
 .../AnyImageConverter/Test/AnyImageConverterTest.cpp          | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/snippets/MagnumTrade.cpp b/doc/snippets/MagnumTrade.cpp
index 628212b15..9246f0ba5 100644
--- a/doc/snippets/MagnumTrade.cpp
+++ b/doc/snippets/MagnumTrade.cpp
@@ -134,7 +134,7 @@ importer->setFileCallback([](const std::string& filename,
     {
         auto found = data.files.find(filename);
         if(found == data.files.end()) {
-            if(!Utility::Directory::fileExists(filename))
+            if(!Utility::Directory::exists(filename))
                 return Containers::NullOpt;
             found = data.files.emplace(filename, Utility::Directory::read(filename)).first;
         }
diff --git a/src/Magnum/Audio/AbstractImporter.cpp b/src/Magnum/Audio/AbstractImporter.cpp
index 09a61fc09..23a177d7d 100644
--- a/src/Magnum/Audio/AbstractImporter.cpp
+++ b/src/Magnum/Audio/AbstractImporter.cpp
@@ -82,7 +82,7 @@ void AbstractImporter::doOpenFile(const std::string& filename) {
     CORRADE_ASSERT(features() & Feature::OpenData, "Audio::AbstractImporter::openFile(): not implemented", );
 
     /* Open file */
-    if(!Utility::Directory::fileExists(filename)) {
+    if(!Utility::Directory::exists(filename)) {
         Error() << "Trade::AbstractImporter::openFile(): cannot open file" << filename;
         return;
     }
diff --git a/src/Magnum/GL/Shader.cpp b/src/Magnum/GL/Shader.cpp
index 6612f7c10..c1ff0ada7 100644
--- a/src/Magnum/GL/Shader.cpp
+++ b/src/Magnum/GL/Shader.cpp
@@ -740,7 +740,7 @@ void Shader::addSourceImplementationEmscriptenPthread(std::string source) {
 #endif
 
 Shader& Shader::addFile(const std::string& filename) {
-    CORRADE_ASSERT(Utility::Directory::fileExists(filename),
+    CORRADE_ASSERT(Utility::Directory::exists(filename),
         "GL::Shader file " << '\'' + filename + '\'' << " cannot be read.", *this);
 
     addSource(Utility::Directory::readString(filename));
diff --git a/src/Magnum/Text/AbstractFont.cpp b/src/Magnum/Text/AbstractFont.cpp
index 50fe40790..f96dd2bda 100644
--- a/src/Magnum/Text/AbstractFont.cpp
+++ b/src/Magnum/Text/AbstractFont.cpp
@@ -123,7 +123,7 @@ auto AbstractFont::doOpenFile(const std::string& filename, const Float size) ->
         "Text::AbstractFont::openFile(): not implemented", {});
 
     /* Open file */
-    if(!Utility::Directory::fileExists(filename)) {
+    if(!Utility::Directory::exists(filename)) {
         Error() << "Trade::AbstractFont::openFile(): cannot open file" << filename;
         return {};
     }
diff --git a/src/Magnum/Text/AbstractFontConverter.cpp b/src/Magnum/Text/AbstractFontConverter.cpp
index 10686dac9..62c535bd5 100644
--- a/src/Magnum/Text/AbstractFontConverter.cpp
+++ b/src/Magnum/Text/AbstractFontConverter.cpp
@@ -226,7 +226,7 @@ Containers::Pointer<GlyphCache> AbstractFontConverter::doImportGlyphCacheFromFil
         "Text::AbstractFontConverter::importGlyphCacheFromFile(): not implemented", nullptr);
 
     /* Open file */
-    if(!Utility::Directory::fileExists(filename)) {
+    if(!Utility::Directory::exists(filename)) {
         Error() << "Trade::AbstractFontConverter::importGlyphCacheFromFile(): cannot open file" << filename;
         return nullptr;
     }
diff --git a/src/Magnum/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp
index 2ef992552..521fcd002 100644
--- a/src/Magnum/Trade/AbstractImporter.cpp
+++ b/src/Magnum/Trade/AbstractImporter.cpp
@@ -162,7 +162,7 @@ void AbstractImporter::doOpenFile(const std::string& filename) {
 
     /* Otherwise open the file directly */
     } else {
-        if(!Utility::Directory::fileExists(filename)) {
+        if(!Utility::Directory::exists(filename)) {
             Error() << "Trade::AbstractImporter::openFile(): cannot open file" << filename;
             return;
         }
diff --git a/src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp b/src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp
index 4b5e60843..9a399a007 100644
--- a/src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp
+++ b/src/MagnumPlugins/AnyImageConverter/Test/AnyImageConverterTest.cpp
@@ -110,13 +110,13 @@ void AnyImageConverterTest::convert() {
 
     const std::string filename = Utility::Directory::join(ANYIMAGECONVERTER_TEST_DIR, data.filename);
 
-    if(Utility::Directory::fileExists(filename))
+    if(Utility::Directory::exists(filename))
         CORRADE_VERIFY(Utility::Directory::rm(filename));
 
     /* Just test that the exported file exists */
     Containers::Pointer<AbstractImageConverter> converter = _manager.instantiate("AnyImageConverter");
     CORRADE_VERIFY(converter->exportToFile(Image, filename));
-    CORRADE_VERIFY(Utility::Directory::fileExists(filename));
+    CORRADE_VERIFY(Utility::Directory::exists(filename));
 }
 
 void AnyImageConverterTest::detect() {