From fa330c109dcf3399b5fdc27b188c0bafbb6e6016 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Thu, 3 Sep 2020 18:33:12 +0200 Subject: themeeditor: Make it compile with current Qt5. - 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 --- utils/themeeditor/graphics/rbscreen.cpp | 8 ++++---- utils/themeeditor/gui/configdocument.cpp | 10 +++++----- utils/themeeditor/gui/editorwindow.cpp | 2 +- utils/themeeditor/gui/preferencesdialog.cpp | 6 +++--- utils/themeeditor/gui/projectexporter.cpp | 2 +- utils/themeeditor/gui/skindocument.cpp | 16 ++++++++-------- utils/themeeditor/gui/skinhighlighter.cpp | 14 +++++++------- utils/themeeditor/main.cpp | 2 +- utils/themeeditor/models/parsetreemodel.cpp | 8 ++++---- utils/themeeditor/themeeditor.pro | 2 +- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/utils/themeeditor/graphics/rbscreen.cpp b/utils/themeeditor/graphics/rbscreen.cpp index b01552cc44..2e814a084f 100644 --- a/utils/themeeditor/graphics/rbscreen.cpp +++ b/utils/themeeditor/graphics/rbscreen.cpp @@ -227,7 +227,7 @@ void RBScreen::makeCustomUI(QString id) void RBScreen::endSbsRender() { - sbsChildren = children(); + sbsChildren = childItems(); QList keys = fonts.keys(); for(QList::iterator i = keys.begin(); i != keys.end(); i++) @@ -259,7 +259,7 @@ QColor RBScreen::stringToColor(QString str, QColor fallback) { for(int i = 0; i < 6; i++) { - char c = str[i].toAscii(); + char c = str[i].toLatin1(); if(!((c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F') || isdigit(c))) { @@ -274,9 +274,9 @@ QColor RBScreen::stringToColor(QString str, QColor fallback) } else if(str.length() == 1) { - if(isdigit(str[0].toAscii()) && str[0].toAscii() <= '3') + if(isdigit(str[0].toLatin1()) && str[0].toLatin1() <= '3') { - int shade = 255 * (str[0].toAscii() - '0') / 3; + int shade = 255 * (str[0].toLatin1() - '0') / 3; retval = QColor(shade, shade, shade); } else diff --git a/utils/themeeditor/gui/configdocument.cpp b/utils/themeeditor/gui/configdocument.cpp index aaea3aa1e2..0083899770 100644 --- a/utils/themeeditor/gui/configdocument.cpp +++ b/utils/themeeditor/gui/configdocument.cpp @@ -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 bg = settings.value("bgColor", Qt::white).value(); + QColor fg = settings.value("fgColor", QColor(Qt::black)).value(); + QColor bg = settings.value("bgColor", QColor(Qt::white)).value(); 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 highlight = settings.value("errorColor", QColor(Qt::red)).value(); editor->setErrorColor(highlight); /* Setting the font */ diff --git a/utils/themeeditor/gui/editorwindow.cpp b/utils/themeeditor/gui/editorwindow.cpp index 71b0c07405..89c9d670aa 100644 --- a/utils/themeeditor/gui/editorwindow.cpp +++ b/utils/themeeditor/gui/editorwindow.cpp @@ -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(); } diff --git a/utils/themeeditor/gui/preferencesdialog.cpp b/utils/themeeditor/gui/preferencesdialog.cpp index 2c4acaee84..4ab6fdadcc 100644 --- a/utils/themeeditor/gui/preferencesdialog.cpp +++ b/utils/themeeditor/gui/preferencesdialog.cpp @@ -85,13 +85,13 @@ void PreferencesDialog::loadColors() /* Buttons from the editor group */ settings.beginGroup("SkinDocument"); - fgColor = settings.value("fgColor", Qt::black).value(); + fgColor = settings.value("fgColor", QColor(Qt::black)).value(); setButtonColor(ui->fgButton, fgColor); - bgColor = settings.value("bgColor", Qt::white).value(); + bgColor = settings.value("bgColor", QColor(Qt::white)).value(); setButtonColor(ui->bgButton, bgColor); - errorColor = settings.value("errorColor", Qt::red).value(); + errorColor = settings.value("errorColor", QColor(Qt::red)).value(); setButtonColor(ui->errorButton, errorColor); settings.endGroup(); diff --git a/utils/themeeditor/gui/projectexporter.cpp b/utils/themeeditor/gui/projectexporter.cpp index 35fa90d060..ae47758dcf 100644 --- a/utils/themeeditor/gui/projectexporter.cpp +++ b/utils/themeeditor/gui/projectexporter.cpp @@ -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()); diff --git a/utils/themeeditor/gui/skindocument.cpp b/utils/themeeditor/gui/skindocument.cpp index 1ee6b6e7ee..807478807d 100644 --- a/utils/themeeditor/gui/skindocument.cpp +++ b/utils/themeeditor/gui/skindocument.cpp @@ -197,14 +197,14 @@ void SkinDocument::settingsChanged() QSettings settings; settings.beginGroup("SkinDocument"); - QColor fg = settings.value("fgColor", Qt::black).value(); - QColor bg = settings.value("bgColor", Qt::white).value(); + QColor fg = settings.value("fgColor", QColor(Qt::black)).value(); + QColor bg = settings.value("bgColor", QColor(Qt::white)).value(); 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 highlight = settings.value("errorColor", QColor(Qt::red)).value(); 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(); diff --git a/utils/themeeditor/gui/skinhighlighter.cpp b/utils/themeeditor/gui/skinhighlighter.cpp index 92475dc5fd..9236cce2b6 100644 --- a/utils/themeeditor/gui/skinhighlighter.cpp +++ b/utils/themeeditor/gui/skinhighlighter.cpp @@ -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); diff --git a/utils/themeeditor/main.cpp b/utils/themeeditor/main.cpp index 5dc52a0b88..1a082759e7 100644 --- a/utils/themeeditor/main.cpp +++ b/utils/themeeditor/main.cpp @@ -21,7 +21,7 @@ #include "editorwindow.h" -#include +#include int main(int argc, char* argv[]) { diff --git a/utils/themeeditor/models/parsetreemodel.cpp b/utils/themeeditor/models/parsetreemodel.cpp index 37ec9b01da..cc1e9777bd 100644 --- a/utils/themeeditor/models/parsetreemodel.cpp +++ b/utils/themeeditor/models/parsetreemodel.cpp @@ -242,7 +242,7 @@ bool ParseTreeModel::setData(const QModelIndex &index, const QVariant &value, free(param->data.text); param->type = skin_tag_parameter::STRING; - param->data.text = strdup(value.toString().trimmed().toAscii()); + param->data.text = strdup(value.toString().trimmed().toLatin1()); } else if(tolower(param->type_code) == 'i') { @@ -265,7 +265,7 @@ bool ParseTreeModel::setData(const QModelIndex &index, const QVariant &value, return false; free(element->data); - element->data = strdup(value.toString().trimmed().toAscii()); + element->data = strdup(value.toString().trimmed().toLatin1()); } emit dataChanged(index, index); @@ -330,7 +330,7 @@ RBScene* ParseTreeModel::render(ProjectModel* project, if(sbsModel) sbsModel->deleteLater(); - sbsModel = new ParseTreeModel(QString(sbs.readAll()).toAscii()); + sbsModel = new ParseTreeModel(QString(sbs.readAll()).toLatin1()); if(sbsModel->root != 0) { @@ -391,7 +391,7 @@ void ParseTreeModel::setChildrenUnselectable(QGraphicsItem *root) root->setFlag(QGraphicsItem::ItemIsSelectable, false); root->setFlag(QGraphicsItem::ItemIsMovable, false); - QList children = root->children(); + QList children = root->childItems(); for(QList::iterator i = children.begin() ; i != children.end(); i++) setChildrenUnselectable(*i); diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro index a7db28c7e9..b7795555d3 100644 --- a/utils/themeeditor/themeeditor.pro +++ b/utils/themeeditor/themeeditor.pro @@ -8,7 +8,7 @@ CONFIG(debug) { } # Adding network support -QT += network +QT += network widgets # Enabling profiling QMAKE_CXXFLAGS_DEBUG += -pg -- cgit v1.2.3