mirror of
https://github.com/SFML/SFML.git
synced 2025-02-23 14:56:02 +08:00
Remove unnecessary sf::
namespace
This commit is contained in:
parent
15bfde50d3
commit
7f22f6c63a
@ -178,9 +178,9 @@ EglContext::EglContext(EglContext* /*shared*/, const ContextSettings& /*settings
|
|||||||
{
|
{
|
||||||
EglContextImpl::ensureInit();
|
EglContextImpl::ensureInit();
|
||||||
|
|
||||||
sf::err() << "Warning: context has not been initialized. The constructor EglContext(shared, settings, size) is "
|
err() << "Warning: context has not been initialized. The constructor EglContext(shared, settings, size) is "
|
||||||
"currently not implemented."
|
"currently not implemented."
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -419,7 +419,7 @@ void JoystickImpl::initialize()
|
|||||||
|
|
||||||
if (!udevContext)
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1190,7 +1190,7 @@ void WindowImplX11::requestFocus()
|
|||||||
XWindowAttributes attributes;
|
XWindowAttributes attributes;
|
||||||
if (XGetWindowAttributes(m_display.get(), m_window, &attributes) == 0)
|
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
|
return; // error getting attribute
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1588,7 +1588,7 @@ void WindowImplX11::initialize()
|
|||||||
if (allWindows.empty())
|
if (allWindows.empty())
|
||||||
{
|
{
|
||||||
if (!initRawMouse(m_display.get()))
|
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
|
// Show the window
|
||||||
|
@ -268,9 +268,9 @@ bool JoystickImpl::open(unsigned int index)
|
|||||||
|
|
||||||
if (min != 0 || max != 7)
|
if (min != 0 || max != 7)
|
||||||
{
|
{
|
||||||
sf::err() << std::hex << "Joystick (vendor/product id: 0x" << m_identification.vendorId
|
err() << std::hex << "Joystick (vendor/product id: 0x" << m_identification.vendorId
|
||||||
<< "/0x" << m_identification.productId << std::dec
|
<< "/0x" << m_identification.productId << std::dec
|
||||||
<< ") range is an unexpected one: [" << min << ", " << max << "]" << std::endl;
|
<< ") range is an unexpected one: [" << min << ", " << max << "]" << std::endl;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -285,16 +285,16 @@ bool JoystickImpl::open(unsigned int index)
|
|||||||
// See §3.4.3 Usage Types (Collection) of HUT v1.12
|
// See §3.4.3 Usage Types (Collection) of HUT v1.12
|
||||||
if (IOHIDElementGetCollectionType(element) != kIOHIDElementCollectionTypeApplication)
|
if (IOHIDElementGetCollectionType(element) != kIOHIDElementCollectionTypeApplication)
|
||||||
{
|
{
|
||||||
sf::err() << std::hex << "Gamepage (vendor/product id: 0x" << m_identification.vendorId
|
err() << std::hex << "Gamepage (vendor/product id: 0x" << m_identification.vendorId << "/0x"
|
||||||
<< "/0x" << m_identification.productId << ") is not an CA but a 0x"
|
<< m_identification.productId << ") is not an CA but a 0x"
|
||||||
<< IOHIDElementGetCollectionType(element) << std::dec << std::endl;
|
<< IOHIDElementGetCollectionType(element) << std::dec << std::endl;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
#ifdef SFML_DEBUG
|
#ifdef SFML_DEBUG
|
||||||
sf::err() << "Unexpected usage for element of Page Generic Desktop: 0x" << std::hex
|
err() << "Unexpected usage for element of Page Generic Desktop: 0x" << std::hex
|
||||||
<< IOHIDElementGetUsage(element) << std::dec << std::endl;
|
<< IOHIDElementGetUsage(element) << std::dec << std::endl;
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ std::vector<VideoMode> VideoModeImpl::getFullscreenModes()
|
|||||||
|
|
||||||
if (cgmodes == nullptr)
|
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 {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,11 +116,10 @@ WindowImplCocoa::WindowImplCocoa(WindowHandle handle)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
err() << "Cannot import this Window Handle because it is neither "
|
||||||
sf::err() << "Cannot import this Window Handle because it is neither "
|
<< "a <NSWindow*> nor <NSView*> object "
|
||||||
<< "a <NSWindow*> nor <NSView*> object "
|
<< "(or any of their subclasses). You gave a <" << [[nsHandle className] UTF8String] << "> object."
|
||||||
<< "(or any of their subclasses). You gave a <" << [[nsHandle className] UTF8String] << "> object."
|
<< std::endl;
|
||||||
<< std::endl;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user