Commit d2d818b0 authored by Gustavo Carneiro's avatar Gustavo Carneiro Committed by Kurt Hindenburg
Browse files

konsole: Convert depreciated QString::SkipEmptyParts and QButtonGroup::idClicked

Qt v5.15.0:
	Convert QString::SkipEmptyParts to Qt::SkipEmptyParts
	Convert QButtonGroup::buttonClicked to QButtonGroup::idClicked
parent d86b0547
......@@ -303,7 +303,11 @@ bool Application::processTabsFromFileArgs(MainWindow *window)
}
QHash<QString, QString> lineTokens;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
QStringList lineParts = lineString.split(QStringLiteral(";;"), Qt::SkipEmptyParts);
#else
QStringList lineParts = lineString.split(QStringLiteral(";;"), QString::SkipEmptyParts);
#endif
for (int i = 0; i < lineParts.size(); ++i) {
QString key = lineParts.at(i).section(QLatin1Char(':'), 0, 0).trimmed().toLower();
......
......@@ -1539,8 +1539,11 @@ void EditProfileDialog::setupButtonGroup(const ButtonGroupOptions &options, cons
activeButton = options.buttons[0].button;
}
activeButton->setChecked(true);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
connect(options.group, QOverload<int>::of(&QButtonGroup::idClicked),
#else
connect(options.group, QOverload<int>::of(&QButtonGroup::buttonClicked),
#endif
this, [this, options](int value) {
if (options.preview) {
preview(options.profileProperty, value);
......
......@@ -481,7 +481,11 @@ private:
}
} while (!statusLine.isNull() && uidLine.isNull());
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
uidStrings << uidLine.split(QLatin1Char('\t'), Qt::SkipEmptyParts);
#else
uidStrings << uidLine.split(QLatin1Char('\t'), QString::SkipEmptyParts);
#endif
// Must be 5 entries: 'Uid: %d %d %d %d' and
// uid string must be less than 5 chars (uint)
if (uidStrings.size() == 5) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment