Changeset 128051 in webkit


Ignore:
Timestamp:
Sep 10, 2012 6:08:13 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[Qt] Fix deprecation failures if QT_NO_DEPRECATED enabled
https://bugs.webkit.org/show_bug.cgi?id=96258

Patch by Kevin Funk <kevin.funk@kdab.com> on 2012-09-10
Reviewed by Simon Hausmann.

Sync with latest changes in Qt5.

Source/WebCore:

  • platform/qt/RenderThemeQt.cpp:
  • platform/qt/SharedTimerQt.cpp:

Source/WebKit2:

  • WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp:
  • WebProcess/qt/WebProcessQt.cpp:
Location:
trunk/Source
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r128049 r128051  
     12012-09-10  Kevin Funk  <kevin.funk@kdab.com>
     2
     3        [Qt] Fix deprecation failures if QT_NO_DEPRECATED enabled
     4        https://bugs.webkit.org/show_bug.cgi?id=96258
     5
     6        Reviewed by Simon Hausmann.
     7
     8        Sync with latest changes in Qt5.
     9
     10        * platform/qt/RenderThemeQt.cpp:
     11        * platform/qt/SharedTimerQt.cpp:
     12
    1132012-09-10  Christophe Dumez  <christophe.dumez@intel.com>
    214
  • trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp

    r127802 r128051  
    868868        string = QCoreApplication::translate("QWebPage", "%n file(s)",
    869869                                             "number of chosen file",
    870                                              QCoreApplication::DefaultCodec, n);
     870                                             n);
    871871    }
    872872
  • trunk/Source/WebCore/platform/qt/SharedTimerQt.cpp

    r125603 r128051  
    3434#include <QCoreApplication>
    3535#include <QDebug>
    36 #include <QWeakPointer>
     36#include <QPointer>
    3737#include <wtf/CurrentTime.h>
    3838
     
    8484SharedTimerQt* SharedTimerQt::inst()
    8585{
    86     static QWeakPointer<SharedTimerQt> timer;
     86    static QPointer<SharedTimerQt> timer;
    8787    if (!timer) {
    8888        timer = new SharedTimerQt();
  • trunk/Source/WebKit2/ChangeLog

    r128050 r128051  
     12012-09-10  Kevin Funk  <kevin.funk@kdab.com>
     2
     3        [Qt] Fix deprecation failures if QT_NO_DEPRECATED enabled
     4        https://bugs.webkit.org/show_bug.cgi?id=96258
     5
     6        Reviewed by Simon Hausmann.
     7
     8        Sync with latest changes in Qt5.
     9
     10        * WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp:
     11        * WebProcess/qt/WebProcessQt.cpp:
     12
    1132012-09-10  Carlos Garcia Campos  <cgarcia@igalia.com>
    214
  • trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp

    r117777 r128051  
    4040
    4141#if PLATFORM(QT)
     42#include <QPointer>
    4243#include <QSocketNotifier>
    43 #include <QWeakPointer>
    4444#elif PLATFORM(GTK)
    4545#include <glib.h>
     
    176176
    177177private:
    178     QWeakPointer<QSocketNotifier> const m_socketNotifier;
     178    QPointer<QSocketNotifier> const m_socketNotifier;
    179179};
    180180#endif
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp

    r97399 r128051  
    4444{
    4545    ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url().string(),
    46                                         QCoreApplication::translate("QWebFrame", "Request cancelled", 0, QCoreApplication::UnicodeUTF8));
     46                                        QCoreApplication::translate("QWebFrame", "Request cancelled"));
    4747    error.setIsCancellation(true);
    4848    return error;   
     
    5252{
    5353    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url().string(),
    54                          QCoreApplication::translate("QWebFrame", "Request blocked", 0, QCoreApplication::UnicodeUTF8));
     54                         QCoreApplication::translate("QWebFrame", "Request blocked"));
    5555}
    5656
     
    5858{
    5959    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url().string(),
    60                          QCoreApplication::translate("QWebFrame", "Cannot show URL", 0, QCoreApplication::UnicodeUTF8));
     60                         QCoreApplication::translate("QWebFrame", "Cannot show URL"));
    6161}
    6262
     
    6464{
    6565    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url().string(),
    66                          QCoreApplication::translate("QWebFrame", "Frame load interrupted by policy change", 0, QCoreApplication::UnicodeUTF8));
     66                         QCoreApplication::translate("QWebFrame", "Frame load interrupted by policy change"));
    6767}
    6868
     
    7070{
    7171    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url().string(),
    72                          QCoreApplication::translate("QWebFrame", "Cannot show mimetype", 0, QCoreApplication::UnicodeUTF8));
     72                         QCoreApplication::translate("QWebFrame", "Cannot show mimetype"));
    7373}
    7474
     
    7676{
    7777    return ResourceError("QtNetwork", QNetworkReply::ContentNotFoundError, response.url().string(),
    78                          QCoreApplication::translate("QWebFrame", "File does not exist", 0, QCoreApplication::UnicodeUTF8));
     78                         QCoreApplication::translate("QWebFrame", "File does not exist"));
    7979}
    8080
     
    8282{
    8383    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url().string(),
    84                          QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine", 0, QCoreApplication::UnicodeUTF8));
     84                         QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine"));
    8585}
    8686
  • trunk/Source/WebKit2/WebProcess/qt/QtNetworkReply.cpp

    r106355 r128051  
    7474
    7575    qint64 bytesRead = maxlen < m_bytesAvailable ? maxlen : m_bytesAvailable;
    76     if (qMemCopy(data, static_cast<char*>(m_sharedMemory->data()) + m_sharedMemorySize - m_bytesAvailable, bytesRead)) {
     76    if (memcpy(data, static_cast<char*>(m_sharedMemory->data()) + m_sharedMemorySize - m_bytesAvailable, bytesRead)) {
    7777        m_bytesAvailable -= bytesRead;
    7878        return bytesRead;
  • trunk/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp

    r126296 r128051  
    9999    // that tends to overestimate the memory quite a bit (1 byte misalignment ~ 48 MiB misestimation).
    100100    // We use 1024 * 1023 for now to keep the estimation error down to +/- ~1 MiB.
    101     uint64_t freeVolumeSpace = WebCore::getVolumeFreeSizeForPath(diskCache->cacheDirectory().toAscii().constData()) / 1024 / 1023;
     101    uint64_t freeVolumeSpace = WebCore::getVolumeFreeSizeForPath(diskCache->cacheDirectory().toLocal8Bit().constData()) / 1024 / 1023;
    102102
    103103    // The following variables are initialised to 0 because WebProcess::calculateCacheSizes might not
Note: See TracChangeset for help on using the changeset viewer.