diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-09-03 18:33:12 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-09-03 18:45:48 +0200 |
commit | fa330c109dcf3399b5fdc27b188c0bafbb6e6016 (patch) | |
tree | e9e96d7f507404e4936ef681f03630aa1e3affae /utils/themeeditor/graphics/rbscreen.cpp | |
parent | ff38666a19b09169b1a7cf1f0eda20374bc390de (diff) | |
download | rockbox-fa330c109dcf3399b5fdc27b188c0bafbb6e6016.tar.gz rockbox-fa330c109dcf3399b5fdc27b188c0bafbb6e6016.zip |
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
Diffstat (limited to 'utils/themeeditor/graphics/rbscreen.cpp')
-rw-r--r-- | utils/themeeditor/graphics/rbscreen.cpp | 8 |
1 files changed, 4 insertions, 4 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) | |||
227 | 227 | ||
228 | void RBScreen::endSbsRender() | 228 | void RBScreen::endSbsRender() |
229 | { | 229 | { |
230 | sbsChildren = children(); | 230 | sbsChildren = childItems(); |
231 | 231 | ||
232 | QList<int> keys = fonts.keys(); | 232 | QList<int> keys = fonts.keys(); |
233 | for(QList<int>::iterator i = keys.begin(); i != keys.end(); i++) | 233 | for(QList<int>::iterator i = keys.begin(); i != keys.end(); i++) |
@@ -259,7 +259,7 @@ QColor RBScreen::stringToColor(QString str, QColor fallback) | |||
259 | { | 259 | { |
260 | for(int i = 0; i < 6; i++) | 260 | for(int i = 0; i < 6; i++) |
261 | { | 261 | { |
262 | char c = str[i].toAscii(); | 262 | char c = str[i].toLatin1(); |
263 | if(!((c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F') || | 263 | if(!((c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F') || |
264 | isdigit(c))) | 264 | isdigit(c))) |
265 | { | 265 | { |
@@ -274,9 +274,9 @@ QColor RBScreen::stringToColor(QString str, QColor fallback) | |||
274 | } | 274 | } |
275 | else if(str.length() == 1) | 275 | else if(str.length() == 1) |
276 | { | 276 | { |
277 | if(isdigit(str[0].toAscii()) && str[0].toAscii() <= '3') | 277 | if(isdigit(str[0].toLatin1()) && str[0].toLatin1() <= '3') |
278 | { | 278 | { |
279 | int shade = 255 * (str[0].toAscii() - '0') / 3; | 279 | int shade = 255 * (str[0].toLatin1() - '0') / 3; |
280 | retval = QColor(shade, shade, shade); | 280 | retval = QColor(shade, shade, shade); |
281 | } | 281 | } |
282 | else | 282 | else |