mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 03:59:56 +00:00
Code Issues Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/launcher/maindialog.cpp
View file

@ -308,7 +308,7 @@ bool Launcher::MainDialog::setupLauncherSettings()
return false;
}
QTextStream stream(&file);
ensureUtf8Encoding(stream);
Misc::ensureUtf8Encoding(stream);
mLauncherSettings.readFile(stream);
}
@ -344,7 +344,7 @@ bool Launcher::MainDialog::setupGameSettings()
return {};
}
QTextStream stream(&file);
ensureUtf8Encoding(stream);
Misc::ensureUtf8Encoding(stream);
(mGameSettings.*reader)(stream, ignoreContent);
file.close();
@ -544,7 +544,7 @@ bool Launcher::MainDialog::writeSettings()
QTextStream stream(&file);
stream.setDevice(&file);
ensureUtf8Encoding(stream);
Misc::ensureUtf8Encoding(stream);
mLauncherSettings.writeFile(stream);
file.close();

10
apps/wizard/mainwizard.cpp
View file

@ -165,7 +165,7 @@ void Wizard::MainWizard::setupGameSettings()
return;
}
QTextStream stream(&file);
ensureUtf8Encoding(stream);
Misc::ensureUtf8Encoding(stream);
mGameSettings.readUserFile(stream);
}
@ -197,7 +197,7 @@ void Wizard::MainWizard::setupGameSettings()
return;
}
QTextStream stream(&file);
ensureUtf8Encoding(stream);
Misc::ensureUtf8Encoding(stream);
mGameSettings.readFile(stream);
}
@ -233,7 +233,7 @@ void Wizard::MainWizard::setupLauncherSettings()
return;
}
QTextStream stream(&file);
ensureUtf8Encoding(stream);
Misc::ensureUtf8Encoding(stream);
mLauncherSettings.readFile(stream);
}
@ -460,7 +460,7 @@ void Wizard::MainWizard::writeSettings()
}
QTextStream stream(&file);
ensureUtf8Encoding(stream);
Misc::ensureUtf8Encoding(stream);
mGameSettings.writeFile(stream);
file.close();
@ -486,7 +486,7 @@ void Wizard::MainWizard::writeSettings()
}
stream.setDevice(&file);
ensureUtf8Encoding(stream);
Misc::ensureUtf8Encoding(stream);
mLauncherSettings.writeFile(stream);
file.close();

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"));