Bugfix:#333 Accented letters in annotations in UTF8

Isarhamster · Jun 14, 2024 · 8898a88 · 8898a88
1 parent abbb5ec
commit 8898a88
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/database/output.cpp b/src/database/output.cpp
@@ -1070,7 +1070,7 @@ void Output::outputLatin1(const QString& filename, Database& database)
     f.close();
 }
 
-QString Output::output(Database* database)
+QString Output::outputUtf8(Database* database)
 {
     QString s;
     QTextStream out(&s);

diff --git a/src/database/output.h b/src/database/output.h
@@ -141,7 +141,7 @@ class Output : public QObject
     /** Create the output for the given database
      * @param database A pointer to a database object. All games in the database will be output, one
      *               after the other, using the output(GameX* game) method */
-    QString output(Database* database);
+    QString outputUtf8(Database* database);
 
     /** Append output to a closed file */
     bool append(const QString& filename, GameX& game);

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -2160,7 +2160,7 @@ bool MainWindow::confirmQuit()
             {
                 if (dbi->database()->isModified())
                 {
-                    output.outputLatin1(dbi->database()->filename(), *(dbi->database()));
+                    output.output(dbi->database()->filename(), *(dbi->database()));
                 }
             }
         }

diff --git a/src/gui/mainwindowactions.cpp b/src/gui/mainwindowactions.cpp
@@ -169,7 +169,7 @@ void MainWindow::saveDatabase(DatabaseInfo* dbInfo)
         startOperation(tr("Saving %1...").arg(db->name()));
         Output output(Output::Pgn, &BoardView::renderImageForBoard);
         connect(&output, SIGNAL(progress(int)), SLOT(slotOperationProgress(int)));
-        output.outputLatin1(db->filename(), *db);
+        output.output(db->filename(), *db);
         finishOperation(tr("%1 saved").arg(db->name()));
     }
 }
@@ -3443,7 +3443,7 @@ void MainWindow::copyFromDatabase(int preselect, QList<GameId> gameIndexList)
     else
     {
         Output out(Output::Pgn);
-        QString s = out.output(dest);
+        QString s = out.outputUtf8(dest);
         QApplication::clipboard()->setText(s);
         QString msg = tr("Set %1 games into system clipboard.").arg(n);
         slotStatusMessage(msg);

diff --git a/src/gui/testadapter.cpp b/src/gui/testadapter.cpp
@@ -134,7 +134,7 @@ void TestAdapter::convertPgn(const QString& filename, const QString& outfile, QC
         }
 
         Output output(lc ? Output::LocalPgn : Output::Pgn);
-        output.outputLatin1(outfile, db);
+        output.output(outfile, db);
     }
 }