Utils: Rename most FilePath::{from,to}Variant uses to {from,to}Settings

Specifies the main purpose more clearly. The remaining ones a "true"
(internal) variants in models and as action data.

Change-Id: I8dd3c846e419f29d88283c2f48268ef6685b19fe
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-01-03 12:31:52 +01:00
parent ca4af940b1
commit 66c08a824d
59 changed files with 154 additions and 139 deletions

View File

@@ -168,6 +168,11 @@ QFileInfo FilePath::toFileInfo() const
return QFileInfo(toFSPathString());
}
FilePath FilePath::fromVariant(const QVariant &variant)
{
return fromSettings(variant); // FIXME: Use variant.value<FilePath>()
}
FilePath FilePath::fromParts(const QStringView scheme, const QStringView host, const QStringView path)
{
FilePath result;
@@ -989,7 +994,7 @@ FilePath FilePath::fromUtf8(const char *filename, int filenameSize)
return FilePath::fromString(QString::fromUtf8(filename, filenameSize));
}
FilePath FilePath::fromVariant(const QVariant &variant)
FilePath FilePath::fromSettings(const QVariant &variant)
{
if (variant.type() == QVariant::Url) {
const QUrl url = variant.toUrl();
@@ -998,11 +1003,17 @@ FilePath FilePath::fromVariant(const QVariant &variant)
return FilePath::fromUserInput(variant.toString());
}
QVariant FilePath::toVariant() const
QVariant FilePath::toSettings() const
{
return toString();
}
QVariant FilePath::toVariant() const
{
// FIXME: Use qVariantFromValue
return toSettings();
}
/*!
\returns whether FilePath is a child of \a s
*/