Changeset 141255 in webkit


Ignore:
Timestamp:
Jan 30, 2013 4:27:34 AM (11 years ago)
Author:
Simon Hausmann
Message:

[Qt] Remove QT4_UNICODE related code paths
​https://bugs.webkit.org/show_bug.cgi?id=108316

Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Get rid of QT4_UNICODE and any related code paths. The Qt port
requires Qt5 and ICU these days. This also allows for the removal
of TextCodecQt.

  • Target.pri:
  • platform/KURL.cpp:

(WebCore::appendEncodedHostname):

  • platform/graphics/SurrogatePairAwareTextIterator.cpp:

(WebCore::SurrogatePairAwareTextIterator::normalizeVoicingMarks):

  • platform/text/TextEncoding.cpp:

(WebCore::TextEncoding::encode):

  • platform/text/TextEncodingRegistry.cpp:

(WebCore::extendTextCodecMaps):

  • platform/text/qt/TextCodecQt.cpp: Removed.
  • platform/text/qt/TextCodecQt.h: Removed.

Source/WebKit/blackberry:

  • WebCoreSupport/AboutDataUseFeatures.in: The feature macro has been removed.

Source/WTF:

Get rid of QT4_UNICODE and any related code paths. The Qt port
requires Qt5 and ICU these days.

  • WTF.gypi:
  • WTF.pro:
  • wtf/unicode/Unicode.h:
  • wtf/unicode/qt4/UnicodeQt4.h: Removed.
Location:
trunk/Source
Files:
3 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r141219 r141255  
     12013-01-30  Simon Hausmann  <simon.hausmann@digia.com>
     2
     3        [Qt] Remove QT4_UNICODE related code paths
     4        https://bugs.webkit.org/show_bug.cgi?id=108316
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Get rid of QT4_UNICODE and any related code paths. The Qt port
     9        requires Qt5 and ICU these days.
     10
     11        * WTF.gypi:
     12        * WTF.pro:
     13        * wtf/unicode/Unicode.h:
     14        * wtf/unicode/qt4/UnicodeQt4.h: Removed.
     15
    1162013-01-29  Mark Lam  <mark.lam@apple.com>
    217

  • trunk/Source/WTF/WTF.gypi

    r139780 r141255  
    257257            'wtf/unicode/glib/UnicodeGLib.h',
    258258            'wtf/unicode/icu/CollatorICU.cpp',
    259             'wtf/unicode/qt4/UnicodeQt4.h',
    260259            'wtf/unicode/wchar/UnicodeWchar.cpp',
    261260            'wtf/unicode/wchar/UnicodeWchar.h',

  • trunk/Source/WTF/WTF.pro

    r139780 r141255  
    179179    unicode/Collator.h \
    180180    unicode/icu/UnicodeIcu.h \
    181     unicode/qt4/UnicodeQt4.h \
    182181    unicode/ScriptCodesFromICU.h \
    183182    unicode/Unicode.h \

  • trunk/Source/WTF/wtf/unicode/Unicode.h

    r124010 r141255  
    2929typedef unsigned char LChar;
    3030
    31 #if USE(QT4_UNICODE)
    32 #include "qt4/UnicodeQt4.h"
    33 #elif USE(ICU_UNICODE)
     31#if USE(ICU_UNICODE)
    3432#include <wtf/unicode/icu/UnicodeIcu.h>
    3533#elif USE(GLIB_UNICODE)

  • trunk/Source/WebCore/ChangeLog

    r141254 r141255  
     12013-01-30  Simon Hausmann  <simon.hausmann@digia.com>
     2
     3        [Qt] Remove QT4_UNICODE related code paths
     4        https://bugs.webkit.org/show_bug.cgi?id=108316
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Get rid of QT4_UNICODE and any related code paths. The Qt port
     9        requires Qt5 and ICU these days. This also allows for the removal
     10        of TextCodecQt.
     11
     12        * Target.pri:
     13        * platform/KURL.cpp:
     14        (WebCore::appendEncodedHostname):
     15        * platform/graphics/SurrogatePairAwareTextIterator.cpp:
     16        (WebCore::SurrogatePairAwareTextIterator::normalizeVoicingMarks):
     17        * platform/text/TextEncoding.cpp:
     18        (WebCore::TextEncoding::encode):
     19        * platform/text/TextEncodingRegistry.cpp:
     20        (WebCore::extendTextCodecMaps):
     21        * platform/text/qt/TextCodecQt.cpp: Removed.
     22        * platform/text/qt/TextCodecQt.h: Removed.
     23
    1242013-01-30  David Kilzer  <ddkilzer@apple.com>
    225

  • trunk/Source/WebCore/Target.pri

    r141219 r141255  
    23582358    platform/text/Hyphenation.h \
    23592359    platform/text/QuotedPrintable.h \
    2360     platform/text/qt/TextCodecQt.h \
    23612360    platform/text/RegularExpression.h \
    23622361    platform/text/SegmentedString.h \
    … …  
    29282927    platform/text/qt/TextBoundariesQt.cpp \
    29292928    platform/text/qt/TextBreakIteratorInternalICUQt.cpp \
    2930     platform/text/qt/TextCodecQt.cpp \
    29312929    platform/qt/WidgetQt.cpp
    29322930

  • trunk/Source/WebCore/platform/KURL.cpp

    r137573 r141255  
    4545#if USE(ICU_UNICODE)
    4646#include <unicode/uidna.h>
    47 #elif USE(QT4_UNICODE)
    48 #include <QUrl>
    4947#elif USE(GLIB_UNICODE)
    5048#include <glib.h>
    … …  
    14881486    if (error == U_ZERO_ERROR)
    14891487        buffer.append(hostnameBuffer, numCharactersConverted);
    1490 #elif USE(QT4_UNICODE)
    1491     QByteArray result = QUrl::toAce(String(str, strLen));
    1492     buffer.append(result.constData(), result.length());
    14931488#elif USE(GLIB_UNICODE)
    14941489    GOwnPtr<gchar> utf8Hostname;

  • trunk/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp

    r128504 r141255  
    9191        if (resultLength == 1 && !uStatus)
    9292            return normalizedCharacters[0];
    93 #elif USE(QT4_UNICODE)
    94         QString tmp(reinterpret_cast<const QChar*>(m_characters), 2);
    95         QString res = tmp.normalized(QString::NormalizationForm_C, QChar::Unicode_3_2);
    96         if (res.length() == 1)
    97             return res.at(0).unicode();
    9893#endif
    9994    }

  • trunk/Source/WebCore/platform/text/TextEncoding.cpp

    r127757 r141255  
    3838#if USE(ICU_UNICODE)
    3939#include <unicode/unorm.h>
    40 #elif USE(QT4_UNICODE)
    41 #include <QString>
    4240#elif USE(GLIB_UNICODE)
    4341#include <glib.h>
    … …  
    107105    }
    108106    return newTextCodec(*this)->encode(source, sourceLength, handling);
    109 #elif USE(QT4_UNICODE)
    110     QString str(reinterpret_cast<const QChar*>(characters), length);
    111     str = str.normalized(QString::NormalizationForm_C);
    112     return newTextCodec(*this)->encode(reinterpret_cast<const UChar *>(str.utf16()), str.length(), handling);
    113107#elif USE(GLIB_UNICODE)
    114108    GOwnPtr<char> UTF8Source;

  • trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp

    r130612 r141255  
    4646#include "TextCodecMac.h"
    4747#endif
    48 #if USE(QT4_UNICODE)
    49 #include "qt/TextCodecQt.h"
    50 #endif
    5148#if USE(GLIB_UNICODE)
    5249#include "gtk/TextCodecGtk.h"
    … …  
    297294#endif
    298295
    299 #if USE(QT4_UNICODE)
    300     TextCodecQt::registerEncodingNames(addToTextEncodingNameMap);
    301     TextCodecQt::registerCodecs(addToTextCodecMap);
    302 #endif
    303 
    304296#if PLATFORM(MAC)
    305297    TextCodecMac::registerEncodingNames(addToTextEncodingNameMap);

  • trunk/Source/WebKit/blackberry/ChangeLog

    r141202 r141255  
     12013-01-30  Simon Hausmann  <simon.hausmann@digia.com>
     2
     3        [Qt] Remove QT4_UNICODE related code paths
     4        https://bugs.webkit.org/show_bug.cgi?id=108316
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        * WebCoreSupport/AboutDataUseFeatures.in: The feature macro has been removed.
     9
    1102013-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
    211

  • trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataUseFeatures.in

    r133410 r141255  
    7777PTHREAD_GETSPECIFIC_DIRECT
    7878PTHREADS
    79 QT4_UNICODE
    8079QTKIT
    8180QT_MOBILE_THEME
Note: See TracChangeset for help on using the changeset viewer.