1 files changed, 12 insertions, 17 deletions

diff --git a/src/frontend/qt_sdl/CheatsDialog.cpp b/src/frontend/qt_sdl/CheatsDialog.cpp
index afa0805..28211ad 100644
--- a/src/frontend/qt_sdl/CheatsDialog.cpp
+++ b/src/frontend/qt_sdl/CheatsDialog.cpp
@@ -24,6 +24,7 @@
 #include "types.h"
 #include "Platform.h"
 #include "Config.h"
+#include "ROMManager.h"
 
 #include "CheatsDialog.h"
 #include "ui_CheatsDialog.h"
@@ -33,15 +34,13 @@ CheatsDialog* CheatsDialog::currentDlg = nullptr;
 
 extern std::string EmuDirectory;
 
-namespace Frontend { extern ARCodeFile* CheatFile; }
-
 
 CheatsDialog::CheatsDialog(QWidget* parent) : QDialog(parent), ui(new Ui::CheatsDialog)
 {
     ui->setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
 
-    codeFile = Frontend::CheatFile;
+    codeFile = ROMManager::GetCheatFile();
 
     QStandardItemModel* model = new QStandardItemModel();
     ui->tvCodeList->setModel(model);
@@ -55,7 +54,7 @@ CheatsDialog::CheatsDialog(QWidget* parent) : QDialog(parent), ui(new Ui::Cheats
         {
             ARCodeCat& cat = *i;
 
-            QStandardItem* catitem = new QStandardItem(cat.Name);
+            QStandardItem* catitem = new QStandardItem(QString::fromStdString(cat.Name));
             catitem->setEditable(true);
             catitem->setData(QVariant::fromValue(i));
             root->appendRow(catitem);
@@ -64,7 +63,7 @@ CheatsDialog::CheatsDialog(QWidget* parent) : QDialog(parent), ui(new Ui::Cheats
             {
                 ARCode& code = *j;
 
-                QStandardItem* codeitem = new QStandardItem(code.Name);
+                QStandardItem* codeitem = new QStandardItem(QString::fromStdString(code.Name));
                 codeitem->setEditable(true);
                 codeitem->setCheckable(true);
                 codeitem->setCheckState(code.Enabled ? Qt::Checked : Qt::Unchecked);
@@ -113,13 +112,12 @@ void CheatsDialog::on_btnNewCat_clicked()
 
     ARCodeCat cat;
     cat.Codes.clear();
-    memset(cat.Name, 0, 128);
-    strncpy(cat.Name, "(new category)", 127);
+    cat.Name = "(new category)";
 
     codeFile->Categories.push_back(cat);
     ARCodeCatList::iterator id = codeFile->Categories.end(); id--;
 
-    QStandardItem* catitem = new QStandardItem(cat.Name);
+    QStandardItem* catitem = new QStandardItem(QString::fromStdString(cat.Name));
     catitem->setEditable(true);
     catitem->setData(QVariant::fromValue(id));
     root->appendRow(catitem);
@@ -160,8 +158,7 @@ void CheatsDialog::on_btnNewARCode_clicked()
     ARCodeCat& cat = *it_cat;
 
     ARCode code;
-    memset(code.Name, 0, 128);
-    strncpy(code.Name, "(new AR code)", 127);
+    code.Name = "(new AR code)";
     code.Enabled = true;
     code.CodeLen = 0;
     memset(code.Code, 0, sizeof(code.Code));
@@ -169,7 +166,7 @@ void CheatsDialog::on_btnNewARCode_clicked()
     cat.Codes.push_back(code);
     ARCodeList::iterator id = cat.Codes.end(); id--;
 
-    QStandardItem* codeitem = new QStandardItem(code.Name);
+    QStandardItem* codeitem = new QStandardItem(QString::fromStdString(code.Name));
     codeitem->setEditable(true);
     codeitem->setCheckable(true);
     codeitem->setCheckState(code.Enabled ? Qt::Checked : Qt::Unchecked);
@@ -275,13 +272,12 @@ void CheatsDialog::onCheatEntryModified(QStandardItem* item)
 
         if (item->text().isEmpty())
         {
-            QString oldname = QString(cat.Name);
+            QString oldname = QString::fromStdString(cat.Name);
             item->setText(oldname.isEmpty() ? "(blank category name?)" : oldname);
         }
         else
         {
-            strncpy(cat.Name, item->text().toStdString().c_str(), 127);
-            cat.Name[127] = '\0';
+            cat.Name = item->text().toStdString();
         }
     }
     else if (data.canConvert<ARCodeList::iterator>())
@@ -290,13 +286,12 @@ void CheatsDialog::onCheatEntryModified(QStandardItem* item)
 
         if (item->text().isEmpty())
         {
-            QString oldname = QString(code.Name);
+            QString oldname = QString::fromStdString(code.Name);
             item->setText(oldname.isEmpty() ? "(blank code name?)" : oldname);
         }
         else
         {
-            strncpy(code.Name, item->text().toStdString().c_str(), 127);
-            code.Name[127] = '\0';
+            code.Name = item->text().toStdString();
         }
 
         code.Enabled = (item->checkState() == Qt::Checked);