2018-07-31 Fred Gleason <fredg@paravelsystems.com>

* Refactored 'RDMacro' to handle UTF-8 strings correctly.
This commit is contained in:
Fred Gleason
2018-07-31 12:54:08 -04:00
parent dbb0d9c415
commit 26c29e1d4e
47 changed files with 676 additions and 686 deletions

View File

@@ -77,9 +77,7 @@ EditMacro::EditMacro(RDMacro *cmd,bool highlight,QWidget *parent)
edit_cancel_button->setText(tr("&Cancel"));
connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
char cmdstr[RD_RML_MAX_LENGTH];
edit_macro->generateString(cmdstr,RD_RML_MAX_LENGTH);
edit_macro_edit->setText(cmdstr);
edit_macro_edit->setText(edit_macro->toString());
if(highlight) {
edit_macro_edit->selectAll();
}
@@ -100,8 +98,7 @@ QSizePolicy EditMacro::sizePolicy() const
void EditMacro::okData()
{
edit_macro->parseString((const char *)edit_macro_edit->text(),
edit_macro_edit->text().length());
*edit_macro=RDMacro::fromString(edit_macro_edit->text());
done(0);
}