Remove unnecessary namespace usage

src/SFML/Audio/MiniaudioUtils.cpp

@@ -121,7 +121,7 @@ MiniaudioUtils::SoundBase::SoundBase(const ma_data_source_vtable&     dataSource
     if (const ma_result result = ma_data_source_init(&config, &dataSourceBase); result != MA_SUCCESS)
         err() << "Failed to initialize audio data source: " << ma_result_description(result) << std::endl;
 
-    resourceEntryIter = priv::AudioDevice::registerResource(
+    resourceEntryIter = AudioDevice::registerResource(
         this,
         [](void* ptr) { static_cast<SoundBase*>(ptr)->deinitialize(); },
         reinitializeFunc);
@@ -131,7 +131,7 @@ MiniaudioUtils::SoundBase::SoundBase(const ma_data_source_vtable&     dataSource
 ////////////////////////////////////////////////////////////
 MiniaudioUtils::SoundBase::~SoundBase()
 {
-    priv::AudioDevice::unregisterResource(resourceEntryIter);
+    AudioDevice::unregisterResource(resourceEntryIter);
     ma_sound_uninit(&sound);
     ma_node_uninit(&effectNode, nullptr);
     ma_data_source_uninit(&dataSourceBase);
@@ -142,7 +142,7 @@ MiniaudioUtils::SoundBase::~SoundBase()
 void MiniaudioUtils::SoundBase::initialize(ma_sound_end_proc endCallback)
 {
     // Initialize the sound
-    auto* engine = priv::AudioDevice::getEngine();
+    auto* engine = AudioDevice::getEngine();
 
     if (engine == nullptr)
     {

src/SFML/Audio/MiniaudioUtils.hpp

@@ -97,9 +97,9 @@ struct SoundBase
     std::vector<ma_channel> soundChannelMap; //!< The map of position in sample frame to sound channel (miniaudio channels)
     ma_sound                sound{};         //!< The sound
     SoundSource::Status     status{SoundSource::Status::Stopped}; //!< The status
-    SoundSource::EffectProcessor         effectProcessor;         //!< The effect processor
-    priv::AudioDevice::ResourceEntryIter resourceEntryIter; //!< Iterator to the resource entry registered with the AudioDevice
-    priv::MiniaudioUtils::SavedSettings savedSettings; //!< Saved settings used to restore ma_sound state in case we need to recreate it
+    SoundSource::EffectProcessor   effectProcessor;               //!< The effect processor
+    AudioDevice::ResourceEntryIter resourceEntryIter; //!< Iterator to the resource entry registered with the AudioDevice
+    MiniaudioUtils::SavedSettings savedSettings; //!< Saved settings used to restore ma_sound state in case we need to recreate it
 };
 
 [[nodiscard]] ma_channel   soundChannelToMiniaudioChannel(SoundChannel soundChannel);

src/SFML/Graphics/RenderTextureImplDefault.cpp

@@ -87,7 +87,7 @@ bool RenderTextureImplDefault::isSrgb() const
 void RenderTextureImplDefault::updateTexture(unsigned int textureId)
 {
     // Make sure that the current texture binding will be preserved
-    const priv::TextureSaver save;
+    const TextureSaver save;
 
     // Copy the rendered pixels to the texture
     glCheck(glBindTexture(GL_TEXTURE_2D, textureId));

src/SFML/Graphics/RenderTextureImplFBO.cpp

@@ -107,7 +107,7 @@ bool RenderTextureImplFBO::isAvailable()
     const TransientContextLock lock;
 
     // Make sure that extensions are initialized
-    priv::ensureExtensionsInit();
+    ensureExtensionsInit();
 
     return GLEXT_framebuffer_object != 0;
 }
@@ -148,7 +148,7 @@ bool RenderTextureImplFBO::create(const Vector2u& size, unsigned int textureId,
         const TransientContextLock lock;
 
         // Make sure that extensions are initialized
-        priv::ensureExtensionsInit();
+        ensureExtensionsInit();
 
         if (settings.antialiasingLevel && !(GLEXT_framebuffer_multisample && GLEXT_framebuffer_blit))
             return false;

src/SFML/Graphics/VertexBuffer.cpp

@@ -211,7 +211,7 @@ bool VertexBuffer::update([[maybe_unused]] const VertexBuffer& vertexBuffer)
     const TransientContextLock contextLock;
 
     // Make sure that extensions are initialized
-    sf::priv::ensureExtensionsInit();
+    priv::ensureExtensionsInit();
 
     if (GLEXT_copy_buffer)
     {
@@ -338,7 +338,7 @@ bool VertexBuffer::isAvailable()
         const TransientContextLock contextLock;
 
         // Make sure that extensions are initialized
-        sf::priv::ensureExtensionsInit();
+        priv::ensureExtensionsInit();
 
         return GLEXT_vertex_buffer_object != 0;
     }();

src/SFML/Window/Unix/WindowImplX11.cpp

@@ -794,7 +794,7 @@ void WindowImplX11::processEvents()
     }
 
     // Process clipboard window events
-    priv::ClipboardImpl::processEvents();
+    ClipboardImpl::processEvents();
 }
 
 

src/SFML/Window/Win32/JoystickImpl.cpp

@@ -1102,7 +1102,7 @@ BOOL CALLBACK JoystickImpl::deviceEnumerationCallback(const DIDEVICEINSTANCE* de
 ////////////////////////////////////////////////////////////
 BOOL CALLBACK JoystickImpl::deviceObjectEnumerationCallback(const DIDEVICEOBJECTINSTANCE* deviceObjectInstance, void* userData)
 {
-    sf::priv::JoystickImpl& joystick = *reinterpret_cast<sf::priv::JoystickImpl*>(userData);
+    JoystickImpl& joystick = *reinterpret_cast<JoystickImpl*>(userData);
 
     if (DIDFT_GETTYPE(deviceObjectInstance->dwType) & DIDFT_AXIS)
     {