diff --git a/CMakeLists.txt b/CMakeLists.txt index 36e166a..6a2cbe9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,7 +187,7 @@ include(BasicConfig) # find qtutilities if (WIDGETS_GUI OR QUICK_GUI) - find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.1.0 REQUIRED) + find_package(qtutilities${CONFIGURATION_PACKAGE_SUFFIX} 6.3.0 REQUIRED) use_qt_utilities() endif () diff --git a/gui/notificationlabel.cpp b/gui/notificationlabel.cpp index 5ec1c03..e2519b9 100644 --- a/gui/notificationlabel.cpp +++ b/gui/notificationlabel.cpp @@ -39,7 +39,11 @@ void NotificationLabel::paintEvent(QPaintEvent *event) { QStyle *style = QWidget::style(); QStyleOption option; +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) + option.initFrom(this); +#else option.init(this); +#endif int iconSize = option.rect.height() > m_maxIconSize ? m_maxIconSize : option.rect.height(); QRect pixmapRect(option.rect.x(), option.rect.y(), iconSize, iconSize); pixmapRect.moveCenter(QRect(option.rect.x(), option.rect.y(), iconSize, option.rect.height()).center()); diff --git a/gui/tageditorwidget.cpp b/gui/tageditorwidget.cpp index 65ca8ed..03a7796 100644 --- a/gui/tageditorwidget.cpp +++ b/gui/tageditorwidget.cpp @@ -31,6 +31,7 @@ #include #include +#include #include #include #include diff --git a/misc/utility.cpp b/misc/utility.cpp index c4d346b..95464d1 100644 --- a/misc/utility.cpp +++ b/misc/utility.cpp @@ -9,6 +9,8 @@ #include #include +#include + #include #include #include @@ -82,7 +84,8 @@ QString dataToQString(const char *data, size_t dataSize, TagTextEncoding encodin #else case TagTextEncoding::Utf16BigEndian: #endif - return QString::fromUtf16(reinterpret_cast(data), static_cast(dataSize / (sizeof(ushort) / sizeof(char)))); + return QString::fromUtf16( + reinterpret_cast(data), static_cast(dataSize / (sizeof(ushort) / sizeof(char)))); default:; } @@ -93,8 +96,8 @@ QString dataToQString(const char *data, size_t dataSize, TagTextEncoding encodin "UTF-16BE", #endif data, dataSize, 2.0f); - return QString::fromUtf16( - reinterpret_cast(utf16Data.first.get()), static_cast(utf16Data.second / (sizeof(ushort) / sizeof(char)))); + return QString::fromUtf16(reinterpret_cast(utf16Data.first.get()), + static_cast(utf16Data.second / (sizeof(ushort) / sizeof(char)))); } QString stringToQString(const string &value, TagTextEncoding textEncoding) @@ -174,7 +177,7 @@ QString formatName(const QString &str, bool underscoreToWhitespace) res += ' '; } else if (whitespace) { if (i) { - auto rest = str.midRef(i); + auto rest = QtUtilities::midRef(str, i); static const char *const connectingWords[] = { "the ", "a ", "an ", "of ", "or ", "and ", "in ", "to ", "at ", "on ", "as " }; for (const char *word : connectingWords) { if (rest.startsWith(QLatin1String(word), Qt::CaseInsensitive)) { @@ -235,11 +238,11 @@ void parseFileName(const QString &fileName, QString &title, int &trackNumber) int delimIndex = title.indexOf(delim); while (delimIndex > lastDelimIndex) { bool ok = false; - trackNumber = title.midRef(lastDelimIndex, delimIndex - lastDelimIndex).toInt(&ok); + trackNumber = QtUtilities::midRef(title, lastDelimIndex, delimIndex - lastDelimIndex).toInt(&ok); if (ok) { int titleStart = delimIndex + delim.size(); for (const auto &delim : delims) { - if (title.midRef(titleStart).startsWith(delim)) { + if (QtUtilities::midRef(title, titleStart).startsWith(delim)) { titleStart += delim.size(); break; }