Fix uninitialized variable warning in konsole_globalaccel.cpp

The compiler may produce a false positive -Wconditional-uninitialized compiler warning.
wilder
Vlad Zahorodnii 4 years ago
parent eb834ca2f7
commit cc279b7dbd
  1. 10
      kconf_update/konsole_globalaccel.cpp

@ -7,6 +7,8 @@
#include <KGlobalAccel> #include <KGlobalAccel>
#include <KService> #include <KService>
#include <optional>
static void migrateShortcut(const QString &desktopFile, const QList<QKeySequence> &shortcuts) static void migrateShortcut(const QString &desktopFile, const QList<QKeySequence> &shortcuts)
{ {
const KService::Ptr service = KService::serviceByStorageId(desktopFile); const KService::Ptr service = KService::serviceByStorageId(desktopFile);
@ -26,24 +28,22 @@ int main(int argc, char **argv)
KConfig khotkeysrc(QStringLiteral("khotkeysrc"), KConfig::SimpleConfig); KConfig khotkeysrc(QStringLiteral("khotkeysrc"), KConfig::SimpleConfig);
const int dataCount = KConfigGroup(&khotkeysrc, "Data").readEntry("DataCount", 0); const int dataCount = KConfigGroup(&khotkeysrc, "Data").readEntry("DataCount", 0);
bool foundKmenuedit = false; std::optional<int> kmenueditIndex = std::nullopt;
int kmenueditIndex;
KConfigGroup kmenueditGroup; KConfigGroup kmenueditGroup;
for (int i = 1; i <= dataCount; ++i) { for (int i = 1; i <= dataCount; ++i) {
kmenueditGroup = KConfigGroup(&khotkeysrc, QStringLiteral("Data_%1").arg(i)); kmenueditGroup = KConfigGroup(&khotkeysrc, QStringLiteral("Data_%1").arg(i));
if (kmenueditGroup.readEntry("Name") == QLatin1String("KMenuEdit")) { if (kmenueditGroup.readEntry("Name") == QLatin1String("KMenuEdit")) {
foundKmenuedit = true;
kmenueditIndex = i; kmenueditIndex = i;
break; break;
} }
} }
if (!foundKmenuedit) { if (!kmenueditIndex.has_value()) {
return 0; return 0;
} }
const int shortcutCount = kmenueditGroup.readEntry("DataCount", 0); const int shortcutCount = kmenueditGroup.readEntry("DataCount", 0);
for (int i = 1; i <= shortcutCount; ++i) { for (int i = 1; i <= shortcutCount; ++i) {
const QString groupName = QStringLiteral("Data_%1_%2").arg(kmenueditIndex).arg(i); const QString groupName = QStringLiteral("Data_%1_%2").arg(kmenueditIndex.value()).arg(i);
if (KConfigGroup(&khotkeysrc, groupName).readEntry("Type") == QLatin1String("MENUENTRY_SHORTCUT_ACTION_DATA")) { if (KConfigGroup(&khotkeysrc, groupName).readEntry("Type") == QLatin1String("MENUENTRY_SHORTCUT_ACTION_DATA")) {
const QString desktopFile = KConfigGroup(&khotkeysrc, groupName + QStringLiteral("Actions0")).readEntry("CommandURL"); const QString desktopFile = KConfigGroup(&khotkeysrc, groupName + QStringLiteral("Actions0")).readEntry("CommandURL");
if (desktopFile == QLatin1String("org.kde.konsole.desktop")) { if (desktopFile == QLatin1String("org.kde.konsole.desktop")) {

Loading…
Cancel
Save