cleanup

Author: mgubi

src/Plugins/Qt/qt_gui.cpp

@@ -495,6 +495,22 @@ gui_open (int& argc, char** argv) {
 #ifdef MACOSX_EXTENSIONS
   mac_begin_remote();
 #endif
+
+  // Qt and Guile want to change the locale.
+  // We reset it to have POSIX functions parse correctly the configuration files
+  // (see as_double() in string.cpp)
+
+  setlocale(LC_NUMERIC, "C");
+
+  // From Qt docs:
+  // On Unix/Linux Qt is configured to use the system locale settings by
+  // default. This can cause a conflict when using POSIX functions, for
+  // instance, when converting between data types such as floats and strings,
+  // since the notation may differ between locales. To get around this problem,
+  // call the POSIX function setlocale(LC_NUMERIC,"C") right after initializing
+  // QApplication, QGuiApplication or QCoreApplication to reset the locale
+  // that is used for number formatting to "C"-locale.
+  // See https://doc.qt.io/qt-5/qcoreapplication.html#locale-settings
 }
 
 void

src/Texmacs/Texmacs/texmacs.cpp

@@ -430,20 +430,14 @@ TeXmacs_main (int argc, char** argv) {
   if (DEBUG_STD) debug_boot << "Opening display...\n";
 
 #if defined(X11TEXMACS) && defined(MACOSX_EXTENSIONS)
-  init_mac_application ();
+ // init_mac_application ();
 #endif
 
   gui_open (argc, argv);
   set_default_font (the_default_font);
   if (DEBUG_STD) debug_boot << "Starting server...\n";
   { // opening scope for server sv
   server sv;
-
-  // HACK:
-  // Qt and Guile want to change the locale. 
-  // We need to force it to C to parse correctly the configuration files
-  // (see as_double() in string.cpp)
-  setlocale(LC_NUMERIC, "C");    
 
   string where= "";
   for (i=1; i<argc; i++) {