kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix deprecated warning QString::SplitBehavior

Browse Source 
enum QString::SplitBehavior This enum is obsolete.

Use Qt::SplitBehavior instead.
This enum was introduced or modified in Qt 5.14.
This commit is contained in:
Simon De Backer
2020-06-09 22:41:01 +02:00
committed by Laurent Trinques
parent 2570108caf
commit 2ec018a4e9
6 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/titleblocktemplate.cpp
View File

@@ -334,8 +334,12 @@ void TitleBlockTemplate::parseRows(const QString &rows_string) {
// parse the rows attribute: we expect a serie of absolute heights
QRegExp row_size_format("^([0-9]+)(?:px)?$", Qt::CaseInsensitive);
bool conv_ok;
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove
QStringList rows_descriptions = rows_string.split(QChar(';'), QString::SkipEmptyParts);
#else
QStringList rows_descriptions = rows_string.split(QChar(';'), Qt::SkipEmptyParts);
#endif
foreach (QString rows_description, rows_descriptions) {
if (row_size_format.exactMatch(rows_description)) {
int row_size = row_size_format.capturedTexts().at(1).toInt(&conv_ok);
@@ -357,8 +361,12 @@ void TitleBlockTemplate::parseColumns(const QString &cols_string) {
QRegExp abs_col_size_format("^([0-9]+)(?:px)?$", Qt::CaseInsensitive);
QRegExp rel_col_size_format("^([rt])([0-9]+)%$", Qt::CaseInsensitive);
bool conv_ok;
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove
QStringList cols_descriptions = cols_string.split(QChar(';'), QString::SkipEmptyParts);
#else
QStringList cols_descriptions = cols_string.split(QChar(';'), Qt::SkipEmptyParts);
#endif
foreach (QString cols_description, cols_descriptions) {
if (abs_col_size_format.exactMatch(cols_description)) {
int col_size = abs_col_size_format.capturedTexts().at(1).toInt(&conv_ok);