diff --git a/src/SFML/Window/EglContext.cpp b/src/SFML/Window/EglContext.cpp index 9bb62e5ef..a0b4001d1 100644 --- a/src/SFML/Window/EglContext.cpp +++ b/src/SFML/Window/EglContext.cpp @@ -178,9 +178,9 @@ EglContext::EglContext(EglContext* /*shared*/, const ContextSettings& /*settings { EglContextImpl::ensureInit(); - sf::err() << "Warning: context has not been initialized. The constructor EglContext(shared, settings, size) is " - "currently not implemented." - << std::endl; + err() << "Warning: context has not been initialized. The constructor EglContext(shared, settings, size) is " + "currently not implemented." + << std::endl; } diff --git a/src/SFML/Window/Unix/JoystickImpl.cpp b/src/SFML/Window/Unix/JoystickImpl.cpp index 0bc998427..7fdc452e7 100644 --- a/src/SFML/Window/Unix/JoystickImpl.cpp +++ b/src/SFML/Window/Unix/JoystickImpl.cpp @@ -419,7 +419,7 @@ void JoystickImpl::initialize() if (!udevContext) { - sf::err() << "Failed to create udev context, joystick support not available" << std::endl; + err() << "Failed to create udev context, joystick support not available" << std::endl; return; } diff --git a/src/SFML/Window/Unix/WindowImplX11.cpp b/src/SFML/Window/Unix/WindowImplX11.cpp index 660346c73..a70e0b54e 100644 --- a/src/SFML/Window/Unix/WindowImplX11.cpp +++ b/src/SFML/Window/Unix/WindowImplX11.cpp @@ -1190,7 +1190,7 @@ void WindowImplX11::requestFocus() XWindowAttributes attributes; if (XGetWindowAttributes(m_display.get(), m_window, &attributes) == 0) { - sf::err() << "Failed to check if window is viewable while requesting focus" << std::endl; + err() << "Failed to check if window is viewable while requesting focus" << std::endl; return; // error getting attribute } @@ -1588,7 +1588,7 @@ void WindowImplX11::initialize() if (allWindows.empty()) { if (!initRawMouse(m_display.get())) - sf::err() << "Failed to initialize raw mouse input" << std::endl; + err() << "Failed to initialize raw mouse input" << std::endl; } // Show the window diff --git a/src/SFML/Window/macOS/JoystickImpl.cpp b/src/SFML/Window/macOS/JoystickImpl.cpp index a6bb10b9a..1aab57643 100644 --- a/src/SFML/Window/macOS/JoystickImpl.cpp +++ b/src/SFML/Window/macOS/JoystickImpl.cpp @@ -268,9 +268,9 @@ bool JoystickImpl::open(unsigned int index) if (min != 0 || max != 7) { - sf::err() << std::hex << "Joystick (vendor/product id: 0x" << m_identification.vendorId - << "/0x" << m_identification.productId << std::dec - << ") range is an unexpected one: [" << min << ", " << max << "]" << std::endl; + err() << std::hex << "Joystick (vendor/product id: 0x" << m_identification.vendorId + << "/0x" << m_identification.productId << std::dec + << ") range is an unexpected one: [" << min << ", " << max << "]" << std::endl; } else { @@ -285,16 +285,16 @@ bool JoystickImpl::open(unsigned int index) // See ยง3.4.3 Usage Types (Collection) of HUT v1.12 if (IOHIDElementGetCollectionType(element) != kIOHIDElementCollectionTypeApplication) { - sf::err() << std::hex << "Gamepage (vendor/product id: 0x" << m_identification.vendorId - << "/0x" << m_identification.productId << ") is not an CA but a 0x" - << IOHIDElementGetCollectionType(element) << std::dec << std::endl; + err() << std::hex << "Gamepage (vendor/product id: 0x" << m_identification.vendorId << "/0x" + << m_identification.productId << ") is not an CA but a 0x" + << IOHIDElementGetCollectionType(element) << std::dec << std::endl; } break; default: #ifdef SFML_DEBUG - sf::err() << "Unexpected usage for element of Page Generic Desktop: 0x" << std::hex - << IOHIDElementGetUsage(element) << std::dec << std::endl; + err() << "Unexpected usage for element of Page Generic Desktop: 0x" << std::hex + << IOHIDElementGetUsage(element) << std::dec << std::endl; #endif break; } diff --git a/src/SFML/Window/macOS/VideoModeImpl.cpp b/src/SFML/Window/macOS/VideoModeImpl.cpp index 35b8cba89..b0f69b8d0 100644 --- a/src/SFML/Window/macOS/VideoModeImpl.cpp +++ b/src/SFML/Window/macOS/VideoModeImpl.cpp @@ -45,7 +45,7 @@ std::vector VideoModeImpl::getFullscreenModes() if (cgmodes == nullptr) { - sf::err() << "Couldn't get VideoMode for main display." << std::endl; + err() << "Couldn't get VideoMode for main display." << std::endl; return {}; } diff --git a/src/SFML/Window/macOS/WindowImplCocoa.mm b/src/SFML/Window/macOS/WindowImplCocoa.mm index c920a8b40..ddce4775a 100644 --- a/src/SFML/Window/macOS/WindowImplCocoa.mm +++ b/src/SFML/Window/macOS/WindowImplCocoa.mm @@ -116,11 +116,10 @@ WindowImplCocoa::WindowImplCocoa(WindowHandle handle) } else { - - sf::err() << "Cannot import this Window Handle because it is neither " - << "a nor object " - << "(or any of their subclasses). You gave a <" << [[nsHandle className] UTF8String] << "> object." - << std::endl; + err() << "Cannot import this Window Handle because it is neither " + << "a nor object " + << "(or any of their subclasses). You gave a <" << [[nsHandle className] UTF8String] << "> object." + << std::endl; return; }