Refactor encodings

client/client_main.cpp

@@ -329,9 +329,9 @@ int client_main(int argc, char *argv[])
 #ifdef ENABLE_NLS
   (void) bindtextdomain("freeciv21-nations", get_locale_dir());
 #endif
-  init_character_encodings(gui_character_encoding, gui_use_transliteration);
+  init_character_encodings();
 #ifdef ENABLE_NLS
-  bind_textdomain_codeset("freeciv21-nations", get_internal_encoding());
+  bind_textdomain_codeset("freeciv21-nations", "UTF-8");
 #endif
 
   QCommandLineParser parser;

client/connectdlg_common.cpp

@@ -21,6 +21,7 @@
 #include <QUuid>
 
 #include <cstring>
+#include <qglobal.h>
 
 #ifdef FREECIV_MSWINDOWS
 #include <windows.h>
@@ -50,7 +51,7 @@
 
 bool server_quitting = false;
 
-static char challenge_fullname[MAX_LEN_PATH];
+static QString challenge_fullname{};
 static bool client_has_hack = false;
 
 int internal_server_port;
@@ -318,9 +319,9 @@ static void randomize_string(char *str, size_t n)
    and then sends the string to the server. If the server can open
    and read the string, then the client is given hack access.
  */
-void send_client_wants_hack(const char *filename)
+void send_client_wants_hack(const QString &filename)
 {
-  if (filename[0] != '\0') {
+  if (!filename.isEmpty()) {
     struct packet_single_want_hack_req req;
     struct section_file *file;
     auto sdir = freeciv_storage_dir();
@@ -334,9 +335,7 @@ void send_client_wants_hack(const char *filename)
     }
 
     QDir().mkpath(sdir);
-
-    fc_snprintf(challenge_fullname, sizeof(challenge_fullname), "%s/%s",
-                qUtf8Printable(sdir), filename);
+    challenge_fullname = sdir + QStringLiteral("/") + filename;
 
     // generate an authentication token
     randomize_string(req.token, sizeof(req.token));
@@ -345,7 +344,7 @@ void send_client_wants_hack(const char *filename)
     secfile_insert_str(file, req.token, "challenge.token");
     if (!secfile_save(file, challenge_fullname)) {
       qCritical("Couldn't write token to temporary file: %s",
-                challenge_fullname);
+                qUtf8Printable(challenge_fullname));
     }
     secfile_destroy(file);
 
@@ -360,11 +359,12 @@ void send_client_wants_hack(const char *filename)
 void handle_single_want_hack_reply(bool you_have_hack)
 {
   // remove challenge file
-  if (challenge_fullname[0] != '\0') {
-    if (fc_remove(challenge_fullname) == -1) {
-      qCritical("Couldn't remove temporary file: %s", challenge_fullname);
+  if (!challenge_fullname.isEmpty()) {
+    if (!QFile::remove(challenge_fullname)) {
+      qCritical("Couldn't remove temporary file: %s",
+                qUtf8Printable(challenge_fullname));
     }
-    challenge_fullname[0] = '\0';
+    challenge_fullname.clear();
   }
 
   if (you_have_hack) {

client/connectdlg_common.h

@@ -19,7 +19,7 @@ void client_kill_server(bool force);
 bool is_server_running();
 bool can_client_access_hack();
 
-void send_client_wants_hack(const char *filename);
+void send_client_wants_hack(const QString &filename);
 void send_save_game(const char *filename);
 
 void set_ruleset(const char *ruleset);

client/gui_main.cpp

@@ -44,8 +44,6 @@ void real_science_report_dialog_update(void *);
 
 extern void city_font_update();
 
-const bool gui_use_transliteration = false;
-const char *const gui_character_encoding = "UTF-8";
 const char *client_string = "gui-qt";
 static fc_client *freeciv_qt;
 

client/options.cpp

@@ -3788,7 +3788,6 @@ static const char *get_last_option_file_name(bool *allow_digital_boolean)
     fc_strlcpy(name_buffer, OPTION_FILE_NAME, sizeof(name_buffer));
 #else
     int major, minor;
-    struct stat buf;
 
     name = freeciv_storage_dir();
     if (name.isEmpty()) {
@@ -3807,7 +3806,7 @@ static const char *get_last_option_file_name(bool *allow_digital_boolean)
         fc_snprintf(name_buffer, sizeof(name_buffer),
                     "%s/freeciv-client-rc-%d.%d", qUtf8Printable(name),
                     major, minor);
-        if (0 == fc_stat(name_buffer, &buf)) {
+        if (QFileInfo::exists(name_buffer)) {
           if (MAJOR_NEW_OPTION_FILE_NAME != major
               || MINOR_NEW_OPTION_FILE_NAME != minor) {
             qInfo(_("Didn't find '%s' option file, "
@@ -3831,7 +3830,7 @@ static const char *get_last_option_file_name(bool *allow_digital_boolean)
       fc_snprintf(name_buffer, sizeof(name_buffer),
                   "%s/.freeciv-client-rc-%d.%d",
                   qUtf8Printable(QDir::homePath()), major, minor);
-      if (0 == fc_stat(name_buffer, &buf)) {
+      if (QFileInfo::exists(name_buffer)) {
         qInfo(_("Didn't find '%s' option file, "
                 "loading from '%s' instead."),
               get_current_option_file_name()
@@ -3848,7 +3847,7 @@ static const char *get_last_option_file_name(bool *allow_digital_boolean)
     // Try with the old one.
     fc_snprintf(name_buffer, sizeof(name_buffer), "%s/%s",
                 qUtf8Printable(name), OLD_OPTION_FILE_NAME);
-    if (0 == fc_stat(name_buffer, &buf)) {
+    if (QFileInfo::exists(name_buffer)) {
       qInfo(_("Didn't find '%s' option file, "
               "loading from '%s' instead."),
             get_current_option_file_name(), OLD_OPTION_FILE_NAME);