Code drop from //branches/cupcake/...@124589

1 files changed, 5 insertions, 3 deletions

diff --git a/WebCore/platform/text/qt/TextCodecQt.cpp b/WebCore/platform/text/qt/TextCodecQt.cpp
index 888c6af..0f385dd 100644
--- a/WebCore/platform/text/qt/TextCodecQt.cpp
+++ b/WebCore/platform/text/qt/TextCodecQt.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2006 Lars Knoll <lars@trolltech.com>
+ * Copyright (C) 2008 Holger Hans Peter Freyther
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -91,9 +92,10 @@ TextCodecQt::~TextCodecQt()
 }
 
 
-String TextCodecQt::decode(const char* bytes, size_t length, bool flush)
+String TextCodecQt::decode(const char* bytes, size_t length, bool flush, bool /*stopOnError*/, bool& sawError)
 {
     QString unicode = m_codec->toUnicode(bytes, length, &m_state);
+    sawError = m_state.invalidChars != 0;
 
     if (flush) {
         m_state.flags = QTextCodec::DefaultConversion;
@@ -104,12 +106,12 @@ String TextCodecQt::decode(const char* bytes, size_t length, bool flush)
     return unicode;
 }
 
-CString TextCodecQt::encode(const UChar* characters, size_t length, bool allowEntities)
+CString TextCodecQt::encode(const UChar* characters, size_t length, UnencodableHandling)
 {
     if (!length)
         return "";
 
-    // FIXME: do something sensible with allowEntities
+    // FIXME: do something sensible with UnencodableHandling
 
     QByteArray ba = m_codec->fromUnicode(reinterpret_cast<const QChar*>(characters), length, 0);
     return CString(ba.constData(), ba.length());