2006-08-28 Nikolas Zimmermann <zimmermann@kde.org>

        Reviewed and landed by ap.

        Fixes one chunk of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10604
        Offer QString -> DeprecatedString conversion.

        * platform/DeprecatedString.h:
        * platform/qt/StringQt.cpp:
        (WebCore::DeprecatedString::DeprecatedString):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16078 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ad6f70a7a26fda2c53fcc76e06bb6ba5b32dfac2..c0955e10947e71cb6b78f7cabb8aecdeae66c372 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2006-08-28  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed and landed by ap.
+
+        Fixes one chunk of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10604
+        Offer QString -> DeprecatedString conversion.
+
+        * platform/DeprecatedString.h:
+        * platform/qt/StringQt.cpp:
+        (WebCore::DeprecatedString::DeprecatedString):
+
 2006-08-28  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Tim Hatcher.

diff --git a/WebCore/platform/DeprecatedString.h b/WebCore/platform/DeprecatedString.h
index 345ce82ff84daf8c56bf5e1d8b70ec44cf2ac967..3211070f2fe3cd74ad83b1512d928ebd4335e455 100644 (file)
--- a/WebCore/platform/DeprecatedString.h
+++ b/WebCore/platform/DeprecatedString.h
@@ -253,6 +253,7 @@ public:
     operator KJS::UString() const;
 
 #if PLATFORM(QT)
+    DeprecatedString(const QString&);
     operator QString() const;
 #endif
 

diff --git a/WebCore/platform/qt/StringQt.cpp b/WebCore/platform/qt/StringQt.cpp
index 34b43d73842d04e58126303933674eaf73c7aedd..a9d72f5dbb7075f554474e7f680e57e69fb0709a 100644 (file)
--- a/WebCore/platform/qt/StringQt.cpp
+++ b/WebCore/platform/qt/StringQt.cpp
@@ -32,6 +32,7 @@
 
 namespace WebCore {
 
+// String conversions
 String::String(const QString& qstr)
 {
     unsigned int len = qstr.length();
@@ -51,6 +52,17 @@ String::operator QString() const
     return QString(reinterpret_cast<const QChar*>(characters()), length());
 }
 
+// DeprecatedString conversions
+DeprecatedString::DeprecatedString(const QString& qstr)
+{
+    if (qstr.isNull()) {
+        (*this) = DeprecatedString::null;
+    } else {
+        QByteArray utf8Data = qstr.toUtf8();
+        (*this) = DeprecatedString::fromUtf8(utf8Data.data(), utf8Data.length());
+    }
+}
+
 DeprecatedString::operator QString() const
 {
     return QString(reinterpret_cast<const QChar*>(unicode()), length());