From 45411b453d553abee71e61938c3e87af043cd044 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 10 Oct 2016 18:44:09 +0300 Subject: Added missing Q_DECL_OVERRIDEs to QtWebKitWidgets headers Change-Id: I2ab9287f17155b18f8caee3866d4125d4451a078 Reviewed-by: Allan Sandfeld Jensen --- Source/WebKit/qt/WidgetApi/qgraphicswebview.h | 54 +++++++++++------------ Source/WebKit/qt/WidgetApi/qwebframe.h | 2 +- Source/WebKit/qt/WidgetApi/qwebinspector.h | 12 ++--- Source/WebKit/qt/WidgetApi/qwebpage.h | 2 +- Source/WebKit/qt/WidgetApi/qwebview.h | 48 ++++++++++---------- Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h | 32 +++++++------- 6 files changed, 75 insertions(+), 75 deletions(-) diff --git a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h index 0d990086f..1aa5b66c8 100644 --- a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h +++ b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h @@ -92,15 +92,15 @@ public: bool isTiledBackingStoreFrozen() const; void setTiledBackingStoreFrozen(bool frozen); - virtual void setGeometry(const QRectF& rect); - virtual void updateGeometry(); - virtual void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = Q_NULLPTR); - virtual QVariant itemChange(GraphicsItemChange change, const QVariant& value); - virtual bool event(QEvent*); + void setGeometry(const QRectF& rect) Q_DECL_OVERRIDE; + void updateGeometry() Q_DECL_OVERRIDE; + void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = Q_NULLPTR) Q_DECL_OVERRIDE; + QVariant itemChange(GraphicsItemChange change, const QVariant& value) Q_DECL_OVERRIDE; + bool event(QEvent*) Q_DECL_OVERRIDE; - virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const Q_DECL_OVERRIDE; - virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const; + QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; QPainter::RenderHints renderHints() const; void setRenderHints(QPainter::RenderHints); @@ -124,30 +124,30 @@ Q_SIGNALS: void linkClicked(const QUrl&); protected: - virtual void mousePressEvent(QGraphicsSceneMouseEvent*); - virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent*); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent*); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent*); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent*); - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent*); + void mousePressEvent(QGraphicsSceneMouseEvent*) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent*) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QGraphicsSceneMouseEvent*) Q_DECL_OVERRIDE; + void mouseMoveEvent(QGraphicsSceneMouseEvent*) Q_DECL_OVERRIDE; + void hoverMoveEvent(QGraphicsSceneHoverEvent*) Q_DECL_OVERRIDE; + void hoverLeaveEvent(QGraphicsSceneHoverEvent*) Q_DECL_OVERRIDE; #ifndef QT_NO_WHEELEVENT - virtual void wheelEvent(QGraphicsSceneWheelEvent*); + void wheelEvent(QGraphicsSceneWheelEvent*) Q_DECL_OVERRIDE; #endif - virtual void keyPressEvent(QKeyEvent*); - virtual void keyReleaseEvent(QKeyEvent*); + void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent*) Q_DECL_OVERRIDE; #ifndef QT_NO_CONTEXTMENU - virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent*); + void contextMenuEvent(QGraphicsSceneContextMenuEvent*) Q_DECL_OVERRIDE; #endif - virtual void dragEnterEvent(QGraphicsSceneDragDropEvent*); - virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent*); - virtual void dragMoveEvent(QGraphicsSceneDragDropEvent*); - virtual void dropEvent(QGraphicsSceneDragDropEvent*); - virtual void focusInEvent(QFocusEvent*); - virtual void focusOutEvent(QFocusEvent*); - virtual void inputMethodEvent(QInputMethodEvent*); - virtual bool focusNextPrevChild(bool next); - - virtual bool sceneEvent(QEvent*); + void dragEnterEvent(QGraphicsSceneDragDropEvent*) Q_DECL_OVERRIDE; + void dragLeaveEvent(QGraphicsSceneDragDropEvent*) Q_DECL_OVERRIDE; + void dragMoveEvent(QGraphicsSceneDragDropEvent*) Q_DECL_OVERRIDE; + void dropEvent(QGraphicsSceneDragDropEvent*) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent*) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent*) Q_DECL_OVERRIDE; + void inputMethodEvent(QInputMethodEvent*) Q_DECL_OVERRIDE; + bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + + bool sceneEvent(QEvent*) Q_DECL_OVERRIDE; private: Q_PRIVATE_SLOT(d, void _q_doLoadFinished(bool success)) diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.h b/Source/WebKit/qt/WidgetApi/qwebframe.h index 619594336..1c3cb07c3 100644 --- a/Source/WebKit/qt/WidgetApi/qwebframe.h +++ b/Source/WebKit/qt/WidgetApi/qwebframe.h @@ -202,7 +202,7 @@ public: QWebHitTestResult hitTestContent(const QPoint &pos) const; - virtual bool event(QEvent *); + bool event(QEvent *) Q_DECL_OVERRIDE; QWebSecurityOrigin securityOrigin() const; QWebFrameAdapter* handle() const; diff --git a/Source/WebKit/qt/WidgetApi/qwebinspector.h b/Source/WebKit/qt/WidgetApi/qwebinspector.h index d6a4aad3c..c5f097e27 100644 --- a/Source/WebKit/qt/WidgetApi/qwebinspector.h +++ b/Source/WebKit/qt/WidgetApi/qwebinspector.h @@ -36,14 +36,14 @@ public: void setPage(QWebPage* page); QWebPage* page() const; - QSize sizeHint() const; - bool event(QEvent*); + QSize sizeHint() const Q_DECL_OVERRIDE; + bool event(QEvent*) Q_DECL_OVERRIDE; protected: - void resizeEvent(QResizeEvent* event); - void showEvent(QShowEvent* event); - void hideEvent(QHideEvent* event); - void closeEvent(QCloseEvent* event); + void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE; private: QWebInspectorPrivate* d; diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.h b/Source/WebKit/qt/WidgetApi/qwebpage.h index a9c71fd42..01e77d44b 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.h +++ b/Source/WebKit/qt/WidgetApi/qwebpage.h @@ -312,7 +312,7 @@ public: void setPreferredContentsSize(const QSize &size) const; void setActualVisibleContentRect(const QRect& rect) const; - virtual bool event(QEvent*); + bool event(QEvent*) Q_DECL_OVERRIDE; bool focusNextPrevChild(bool next); QVariant inputMethodQuery(Qt::InputMethodQuery property) const; diff --git a/Source/WebKit/qt/WidgetApi/qwebview.h b/Source/WebKit/qt/WidgetApi/qwebview.h index ac0946773..0ed324da1 100644 --- a/Source/WebKit/qt/WidgetApi/qwebview.h +++ b/Source/WebKit/qt/WidgetApi/qwebview.h @@ -55,7 +55,7 @@ class QWEBKITWIDGETS_EXPORT QWebView : public QWidget { Q_FLAGS(QPainter::RenderHints) public: explicit QWebView(QWidget* parent = Q_NULLPTR); - virtual ~QWebView(); + ~QWebView(); QWebPage* page() const; void setPage(QWebPage* page); @@ -90,9 +90,9 @@ public: void setTextInteractionFlag(Qt::TextInteractionFlag flag); */ - QVariant inputMethodQuery(Qt::InputMethodQuery property) const; + QVariant inputMethodQuery(Qt::InputMethodQuery property) const Q_DECL_OVERRIDE; - QSize sizeHint() const; + QSize sizeHint() const Q_DECL_OVERRIDE; qreal zoomFactor() const; void setZoomFactor(qreal factor); @@ -106,7 +106,7 @@ public: bool findText(const QString& subString, QWebPage::FindFlags options = QWebPage::FindFlags()); - virtual bool event(QEvent*); + bool event(QEvent*) Q_DECL_OVERRIDE; public Q_SLOTS: void stop(); @@ -128,33 +128,33 @@ Q_SIGNALS: void urlChanged(const QUrl&); protected: - void resizeEvent(QResizeEvent*); - void paintEvent(QPaintEvent*); + void resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; virtual QWebView *createWindow(QWebPage::WebWindowType type); - virtual void changeEvent(QEvent*); - virtual void mouseMoveEvent(QMouseEvent*); - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseDoubleClickEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent*); + void changeEvent(QEvent*) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QMouseEvent*) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE; #ifndef QT_NO_CONTEXTMENU - virtual void contextMenuEvent(QContextMenuEvent*); + void contextMenuEvent(QContextMenuEvent*) Q_DECL_OVERRIDE; #endif #ifndef QT_NO_WHEELEVENT - virtual void wheelEvent(QWheelEvent*); + void wheelEvent(QWheelEvent*) Q_DECL_OVERRIDE; #endif - virtual void keyPressEvent(QKeyEvent*); - virtual void keyReleaseEvent(QKeyEvent*); - virtual void dragEnterEvent(QDragEnterEvent*); - virtual void dragLeaveEvent(QDragLeaveEvent*); - virtual void dragMoveEvent(QDragMoveEvent*); - virtual void dropEvent(QDropEvent*); - virtual void focusInEvent(QFocusEvent*); - virtual void focusOutEvent(QFocusEvent*); - virtual void inputMethodEvent(QInputMethodEvent*); - - virtual bool focusNextPrevChild(bool next); + void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent*) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent*) Q_DECL_OVERRIDE; + void dragLeaveEvent(QDragLeaveEvent*) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent*) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent*) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent*) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent*) Q_DECL_OVERRIDE; + void inputMethodEvent(QInputMethodEvent*) Q_DECL_OVERRIDE; + + bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; private: friend class QWebPage; diff --git a/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h b/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h index 7cbf44870..c68cc9011 100644 --- a/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h +++ b/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h @@ -41,15 +41,15 @@ public: QWebFrame* frame() const; - QAccessibleInterface* parent() const; - int childCount() const; - QAccessibleInterface* child(int index) const; - int indexOfChild(const QAccessibleInterface*) const; + QAccessibleInterface* parent() const Q_DECL_OVERRIDE; + int childCount() const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; + int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE; int navigate(QAccessible::RelationFlag, int, QAccessibleInterface** target) const; - QString text(QAccessible::Text) const; - QAccessible::Role role() const; - QAccessible::State state() const; + QString text(QAccessible::Text) const Q_DECL_OVERRIDE; + QAccessible::Role role() const Q_DECL_OVERRIDE; + QAccessible::State state() const Q_DECL_OVERRIDE; }; class QWebPageAccessible : public QAccessibleObject { @@ -58,15 +58,15 @@ public: QWebPage* page() const; - QAccessibleInterface* parent() const; - int childCount() const; - QAccessibleInterface* child(int index) const; - int indexOfChild(const QAccessibleInterface*) const; + QAccessibleInterface* parent() const Q_DECL_OVERRIDE; + int childCount() const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; + int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE; int navigate(QAccessible::RelationFlag, int, QAccessibleInterface** target) const; - QString text(QAccessible::Text) const; - QAccessible::Role role() const; - QAccessible::State state() const; + QString text(QAccessible::Text) const Q_DECL_OVERRIDE; + QAccessible::Role role() const Q_DECL_OVERRIDE; + QAccessible::State state() const Q_DECL_OVERRIDE; }; class QWebViewAccessible : public QAccessibleWidget { @@ -75,8 +75,8 @@ public: QWebView* view() const; - int childCount() const; - QAccessibleInterface* child(int index) const; + int childCount() const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; }; #endif -- cgit v1.2.1 From 766858f1879ed03fcc8776df3bff2cc97dd60a97 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 10 Oct 2016 20:11:44 +0300 Subject: Added missing Q_DECL_OVERRIDEs to QML API headers Change-Id: Ic8f0fc6fe055cd432aaff8e46d62c0f8d41e61f8 Reviewed-by: Allan Sandfeld Jensen --- Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h | 2 +- Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h | 46 +++++++++++----------- .../WebKit2/UIProcess/API/qt/qquickwebview_p_p.h | 22 +++++------ .../UIProcess/API/qt/qwebiconimageprovider_p.h | 2 +- .../UIProcess/API/qt/qwebnavigationhistory_p.h | 6 +-- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h index e2aaa6c38..988135877 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h @@ -44,7 +44,7 @@ public: QTransform transformToItem() const; protected: - virtual QSGNode* updatePaintNode(QSGNode*, UpdatePaintNodeData*); + QSGNode* updatePaintNode(QSGNode*, UpdatePaintNodeData*) Q_DECL_OVERRIDE; private: QQuickWebPagePrivate* d; diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h index 1daf5db0a..c06f8f219 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h @@ -136,7 +136,7 @@ public: bool canGoForward() const; bool loading() const; - virtual QVariant inputMethodQuery(Qt::InputMethodQuery property) const; + QVariant inputMethodQuery(Qt::InputMethodQuery property) const Q_DECL_OVERRIDE; QPointF mapToWebContent(const QPointF&) const; QRectF mapRectToWebContent(const QRectF&) const; @@ -177,28 +177,28 @@ Q_SIGNALS: void navigationRequested(QWebNavigationRequest* request); protected: - virtual bool childMouseEventFilter(QQuickItem*, QEvent*); - virtual void geometryChanged(const QRectF&, const QRectF&); - virtual void componentComplete(); - virtual void keyPressEvent(QKeyEvent*); - virtual void keyReleaseEvent(QKeyEvent*); - virtual void inputMethodEvent(QInputMethodEvent*); - virtual void focusInEvent(QFocusEvent*); - virtual void itemChange(ItemChange change, const ItemChangeData &value); - virtual void touchEvent(QTouchEvent*); - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseMoveEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void mouseDoubleClickEvent(QMouseEvent*); - virtual void wheelEvent(QWheelEvent*); - virtual void hoverEnterEvent(QHoverEvent*); - virtual void hoverMoveEvent(QHoverEvent*); - virtual void hoverLeaveEvent(QHoverEvent*); - virtual void dragMoveEvent(QDragMoveEvent*); - virtual void dragEnterEvent(QDragEnterEvent*); - virtual void dragLeaveEvent(QDragLeaveEvent*); - virtual void dropEvent(QDropEvent*); - virtual bool event(QEvent*); + bool childMouseEventFilter(QQuickItem*, QEvent*) Q_DECL_OVERRIDE; + void geometryChanged(const QRectF&, const QRectF&) Q_DECL_OVERRIDE; + void componentComplete() Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent*) Q_DECL_OVERRIDE; + void inputMethodEvent(QInputMethodEvent*) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent*) Q_DECL_OVERRIDE; + void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; + void touchEvent(QTouchEvent*) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QMouseEvent*) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent*) Q_DECL_OVERRIDE; + void hoverEnterEvent(QHoverEvent*) Q_DECL_OVERRIDE; + void hoverMoveEvent(QHoverEvent*) Q_DECL_OVERRIDE; + void hoverLeaveEvent(QHoverEvent*) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent*) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent*) Q_DECL_OVERRIDE; + void dragLeaveEvent(QDragLeaveEvent*) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent*) Q_DECL_OVERRIDE; + bool event(QEvent*) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QQuickWebView) diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h index a7358b5cf..ea7ded46b 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h @@ -231,28 +231,28 @@ class QQuickWebViewLegacyPrivate : public QQuickWebViewPrivate { Q_DECLARE_PUBLIC(QQuickWebView) public: QQuickWebViewLegacyPrivate(QQuickWebView* viewport); - virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0); + void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0) Q_DECL_OVERRIDE; - virtual void updateViewportSize(); + void updateViewportSize() Q_DECL_OVERRIDE; - qreal zoomFactor() const; - void setZoomFactor(qreal); + qreal zoomFactor() const Q_DECL_OVERRIDE; + void setZoomFactor(qreal) Q_DECL_OVERRIDE; }; class QQuickWebViewFlickablePrivate : public QQuickWebViewPrivate { Q_DECLARE_PUBLIC(QQuickWebView) public: QQuickWebViewFlickablePrivate(QQuickWebView* viewport); - virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0); + void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0) Q_DECL_OVERRIDE; - virtual void onComponentComplete(); + void onComponentComplete() Q_DECL_OVERRIDE; - virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&); - virtual WebKit::PageViewportController* viewportController() const { return m_pageViewportController.data(); } - virtual void updateViewportSize(); + void didChangeViewportProperties(const WebCore::ViewportAttributes&) Q_DECL_OVERRIDE; + WebKit::PageViewportController* viewportController() const Q_DECL_OVERRIDE { return m_pageViewportController.data(); } + void updateViewportSize() Q_DECL_OVERRIDE; - virtual void pageDidRequestScroll(const QPoint& pos); - virtual void handleMouseEvent(QMouseEvent*); + void pageDidRequestScroll(const QPoint& pos) Q_DECL_OVERRIDE; + void handleMouseEvent(QMouseEvent*) Q_DECL_OVERRIDE; private: QScopedPointer m_pageViewportController; diff --git a/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h b/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h index 10b2f697e..2d903e9cd 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h @@ -36,7 +36,7 @@ public: static QString identifier() { return QStringLiteral("webicon"); } QUrl iconURLForPageURLInContext(const QString& pageURL, WebKit::QtWebContext* context); - virtual QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize); + QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize) Q_DECL_OVERRIDE; }; #endif diff --git a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h index 84ef867be..06a804a17 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h @@ -46,9 +46,9 @@ class QWEBKIT_EXPORT QWebNavigationListModel : public QAbstractListModel { public: virtual ~QWebNavigationListModel(); - int rowCount(const QModelIndex& parent = QModelIndex()) const; - QVariant data(const QModelIndex& index, int role) const; - QHash roleNames() const; + int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex& index, int role) const Q_DECL_OVERRIDE; + QHash roleNames() const Q_DECL_OVERRIDE; void reset(); private: -- cgit v1.2.1 From 7c3f338f042acebe7cf56de319bfb26a16d1aca3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 3 Nov 2016 18:26:03 +0100 Subject: remove dependencies from sync.profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the CI obtains them from the qt5 super repo nowadays. Change-Id: I1a981272cff5cca5d72b22b31a8c8f13a363330d Reviewed-by: Konstantin Tokarev Reviewed-by: Jędrzej Nowacki --- Source/sync.profile | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Source/sync.profile b/Source/sync.profile index c0f687dc0..1c5e0113d 100644 --- a/Source/sync.profile +++ b/Source/sync.profile @@ -9,20 +9,3 @@ %classnames = ( ); @ignore_for_master_contents = ( "qwebscriptworld.h", "testwindow.h", "util.h", "bytearraytestdata.h" ); - -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) -# -%dependencies = ( - "qtbase" => "", - "qtxmlpatterns" => "", - "qtdeclarative" => "", - "qtlocation" => "", - "qtmultimedia" => "", - "qtsensors" => "", - "qtwebchannel" => "", -); -- cgit v1.2.1 From d542341492a0c18058b3f03008ea8916d84ccef3 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 17 Nov 2016 22:21:00 +0300 Subject: Fixed crash in FormDataIODevice It happens that m_formElements can be null in some cases when FormDataIODevice::reset() is invoked. Change-Id: I92113588db57c9687bc20d331ba2f5ed8f9eec54 Reviewed-by: Allan Sandfeld Jensen --- Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp index 4a2121907..cd89aa9ec 100644 --- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp @@ -70,7 +70,11 @@ bool FormDataIODevice::reset() m_currentFile->close(); m_currentDelta = 0; - m_formElements = m_formData->elements(); + + if (m_formData) + m_formElements = m_formData->elements(); + else + m_formElements.clear(); prepareCurrentElement(); return true; -- cgit v1.2.1 From ed84b8b4ff88c5affaa89edb72e6aaf481f3ccc1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 1 Nov 2016 22:32:05 -0700 Subject: Fix QDataStreamCoder encoding and decoding of binary data This code was all wrong. The dereferencing of the pointer was missing, so QDataStreamCoder::encodeBytes was encoding pointers (cast to something, though unclear what), while the decoder was decoding them one byte at a time This clearly has never worked. So just use writeRawData and readRawData. Change-Id: Ic46ff326a6ba46bc877cfffd1483240963ec5ee0 Reviewed-by: Konstantin Tokarev Reviewed-by: Allan Sandfeld Jensen --- Source/WebCore/history/qt/HistoryItemQt.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Source/WebCore/history/qt/HistoryItemQt.cpp b/Source/WebCore/history/qt/HistoryItemQt.cpp index 5a54516f3..89777eb72 100644 --- a/Source/WebCore/history/qt/HistoryItemQt.cpp +++ b/Source/WebCore/history/qt/HistoryItemQt.cpp @@ -81,8 +81,7 @@ QDataStreamCoder::QDataStreamCoder(QDataStream& stream) void QDataStreamCoder::encodeBytes(const uint8_t* bytes, size_t size) { m_stream << qint64(size); - for (; size > 0; --size) - m_stream << bytes++; + m_stream.writeRawData(reinterpret_cast(bytes++), size); } void QDataStreamCoder::encodeBool(bool value) @@ -129,13 +128,9 @@ bool QDataStreamCoder::decodeBytes(Vector& out) { out.clear(); qint64 count; - uint8_t byte; m_stream >> count; - out.reserveCapacity(count); - for (qint64 i = 0; i < count; ++i) { - m_stream >> byte; - out.append(byte); - } + out.resize(count); + m_stream.readRawData(reinterpret_cast(out.data()), count); return m_stream.status() == QDataStream::Ok; } -- cgit v1.2.1