Changeset 64965 in webkit


Ignore:
Timestamp:
Aug 8, 2010 10:47:58 PM (14 years ago)
Author:
ariya@webkit.org
Message:

2010-08-08 Ariya Hidayat <​ariya@sencha.com>

Reviewed by Antonio Gomes.

Inconsistent Qt version checks
​https://bugs.webkit.org/show_bug.cgi?id=43695

Use QT_VERSION_CHECK macro instead of encoded hex.

  • Api/qgraphicswebview.cpp: (QGraphicsWebView::QGraphicsWebView): (QGraphicsWebViewPrivate::detachCurrentPage):
  • Api/qwebframe.cpp: (QWebFrame::load):
  • Api/qwebpage.cpp: (QWebPagePrivate::QWebPagePrivate): (QWebPagePrivate::inputMethodEvent): (QWebPage::inputMethodQuery): (QWebPage::view):
  • Api/qwebview.cpp: (QWebViewPrivate::detachCurrentPage):
  • WebCoreSupport/EditorClientQt.cpp: (WebCore::EditorClientQt::setInputMethodState):
  • WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::createPlugin):
  • WebCoreSupport/PageClientQt.cpp:
  • WebCoreSupport/PageClientQt.h:
Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r64964 r64965  
     12010-08-08  Ariya Hidayat  <ariya@sencha.com>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        Inconsistent Qt version checks
     6        https://bugs.webkit.org/show_bug.cgi?id=43695
     7
     8        Use QT_VERSION_CHECK macro instead of encoded hex.
     9
     10        * platform/graphics/qt/ImageBufferQt.cpp:
     11        (WebCore::getImageData):
     12        * platform/network/qt/NetworkStateNotifierPrivate.h:
     13        * platform/network/qt/NetworkStateNotifierQt.cpp:
     14        * platform/network/qt/QNetworkReplyHandler.cpp:
     15        (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
     16        (WebCore::QNetworkReplyHandler::start):
     17        * platform/qt/RenderThemeQt.cpp:
     18        (WebCore::RenderThemeQt::paintMediaSliderTrack):
     19
    1202010-08-08  Csaba Osztrogonác  <ossy@webkit.org>
    221

  • trunk/WebCore/platform/graphics/qt/ImageBufferQt.cpp

    r64202 r64965  
    182182
    183183    const int bytesPerLine = image.bytesPerLine();
    184 #if QT_VERSION >= 0x040700
     184#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
    185185    const uchar* bits = image.constBits();
    186186#else

  • trunk/WebCore/platform/network/qt/NetworkStateNotifierPrivate.h

    r57819 r64965  
    2323#include <QObject>
    2424
    25 #if QT_VERSION < 0x040700
     25#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)
    2626namespace QtMobility {
    2727class QNetworkConfigurationManager;
    … …  
    4747
    4848public:
    49 #if QT_VERSION < 0x040700
     49#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)
    5050    QtMobility::QNetworkConfigurationManager* m_configurationManager;
    5151#else

  • trunk/WebCore/platform/network/qt/NetworkStateNotifierQt.cpp

    r58662 r64965  
    2626#include "qnetworkconfigmanager.h"
    2727
    28 #if QT_VERSION < 0x040700
     28#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)
    2929using namespace QtMobility;
    3030#endif

  • trunk/WebCore/platform/network/qt/QNetworkReplyHandler.cpp

    r63332 r64965  
    161161    else if (r.httpMethod() == "PUT")
    162162        m_method = QNetworkAccessManager::PutOperation;
    163 #if QT_VERSION >= 0x040600
     163#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    164164    else if (r.httpMethod() == "DELETE")
    165165        m_method = QNetworkAccessManager::DeleteOperation;
    166166#endif
    167 #if QT_VERSION >= 0x040700
     167#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
    168168    else if (r.httpMethod() == "OPTIONS")
    169169        m_method = QNetworkAccessManager::CustomOperation;
    … …  
    457457            break;
    458458        }
    459 #if QT_VERSION >= 0x040600
     459#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    460460        case QNetworkAccessManager::DeleteOperation: {
    461461            m_reply = manager->deleteResource(m_request);
    … …  
    463463        }
    464464#endif
    465 #if QT_VERSION >= 0x040700
     465#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
    466466        case QNetworkAccessManager::CustomOperation:
    467467            m_reply = manager->sendCustomRequest(m_request, m_resourceHandle->firstRequest().httpMethod().latin1().data());

  • trunk/WebCore/platform/qt/RenderThemeQt.cpp

    r63571 r64965  
    12031203    paintMediaBackground(p.painter, r);
    12041204
    1205 #if QT_VERSION >= 0x040700
     1205#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
    12061206    if (MediaPlayer* player = mediaElement->player()) {
    12071207        // Get the buffered parts of the media

  • trunk/WebKit/qt/Api/qgraphicswebview.cpp

    r64284 r64965  
    242242    , d(new QGraphicsWebViewPrivate(this))
    243243{
    244 #if QT_VERSION >= 0x040600
     244#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    245245    setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true);
    246246#endif
    … …  
    418418        return;
    419419
    420 #if QT_VERSION >= 0x040600
     420#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    421421    page->d->view.clear();
    422422#else

  • trunk/WebKit/qt/Api/qwebframe.cpp

    r64679 r64965  
    755755            request.setHTTPMethod("POST");
    756756            break;
    757 #if QT_VERSION >= 0x040600
     757#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    758758        case QNetworkAccessManager::DeleteOperation:
    759759            request.setHTTPMethod("DELETE");

  • trunk/WebKit/qt/Api/qwebpage.cpp

    r64401 r64965  
    253253    : q(qq)
    254254    , client(0)
    255 #if QT_VERSION < 0x040600
     255#if QT_VERSION < QT_VERSION_CHECK(4, 6, 0)
    256256    , view(0)
    257257#endif
    … …  
    11321132    WebCore::Frame *frame = page->focusController()->focusedOrMainFrame();
    11331133    WebCore::Editor *editor = frame->editor();
    1134 #if QT_VERSION >= 0x040600
     1134#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    11351135    QInputMethodEvent::Attribute selection(QInputMethodEvent::Selection, 0, 0, QVariant());
    11361136#endif
    … …  
    11731173            break;
    11741174        }
    1175 #if QT_VERSION >= 0x040600
     1175#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    11761176        case QInputMethodEvent::Selection: {
    11771177            selection = a;
    … …  
    11911191        // 4. otherwise event is updating supplied pre-edit text
    11921192        QString preedit = ev->preeditString();
    1193 #if QT_VERSION >= 0x040600
     1193#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    11941194        if (hasSelection) {
    11951195            QString text = (renderTextControl) ? QString(renderTextControl->text()) : QString();
    … …  
    14741474
    14751475        }
    1476 #if QT_VERSION >= 0x040600
     1476#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    14771477        case Qt::ImAnchorPosition: {
    14781478            if (renderTextControl) {
    … …  
    19791979QWidget *QWebPage::view() const
    19801980{
    1981 #if QT_VERSION < 0x040600
     1981#if QT_VERSION < QT_VERSION_CHECK(4, 6, 0)
    19821982    return d->view;
    19831983#else

  • trunk/WebKit/qt/Api/qwebview.cpp

    r64284 r64965  
    350350
    351351    if (page) {
    352 #if QT_VERSION >= 0x040600
     352#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    353353        page->d->view.clear();
    354354#else

  • trunk/WebKit/qt/ChangeLog

    r64861 r64965  
     12010-08-08  Ariya Hidayat  <ariya@sencha.com>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        Inconsistent Qt version checks
     6        https://bugs.webkit.org/show_bug.cgi?id=43695
     7
     8        Use QT_VERSION_CHECK macro instead of encoded hex.
     9
     10        * Api/qgraphicswebview.cpp:
     11        (QGraphicsWebView::QGraphicsWebView):
     12        (QGraphicsWebViewPrivate::detachCurrentPage):
     13        * Api/qwebframe.cpp:
     14        (QWebFrame::load):
     15        * Api/qwebpage.cpp:
     16        (QWebPagePrivate::QWebPagePrivate):
     17        (QWebPagePrivate::inputMethodEvent):
     18        (QWebPage::inputMethodQuery):
     19        (QWebPage::view):
     20        * Api/qwebview.cpp:
     21        (QWebViewPrivate::detachCurrentPage):
     22        * WebCoreSupport/EditorClientQt.cpp:
     23        (WebCore::EditorClientQt::setInputMethodState):
     24        * WebCoreSupport/FrameLoaderClientQt.cpp:
     25        (WebCore::FrameLoaderClientQt::createPlugin):
     26        * WebCoreSupport/PageClientQt.cpp:
     27        * WebCoreSupport/PageClientQt.h:
     28
    1292010-08-06  Jessie Berlin  <jberlin@apple.com>
    230

  • trunk/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

    r64737 r64965  
    596596    QWebPageClient* webPageClient = m_page->d->client;
    597597    if (webPageClient) {
    598 #if QT_VERSION >= 0x040600
     598#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    599599        Qt::InputMethodHints hints;
    600600

  • trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r64036 r64965  
    13221322};
    13231323
    1324 #if QT_VERSION >= 0x040600
     1324#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    13251325class QtPluginGraphicsWidget: public Widget
    13261326{
    … …  
    14401440                return w;
    14411441            }
    1442 #if QT_VERSION >= 0x040600
     1442#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    14431443            QGraphicsWidget* graphicsWidget = qobject_cast<QGraphicsWidget*>(object);
    14441444            if (graphicsWidget) {

  • trunk/WebKit/qt/WebCoreSupport/PageClientQt.cpp

    r64737 r64965  
    4949}
    5050
    51 #if QT_VERSION >= 0x040600
     51#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    5252void PageClientQWidget::setInputMethodHints(Qt::InputMethodHints hints)
    5353{
    … …  
    230230}
    231231
    232 #if QT_VERSION >= 0x040600
     232#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    233233void PageClientQGraphicsWidget::setInputMethodHints(Qt::InputMethodHints hints)
    234234{

  • trunk/WebKit/qt/WebCoreSupport/PageClientQt.h

    r64737 r64965  
    5959    virtual void setInputMethodEnabled(bool enable);
    6060    virtual bool inputMethodEnabled() const;
    61 #if QT_VERSION >= 0x040600
     61#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    6262    virtual void setInputMethodHints(Qt::InputMethodHints hints);
    6363#endif
    … …  
    147147    virtual void setInputMethodEnabled(bool enable);
    148148    virtual bool inputMethodEnabled() const;
    149 #if QT_VERSION >= 0x040600
     149#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
    150150    virtual void setInputMethodHints(Qt::InputMethodHints hints);
    151151#endif
Note: See TracChangeset for help on using the changeset viewer.