From d2d818b08b58739005e763b29741be703e3dcfbd Mon Sep 17 00:00:00 2001
From: Gustavo Carneiro <gcarneiroa@hotmail.com>
Date: Thu, 4 Jun 2020 00:37:07 -0300
Subject: [PATCH] konsole: Convert depreciated QString::SkipEmptyParts and
 QButtonGroup::idClicked

Qt v5.15.0:
	Convert QString::SkipEmptyParts to Qt::SkipEmptyParts
	Convert QButtonGroup::buttonClicked to QButtonGroup::idClicked
---
 src/Application.cpp       | 4 ++++
 src/EditProfileDialog.cpp | 5 ++++-
 src/ProcessInfo.cpp       | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Application.cpp b/src/Application.cpp
index ed8baa433..460f9a2c9 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -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();
diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
index f93e9e166..868fa9f68 100644
--- a/src/EditProfileDialog.cpp
+++ b/src/EditProfileDialog.cpp
@@ -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);
diff --git a/src/ProcessInfo.cpp b/src/ProcessInfo.cpp
index f2865dee4..f754897b9 100644
--- a/src/ProcessInfo.cpp
+++ b/src/ProcessInfo.cpp
@@ -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) {