aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib/tools')
-rw-r--r--src/lib/corelib/tools/applecodesignutils.cpp12
-rw-r--r--src/lib/corelib/tools/commandechomode.cpp2
-rw-r--r--src/lib/corelib/tools/fileinfo.cpp10
-rw-r--r--src/lib/corelib/tools/id.cpp12
-rw-r--r--src/lib/corelib/tools/msvcinfo.cpp2
-rw-r--r--src/lib/corelib/tools/processutils.cpp12
-rw-r--r--src/lib/corelib/tools/profile.cpp4
-rw-r--r--src/lib/corelib/tools/scannerpluginmanager.cpp2
-rw-r--r--src/lib/corelib/tools/settings.cpp2
-rw-r--r--src/lib/corelib/tools/settings.h2
-rw-r--r--src/lib/corelib/tools/settingsmodel.cpp24
-rw-r--r--src/lib/corelib/tools/setupprojectparameters.cpp2
-rw-r--r--src/lib/corelib/tools/shellutils.cpp2
-rw-r--r--src/lib/corelib/tools/version.cpp4
-rw-r--r--src/lib/corelib/tools/vsenvironmentdetector.cpp6
15 files changed, 49 insertions, 49 deletions
diff --git a/src/lib/corelib/tools/applecodesignutils.cpp b/src/lib/corelib/tools/applecodesignutils.cpp
index f89fc7732..67c4f5238 100644
--- a/src/lib/corelib/tools/applecodesignutils.cpp
+++ b/src/lib/corelib/tools/applecodesignutils.cpp
@@ -58,17 +58,17 @@ QByteArray smimeMessageContent(const QByteArray &data)
{
QCFType<CMSDecoderRef> decoder = NULL;
if (CMSDecoderCreate(&decoder) != noErr)
- return QByteArray();
+ return {};
if (CMSDecoderUpdateMessage(decoder, data.constData(), data.size()) != noErr)
- return QByteArray();
+ return {};
if (CMSDecoderFinalizeMessage(decoder) != noErr)
- return QByteArray();
+ return {};
QCFType<CFDataRef> content = NULL;
if (CMSDecoderCopyContent(decoder, &content) != noErr)
- return QByteArray();
+ return {};
return QByteArray::fromCFData(content);
}
@@ -83,7 +83,7 @@ QVariantMap certificateInfo(const QByteArray &data)
for (const auto &extension : cert.extensions()) {
if (extension.name() == QStringLiteral("extendedKeyUsage")) {
if (!extension.value().toStringList().contains(QStringLiteral("Code Signing")))
- return QVariantMap();
+ return {};
}
}
@@ -120,7 +120,7 @@ QVariantMap identitiesProperties()
&kCFTypeDictionaryValueCallBacks);
QCFType<CFTypeRef> result = NULL;
if (SecItemCopyMatching(query, &result) != errSecSuccess)
- return QVariantMap();
+ return {};
QVariantMap items;
const auto tryAppend = [&](SecIdentityRef identity) {
diff --git a/src/lib/corelib/tools/commandechomode.cpp b/src/lib/corelib/tools/commandechomode.cpp
index aef9faa11..c47ddb5bc 100644
--- a/src/lib/corelib/tools/commandechomode.cpp
+++ b/src/lib/corelib/tools/commandechomode.cpp
@@ -74,7 +74,7 @@ QString commandEchoModeName(CommandEchoMode mode)
default:
break;
}
- return QString();
+ return {};
}
CommandEchoMode commandEchoModeFromName(const QString &name)
diff --git a/src/lib/corelib/tools/fileinfo.cpp b/src/lib/corelib/tools/fileinfo.cpp
index eb24fdd37..cec6b2660 100644
--- a/src/lib/corelib/tools/fileinfo.cpp
+++ b/src/lib/corelib/tools/fileinfo.cpp
@@ -107,7 +107,7 @@ QString FileInfo::completeSuffix(const QString &fp)
QString FileInfo::path(const QString &fp, HostOsInfo::HostOs hostOs)
{
if (fp.isEmpty())
- return QString();
+ return {};
int last = fp.lastIndexOf(QLatin1Char('/'));
if (last < 0)
return StringConstants::dot();
@@ -207,7 +207,7 @@ QString FileInfo::resolvePath(const QString &base, const QString &rel, HostOsInf
{
QBS_ASSERT(isAbsolute(base, hostOs) && !isCurrentDrivePath(rel, hostOs),
qDebug("base: %s, rel: %s", qPrintable(base), qPrintable(rel));
- return QString());
+ return {});
if (isAbsolute(rel, hostOs))
return rel;
if (rel.size() == 1 && rel.at(0) == QLatin1Char('.'))
@@ -324,7 +324,7 @@ FileTime FileInfo::lastModified() const
{
const FileTime::InternalType* ft_it;
ft_it = reinterpret_cast<const FileTime::InternalType*>(&z(m_stat)->ftLastWriteTime);
- return FileTime(*ft_it);
+ return {*ft_it};
}
FileTime FileInfo::lastStatusChange() const
@@ -453,7 +453,7 @@ static QByteArray storedLinkTarget(const QString &filePath)
if (lstat(nativeFilePath.constData(), &sb)) {
qWarning("storedLinkTarget: lstat for %s failed with error code %d",
nativeFilePath.constData(), errno);
- return QByteArray();
+ return {};
}
result.resize(sb.st_size);
@@ -461,7 +461,7 @@ static QByteArray storedLinkTarget(const QString &filePath)
if (len < 0) {
qWarning("storedLinkTarget: readlink for %s failed with error code %d",
nativeFilePath.constData(), errno);
- return QByteArray();
+ return {};
}
if (len < sb.st_size) {
diff --git a/src/lib/corelib/tools/id.cpp b/src/lib/corelib/tools/id.cpp
index 1c61792e6..9d31d3776 100644
--- a/src/lib/corelib/tools/id.cpp
+++ b/src/lib/corelib/tools/id.cpp
@@ -214,7 +214,7 @@ QString Id::toString() const
QVariant Id::toSetting() const
{
- return QVariant(QString::fromUtf8(getStringFromId(m_id)));
+ return QString::fromUtf8(getStringFromId(m_id));
}
/*!
@@ -227,8 +227,8 @@ Id Id::fromSetting(const QVariant &variant)
{
const QByteArray ba = variant.toString().toUtf8();
if (ba.isEmpty())
- return Id();
- return Id(theId(ba));
+ return {};
+ return {theId(ba)};
}
/*!
@@ -242,7 +242,7 @@ Id Id::fromSetting(const QVariant &variant)
Id Id::withSuffix(int suffix) const
{
const QByteArray ba = name() + QByteArray::number(suffix);
- return Id(ba.constData());
+ return {ba.constData()};
}
/*!
@@ -252,7 +252,7 @@ Id Id::withSuffix(int suffix) const
Id Id::withSuffix(const char *suffix) const
{
const QByteArray ba = name() + suffix;
- return Id(ba.constData());
+ return {ba.constData()};
}
/*!
@@ -266,7 +266,7 @@ Id Id::withSuffix(const char *suffix) const
Id Id::withPrefix(const char *prefix) const
{
const QByteArray ba = prefix + name();
- return Id(ba.constData());
+ return {ba.constData()};
}
bool Id::operator==(const char *name) const
diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp
index 313cf802c..f51ba8ba2 100644
--- a/src/lib/corelib/tools/msvcinfo.cpp
+++ b/src/lib/corelib/tools/msvcinfo.cpp
@@ -192,7 +192,7 @@ static QVariantMap getMsvcDefines(const QString &compilerFilePath,
Q_UNUSED(compilerFilePath);
Q_UNUSED(compilerEnv);
Q_UNUSED(language);
- return QVariantMap();
+ return {};
#endif
}
diff --git a/src/lib/corelib/tools/processutils.cpp b/src/lib/corelib/tools/processutils.cpp
index 58a082fa5..060a0577e 100644
--- a/src/lib/corelib/tools/processutils.cpp
+++ b/src/lib/corelib/tools/processutils.cpp
@@ -69,12 +69,12 @@ QString processNameByPid(qint64 pid)
#if defined(Q_OS_WIN)
HANDLE hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, DWORD(pid));
if (!hProcess)
- return QString();
+ return {};
wchar_t buf[UNICODE_STRING_MAX_CHARS];
const DWORD length = GetModuleFileNameEx(hProcess, NULL, buf, sizeof(buf) / sizeof(wchar_t));
CloseHandle(hProcess);
if (!length)
- return QString();
+ return {};
QString name = QString::fromWCharArray(buf, length);
int i = name.lastIndexOf(QLatin1Char('\\'));
if (i >= 0)
@@ -109,22 +109,22 @@ QString processNameByPid(qint64 pid)
u_int mib_len = sizeof(mib)/sizeof(u_int);
if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0)
- return QString();
+ return {};
# if defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD)
if (kp.p_pid != pid)
- return QString();
+ return {};
QString name = QFile::decodeName(kp.p_comm);
# else
if (kp.ki_pid != pid)
- return QString();
+ return {};
QString name = QFile::decodeName(kp.ki_comm);
# endif
return name;
#else
Q_UNUSED(pid);
- return QString();
+ return {};
#endif
}
diff --git a/src/lib/corelib/tools/profile.cpp b/src/lib/corelib/tools/profile.cpp
index 3ace77d4d..7e594fd2d 100644
--- a/src/lib/corelib/tools/profile.cpp
+++ b/src/lib/corelib/tools/profile.cpp
@@ -88,7 +88,7 @@ QVariant Profile::value(const QString &key, const QVariant &defaultValue, ErrorI
} catch (const ErrorInfo &e) {
if (error)
*error = e;
- return QVariant();
+ return {};
}
}
@@ -132,7 +132,7 @@ QStringList Profile::allKeys(KeySelection selection, ErrorInfo *error) const
} catch (const ErrorInfo &e) {
if (error)
*error = e;
- return QStringList();
+ return {};
}
}
diff --git a/src/lib/corelib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp
index e4f39b26f..d6b564832 100644
--- a/src/lib/corelib/tools/scannerpluginmanager.cpp
+++ b/src/lib/corelib/tools/scannerpluginmanager.cpp
@@ -71,7 +71,7 @@ std::vector<ScannerPlugin *> ScannerPluginManager::scannersForFileTag(const File
auto it = instance()->d->scannerPlugins.find(fileTag);
if (it != instance()->d->scannerPlugins.cend())
return it->second;
- return { };
+ return {};
}
void ScannerPluginManager::registerPlugins(ScannerPlugin **plugins)
diff --git a/src/lib/corelib/tools/settings.cpp b/src/lib/corelib/tools/settings.cpp
index 3b3d173f8..f2902aed4 100644
--- a/src/lib/corelib/tools/settings.cpp
+++ b/src/lib/corelib/tools/settings.cpp
@@ -69,7 +69,7 @@ static QString defaultSystemSettingsBaseDir()
case HostOsInfo::HostOsOtherUnix:
return QStringLiteral("/etc/xdg");
default:
- return QString();
+ return {};
}
}
diff --git a/src/lib/corelib/tools/settings.h b/src/lib/corelib/tools/settings.h
index d0676a072..2748e6890 100644
--- a/src/lib/corelib/tools/settings.h
+++ b/src/lib/corelib/tools/settings.h
@@ -63,7 +63,7 @@ public:
enum Scope { UserScope = 0x1, SystemScope = 0x2 };
Q_DECLARE_FLAGS(Scopes, Scope)
- static Scopes allScopes() { return Scopes{UserScope, SystemScope}; }
+ static Scopes allScopes() { return {UserScope, SystemScope}; }
QVariant value(const QString &key, Scopes scopes,
const QVariant &defaultValue = QVariant()) const;
diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp
index bbfa71ead..4a90773eb 100644
--- a/src/lib/corelib/tools/settingsmodel.cpp
+++ b/src/lib/corelib/tools/settingsmodel.cpp
@@ -207,7 +207,7 @@ void SettingsModel::setAdditionalProperties(const QVariantMap &properties)
Qt::ItemFlags SettingsModel::flags(const QModelIndex &index) const
{
if (!index.isValid())
- return Qt::ItemFlags();
+ return Qt::NoItemFlags;
const Qt::ItemFlags flags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
if (index.column() == keyColumn()) {
if (d->editable)
@@ -217,25 +217,25 @@ Qt::ItemFlags SettingsModel::flags(const QModelIndex &index) const
if (index.column() == valueColumn()) {
const Node * const node = d->indexToNode(index);
if (!node)
- return Qt::ItemFlags();
+ return Qt::NoItemFlags;
// Only leaf nodes have values.
return d->editable && node->children.empty() ? flags | Qt::ItemIsEditable : flags;
}
- return Qt::ItemFlags();
+ return {};
}
QVariant SettingsModel::headerData(int section, Qt::Orientation orientation, int role) const
{
if (orientation != Qt::Horizontal)
- return QVariant();
+ return {};
if (role != Qt::DisplayRole)
- return QVariant();
+ return {};
if (section == keyColumn())
return tr("Key");
if (section == valueColumn())
return tr("Value");
- return QVariant();
+ return {};
}
int SettingsModel::columnCount(const QModelIndex &parent) const
@@ -256,22 +256,22 @@ int SettingsModel::rowCount(const QModelIndex &parent) const
QVariant SettingsModel::data(const QModelIndex &index, int role) const
{
if (role != Qt::DisplayRole && role != Qt::EditRole && role != Qt::ForegroundRole)
- return QVariant();
+ return {};
const Node * const node = d->indexToNode(index);
if (!node)
- return QVariant();
+ return {};
if (role == Qt::ForegroundRole) {
#ifdef QT_GUI_LIB
if (index.column() == valueColumn() && !node->isFromSettings)
return QBrush(Qt::red);
#endif
- return QVariant();
+ return {};
}
if (index.column() == keyColumn())
return node->name;
if (index.column() == valueColumn() && node->children.empty())
return node->value;
- return QVariant();
+ return {};
}
bool SettingsModel::setData(const QModelIndex &index, const QVariant &value, int role)
@@ -306,7 +306,7 @@ QModelIndex SettingsModel::index(int row, int column, const QModelIndex &parent)
const Node * const parentNode = d->indexToNode(parent);
Q_ASSERT(parentNode);
if (parentNode->children.size() <= row)
- return QModelIndex();
+ return {};
return createIndex(row, column, parentNode->children.at(row));
}
@@ -316,7 +316,7 @@ QModelIndex SettingsModel::parent(const QModelIndex &child) const
Q_ASSERT(childNode);
Node * const parentNode = childNode->parent;
if (parentNode == &d->rootNode)
- return QModelIndex();
+ return {};
const Node * const grandParentNode = parentNode->parent;
Q_ASSERT(grandParentNode);
return createIndex(grandParentNode->children.indexOf(parentNode), 0, parentNode);
diff --git a/src/lib/corelib/tools/setupprojectparameters.cpp b/src/lib/corelib/tools/setupprojectparameters.cpp
index 4d3271f98..6b13570d7 100644
--- a/src/lib/corelib/tools/setupprojectparameters.cpp
+++ b/src/lib/corelib/tools/setupprojectparameters.cpp
@@ -378,7 +378,7 @@ QVariantMap SetupProjectParameters::expandedBuildConfiguration(const Profile &pr
} catch (const ErrorInfo &err) {
if (errorInfo)
*errorInfo = err;
- return QVariantMap();
+ return {};
}
}
diff --git a/src/lib/corelib/tools/shellutils.cpp b/src/lib/corelib/tools/shellutils.cpp
index 233d2ef34..01c177cce 100644
--- a/src/lib/corelib/tools/shellutils.cpp
+++ b/src/lib/corelib/tools/shellutils.cpp
@@ -58,7 +58,7 @@ QString shellInterpreter(const QString &filePath) {
}
}
- return QString();
+ return {};
}
// isSpecialChar, hasSpecialChars, shellQuoteUnix, shellQuoteWin:
diff --git a/src/lib/corelib/tools/version.cpp b/src/lib/corelib/tools/version.cpp
index 264c44c29..ccc9dd799 100644
--- a/src/lib/corelib/tools/version.cpp
+++ b/src/lib/corelib/tools/version.cpp
@@ -97,12 +97,12 @@ Version Version::fromString(const QString &versionString, bool buildNumberAllowe
pattern += QStringLiteral("(?:-(\\d+))?"); // And possibly a dash followed by the build number.
QRegExp rex(pattern);
if (!rex.exactMatch(versionString))
- return Version();
+ return Version{};
const int majorNr = rex.cap(1).toInt();
const int minorNr = rex.captureCount() >= 2 ? rex.cap(2).toInt() : 0;
const int patchNr = rex.captureCount() >= 3 ? rex.cap(3).toInt() : 0;
const int buildNr = rex.captureCount() >= 4 ? rex.cap(4).toInt() : 0;
- return Version(majorNr, minorNr, patchNr, buildNr);
+ return Version{majorNr, minorNr, patchNr, buildNr};
}
QString Version::toString() const
diff --git a/src/lib/corelib/tools/vsenvironmentdetector.cpp b/src/lib/corelib/tools/vsenvironmentdetector.cpp
index 08a9cb1e6..b91a8ff74 100644
--- a/src/lib/corelib/tools/vsenvironmentdetector.cpp
+++ b/src/lib/corelib/tools/vsenvironmentdetector.cpp
@@ -66,7 +66,7 @@ static QString windowsSystem32Path()
if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_SYSTEM, NULL, 0, str)))
return QString::fromUtf16(reinterpret_cast<ushort*>(str));
#endif
- return QString();
+ return {};
}
VsEnvironmentDetector::VsEnvironmentDetector()
@@ -114,7 +114,7 @@ QString VsEnvironmentDetector::findVcVarsAllBat(const MSVC &msvc,
QDir dir(msvc.vcInstallPath);
for (;;) {
if (!dir.cdUp())
- return QString();
+ return {};
if (dir.dirName() == QLatin1String("VC"))
break;
}
@@ -131,7 +131,7 @@ QString VsEnvironmentDetector::findVcVarsAllBat(const MSVC &msvc,
return fullPath;
else
searchedPaths.push_back(fullPath);
- return QString();
+ return {};
}
bool VsEnvironmentDetector::startDetection(const std::vector<MSVC *> &compatibleMSVCs)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 21:48:32 +0000