diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-02 12:35:21 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-12-02 09:18:39 +0100 |
| commit | 4f285f7b2a1316bbad6e74258305613933f574c8 (patch) | |
| tree | 5e4cc05334c25dc5a99915c5f314db9e86bb4906 /src/core/type_conversion.h | |
| parent | da019632bfc0227e2d0d0cc676a80a352fc27a62 (diff) | |
Adaptations for Chromium 91
Change-Id: Ie0236697615fd67e4f53df3dca013ce39628cc29
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/type_conversion.h')
| -rw-r--r-- | src/core/type_conversion.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h index 9bf0416a9..c9f2b1473 100644 --- a/src/core/type_conversion.h +++ b/src/core/type_conversion.h @@ -49,7 +49,6 @@ #include <QRect> #include <QString> #include <QUrl> -#include <base/strings/nullable_string16.h> #include "base/files/file_path.h" #include "base/time/time.h" #include "net/cookies/canonical_cookie.h" @@ -77,7 +76,7 @@ class X509Certificate; namespace QtWebEngineCore { -inline QString toQt(const base::string16 &string) +inline QString toQt(const std::u16string &string) { #if defined(OS_WIN) return QString::fromStdWString(string); @@ -86,7 +85,7 @@ inline QString toQt(const base::string16 &string) #endif } -inline QString toQt(const base::Optional<base::string16> &string) +inline QString toQt(const base::Optional<std::u16string> &string) { if (!string.has_value()) return QString(); @@ -113,21 +112,16 @@ inline QString toQt(const std::string &string) return toQString(string); } -inline base::string16 toString16(const QString &qString) +inline std::u16string toString16(const QString &qString) { #if defined(OS_WIN) - return base::string16(qString.toStdWString()); + return std::u16string(qString.toStdWString()); #else - return base::string16((const char16_t *)qString.utf16()); + return std::u16string((const char16_t *)qString.utf16()); #endif } -inline base::NullableString16 toNullableString16(const QString &qString) -{ - return base::NullableString16(toString16(qString), qString.isNull()); -} - -inline base::Optional<base::string16> toOptionalString16(const QString &qString) +inline base::Optional<std::u16string> toOptionalString16(const QString &qString) { if (qString.isNull()) return base::nullopt; @@ -264,7 +258,7 @@ inline base::FilePath toFilePath(const QString &str) int flagsFromModifiers(Qt::KeyboardModifiers modifiers); -inline QStringList fromVector(const std::vector<base::string16> &vector) +inline QStringList fromVector(const std::vector<std::u16string> &vector) { QStringList result; for (auto s: vector) { |