diff options
author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-11-09 17:38:17 (GMT) |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-11-10 09:30:24 (GMT) |
commit | d15d7385cb6cfb453ab08d6d7154b66c3fb087ee (patch) | |
tree | 14bc24f2fde81d5d93958be7662d4cdc0a527529 /src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h | |
parent | 7bfdec392df263b15fb5661ab7d4f66f1cd8fbae (diff) | |
download | Qt-d15d7385cb6cfb453ab08d6d7154b66c3fb087ee.zip Qt-d15d7385cb6cfb453ab08d6d7154b66c3fb087ee.tar.gz Qt-d15d7385cb6cfb453ab08d6d7154b66c3fb087ee.tar.bz2 |
Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 363898ca378e2198b855ca2f8921c5e4f898c5e2 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2009-11-09 Benjamin Poulain <benjamin.poulain@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
https://bugs.webkit.org/show_bug.cgi?id=30772
Add a non-const iterator to QWebElementCollection.
Move the two attributes of the iterator to private.
* Api/qwebelement.h:
(const_iterator::begin):
(const_iterator::end):
(const_iterator::constBegin):
(const_iterator::constEnd):
(const_iterator::iterator::iterator):
(const_iterator::iterator::operator*):
(const_iterator::iterator::operator==):
(const_iterator::iterator::operator!=):
(const_iterator::iterator::operator<):
(const_iterator::iterator::operator<=):
(const_iterator::iterator::operator>):
(const_iterator::iterator::operator>=):
(const_iterator::iterator::operator++):
(const_iterator::iterator::operator--):
(const_iterator::iterator::operator+=):
(const_iterator::iterator::operator-=):
(const_iterator::iterator::operator+):
(const_iterator::iterator::operator-):
* tests/qwebelement/tst_qwebelement.cpp:
(tst_QWebElement::nonConstIterator):
(tst_QWebElement::constIterator):
2009-11-09 Laszlo Gombos <laszlo.1.gombos@nokia.com>
Reviewed by Kenneth Christiansen.
[Qt] Remove the sessionStorage setting (per Page)
https://bugs.webkit.org/show_bug.cgi?id=31249
This setting allows to run sessionStorage on/off on a per page
basis. Remove this prematurely exposed API.
* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply):
(QWebSettings::QWebSettings):
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::database):
(tst_QWebPage::testOptionalJSObjects):
2009-11-09 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Remove the QWebPage:webInspectorTriggered signal.
User customization of the communication between QWebPage
and QWebInspector will be properly designed in the next version.
https://bugs.webkit.org/show_bug.cgi?id=30773
* Api/qwebinspector.cpp:
* Api/qwebpage.cpp:
(QWebPagePrivate::getOrCreateInspector):
(QWebPage::triggerAction):
* Api/qwebpage.h:
* QtLauncher/main.cpp:
(MainWindow::MainWindow):
2009-11-05 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Added a missing re-implementation of QGraphicsItem::inputMethodQuery().
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::inputMethodQuery):
* Api/qgraphicswebview.h:
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Provide a dummy re-implementation of QGraphicsLayoutItem::sizeHint(),
similar to QWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::sizeHint):
* Api/qgraphicswebview.h:
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Removed zoomFactoryChanged() signal and added
linkClicked() to QGraphicsWebView, for consistency with
QWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::setPage):
(QGraphicsWebView::setZoomFactor):
* Api/qgraphicswebview.h:
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Added QGraphicsWebView::findText() for convenience and consistency
with QWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::findText):
* Api/qgraphicswebview.h:
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Added QGraphicsWebView::pageAction() and triggerPageAction(), for
consistency with QWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::pageAction):
(QGraphicsWebView::triggerPageAction):
* Api/qgraphicswebview.h:
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Removed QGraphicsWebView::toHtml() after API review.
That's consistent with QWebView and also based on the assumption that
toHtml() is called less frequently than setHtml().
* Api/qgraphicswebview.cpp:
* Api/qgraphicswebview.h:
* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView::qgraphicswebview):
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Removed the interactive property of QGraphicsWebView.
There are clearly use-cases for this feature, but it will require
more work to make this fully work with an enum to have fine-grained
control over the interactivity levels. For now it is easy to achieve
in user-code what the boolean property did.
* Api/qgraphicswebview.cpp:
(QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
(QGraphicsWebView::hoverMoveEvent):
(QGraphicsWebView::mouseMoveEvent):
(QGraphicsWebView::mousePressEvent):
(QGraphicsWebView::mouseReleaseEvent):
(QGraphicsWebView::mouseDoubleClickEvent):
(QGraphicsWebView::keyPressEvent):
(QGraphicsWebView::keyReleaseEvent):
(QGraphicsWebView::dragLeaveEvent):
(QGraphicsWebView::dragMoveEvent):
(QGraphicsWebView::dropEvent):
(QGraphicsWebView::wheelEvent):
(QGraphicsWebView::inputMethodEvent):
* Api/qgraphicswebview.h:
* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView::qgraphicswebview):
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Tor Arne Vestbø.
Make the QGraphicsWebView constructor explicit.
* Api/qgraphicswebview.h:
2009-11-05 Simon Hausmann <hausmann@webkit.org>
Last Qt 4.5 build fix (*sigh*)
* tests/qwebpage/tst_qwebpage.cpp:
(inputMethodHints): inputMethodHints() is only used for
Qt 4.6, so guard the whole function.
2009-11-05 Simon Hausmann <hausmann@webkit.org>
Another prospective build fix against Qt 4.5 (build bot)
Don't compile & run the QGraphicsWebView portion of the
input methods auto test with Qt 4.5.
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::inputMethods_data):
(inputMethodHints):
(inputMethodEnabled):
(tst_QWebPage::inputMethods):
2009-11-05 Simon Hausmann <hausmann@webkit.org>
Prospective build fix against Qt 4.5 (build bot)
* Api/qgraphicswebview.cpp:
(QGraphicsWebViewPrivate::setInputMethodEnabled): Guard the
use of Qt 4.6 specific API with #ifdefs.
2009-11-01 Simon Hausmann <hausmann@webkit.org>
Reviewed by Kenneth Christiansen.
[Qt] Fix enabling of input method support on QGraphicsWebView.
https://bugs.webkit.org/show_bug.cgi?id=30605
Instead of setting the unsupported widget attribute on the
QGraphicsWidget in setInputMethodEnabled() set the
ItemAcceptsInputMethod GraphicsItem flag directly.
Changed the existing input method auto test to run once
on a QWebView and once on a QGraphicsWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebViewPrivate::setInputMethodEnabled):
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::inputMethods_data):
(inputMethodHints):
(inputMethodEnabled):
(tst_QWebPage::inputMethods):
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Kenneth Christiansen.
Added QGraphicsWebView::modified property, for consistency
with QWebView.
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::isModified):
* Api/qgraphicswebview.h:
* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView::qgraphicswebview):
2009-11-04 Simon Hausmann <hausmann@webkit.org>
Reviewed by Kenneth Christiansen.
Removed status and progress properties of QGraphicsWebView.
Added loadProgress and statusBarMessage signals instead,
after API review.
* Api/qgraphicswebview.cpp:
(QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
(QGraphicsWebView::setPage):
* Api/qgraphicswebview.h:
* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView::qgraphicswebview):
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h')
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h | 71 |
1 files changed, 51 insertions, 20 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h index a18d262..9cb1ea1 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h @@ -177,6 +177,7 @@ public: int count() const; QWebElement at(int i) const; + inline QWebElement operator[](int i) const { return at(i); } inline QWebElement first() const { return at(0); } inline QWebElement last() const { return at(count() - 1); } @@ -185,39 +186,69 @@ public: class const_iterator { public: - int i; - const QWebElementCollection *s; - - inline const_iterator(const QWebElementCollection *collection, int index) : i(index), s(collection) {} - inline const_iterator(const const_iterator &o) : i(o.i), s(o.s) {} + inline const_iterator(const QWebElementCollection* collection, int index) : i(index), collection(collection) {} + inline const_iterator(const const_iterator& o) : i(o.i), collection(o.collection) {} - inline const QWebElement operator*() const { return s->at(i); } + inline const QWebElement operator*() const { return collection->at(i); } - inline bool operator==(const const_iterator& o) const { return i == o.i && s == o.s; } - inline bool operator!=(const const_iterator& o) const { return i != o.i || s != o.s; } + inline bool operator==(const const_iterator& o) const { return i == o.i && collection == o.collection; } + inline bool operator!=(const const_iterator& o) const { return i != o.i || collection != o.collection; } inline bool operator<(const const_iterator& o) const { return i < o.i; } inline bool operator<=(const const_iterator& o) const { return i <= o.i; } inline bool operator>(const const_iterator& o) const { return i > o.i; } inline bool operator>=(const const_iterator& o) const { return i >= o.i; } - inline const_iterator &operator++() { ++i; return *this; } - inline const_iterator operator++(int) { const_iterator n(s, i); ++i; return n; } - inline const_iterator &operator--() { i--; return *this; } - inline const_iterator operator--(int) { const_iterator n(s, i); i--; return n; } - inline const_iterator &operator+=(int j) { i += j; return *this; } - inline const_iterator &operator-=(int j) { i -= j; return *this; } - inline const_iterator operator+(int j) const { return const_iterator(s, i + j); } - inline const_iterator operator-(int j) const { return const_iterator(s, i - j); } + inline const_iterator& operator++() { ++i; return *this; } + inline const_iterator operator++(int) { const_iterator n(collection, i); ++i; return n; } + inline const_iterator& operator--() { i--; return *this; } + inline const_iterator operator--(int) { const_iterator n(collection, i); i--; return n; } + inline const_iterator& operator+=(int j) { i += j; return *this; } + inline const_iterator& operator-=(int j) { i -= j; return *this; } + inline const_iterator operator+(int j) const { return const_iterator(collection, i + j); } + inline const_iterator operator-(int j) const { return const_iterator(collection, i - j); } inline int operator-(const_iterator j) const { return i - j.i; } private: - inline const_iterator() : i(0), s(0) {} + int i; + const QWebElementCollection* const collection; }; friend class const_iterator; - inline const_iterator begin() const { return const_iterator(this, 0); } - inline const_iterator end() const { return const_iterator(this, count()); } - inline QWebElement operator[](int i) const { return at(i); } + inline const_iterator begin() const { return constBegin(); } + inline const_iterator end() const { return constEnd(); } + inline const_iterator constBegin() const { return const_iterator(this, 0); } + inline const_iterator constEnd() const { return const_iterator(this, count()); }; + + class iterator { + public: + inline iterator(const QWebElementCollection* collection, int index) : i(index), collection(collection) {} + inline iterator(const iterator& o) : i(o.i), collection(o.collection) {} + + inline QWebElement operator*() const { return collection->at(i); } + + inline bool operator==(const iterator& o) const { return i == o.i && collection == o.collection; } + inline bool operator!=(const iterator& o) const { return i != o.i || collection != o.collection; } + inline bool operator<(const iterator& o) const { return i < o.i; } + inline bool operator<=(const iterator& o) const { return i <= o.i; } + inline bool operator>(const iterator& o) const { return i > o.i; } + inline bool operator>=(const iterator& o) const { return i >= o.i; } + + inline iterator& operator++() { ++i; return *this; } + inline iterator operator++(int) { iterator n(collection, i); ++i; return n; } + inline iterator& operator--() { i--; return *this; } + inline iterator operator--(int) { iterator n(collection, i); i--; return n; } + inline iterator& operator+=(int j) { i += j; return *this; } + inline iterator& operator-=(int j) { i -= j; return *this; } + inline iterator operator+(int j) const { return iterator(collection, i + j); } + inline iterator operator-(int j) const { return iterator(collection, i - j); } + inline int operator-(iterator j) const { return i - j.i; } + private: + int i; + const QWebElementCollection* const collection; + }; + friend class iterator; + inline iterator begin() { return iterator(this, 0); } + inline iterator end() { return iterator(this, count()); } private: QExplicitlySharedDataPointer<QWebElementCollectionPrivate> d; }; |