devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

themeeditor: Make it compile with current Qt5.

Browse source 
- Replace use of obsolete members with their replacements.
- Fix type issue that requires explicitly creating the right object now.
- Update project file to work with Qt5.

Change-Id: I3af2b1520796e977e58c0a01e165c77c469a23b9
This commit is contained in:
Dominik Riebeling 2020-09-03 18:33:12 +02:00
parent ff38666a19
commit fa330c109d
10 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
utils/themeeditor/gui/configdocument.cpp
View file

@ -143,7 +143,7 @@ void ConfigDocument::save()
}
fout.open(QFile::WriteOnly);
fout.write(toPlainText().toAscii());
fout.write(toPlainText().toLatin1());
fout.close();
saved = toPlainText();
@ -174,7 +174,7 @@ void ConfigDocument::saveAs()
QFile fout(filePath);
fout.open(QFile::WriteOnly);
fout.write(toPlainText().toAscii());
fout.write(toPlainText().toLatin1());
fout.close();
saved = toPlainText();
@ -415,14 +415,14 @@ void ConfigDocument::settingsChanged()
QSettings settings;
settings.beginGroup("SkinDocument");
QColor fg = settings.value("fgColor", Qt::black).value<QColor>();
QColor bg = settings.value("bgColor", Qt::white).value<QColor>();
QColor fg = settings.value("fgColor", QColor(Qt::black)).value<QColor>();
QColor bg = settings.value("bgColor", QColor(Qt::white)).value<QColor>();
QPalette palette;
palette.setColor(QPalette::All, QPalette::Base, bg);
palette.setColor(QPalette::All, QPalette::Text, fg);
editor->setPalette(palette);
QColor highlight = settings.value("errorColor", Qt::red).value<QColor>();
QColor highlight = settings.value("errorColor", QColor(Qt::red)).value<QColor>();
editor->setErrorColor(highlight);
/* Setting the font */

2
utils/themeeditor/gui/editorwindow.cpp
View file

@ -874,7 +874,7 @@ void EditorWindow::createFile(QString filename, QString contents)
QFile fout(filename);
fout.open(QFile::WriteOnly);
fout.write(contents.toAscii());
fout.write(contents.toLatin1());
fout.close();
}

6
utils/themeeditor/gui/preferencesdialog.cpp
View file

@ -85,13 +85,13 @@ void PreferencesDialog::loadColors()
/* Buttons from the editor group */
settings.beginGroup("SkinDocument");
fgColor = settings.value("fgColor", Qt::black).value<QColor>();
fgColor = settings.value("fgColor", QColor(Qt::black)).value<QColor>();
setButtonColor(ui->fgButton, fgColor);
bgColor = settings.value("bgColor", Qt::white).value<QColor>();
bgColor = settings.value("bgColor", QColor(Qt::white)).value<QColor>();
setButtonColor(ui->bgButton, bgColor);
errorColor = settings.value("errorColor", Qt::red).value<QColor>();
errorColor = settings.value("errorColor", QColor(Qt::red)).value<QColor>();
setButtonColor(ui->errorButton, errorColor);
settings.endGroup();

2
utils/themeeditor/gui/projectexporter.cpp
View file

@ -204,7 +204,7 @@ void ProjectExporter::checkWPS(ProjectModel* project, QString file)
fin.close();
skin_element* root;
root = skin_parse(contents.toAscii());
root = skin_parse(contents.toLatin1());
if(!root)
{
addWarning(tr("Couldn't parse ") + file.split("/").last());

16
utils/themeeditor/gui/skindocument.cpp
View file

@ -197,14 +197,14 @@ void SkinDocument::settingsChanged()
QSettings settings;
settings.beginGroup("SkinDocument");
QColor fg = settings.value("fgColor", Qt::black).value<QColor>();
QColor bg = settings.value("bgColor", Qt::white).value<QColor>();
QColor fg = settings.value("fgColor", QColor(Qt::black)).value<QColor>();
QColor bg = settings.value("bgColor", QColor(Qt::white)).value<QColor>();
QPalette palette;
palette.setColor(QPalette::All, QPalette::Base, bg);
palette.setColor(QPalette::All, QPalette::Text, fg);
editor->setPalette(palette);
QColor highlight = settings.value("errorColor", Qt::red).value<QColor>();
QColor highlight = settings.value("errorColor", QColor(Qt::red)).value<QColor>();
editor->setErrorColor(highlight);
/* Setting the font */
@ -227,7 +227,7 @@ void SkinDocument::cursorChanged()
QTextCursor line = editor->textCursor();
line.movePosition(QTextCursor::StartOfLine);
line.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
skin_parse(line.selectedText().toAscii());
skin_parse(line.selectedText().toLatin1());
if(skin_error_line() > 0)
parseStatus = tr("Error on line ") +
QString::number(line.blockNumber() + 1)
@ -263,7 +263,7 @@ void SkinDocument::codeChanged()
editor->clearErrors();
parseStatus = model->changeTree(editor->document()->
toPlainText().toAscii());
toPlainText().toLatin1());
treeInSync = true;
emit antiSync(false);
@ -294,7 +294,7 @@ void SkinDocument::codeChanged()
rest.removeSelectedText();
base += skin_error_line();
skin_parse(doc.toPlainText().toAscii());
skin_parse(doc.toPlainText().toLatin1());
if(skin_error_line() > 0)
editor->addError(base + skin_error_line());
@ -338,7 +338,7 @@ void SkinDocument::save()
}
fout.open(QFile::WriteOnly);
fout.write(editor->document()->toPlainText().toAscii());
fout.write(editor->document()->toPlainText().toLatin1());
fout.close();
saved = editor->document()->toPlainText();
@ -372,7 +372,7 @@ void SkinDocument::saveAs()
QFile fout(fileName);
fout.open(QFile::WriteOnly);
fout.write(editor->document()->toPlainText().toAscii());
fout.write(editor->document()->toPlainText().toLatin1());
fout.close();
saved = editor->document()->toPlainText();

14
utils/themeeditor/gui/skinhighlighter.cpp
View file

@ -63,7 +63,7 @@ void SkinHighlighter::highlightBlock(const QString& text)
if(text.length() - i < 2)
return;
if(find_escape_character(text[i + 1].toAscii()))
if(find_escape_character(text[i + 1].toLatin1()))
{
/* Checking for escaped characters */
@ -82,8 +82,8 @@ void SkinHighlighter::highlightBlock(const QString& text)
if(text.length() - i >= 3)
{
lookup[0] = text[i + 1].toAscii();
lookup[1] = text[i + 2].toAscii();
lookup[0] = text[i + 1].toLatin1();
lookup[1] = text[i + 2].toLatin1();
found = find_tag(lookup);
}
@ -96,7 +96,7 @@ void SkinHighlighter::highlightBlock(const QString& text)
else
{
lookup[1] = '\0';
lookup[0] = text[i + 1].toAscii();
lookup[0] = text[i + 1].toLatin1();
found = find_tag(lookup);
if(found)
@ -121,8 +121,8 @@ void SkinHighlighter::highlightBlock(const QString& text)
if(text.length() - i >= 4)
{
lookup[0] = text[i + 2].toAscii();
lookup[1] = text[i + 3].toAscii();
lookup[0] = text[i + 2].toLatin1();
lookup[1] = text[i + 3].toLatin1();
found = find_tag(lookup);
}
@ -135,7 +135,7 @@ void SkinHighlighter::highlightBlock(const QString& text)
else
{
lookup[1] = '\0';
lookup[0] = text[i + 2].toAscii();
lookup[0] = text[i + 2].toLatin1();
found = find_tag(lookup);