From d64cbff463c98e37aead8e588c663c2a3524dac3 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Mon, 14 Mar 2022 19:30:29 -0600 Subject: [PATCH] Remove redundant quotes when printing filesystem paths operator<< for std::filesystem::path already adds quotes around the path so we don't need to keep manually quoting them. --- src/SFML/Audio/SoundFileFactory.cpp | 6 +++--- src/SFML/Audio/SoundFileWriterFlac.cpp | 4 ++-- src/SFML/Audio/SoundFileWriterOgg.cpp | 6 +++--- src/SFML/Audio/SoundFileWriterWav.cpp | 4 ++-- src/SFML/Graphics/Font.cpp | 8 ++++---- src/SFML/Graphics/ImageLoader.cpp | 4 ++-- src/SFML/Graphics/Shader.cpp | 12 ++++++------ 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/SFML/Audio/SoundFileFactory.cpp b/src/SFML/Audio/SoundFileFactory.cpp index 5abc0bda..af55fc04 100644 --- a/src/SFML/Audio/SoundFileFactory.cpp +++ b/src/SFML/Audio/SoundFileFactory.cpp @@ -74,7 +74,7 @@ std::unique_ptr SoundFileFactory::createReaderFromFilename(cons // Wrap the input file into a file stream FileInputStream stream; if (!stream.open(filename)) { - err() << "Failed to open sound file \"" << filename << "\" (couldn't open stream)" << std::endl; + err() << "Failed to open sound file " << filename << " (couldn't open stream)" << std::endl; return nullptr; } @@ -92,7 +92,7 @@ std::unique_ptr SoundFileFactory::createReaderFromFilename(cons } // No suitable reader found - err() << "Failed to open sound file \"" << filename << "\" (format not supported)" << std::endl; + err() << "Failed to open sound file " << filename << " (format not supported)" << std::endl; return nullptr; } @@ -165,7 +165,7 @@ std::unique_ptr SoundFileFactory::createWriterFromFilename(cons } // No suitable writer found - err() << "Failed to open sound file \"" << filename << "\" (format not supported)" << std::endl; + err() << "Failed to open sound file " << filename << " (format not supported)" << std::endl; return nullptr; } diff --git a/src/SFML/Audio/SoundFileWriterFlac.cpp b/src/SFML/Audio/SoundFileWriterFlac.cpp index aaf42297..84d485fc 100644 --- a/src/SFML/Audio/SoundFileWriterFlac.cpp +++ b/src/SFML/Audio/SoundFileWriterFlac.cpp @@ -68,7 +68,7 @@ bool SoundFileWriterFlac::open(const std::filesystem::path& filename, unsigned i m_encoder = FLAC__stream_encoder_new(); if (!m_encoder) { - err() << "Failed to write flac file \"" << filename << "\" (failed to allocate encoder)" << std::endl; + err() << "Failed to write flac file " << filename << " (failed to allocate encoder)" << std::endl; return false; } @@ -80,7 +80,7 @@ bool SoundFileWriterFlac::open(const std::filesystem::path& filename, unsigned i // Initialize the output stream if (FLAC__stream_encoder_init_file(m_encoder, filename.string().c_str(), nullptr, nullptr) != FLAC__STREAM_ENCODER_INIT_STATUS_OK) { - err() << "Failed to write flac file \"" << filename << "\" (failed to open the file)" << std::endl; + err() << "Failed to write flac file " << filename << " (failed to open the file)" << std::endl; close(); return false; } diff --git a/src/SFML/Audio/SoundFileWriterOgg.cpp b/src/SFML/Audio/SoundFileWriterOgg.cpp index 915599d6..0f9efac7 100644 --- a/src/SFML/Audio/SoundFileWriterOgg.cpp +++ b/src/SFML/Audio/SoundFileWriterOgg.cpp @@ -79,7 +79,7 @@ bool SoundFileWriterOgg::open(const std::filesystem::path& filename, unsigned in int status = vorbis_encode_init_vbr(&m_vorbis, static_cast(channelCount), static_cast(sampleRate), 0.4f); if (status < 0) { - err() << "Failed to write ogg/vorbis file \"" << filename << "\" (unsupported bitrate)" << std::endl; + err() << "Failed to write ogg/vorbis file " << filename << " (unsupported bitrate)" << std::endl; close(); return false; } @@ -89,7 +89,7 @@ bool SoundFileWriterOgg::open(const std::filesystem::path& filename, unsigned in m_file.open(filename.c_str(), std::ios::binary); if (!m_file) { - err() << "Failed to write ogg/vorbis file \"" << filename << "\" (cannot open file)" << std::endl; + err() << "Failed to write ogg/vorbis file " << filename << " (cannot open file)" << std::endl; close(); return false; } @@ -104,7 +104,7 @@ bool SoundFileWriterOgg::open(const std::filesystem::path& filename, unsigned in vorbis_comment_clear(&comment); if (status < 0) { - err() << "Failed to write ogg/vorbis file \"" << filename << "\" (cannot generate the headers)" << std::endl; + err() << "Failed to write ogg/vorbis file " << filename << " (cannot generate the headers)" << std::endl; close(); return false; } diff --git a/src/SFML/Audio/SoundFileWriterWav.cpp b/src/SFML/Audio/SoundFileWriterWav.cpp index eebf5579..16b23f2a 100644 --- a/src/SFML/Audio/SoundFileWriterWav.cpp +++ b/src/SFML/Audio/SoundFileWriterWav.cpp @@ -102,14 +102,14 @@ bool SoundFileWriterWav::open(const std::filesystem::path& filename, unsigned in m_file.open(filename.c_str(), std::ios::binary); if (!m_file) { - err() << "Failed to open WAV sound file \"" << filename << "\" for writing" << std::endl; + err() << "Failed to open WAV sound file " << filename << " for writing" << std::endl; return false; } // Write the header if (!writeHeader(sampleRate, channelCount)) { - err() << "Failed to write header of WAV sound file \"" << filename << '"' << std::endl; + err() << "Failed to write header of WAV sound file " << filename << std::endl; return false; } diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp index 186ea3ef..22c6903c 100644 --- a/src/SFML/Graphics/Font.cpp +++ b/src/SFML/Graphics/Font.cpp @@ -159,7 +159,7 @@ bool Font::loadFromFile(const std::filesystem::path& filename) FT_Library library; if (FT_Init_FreeType(&library) != 0) { - err() << "Failed to load font \"" << filename << "\" (failed to initialize FreeType)" << std::endl; + err() << "Failed to load font " << filename << " (failed to initialize FreeType)" << std::endl; return false; } fontHandles->library.reset(library); @@ -168,7 +168,7 @@ bool Font::loadFromFile(const std::filesystem::path& filename) FT_Face face; if (FT_New_Face(library, filename.string().c_str(), 0, &face) != 0) { - err() << "Failed to load font \"" << filename << "\" (failed to create the font face)" << std::endl; + err() << "Failed to load font " << filename << " (failed to create the font face)" << std::endl; return false; } fontHandles->face.reset(face); @@ -177,7 +177,7 @@ bool Font::loadFromFile(const std::filesystem::path& filename) FT_Stroker stroker; if (FT_Stroker_New(library, &stroker) != 0) { - err() << "Failed to load font \"" << filename << "\" (failed to create the stroker)" << std::endl; + err() << "Failed to load font " << filename << " (failed to create the stroker)" << std::endl; return false; } fontHandles->stroker.reset(stroker); @@ -185,7 +185,7 @@ bool Font::loadFromFile(const std::filesystem::path& filename) // Select the unicode character map if (FT_Select_Charmap(face, FT_ENCODING_UNICODE) != 0) { - err() << "Failed to load font \"" << filename << "\" (failed to set the Unicode character set)" << std::endl; + err() << "Failed to load font " << filename << " (failed to set the Unicode character set)" << std::endl; return false; } diff --git a/src/SFML/Graphics/ImageLoader.cpp b/src/SFML/Graphics/ImageLoader.cpp index 8f875e4c..467d906e 100644 --- a/src/SFML/Graphics/ImageLoader.cpp +++ b/src/SFML/Graphics/ImageLoader.cpp @@ -129,7 +129,7 @@ bool ImageLoader::loadImageFromFile(const std::filesystem::path& filename, std:: else { // Error, failed to load the image - err() << "Failed to load image \"" << filename << "\". Reason: " << stbi_failure_reason() << std::endl; + err() << "Failed to load image " << filename << ". Reason: " << stbi_failure_reason() << std::endl; return false; } @@ -277,7 +277,7 @@ bool ImageLoader::saveImageToFile(const std::filesystem::path& filename, const s } } - err() << "Failed to save image \"" << filename << '"' << std::endl; + err() << "Failed to save image " << filename << std::endl; return false; } diff --git a/src/SFML/Graphics/Shader.cpp b/src/SFML/Graphics/Shader.cpp index acea39ec..611f1053 100644 --- a/src/SFML/Graphics/Shader.cpp +++ b/src/SFML/Graphics/Shader.cpp @@ -259,7 +259,7 @@ bool Shader::loadFromFile(const std::filesystem::path& filename, Type type) std::vector shader; if (!getFileContents(filename, shader)) { - err() << "Failed to open shader file \"" << filename << '"' << std::endl; + err() << "Failed to open shader file " << filename << std::endl; return false; } @@ -280,7 +280,7 @@ bool Shader::loadFromFile(const std::filesystem::path& vertexShaderFilename, con std::vector vertexShader; if (!getFileContents(vertexShaderFilename, vertexShader)) { - err() << "Failed to open vertex shader file \"" << vertexShaderFilename << '"' << std::endl; + err() << "Failed to open vertex shader file " << vertexShaderFilename << std::endl; return false; } @@ -288,7 +288,7 @@ bool Shader::loadFromFile(const std::filesystem::path& vertexShaderFilename, con std::vector fragmentShader; if (!getFileContents(fragmentShaderFilename, fragmentShader)) { - err() << "Failed to open fragment shader file \"" << fragmentShaderFilename << '"' << std::endl; + err() << "Failed to open fragment shader file " << fragmentShaderFilename << std::endl; return false; } @@ -304,7 +304,7 @@ bool Shader::loadFromFile(const std::filesystem::path& vertexShaderFilename, con std::vector vertexShader; if (!getFileContents(vertexShaderFilename, vertexShader)) { - err() << "Failed to open vertex shader file \"" << vertexShaderFilename << '"' << std::endl; + err() << "Failed to open vertex shader file " << vertexShaderFilename << std::endl; return false; } @@ -312,7 +312,7 @@ bool Shader::loadFromFile(const std::filesystem::path& vertexShaderFilename, con std::vector geometryShader; if (!getFileContents(geometryShaderFilename, geometryShader)) { - err() << "Failed to open geometry shader file \"" << geometryShaderFilename << '"' << std::endl; + err() << "Failed to open geometry shader file " << geometryShaderFilename << std::endl; return false; } @@ -320,7 +320,7 @@ bool Shader::loadFromFile(const std::filesystem::path& vertexShaderFilename, con std::vector fragmentShader; if (!getFileContents(fragmentShaderFilename, fragmentShader)) { - err() << "Failed to open fragment shader file \"" << fragmentShaderFilename << '"' << std::endl; + err() << "Failed to open fragment shader file " << fragmentShaderFilename << std::endl; return false; }