luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-11-02 08:15:28 +01:00
Code Activity

Remove irr namespace (#16309)

Browse Source
This commit is contained in:
Lars Müller
2025-07-09 10:35:52 +02:00
committed by GitHub
parent 7e22c72492
commit 61551cfc3a
381 changed files with 680 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/enriched_string.cpp
View File

@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "debug.h"
#include "log.h"
using namespace irr::video;
using namespace video;
EnrichedString::EnrichedString()
{
@@ -49,8 +49,8 @@ void EnrichedString::clear()
m_colors.clear();
m_has_background = false;
m_default_length = 0;
m_default_color = irr::video::SColor(255, 255, 255, 255);
m_background = irr::video::SColor(0, 0, 0, 0);
m_default_color = video::SColor(255, 255, 255, 255);
m_background = video::SColor(0, 0, 0, 0);
}
EnrichedString &EnrichedString::operator=(std::wstring_view str)

1
src/util/enriched_string.h
View File

@@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <vector>
#include <SColor.h>
using namespace irr;
class EnrichedString {
public:

10
src/util/string.h
View File

@@ -763,23 +763,23 @@ inline std::string str_join(const std::vector<std::string> &list,
#if IS_CLIENT_BUILD
/**
* Create a UTF8 std::string from an irr::core::stringw.
* Create a UTF8 std::string from an core::stringw.
*/
[[nodiscard]]
inline std::string stringw_to_utf8(const irr::core::stringw &input)
inline std::string stringw_to_utf8(const core::stringw &input)
{
std::wstring_view sv(input.c_str(), input.size());
return wide_to_utf8(sv);
}
/**
* Create an irr::core:stringw from a UTF8 std::string.
* Create an core:stringw from a UTF8 std::string.
*/
[[nodiscard]]
inline irr::core::stringw utf8_to_stringw(std::string_view input)
inline core::stringw utf8_to_stringw(std::string_view input)
{
std::wstring str = utf8_to_wide(input);
return irr::core::stringw(str.c_str(), str.size());
return core::stringw(str.c_str(), str.size());
}
#endif