Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-30 05:47:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Move ensureUtf8Encoding to named namespace

Browse source 
To follow https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#sf21-dont-use-an-unnamed-anonymous-namespace-in-a-header

Add QtGlobal include to define QT_VERSION and QT_VERSION_CHECK macroses before
they're used.
This commit is contained in:
elsid 2023-01-12 22:29:48 +01:00
parent ee980721b8
commit dd89403df0
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/config/gamesettings.cpp
View file

@ -230,7 +230,7 @@ bool Config::GameSettings::isOrderedLine(const QString& line)
bool Config::GameSettings::writeFileWithComments(QFile& file)
{
QTextStream stream(&file);
ensureUtf8Encoding(stream);
Misc::ensureUtf8Encoding(stream);
// slurp
std::vector<QString> fileCopy;

10
components/misc/utf8qtextstream.hpp
View file

@ -1,14 +1,16 @@
#ifndef MISC_UTF8QTEXTSTREAM_HPP
#define MISC_UTF8QTEXTSTREAM_HPP
#ifndef OPENMW_COMPONENTS_MISC_UTF8QTEXTSTREAM_HPP
#define OPENMW_COMPONENTS_MISC_UTF8QTEXTSTREAM_HPP
#include <QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <QTextCodec>
#endif
#include <QTextStream>
namespace
namespace Misc
{
void ensureUtf8Encoding(QTextStream& stream)
inline void ensureUtf8Encoding(QTextStream& stream)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
stream.setCodec(QTextCodec::codecForName("UTF-8"));