summaryrefslogtreecommitdiffstats
path: root/src/core/type_conversion.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/type_conversion.h')
-rw-r--r--src/core/type_conversion.h19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h
index d88fce42f..0da8a6931 100644
--- a/src/core/type_conversion.h
+++ b/src/core/type_conversion.h
@@ -39,7 +39,7 @@ class X509Certificate;
namespace QtWebEngineCore {
-#if defined(OS_WIN)
+#if defined(Q_OS_WIN)
inline QString toQt(const std::wstring &string)
{
return QString::fromStdWString(string);
@@ -58,11 +58,21 @@ inline QString toQt(const absl::optional<std::u16string> &string)
return QString::fromStdU16String(*string);
}
+inline QString toQString(const base::StringPiece &string)
+{
+ return QString::fromUtf8(string.data(), string.size());
+}
+
inline QString toQString(const std::string &string)
{
return QString::fromStdString(string);
}
+inline QByteArray toQByteArray(const base::StringPiece &string)
+{
+ return QByteArray(string.data(), string.size());
+}
+
inline QByteArray toQByteArray(const std::string &string)
{
return QByteArray::fromStdString(string);
@@ -169,6 +179,11 @@ inline QSizeF toQt(const gfx::SizeF &size)
return QSizeF(size.width(), size.height());
}
+inline QSize toQt(const SkISize &size)
+{
+ return QSize(size.width(), size.height());
+}
+
inline QColor toQt(const SkColor &c)
{
return QColor(SkColorGetR(c), SkColorGetG(c), SkColorGetB(c), SkColorGetA(c));
@@ -215,7 +230,7 @@ inline QNetworkCookie toQt(const net::CanonicalCookie & cookie)
inline base::FilePath::StringType toFilePathString(const QString &str)
{
-#if defined(OS_WIN)
+#if defined(Q_OS_WIN)
return QDir::toNativeSeparators(str).toStdWString();
#else
return str.toStdString();