From 513927424f8b9775e531181567fe4e454234d19a Mon Sep 17 00:00:00 2001 From: plc-user <74435298+plc-user@users.noreply.github.com> Date: Sun, 2 Mar 2025 08:48:19 +0100 Subject: [PATCH] bordertitleblock: use same code for Qt5 & Qt6 for "numbering" rows --- sources/bordertitleblock.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sources/bordertitleblock.cpp b/sources/bordertitleblock.cpp index 7a5c42020..7c744c810 100644 --- a/sources/bordertitleblock.cpp +++ b/sources/bordertitleblock.cpp @@ -941,19 +941,12 @@ QString BorderTitleBlock::incrementLetters(const QString &string) { } else { // separate previous digits from last digit // separe les digits precedents du dernier digit - QString first_digits(string.left(string.count() - 1)); - QChar last_digit(string.at(string.count() - 1)); + QString first_digits(string.left(string.length() - 1)); + char last_digit(string.at(string.length() - 1).unicode()); if (last_digit != 'Z') { // increments the last digit // incremente le dernier digit -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove - last_digit = last_digit.toLatin1() + 1; -#else -# if TODO_LIST -# pragma message("@TODO remove code for QT 6 or later") -# endif - qDebug() << "Help code for QT 6 or later"; -#endif + last_digit = (char)(string[string.length()-1].unicode()) + 1; return(first_digits + QString(last_digit)); } else { return(incrementLetters(first_digits) + "A");