Skip to content
This repository was archived by the owner on May 6, 2021. It is now read-only.

Commit d2c0b2e

Browse files
committed
Set qt locale to 'C'
1 parent efc9d44 commit d2c0b2e

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

deploy/hyperion.tar.gz

32 Bytes
Binary file not shown.

src/hyperion-remote/hyperion-remote.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
// Qt includes
66
#include <QCoreApplication>
7+
#include <QLocale>
78

89
// getoptPlusPLus includes
910
#include <getoptPlusPlus/getoptpp.h>
@@ -27,10 +28,12 @@ int count(std::initializer_list<bool> values)
2728

2829
int main(int argc, char * argv[])
2930
{
30-
setlocale(LC_ALL, "C");
31-
3231
QCoreApplication app(argc, argv);
3332

33+
// force the locale
34+
setlocale(LC_ALL, "C");
35+
QLocale::setDefault(QLocale::c());
36+
3437
try
3538
{
3639
// some default settings

src/hyperion-v4l2/hyperion-v4l2.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ void saveScreenshot(void *, const Image<ColorRgb> & image)
3030

3131
int main(int argc, char** argv)
3232
{
33+
// force the locale
3334
setlocale(LC_ALL, "C");
3435

3536
try

src/hyperiond/hyperiond.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// QT includes
77
#include <QCoreApplication>
88
#include <QResource>
9+
#include <QLocale>
910

1011
// config includes
1112
#include "HyperionConfig.h"
@@ -71,7 +72,6 @@ Json::Value loadConfig(const std::string & configFile)
7172
int main(int argc, char** argv)
7273
{
7374
std::cout << "Application build time: " << __DATE__ << " " << __TIME__ << std::endl;
74-
std::cout << "Locale = " << setlocale(LC_ALL, "C") << std::endl;
7575

7676
// Initialising QCoreApplication
7777
QCoreApplication app(argc, argv);
@@ -80,6 +80,10 @@ int main(int argc, char** argv)
8080
signal(SIGINT, signal_handler);
8181
signal(SIGTERM, signal_handler);
8282

83+
// force the locale
84+
setlocale(LC_ALL, "C");
85+
QLocale::setDefault(QLocale::c());
86+
8387
if (argc < 2)
8488
{
8589
std::cout << "Missing required configuration file. Usage:" << std::endl;

0 commit comments

Comments
 (0)