aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/kconfig.cpp6
-rw-r--r--src/core/kconfiggroup.cpp2
-rw-r--r--src/core/kconfigini.cpp4
-rw-r--r--src/gui/kstandardshortcut.cpp4
-rw-r--r--src/kconfig_compiler/kconfig_compiler.cpp24
5 files changed, 20 insertions, 20 deletions
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index ad52da9b..e0e73b8b 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -390,7 +390,7 @@ QMap<QString, QString> KConfig::entryMap(const QString &aGroup) const
const QByteArray theGroup(aGroup.isEmpty() ? "<default>" : aGroup.toUtf8());
const KEntryMapConstIterator theEnd = d->entryMap.constEnd();
- KEntryMapConstIterator it = d->entryMap.findEntry(theGroup, 0, 0);
+ KEntryMapConstIterator it = d->entryMap.findEntry(theGroup, nullptr, nullptr);
if (it != theEnd) {
++it; // advance past the special group entry marker
@@ -833,7 +833,7 @@ bool KConfig::isImmutable() const
bool KConfig::isGroupImmutableImpl(const QByteArray &aGroup) const
{
Q_D(const KConfig);
- return isImmutable() || d->entryMap.getEntryOption(aGroup, 0, 0, KEntryMap::EntryImmutable);
+ return isImmutable() || d->entryMap.getEntryOption(aGroup, nullptr, nullptr, KEntryMap::EntryImmutable);
}
#ifndef KDE_NO_DEPRECATED
@@ -864,7 +864,7 @@ const KConfigGroup KConfig::groupImpl(const QByteArray &group) const
KEntryMap::EntryOptions convertToOptions(KConfig::WriteConfigFlags flags)
{
- KEntryMap::EntryOptions options = 0;
+ KEntryMap::EntryOptions options = nullptr;
if (flags & KConfig::Persistent) {
options |= KEntryMap::EntryDirty;
diff --git a/src/core/kconfiggroup.cpp b/src/core/kconfiggroup.cpp
index 700e579c..8cee2474 100644
--- a/src/core/kconfiggroup.cpp
+++ b/src/core/kconfiggroup.cpp
@@ -653,7 +653,7 @@ QString KConfigGroup::readEntryUntranslated(const char *key, const QString &aDef
{
Q_ASSERT_X(isValid(), "KConfigGroup::readEntryUntranslated", "accessing an invalid group");
- QString result = config()->d_func()->lookupData(d->fullName(), key, KEntryMap::SearchFlags(), 0);
+ QString result = config()->d_func()->lookupData(d->fullName(), key, KEntryMap::SearchFlags(), nullptr);
if (result.isNull()) {
return aDefault;
}
diff --git a/src/core/kconfigini.cpp b/src/core/kconfigini.cpp
index 3d0af962..d4262778 100644
--- a/src/core/kconfigini.cpp
+++ b/src/core/kconfigini.cpp
@@ -166,7 +166,7 @@ KConfigIniBackend::parseConfig(const QByteArray &currentLocale, KEntryMap &entry
} while ((start = end + 2) <= line.length() && line.at(end + 1) == '[');
currentGroup = newGroup;
- groupSkip = entryMap.getEntryOption(currentGroup, 0, 0, KEntryMap::EntryImmutable);
+ groupSkip = entryMap.getEntryOption(currentGroup, nullptr, nullptr, KEntryMap::EntryImmutable);
if (groupSkip && !bDefault) {
continue;
@@ -199,7 +199,7 @@ KConfigIniBackend::parseConfig(const QByteArray &currentLocale, KEntryMap &entry
continue;
}
- KEntryMap::EntryOptions entryOptions = 0;
+ KEntryMap::EntryOptions entryOptions = nullptr;
if (groupOptionImmutable) {
entryOptions |= KEntryMap::EntryImmutable;
}
diff --git a/src/gui/kstandardshortcut.cpp b/src/gui/kstandardshortcut.cpp
index 92eb0913..9e7b1cfc 100644
--- a/src/gui/kstandardshortcut.cpp
+++ b/src/gui/kstandardshortcut.cpp
@@ -69,7 +69,7 @@ struct KStandardShortcutInfo {
// Read the comments of the big enum in kstandardshortcut.h before you change anything!
static KStandardShortcutInfo g_infoStandardShortcut[] = {
//Group File,
- { AccelNone, 0, {0, 0}, 0, 0, QList<QKeySequence>(), false },
+ { AccelNone, nullptr, {nullptr, nullptr}, 0, 0, QList<QKeySequence>(), false },
{ Open, "Open", QT_TRANSLATE_NOOP3("KStandardShortcut", "Open", "@action"), CTRL(O), 0, QList<QKeySequence>(), false },
{ New, "New", QT_TRANSLATE_NOOP3("KStandardShortcut", "New", "@action"), CTRL(N), 0, QList<QKeySequence>(), false },
{ Close, "Close", QT_TRANSLATE_NOOP3("KStandardShortcut", "Close", "@action"), CTRL(W), CTRL(Escape), QList<QKeySequence>(), false },
@@ -170,7 +170,7 @@ static KStandardShortcutInfo g_infoStandardShortcut[] = {
{ Donate, "Donate", QT_TRANSLATE_NOOP3("KStandardShortcut", "Donate", "@action"), 0, 0, QList<QKeySequence>(), false },
//dummy entry to catch simple off-by-one errors. Insert new entries before this line.
- { AccelNone, 0, {0, 0}, 0, 0, QList<QKeySequence>(), false }
+ { AccelNone, nullptr, {nullptr, nullptr}, 0, 0, QList<QKeySequence>(), false }
};
/** Search for the KStandardShortcutInfo object associated with the given @p id.
diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp
index c836252f..8346de2b 100644
--- a/src/kconfig_compiler/kconfig_compiler.cpp
+++ b/src/kconfig_compiler/kconfig_compiler.cpp
@@ -776,11 +776,11 @@ CfgEntry *parseEntry(const QString &group, const QDomElement &element, const Cfg
paramType = e.attribute(QStringLiteral("type"));
if (param.isEmpty()) {
cerr << "Parameter must have a name: " << dumpNode(e) << endl;
- return 0;
+ return nullptr;
}
if (paramType.isEmpty()) {
cerr << "Parameter must have a type: " << dumpNode(e) << endl;
- return 0;
+ return nullptr;
}
if ((paramType == QLatin1String("Int")) || (paramType == QLatin1String("UInt"))) {
bool ok;
@@ -788,7 +788,7 @@ CfgEntry *parseEntry(const QString &group, const QDomElement &element, const Cfg
if (!ok) {
cerr << "Integer parameter must have a maximum (e.g. max=\"0\"): "
<< dumpNode(e) << endl;
- return 0;
+ return nullptr;
}
} else if (paramType == QLatin1String("Enum")) {
for (QDomElement e2 = e.firstChildElement(); !e2.isNull(); e2 = e2.nextSiblingElement()) {
@@ -804,13 +804,13 @@ CfgEntry *parseEntry(const QString &group, const QDomElement &element, const Cfg
if (paramValues.isEmpty()) {
cerr << "No values specified for parameter '" << param
<< "'." << endl;
- return 0;
+ return nullptr;
}
paramMax = paramValues.count() - 1;
} else {
cerr << "Parameter '" << param << "' has type " << paramType
<< " but must be of type int, uint or Enum." << endl;
- return 0;
+ return nullptr;
}
} else if (tag == QLatin1String("default")) {
if (e.attribute(QStringLiteral("param")).isEmpty()) {
@@ -866,7 +866,7 @@ CfgEntry *parseEntry(const QString &group, const QDomElement &element, const Cfg
bool nameIsEmpty = name.isEmpty();
if (nameIsEmpty && key.isEmpty()) {
cerr << "Entry must have a name or a key: " << dumpNode(element) << endl;
- return 0;
+ return nullptr;
}
if (key.isEmpty()) {
@@ -884,12 +884,12 @@ CfgEntry *parseEntry(const QString &group, const QDomElement &element, const Cfg
if (name.contains(QStringLiteral("$("))) {
if (param.isEmpty()) {
cerr << "Name may not be parameterized: " << name << endl;
- return 0;
+ return nullptr;
}
} else {
if (!param.isEmpty()) {
cerr << "Name must contain '$(" << param << ")': " << name << endl;
- return 0;
+ return nullptr;
}
}
@@ -924,13 +924,13 @@ CfgEntry *parseEntry(const QString &group, const QDomElement &element, const Cfg
i = paramValues.indexOf(index);
if (i == -1) {
cerr << "Index '" << index << "' for default value is unknown." << endl;
- return 0;
+ return nullptr;
}
}
if ((i < 0) || (i > paramMax)) {
cerr << "Index '" << i << "' for default value is out of range [0, " << paramMax << "]." << endl;
- return 0;
+ return nullptr;
}
QString tmpDefaultValue = e.text();
@@ -951,7 +951,7 @@ CfgEntry *parseEntry(const QString &group, const QDomElement &element, const Cfg
else {
cerr << "The name '" << name << "' is not a valid name for an entry." << endl;
}
- return 0;
+ return nullptr;
}
if (allNames.contains(name)) {
@@ -961,7 +961,7 @@ CfgEntry *parseEntry(const QString &group, const QDomElement &element, const Cfg
else {
cerr << "The name '" << name << "' is not unique." << endl;
}
- return 0;
+ return nullptr;
}
allNames.append(name);
generated by cgit v1.2.1 (git 2.18.0) at 2025-10-31 12:18:08 +0000