summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/Api
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp5
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h5
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase_p.h3
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp62
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h91
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp90
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h12
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebframe_p.h18
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp17
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h11
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebhistory_p.h6
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp14
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.h3
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp100
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h4
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h10
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.h17
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.h3
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin_p.h3
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp64
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h6
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp23
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebview.h51
23 files changed, 335 insertions, 283 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp
index 0d11381..d51e4e6 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp
@@ -55,7 +55,8 @@ using namespace WebCore;
/*!
Constructs a web database from \a other.
*/
-QWebDatabase::QWebDatabase(const QWebDatabase& other) : d(other.d)
+QWebDatabase::QWebDatabase(const QWebDatabase& other)
+ : d(other.d)
{
}
@@ -163,7 +164,7 @@ QWebSecurityOrigin QWebDatabase::origin() const
Removes the database \a db from its security origin. All data stored in the
database \a db will be destroyed.
*/
-void QWebDatabase::removeDatabase(const QWebDatabase &db)
+void QWebDatabase::removeDatabase(const QWebDatabase& db)
{
#if ENABLE(DATABASE)
DatabaseTracker::tracker().deleteDatabase(db.d->origin.get(), db.d->name);
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h
index 5b4f704..875b2eb 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h
@@ -31,8 +31,7 @@ namespace WebCore {
class QWebDatabasePrivate;
class QWebSecurityOrigin;
-class QWEBKIT_EXPORT QWebDatabase
-{
+class QWEBKIT_EXPORT QWebDatabase {
public:
QWebDatabase(const QWebDatabase& other);
QWebDatabase &operator=(const QWebDatabase& other);
@@ -45,7 +44,7 @@ public:
QString fileName() const;
QWebSecurityOrigin origin() const;
- static void removeDatabase(const QWebDatabase &db);
+ static void removeDatabase(const QWebDatabase&);
static void removeAllDatabases();
private:
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase_p.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase_p.h
index 988fb16..9ae8fc8 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase_p.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase_p.h
@@ -27,8 +27,7 @@
#include "RefPtr.h"
-class QWebDatabasePrivate : public QSharedData
-{
+class QWebDatabasePrivate : public QSharedData {
public:
WebCore::String name;
WTF::RefPtr<WebCore::SecurityOrigin> origin;
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp
index 413a662..1dfb409 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp
@@ -46,46 +46,52 @@
using namespace WebCore;
-class QWebElementPrivate
-{
+class QWebElementPrivate {
public:
};
/*!
\class QWebElement
\since 4.6
- \brief The QWebElement class provides convenience access to DOM elements in a QWebFrame.
- \preliminary
+ \brief The QWebElement class provides convenient access to DOM elements in a QWebFrame.
- QWebElement is the main class to provide easy access to the document model.
+ QWebElement is the main class to easily access to the document model.
The document model is represented by a tree-like structure of DOM elements.
The root of the tree is called the document element and can be accessed using QWebFrame::documentElement().
- You can reach specific elements by using the findAll() and findFirst() functions, which
- allow the use of CSS selectors to identify elements.
+ You can reach specific elements using findAll() and findFirst(); the elements
+ are identified through CSS selectors.
\snippet webkitsnippets/webelement/main.cpp FindAll
- The first list contains all span elements in the document. The second list contains
- only the span elements that are children of the paragraph that is classified
- as "intro" paragraph.
+ The first list contains all \c span elements in the document. The second list contains
+ \c span elements that are children of \c p, classified with \c intro.
+
+ Using findFirst() is more efficient than calling findAll() and extracting the first element
+ only in the returned list.
Alternatively you can manually traverse the document using firstChild() and nextSibling():
\snippet webkitsnippets/webelement/main.cpp Traversing with QWebElement
The underlying content of QWebElement is explicitly shared. Creating a copy of a QWebElement
- does not create a copy of the content, both instances point to the same underlying element.
+ does not create a copy of the content. Instead, both instances point to the same element.
+
+ The element's attributes can be read using attribute() and modified with setAttribute().
- The element's attributes can be read using attribute() and changed using setAttribute().
+ The contents of child elements can be converted to plain text with toPlainText() and to
+ XHTML using toInnerXml(). To also include the element's tag in the output, use toOuterXml().
- The content of the child elements can be converted to plain text using toPlainText() and to
- x(html) using toXml(), and it is possible to replace the content using setPlainText() and setXml().
+ It is possible to replace the contents using setPlainText() and setInnerXml(). To replace
+ the element itself and its contents, use setOuterXml().
- Depending on the type of the underlying element there may be extra functionality available, not
- covered through QWebElement's API. For example a HTML form element can be triggered to submit the
- entire form. These list of these functions is available through functions() and they can be called
- directly using callFunction().
+ In the JavaScript DOM interfaces, elements can have additional functions depending on their
+ type. For example an HTML form element can be triggered to submit the entire form to the
+ web server using the submit() function. A list of these special functions can be obtained
+ in QWebElement using functions(); they can be invoked using callFunction().
+
+ Similarly element specific properties can be obtained using scriptableProperties() and
+ read/written using scriptableProperty()/setScriptableProperty().
*/
/*!
@@ -178,10 +184,13 @@ bool QWebElement::isNull() const
}
/*!
- Returns a new collection of elements that are children of this element
- and that match the given CSS selector \a selectorQuery.
+ Returns a new list of child elements matching the given CSS selector \a selectorQuery.
+ If there are no matching elements, an empty list is returned.
+
+ \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} syntax is
+ used for the query.
- The query is specified using \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{standard CSS2 selectors}.
+ \note This search is performed recursively.
*/
QList<QWebElement> QWebElement::findAll(const QString &selectorQuery) const
{
@@ -205,9 +214,10 @@ QList<QWebElement> QWebElement::findAll(const QString &selectorQuery) const
/*!
Returns the first child element that matches the given CSS selector \a selectorQuery.
- This function is equivalent to calling findAll() and taking only the
- first element in the returned collection of elements. However calling
- this function is more efficient.
+ \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} syntax is
+ used for the query.
+
+ \note This search is performed recursively.
*/
QWebElement QWebElement::findFirst(const QString &selectorQuery) const
{
@@ -743,7 +753,7 @@ QStringList QWebElement::functions() const
continue;
JSC::UString ustring = (*it).ustring();
- names << QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size());
+ names << QString::fromUtf16((const ushort*)ustring.rep()->data(), ustring.size());
}
if (state->hadException())
@@ -868,7 +878,7 @@ QStringList QWebElement::scriptableProperties() const
continue;
JSC::UString ustring = (*it).ustring();
- names << QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size());
+ names << QString::fromUtf16((const ushort*)ustring.rep()->data(), ustring.size());
}
if (exec->hadException())
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h
index 7e56d0f..bc6f8a9 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h
@@ -34,12 +34,11 @@ namespace WebCore {
class QWebFrame;
class QWebElementPrivate;
-class QWEBKIT_EXPORT QWebElement
-{
+class QWEBKIT_EXPORT QWebElement {
public:
QWebElement();
- QWebElement(const QWebElement &);
- QWebElement &operator=(const QWebElement &);
+ QWebElement(const QWebElement&);
+ QWebElement &operator=(const QWebElement&);
~QWebElement();
bool operator==(const QWebElement& o) const;
@@ -47,33 +46,33 @@ public:
bool isNull() const;
- QList<QWebElement> findAll(const QString &selectorQuery) const;
- QWebElement findFirst(const QString &selectorQuery) const;
+ QList<QWebElement> findAll(const QString& selectorQuery) const;
+ QWebElement findFirst(const QString& selectorQuery) const;
- void setPlainText(const QString &text);
+ void setPlainText(const QString& text);
QString toPlainText() const;
- void setOuterXml(const QString &markup);
+ void setOuterXml(const QString& markup);
QString toOuterXml() const;
- void setInnerXml(const QString &markup);
+ void setInnerXml(const QString& markup);
QString toInnerXml() const;
- void setAttribute(const QString &name, const QString &value);
- void setAttributeNS(const QString &namespaceUri, const QString &name, const QString &value);
- QString attribute(const QString &name, const QString &defaultValue = QString()) const;
- QString attributeNS(const QString &namespaceUri, const QString &name, const QString &defaultValue = QString()) const;
- bool hasAttribute(const QString &name) const;
- bool hasAttributeNS(const QString &namespaceUri, const QString &name) const;
- void removeAttribute(const QString &name);
- void removeAttributeNS(const QString &namespaceUri, const QString &name);
+ void setAttribute(const QString& name, const QString& value);
+ void setAttributeNS(const QString& namespaceUri, const QString& name, const QString& value);
+ QString attribute(const QString& name, const QString& defaultValue = QString()) const;
+ QString attributeNS(const QString& namespaceUri, const QString& name, const QString& defaultValue = QString()) const;
+ bool hasAttribute(const QString& name) const;
+ bool hasAttributeNS(const QString& namespaceUri, const QString& name) const;
+ void removeAttribute(const QString& name);
+ void removeAttributeNS(const QString& namespaceUri, const QString& name);
bool hasAttributes() const;
QStringList classes() const;
- bool hasClass(const QString &name) const;
- void addClass(const QString &name);
- void removeClass(const QString &name);
- void toggleClass(const QString &name);
+ bool hasClass(const QString& name) const;
+ void addClass(const QString& name);
+ void removeClass(const QString& name);
+ void toggleClass(const QString& name);
QRect geometry() const;
@@ -92,62 +91,62 @@ public:
// TODO: Add QList<QWebElement> overloads
// docs need example snippet
- void appendInside(const QString &markup);
- void appendInside(const QWebElement &element);
+ void appendInside(const QString& markup);
+ void appendInside(const QWebElement& element);
// docs need example snippet
- void prependInside(const QString &markup);
- void prependInside(const QWebElement &element);
+ void prependInside(const QString& markup);
+ void prependInside(const QWebElement& element);
// docs need example snippet
- void appendOutside(const QString &markup);
- void appendOutside(const QWebElement &element);
+ void appendOutside(const QString& markup);
+ void appendOutside(const QWebElement& element);
// docs need example snippet
- void prependOutside(const QString &markup);
- void prependOutside(const QWebElement &element);
+ void prependOutside(const QString& markup);
+ void prependOutside(const QWebElement& element);
// docs need example snippet
- void encloseContentsWith(const QWebElement &element);
- void encloseContentsWith(const QString &markup);
- void encloseWith(const QString &markup);
- void encloseWith(const QWebElement &element);
+ void encloseContentsWith(const QWebElement& element);
+ void encloseContentsWith(const QString& markup);
+ void encloseWith(const QString& markup);
+ void encloseWith(const QWebElement& element);
- void replace(const QString &markup);
- void replace(const QWebElement &element);
+ void replace(const QString& markup);
+ void replace(const QWebElement& element);
QWebElement clone() const;
- QWebElement &takeFromDocument();
+ QWebElement& takeFromDocument();
void removeFromDocument();
void removeChildren();
QVariant evaluateScript(const QString& scriptSource);
- QVariant callFunction(const QString &functionName, const QVariantList &arguments = QVariantList());
+ QVariant callFunction(const QString& functionName, const QVariantList& arguments = QVariantList());
QStringList functions() const;
- QVariant scriptableProperty(const QString &name) const;
- void setScriptableProperty(const QString &name, const QVariant &value);
+ QVariant scriptableProperty(const QString& name) const;
+ void setScriptableProperty(const QString& name, const QVariant& value);
QStringList scriptableProperties() const;
enum ResolveRule { IgnoreCascadingStyles, RespectCascadingStyles };
- QString styleProperty(const QString &name, ResolveRule = IgnoreCascadingStyles) const;
+ QString styleProperty(const QString& name, ResolveRule = IgnoreCascadingStyles) const;
enum StylePriority { NormalStylePriority, DeclaredStylePriority, ImportantStylePriority };
- void setStyleProperty(const QString &name, const QString &value, StylePriority = DeclaredStylePriority);
+ void setStyleProperty(const QString& name, const QString& value, StylePriority = DeclaredStylePriority);
- QString computedStyleProperty(const QString &name) const;
+ QString computedStyleProperty(const QString& name) const;
private:
- explicit QWebElement(WebCore::Element *domElement);
- explicit QWebElement(WebCore::Node *node);
+ explicit QWebElement(WebCore::Element*);
+ explicit QWebElement(WebCore::Node*);
friend class QWebFrame;
friend class QWebHitTestResult;
friend class QWebHitTestResultPrivate;
- QWebElementPrivate *d;
- WebCore::Element *m_element;
+ QWebElementPrivate* d;
+ WebCore::Element* m_element;
};
#endif // QWEBELEMENT_H
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
index 29d380d..23cb473 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
@@ -232,7 +232,7 @@ WebCore::Scrollbar* QWebFramePrivate::verticalScrollBar() const
return frame->view()->verticalScrollbar();
}
-void QWebFramePrivate::renderPrivate(QPainter *painter, const QRegion &clip, bool contents)
+void QWebFramePrivate::renderPrivate(QPainter *painter, const QRegion &clip)
{
if (!frame->view() || !frame->contentRenderer())
return;
@@ -246,7 +246,7 @@ void QWebFramePrivate::renderPrivate(QPainter *painter, const QRegion &clip, boo
GraphicsContext context(painter);
- if (!contents)
+ if (clipRenderToViewport)
view->paint(&context, vector.first());
else
view->paintContents(&context, vector.first());
@@ -255,7 +255,7 @@ void QWebFramePrivate::renderPrivate(QPainter *painter, const QRegion &clip, boo
const QRect& clipRect = vector.at(i);
painter->save();
painter->setClipRect(clipRect, Qt::IntersectClip);
- if (!contents)
+ if (clipRenderToViewport)
view->paint(&context, clipRect);
else
view->paintContents(&context, clipRect);
@@ -280,6 +280,13 @@ void QWebFramePrivate::renderPrivate(QPainter *painter, const QRegion &clip, boo
\l{Elements of QWebView} for an explanation of how web
frames are related to a web page and web view.
+ The QWebFrame class also offers methods to retrieve both the URL currently
+ loaded by the frame (see url()) as well as the URL originally requested
+ to be loaded (see requestedUrl()). These methods make possible the retrieval
+ of the URL before and after a DNS resolution or a redirection occurs during
+ the load process. The requestedUrl() also matches to the URL added to the
+ frame history (\l{QWebHistory}) if load is successful.
+
The title of an HTML frame can be accessed with the title() property.
Additionally, a frame may also specify an icon, which can be accessed
using the icon() property. If the title or the icon changes, the
@@ -376,7 +383,7 @@ void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object
if (!page()->settings()->testAttribute(QWebSettings::JavascriptEnabled))
return;
- JSC::JSLock lock(false);
+ JSC::JSLock lock(JSC::SilenceAssertionsOnly);
JSDOMWindow* window = toJSDOMWindow(d->frame);
JSC::Bindings::RootObject* root = d->frame->script()->bindingRootObject();
if (!window) {
@@ -443,7 +450,7 @@ QString QWebFrame::title() const
{
if (d->frame->document())
return d->frame->loader()->documentLoader()->title();
- else return QString();
+ return QString();
}
/*!
@@ -479,10 +486,10 @@ QString QWebFrame::title() const
*/
QMultiMap<QString, QString> QWebFrame::metaData() const
{
- if(!d->frame->document())
- return QMap<QString,QString>();
+ if (!d->frame->document())
+ return QMap<QString, QString>();
- QMultiMap<QString,QString> map;
+ QMultiMap<QString, QString> map;
Document* doc = d->frame->document();
RefPtr<NodeList> list = doc->getElementsByTagName("meta");
unsigned len = list->length();
@@ -521,6 +528,24 @@ QUrl QWebFrame::url() const
}
/*!
+ \since 4.6
+ \property QWebFrame::requestedUrl
+
+ The URL requested to loaded by the frame currently viewed. The URL may differ from
+ the one returned by url() if a DNS resolution or a redirection occurs.
+
+ \sa url(), setUrl()
+*/
+QUrl QWebFrame::requestedUrl() const
+{
+ if (!d->frame->loader()->activeDocumentLoader()
+ || !d->frameLoaderClient->m_loadSucceeded)
+ return QUrl(d->frame->loader()->outgoingReferrer());
+
+ return d->frame->loader()->originalRequest().url();
+}
+/*!
+ \since 4.6
\property QWebFrame::baseUrl
\brief the base URL of the frame, can be used to resolve relative URLs
\since 4.6
@@ -815,9 +840,8 @@ int QWebFrame::scrollBarValue(Qt::Orientation orientation) const
{
Scrollbar *sb;
sb = (orientation == Qt::Horizontal) ? d->horizontalScrollBar() : d->verticalScrollBar();
- if (sb) {
+ if (sb)
return sb->value();
- }
return 0;
}
@@ -867,7 +891,7 @@ QRect QWebFrame::scrollBarGeometry(Qt::Orientation orientation) const
\since 4.5
Scrolls the frame \a dx pixels to the right and \a dy pixels downward. Both
\a dx and \a dy may be negative.
-
+
\sa QWebFrame::scrollPosition
*/
@@ -875,7 +899,7 @@ void QWebFrame::scroll(int dx, int dy)
{
if (!d->frame->view())
return;
-
+
d->frame->view()->scrollBy(IntSize(dx, dy));
}
@@ -888,7 +912,7 @@ void QWebFrame::scroll(int dx, int dy)
QPoint QWebFrame::scrollPosition() const
{
if (!d->frame->view())
- return QPoint(0,0);
+ return QPoint(0, 0);
IntSize ofs = d->frame->view()->scrollOffset();
return QPoint(ofs.width(), ofs.height());
@@ -924,12 +948,23 @@ void QWebFrame::render(QPainter *painter)
}
/*!
- \since 4.6
- Render the frame's \a contents into \a painter while clipping to \a contents.
+ \since 4.6
+ \property QWebFrame::clipRenderToViewport
+
+ Returns true if render will clip content to viewport; otherwise returns false.
*/
-void QWebFrame::renderContents(QPainter *painter, const QRegion &contents)
+bool QWebFrame::clipRenderToViewport() const
{
- d->renderPrivate(painter, contents, true);
+ return d->clipRenderToViewport;
+}
+
+/*!
+ \since 4.6
+ Sets whether the content of a frame will be clipped to viewport when rendered.
+*/
+void QWebFrame::setClipRenderToViewport(bool clipRenderToViewport)
+{
+ d->clipRenderToViewport = clipRenderToViewport;
}
/*!
@@ -1051,8 +1086,11 @@ QWebElement QWebFrame::documentElement() const
/*!
\since 4.6
- Returns a new collection of elements that are children of the frame's
- document element and that match the given CSS selector \a selectorQuery.
+ Returns a new list of elements matching the given CSS selector \a selectorQuery.
+ If there are no matching elements, an empty list is returned.
+
+ \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} syntax is
+ used for the query.
\sa QWebElement::findAll()
*/
@@ -1064,8 +1102,11 @@ QList<QWebElement> QWebFrame::findAllElements(const QString &selectorQuery) cons
/*!
\since 4.6
Returns the first element in the frame's document that matches the
- given CSS selector \a selectorQuery. Returns a null element if there is no
- match.
+ given CSS selector \a selectorQuery. If there is no matching element, a
+ null element is returned.
+
+ \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} syntax is
+ used for the query.
\sa QWebElement::findFirst()
*/
@@ -1123,11 +1164,11 @@ void QWebFrame::print(QPrinter *printer) const
printContext.begin(pageRect.width());
- printContext.computePageRects(pageRect, /*headerHeight*/0, /*footerHeight*/0, /*userScaleFactor*/1.0, pageHeight);
+ printContext.computePageRects(pageRect, /* headerHeight */ 0, /* footerHeight */ 0, /* userScaleFactor */ 1.0, pageHeight);
int docCopies;
int pageCopies;
- if (printer->collateCopies() == true){
+ if (printer->collateCopies()) {
docCopies = 1;
pageCopies = printer->numCopies();
} else {
@@ -1340,7 +1381,8 @@ QWebHitTestResultPrivate::QWebHitTestResultPrivate(const WebCore::HitTestResult
return;
pos = hitTest.point();
boundingRect = hitTest.boundingBox();
- title = hitTest.title();
+ WebCore::TextDirection dir;
+ title = hitTest.title(dir);
linkText = hitTest.textContent();
linkUrl = hitTest.absoluteLinkURL();
linkTitle = hitTest.titleDisplayString();
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h
index 2c5309a..55c73b4 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h
@@ -60,8 +60,7 @@ class QWebFrameData;
class QWebHitTestResultPrivate;
class QWebFrame;
-class QWEBKIT_EXPORT QWebHitTestResult
-{
+class QWEBKIT_EXPORT QWebHitTestResult {
public:
QWebHitTestResult();
QWebHitTestResult(const QWebHitTestResult &other);
@@ -102,17 +101,18 @@ private:
friend class QWebPage;
};
-class QWEBKIT_EXPORT QWebFrame : public QObject
-{
+class QWEBKIT_EXPORT QWebFrame : public QObject {
Q_OBJECT
Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
Q_PROPERTY(QString title READ title)
Q_PROPERTY(QUrl url READ url WRITE setUrl)
+ Q_PROPERTY(QUrl requestedUrl READ requestedUrl)
Q_PROPERTY(QUrl baseUrl READ baseUrl)
Q_PROPERTY(QIcon icon READ icon)
Q_PROPERTY(QSize contentsSize READ contentsSize)
Q_PROPERTY(QPoint scrollPosition READ scrollPosition WRITE setScrollPosition)
+ Q_PROPERTY(bool clipRenderToViewport READ clipRenderToViewport WRITE setClipRenderToViewport)
Q_PROPERTY(bool focus READ hasFocus)
private:
QWebFrame(QWebPage *parent, QWebFrameData *frameData);
@@ -142,6 +142,7 @@ public:
QString title() const;
void setUrl(const QUrl &url);
QUrl url() const;
+ QUrl requestedUrl() const;
QUrl baseUrl() const;
QIcon icon() const;
QMultiMap<QString, QString> metaData() const;
@@ -166,7 +167,8 @@ public:
void render(QPainter *painter, const QRegion &clip);
void render(QPainter *painter);
- void renderContents(QPainter *painter, const QRegion &contents);
+ bool clipRenderToViewport() const;
+ void setClipRenderToViewport(bool clipRenderToViewport);
void setTextSizeMultiplier(qreal factor);
qreal textSizeMultiplier() const;
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe_p.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe_p.h
index 2b5c187..d6afc01 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe_p.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe_p.h
@@ -31,8 +31,7 @@
#include "wtf/RefPtr.h"
#include "Frame.h"
-namespace WebCore
-{
+namespace WebCore {
class FrameLoaderClientQt;
class FrameView;
class HTMLFrameOwnerElement;
@@ -40,8 +39,7 @@ namespace WebCore
}
class QWebPage;
-class QWebFrameData
-{
+class QWebFrameData {
public:
QWebFrameData(WebCore::Page*, WebCore::Frame* parentFrame = 0,
WebCore::HTMLFrameOwnerElement* = 0,
@@ -60,8 +58,7 @@ public:
int marginHeight;
};
-class QWebFramePrivate
-{
+class QWebFramePrivate {
public:
QWebFramePrivate()
: q(0)
@@ -73,6 +70,7 @@ public:
, allowsScrolling(true)
, marginWidth(-1)
, marginHeight(-1)
+ , clipRenderToViewport(true)
{}
void init(QWebFrame* qframe, QWebFrameData* frameData);
@@ -82,12 +80,12 @@ public:
WebCore::Scrollbar* verticalScrollBar() const;
Qt::ScrollBarPolicy horizontalScrollBarPolicy;
- Qt::ScrollBarPolicy verticalScrollBarPolicy;
+ Qt::ScrollBarPolicy verticalScrollBarPolicy;
static WebCore::Frame* core(QWebFrame*);
static QWebFrame* kit(WebCore::Frame*);
- void renderPrivate(QPainter *painter, const QRegion &clip, bool contents = false);
+ void renderPrivate(QPainter *painter, const QRegion &clip);
QWebFrame *q;
WebCore::FrameLoaderClientQt *frameLoaderClient;
@@ -97,10 +95,10 @@ public:
bool allowsScrolling;
int marginWidth;
int marginHeight;
+ bool clipRenderToViewport;
};
-class QWebHitTestResultPrivate
-{
+class QWebHitTestResultPrivate {
public:
QWebHitTestResultPrivate() : isContentEditable(false), isContentSelected(false), isScrollBar(false) {}
QWebHitTestResultPrivate(const WebCore::HitTestResult &hitTest);
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp
index 7cdc00e..1c1c72a 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp
@@ -32,7 +32,6 @@
/*!
\class QWebHistoryItem
- \ingroup explicitly-shared
\since 4.4
\brief The QWebHistoryItem class represents one item in the history of a QWebPage
@@ -52,13 +51,17 @@
\row \o userData() \o The user specific data that was stored with the history item.
\endtable
- \note QWebHistoryItem objects are value based and \l{explicitly shared}.
+ \note QWebHistoryItem objects are value based, but \e{explicitly shared}. Changing
+ a QWebHistoryItem instance by calling setUserData() will change all copies of that
+ instance.
\sa QWebHistory, QWebPage::history(), QWebHistoryInterface
*/
/*!
- Constructs a history item from \a other.
+ Constructs a history item from \a other. The new item and \a other
+ will share their data, and modifying either this item or \a other will
+ modify both instances.
*/
QWebHistoryItem::QWebHistoryItem(const QWebHistoryItem &other)
: d(other.d)
@@ -66,7 +69,9 @@ QWebHistoryItem::QWebHistoryItem(const QWebHistoryItem &other)
}
/*!
- Assigns the \a other history item to this.
+ Assigns the \a other history item to this. This item and \a other
+ will share their data, and modifying either this item or \a other will
+ modify both instances.
*/
QWebHistoryItem &QWebHistoryItem::operator=(const QWebHistoryItem &other)
{
@@ -163,6 +168,8 @@ QVariant QWebHistoryItem::userData() const
\since 4.5
Stores user specific data \a userData with the history item.
+
+ \note All copies of this item will be modified.
\sa userData()
*/
@@ -239,7 +246,7 @@ void QWebHistory::clear()
{
RefPtr<WebCore::HistoryItem> current = d->lst->currentItem();
int capacity = d->lst->capacity();
- d->lst->setCapacity(0);
+ d->lst->setCapacity(0);
WebCore::Page* page = d->lst->page();
if (page && page->groupPtr())
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h
index 1a048f4..e46f124 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h
@@ -35,8 +35,8 @@ namespace WebCore {
}
class QWebHistoryItemPrivate;
-class QWEBKIT_EXPORT QWebHistoryItem
-{
+
+class QWEBKIT_EXPORT QWebHistoryItem {
public:
QWebHistoryItem(const QWebHistoryItem &other);
QWebHistoryItem &operator=(const QWebHistoryItem &other);
@@ -74,18 +74,17 @@ private:
class QWebHistoryPrivate;
-class QWEBKIT_EXPORT QWebHistory
-{
+class QWEBKIT_EXPORT QWebHistory {
public:
enum HistoryStateVersion {
HistoryVersion_1,
/*, HistoryVersion_2, */
DefaultHistoryVersion = HistoryVersion_1
};
-
+
bool restoreState(const QByteArray& buffer);
QByteArray saveState(HistoryStateVersion version = DefaultHistoryVersion) const;
-
+
void clear();
QList<QWebHistoryItem> items() const;
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory_p.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory_p.h
index 4bee62b..e77adef 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory_p.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory_p.h
@@ -25,8 +25,7 @@
#include <QtCore/qglobal.h>
#include <QtCore/qshareddata.h>
-class Q_AUTOTEST_EXPORT QWebHistoryItemPrivate : public QSharedData
-{
+class Q_AUTOTEST_EXPORT QWebHistoryItemPrivate : public QSharedData {
public:
static QExplicitlySharedDataPointer<QWebHistoryItemPrivate> get(QWebHistoryItem *q)
{
@@ -65,8 +64,7 @@ public:
WebCore::HistoryItem *item;
};
-class QWebHistoryPrivate : public QSharedData
-{
+class QWebHistoryPrivate : public QSharedData {
public:
QWebHistoryPrivate(WebCore::BackForwardList *l)
{
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp
index 88a1aa3..87d52ce 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp
@@ -28,13 +28,13 @@
#include "PlatformString.h"
-static QWebHistoryInterface *default_interface;
+static QWebHistoryInterface* default_interface;
static bool gRoutineAdded;
static void gCleanupInterface()
{
- if (default_interface && default_interface->parent() == 0)
+ if (default_interface && !default_interface->parent())
delete default_interface;
default_interface = 0;
}
@@ -47,11 +47,12 @@ static void gCleanupInterface()
When the application exists QWebHistoryInterface will automatically delete the
\a defaultInterface if it does not have a parent.
*/
-void QWebHistoryInterface::setDefaultInterface(QWebHistoryInterface *defaultInterface)
+void QWebHistoryInterface::setDefaultInterface(QWebHistoryInterface* defaultInterface)
{
if (default_interface == defaultInterface)
return;
- if (default_interface && default_interface->parent() == 0)
+
+ if (default_interface && !default_interface->parent())
delete default_interface;
default_interface = defaultInterface;
@@ -70,7 +71,7 @@ void QWebHistoryInterface::setDefaultInterface(QWebHistoryInterface *defaultInte
Returns the default interface that will be used by WebKit. If no
default interface has been set, QtWebkit will not track history.
*/
-QWebHistoryInterface *QWebHistoryInterface::defaultInterface()
+QWebHistoryInterface* QWebHistoryInterface::defaultInterface()
{
return default_interface;
}
@@ -91,7 +92,8 @@ QWebHistoryInterface *QWebHistoryInterface::defaultInterface()
/*!
Constructs a new QWebHistoryInterface with parent \a parent.
*/
-QWebHistoryInterface::QWebHistoryInterface(QObject *parent) : QObject(parent)
+QWebHistoryInterface::QWebHistoryInterface(QObject* parent)
+ : QObject(parent)
{
}
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.h
index 670fca0..a49c586 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.h
@@ -26,8 +26,7 @@
#include "qwebkitglobal.h"
-class QWEBKIT_EXPORT QWebHistoryInterface : public QObject
-{
+class QWEBKIT_EXPORT QWebHistoryInterface : public QObject {
Q_OBJECT
public:
QWebHistoryInterface(QObject *parent = 0);
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 3c2151b..1a45fe6 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -59,6 +59,7 @@
#include "Scrollbar.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformWheelEvent.h"
+#include "PluginDatabase.h"
#include "ProgressTracker.h"
#include "RefPtr.h"
#include "HashMap.h"
@@ -99,6 +100,18 @@
using namespace WebCore;
+void QWEBKIT_EXPORT qt_drt_overwritePluginDirectories()
+{
+ PluginDatabase* db = PluginDatabase::installedPlugins(/* populate */ false);
+
+ Vector<String> paths;
+ String qtPath(getenv("QTWEBKIT_PLUGIN_PATH"));
+ qtPath.split(UChar(':'), /* allowEmptyEntries */ false, paths);
+
+ db->setPluginDirectories(paths);
+ db->refresh();
+}
+
bool QWebPagePrivate::drtRun = false;
void QWEBKIT_EXPORT qt_drt_run(bool b)
{
@@ -116,29 +129,29 @@ QString QWEBKIT_EXPORT qt_webpage_groupName(QWebPage* page)
}
// Lookup table mapping QWebPage::WebActions to the associated Editor commands
-static const char* editorCommandWebActions[] =
+static const char* editorCommandWebActions[] =
{
0, // OpenLink,
0, // OpenLinkInNewWindow,
0, // OpenFrameInNewWindow,
-
+
0, // DownloadLinkToDisk,
0, // CopyLinkToClipboard,
-
+
0, // OpenImageInNewWindow,
0, // DownloadImageToDisk,
0, // CopyImageToClipboard,
-
+
0, // Back,
0, // Forward,
0, // Stop,
0, // Reload,
-
+
"Cut", // Cut,
"Copy", // Copy,
"Paste", // Paste,
-
+
"Undo", // Undo,
"Redo", // Redo,
"MoveForward", // MoveToNextChar,
@@ -167,21 +180,22 @@ static const char* editorCommandWebActions[] =
"MoveToEndOfDocumentAndModifySelection", // SelectEndOfDocument,
"DeleteWordBackward", // DeleteStartOfWord,
"DeleteWordForward", // DeleteEndOfWord,
-
+
0, // SetTextDirectionDefault,
0, // SetTextDirectionLeftToRight,
0, // SetTextDirectionRightToLeft,
-
+
"ToggleBold", // ToggleBold,
"ToggleItalic", // ToggleItalic,
"ToggleUnderline", // ToggleUnderline,
-
+
0, // InspectElement,
"InsertNewline", // InsertParagraphSeparator
"InsertLineBreak", // InsertLineSeparator
"SelectAll", // SelectAll
+ 0, // ReloadAndBypassCache,
"PasteAndMatchStyle", // PasteAndMatchStyle
"RemoveFormat", // RemoveFormat
@@ -206,7 +220,6 @@ const char* QWebPagePrivate::editorCommandForWebActions(QWebPage::WebAction acti
{
if ((action > QWebPage::NoWebAction) && (action < int(sizeof(editorCommandWebActions) / sizeof(const char*))))
return editorCommandWebActions[action];
-
return 0;
}
@@ -252,7 +265,7 @@ static inline Qt::DropAction dragOpToDropAction(unsigned actions)
QWebPagePrivate::QWebPagePrivate(QWebPage *qq)
: q(qq)
, view(0)
- , viewportSize(QSize(0,0))
+ , viewportSize(QSize(0, 0))
{
WebCore::InitializeLoggingChannelsIfNecessary();
JSC::initializeThreading();
@@ -405,9 +418,8 @@ QMenu *QWebPagePrivate::createContextMenu(const WebCore::ContextMenu *webcoreMen
if (anyEnabledAction) {
subMenu->setTitle(item.title());
menu->addAction(subMenu->menuAction());
- } else {
+ } else
delete subMenu;
- }
break;
}
}
@@ -456,6 +468,7 @@ void QWebPagePrivate::updateAction(QWebPage::WebAction action)
enabled = loader->isLoading();
break;
case QWebPage::Reload:
+ case QWebPage::ReloadAndBypassCache:
enabled = !loader->isLoading();
break;
#ifndef QT_NO_UNDOSTACK
@@ -501,6 +514,7 @@ void QWebPagePrivate::updateNavigationActions()
updateAction(QWebPage::Forward);
updateAction(QWebPage::Stop);
updateAction(QWebPage::Reload);
+ updateAction(QWebPage::ReloadAndBypassCache);
}
void QWebPagePrivate::updateEditorActions()
@@ -647,12 +661,12 @@ void QWebPagePrivate::mouseReleaseEvent(QMouseEvent *ev)
Pasteboard::generalPasteboard()->setSelectionMode(true);
WebCore::Frame* focusFrame = page->focusController()->focusedOrMainFrame();
if (ev->button() == Qt::LeftButton) {
- if(focusFrame && (focusFrame->editor()->canCopy() || focusFrame->editor()->canDHTMLCopy())) {
+ if (focusFrame && (focusFrame->editor()->canCopy() || focusFrame->editor()->canDHTMLCopy())) {
focusFrame->editor()->copy();
ev->setAccepted(true);
}
} else if (ev->button() == Qt::MidButton) {
- if(focusFrame && (focusFrame->editor()->canPaste() || focusFrame->editor()->canDHTMLPaste())) {
+ if (focusFrame && (focusFrame->editor()->canPaste() || focusFrame->editor()->canDHTMLPaste())) {
focusFrame->editor()->paste();
ev->setAccepted(true);
}
@@ -822,11 +836,10 @@ void QWebPagePrivate::focusInEvent(QFocusEvent *ev)
FocusController *focusController = page->focusController();
Frame *frame = focusController->focusedFrame();
focusController->setActive(true);
- if (frame) {
+ if (frame)
focusController->setFocused(true);
- } else {
+ else
focusController->setFocusedFrame(QWebFramePrivate::core(mainFrame));
- }
}
void QWebPagePrivate::focusOutEvent(QFocusEvent *ev)
@@ -932,7 +945,7 @@ void QWebPagePrivate::inputMethodEvent(QInputMethodEvent *ev)
QString preedit = ev->preeditString();
// ### FIXME: use the provided QTextCharFormat (use color at least)
Vector<CompositionUnderline> underlines;
- underlines.append(CompositionUnderline(0, preedit.length(), Color(0,0,0), false));
+ underlines.append(CompositionUnderline(0, preedit.length(), Color(0, 0, 0), false));
editor->setComposition(preedit, underlines, preedit.length(), 0);
}
ev->accept();
@@ -968,9 +981,8 @@ void QWebPagePrivate::shortcutOverrideEvent(QKeyEvent* event)
}
}
#ifndef QT_NO_SHORTCUT
- else if (editorActionForKeyEvent(event) != QWebPage::NoWebAction) {
+ else if (editorActionForKeyEvent(event) != QWebPage::NoWebAction)
event->accept();
- }
#endif
}
}
@@ -1036,12 +1048,11 @@ bool QWebPagePrivate::handleScrolling(QKeyEvent *ev, Frame *frame)
*/
QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const
{
- switch(property) {
+ switch (property) {
case Qt::ImMicroFocus: {
Frame *frame = d->page->focusController()->focusedFrame();
- if (frame) {
+ if (frame)
return QVariant(frame->selection()->absoluteCaretBounds());
- }
return QVariant();
}
case Qt::ImFont: {
@@ -1054,9 +1065,8 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const
Frame *frame = d->page->focusController()->focusedFrame();
if (frame) {
VisibleSelection selection = frame->selection()->selection();
- if (selection.isCaret()) {
+ if (selection.isCaret())
return QVariant(selection.start().deprecatedEditingOffset());
- }
}
return QVariant();
}
@@ -1064,9 +1074,8 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const
Frame *frame = d->page->focusController()->focusedFrame();
if (frame) {
Document *document = frame->document();
- if (document->focusedNode()) {
+ if (document->focusedNode())
return QVariant(document->focusedNode()->nodeValue());
- }
}
return QVariant();
}
@@ -1142,6 +1151,7 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const
\value Forward Navigate forward in the history of navigated links.
\value Stop Stop loading the current page.
\value Reload Reload the current page.
+ \value ReloadAndBypassCache Reload the current page, but do not use any local cache. (Added in Qt 4.6)
\value Cut Cut the content currently selected into the clipboard.
\value Copy Copy the content currently selected into the clipboard.
\value Paste Paste content from the clipboard.
@@ -1415,9 +1425,8 @@ bool QWebPage::javaScriptPrompt(QWebFrame *frame, const QString& msg, const QStr
bool ok = false;
#ifndef QT_NO_INPUTDIALOG
QString x = QInputDialog::getText(d->view, tr("JavaScript Prompt - %1").arg(mainFrame()->url().host()), msg, QLineEdit::Normal, defaultValue, &ok);
- if (ok && result) {
+ if (ok && result)
*result = x;
- }
#endif
return ok;
}
@@ -1568,7 +1577,10 @@ void QWebPage::triggerAction(WebAction action, bool checked)
mainFrame()->d->frame->loader()->stopForUserCancel();
break;
case Reload:
- mainFrame()->d->frame->loader()->reload();
+ mainFrame()->d->frame->loader()->reload(/*endtoendreload*/false);
+ break;
+ case ReloadAndBypassCache:
+ mainFrame()->d->frame->loader()->reload(/*endtoendreload*/true);
break;
case SetTextDirectionDefault:
editor->setBaseWritingDirection(NaturalWritingDirection);
@@ -1630,9 +1642,8 @@ QSize QWebPage::fixedContentsSize() const
QWebFrame* frame = d->mainFrame;
if (frame) {
WebCore::FrameView* view = frame->d->frame->view();
- if (view && view->useFixedLayout()) {
+ if (view && view->useFixedLayout())
return d->mainFrame->d->frame->view()->fixedLayoutSize();
- }
}
return d->fixedLayoutSize;
@@ -2140,9 +2151,8 @@ void QWebPage::setContentEditable(bool editable)
frame->applyEditingStyleToBodyElement();
// FIXME: mac port calls this if there is no selectedDOMRange
//frame->setSelectionFromNone();
- } else {
+ } else
frame->removeEditingStyleFromBodyElement();
- }
}
d->updateEditorActions();
@@ -2210,9 +2220,8 @@ bool QWebPage::swallowContextMenuEvent(QContextMenuEvent *event)
if (QWebFrame* webFrame = frameAt(event->pos())) {
Frame* frame = QWebFramePrivate::core(webFrame);
- if (Scrollbar* scrollbar = frame->view()->scrollbarAtPoint(PlatformMouseEvent(event, 1).pos())) {
+ if (Scrollbar* scrollbar = frame->view()->scrollbarAtPoint(PlatformMouseEvent(event, 1).pos()))
return scrollbar->contextMenu(PlatformMouseEvent(event, 1));
- }
}
WebCore::Frame* focusedFrame = d->page->focusController()->focusedOrMainFrame();
@@ -2267,9 +2276,8 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
originallyEnabledWebActions &= ~visitedWebActions; // Mask out visited actions (they're part of the menu)
for (int i = 0; i < QWebPage::WebActionCount; ++i) {
if (originallyEnabledWebActions.at(i)) {
- if (QAction *a = this->action(QWebPage::WebAction(i))) {
+ if (QAction *a = this->action(QWebPage::WebAction(i)))
a->setEnabled(true);
- }
}
}
@@ -2392,9 +2400,8 @@ bool QWebPage::findText(const QString &subString, FindFlags options)
if (subString.isEmpty()) {
d->page->unmarkAllTextMatches();
return true;
- } else {
+ } else
return d->page->markAllMatchesForText(subString, caseSensitivity, true, 0);
- }
} else {
::FindDirection direction = ::FindDirectionForward;
if (options & FindBackward)
@@ -2635,7 +2642,7 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
#if defined Q_OS_WIN32
QString ver;
- switch(QSysInfo::WindowsVersion) {
+ switch (QSysInfo::WindowsVersion) {
case QSysInfo::WV_32s:
ver = "Windows 3.1";
break;
@@ -2709,7 +2716,8 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
}
-void QWebPagePrivate::_q_onLoadProgressChanged(int) {
+void QWebPagePrivate::_q_onLoadProgressChanged(int)
+{
m_totalBytes = page->progress()->totalPageAndResourceBytesToLoad();
m_bytesReceived = page->progress()->totalBytesReceived();
}
@@ -2721,7 +2729,8 @@ void QWebPagePrivate::_q_onLoadProgressChanged(int) {
\sa bytesReceived()
*/
-quint64 QWebPage::totalBytes() const {
+quint64 QWebPage::totalBytes() const
+{
return d->m_totalBytes;
}
@@ -2731,7 +2740,8 @@ quint64 QWebPage::totalBytes() const {
\sa totalBytes()
*/
-quint64 QWebPage::bytesReceived() const {
+quint64 QWebPage::bytesReceived() const
+{
return d->m_bytesReceived;
}
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h
index 517a77c..24741a1 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h
@@ -59,8 +59,7 @@ namespace WebCore {
struct FrameLoadRequest;
}
-class QWEBKIT_EXPORT QWebPage : public QObject
-{
+class QWEBKIT_EXPORT QWebPage : public QObject {
Q_OBJECT
Q_PROPERTY(bool modified READ isModified)
@@ -149,6 +148,7 @@ public:
InsertLineSeparator,
SelectAll,
+ ReloadAndBypassCache,
PasteAndMatchStyle,
RemoveFormat,
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h
index 3a3a674..87c624d 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h
@@ -35,8 +35,7 @@
#include <wtf/RefPtr.h>
-namespace WebCore
-{
+namespace WebCore {
class ChromeClientQt;
class ContextMenuClientQt;
class ContextMenuItem;
@@ -66,14 +65,13 @@ class QMenu;
class QBitArray;
QT_END_NAMESPACE
-class QWebPagePrivate
-{
+class QWebPagePrivate {
public:
- QWebPagePrivate(QWebPage *);
+ QWebPagePrivate(QWebPage*);
~QWebPagePrivate();
void createMainFrame();
#ifndef QT_NO_CONTEXTMENU
- QMenu *createContextMenu(const WebCore::ContextMenu *webcoreMenu, const QList<WebCore::ContextMenuItem> *items, QBitArray *visitedWebActions);
+ QMenu* createContextMenu(const WebCore::ContextMenu* webcoreMenu, const QList<WebCore::ContextMenuItem>* items, QBitArray* visitedWebActions);
#endif
void _q_onLoadProgressChanged(int);
void _q_webActionTriggered(bool checked);
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.h
index 3531b06..cff774d 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.h
@@ -31,8 +31,7 @@ class QString;
QT_END_NAMESPACE
class QWebPluginFactoryPrivate;
-class QWEBKIT_EXPORT QWebPluginFactory : public QObject
-{
+class QWEBKIT_EXPORT QWebPluginFactory : public QObject {
Q_OBJECT
public:
struct MimeType {
@@ -47,16 +46,16 @@ public:
QList<MimeType> mimeTypes;
};
- explicit QWebPluginFactory(QObject *parent = 0);
+ explicit QWebPluginFactory(QObject* parent = 0);
virtual ~QWebPluginFactory();
virtual QList<Plugin> plugins() const = 0;
virtual void refreshPlugins();
- virtual QObject *create(const QString &mimeType,
- const QUrl &url,
- const QStringList &argumentNames,
- const QStringList &argumentValues) const = 0;
+ virtual QObject *create(const QString& mimeType,
+ const QUrl&,
+ const QStringList& argumentNames,
+ const QStringList& argumentValues) const = 0;
enum Extension {
};
@@ -64,11 +63,11 @@ public:
{};
class ExtensionReturn
{};
- virtual bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0);
+ virtual bool extension(Extension extension, const ExtensionOption* option = 0, ExtensionReturn* output = 0);
virtual bool supportsExtension(Extension extension) const;
private:
- QWebPluginFactoryPrivate *d;
+ QWebPluginFactoryPrivate* d;
};
#endif
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.h
index b52194d..3cfb0f4 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.h
@@ -34,8 +34,7 @@ class QWebSecurityOriginPrivate;
class QWebDatabase;
class QWebFrame;
-class QWEBKIT_EXPORT QWebSecurityOrigin
-{
+class QWEBKIT_EXPORT QWebSecurityOrigin {
public:
static QList<QWebSecurityOrigin> allOrigins();
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin_p.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin_p.h
index 73fe8ed..cdc93bd 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin_p.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin_p.h
@@ -23,8 +23,7 @@
#include "SecurityOrigin.h"
#include "RefPtr.h"
-class QWebSecurityOriginPrivate : public QSharedData
-{
+class QWebSecurityOriginPrivate : public QSharedData {
public:
QWebSecurityOriginPrivate(WebCore::SecurityOrigin* o)
{
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
index 02ef4a0..fb94d55 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
@@ -42,10 +42,9 @@
#include <QUrl>
#include <QFileInfo>
-class QWebSettingsPrivate
-{
+class QWebSettingsPrivate {
public:
- QWebSettingsPrivate(WebCore::Settings *wcSettings = 0)
+ QWebSettingsPrivate(WebCore::Settings* wcSettings = 0)
: settings(wcSettings)
{
}
@@ -60,7 +59,7 @@ public:
qint64 offlineStorageDefaultQuota;
void apply();
- WebCore::Settings *settings;
+ WebCore::Settings* settings;
};
typedef QHash<int, QPixmap> WebGraphicHash;
@@ -80,14 +79,14 @@ static WebGraphicHash* graphics()
return hash;
}
-Q_GLOBAL_STATIC(QList<QWebSettingsPrivate *>, allSettings);
+Q_GLOBAL_STATIC(QList<QWebSettingsPrivate*>, allSettings);
void QWebSettingsPrivate::apply()
{
if (settings) {
settings->setTextAreasAreResizable(true);
- QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
+ QWebSettingsPrivate* global = QWebSettings::globalSettings()->d;
QString family = fontFamilies.value(QWebSettings::StandardFont,
global->fontFamilies.value(QWebSettings::StandardFont));
@@ -194,7 +193,7 @@ void QWebSettingsPrivate::apply()
global->attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls));
settings->setAllowUniversalAccessFromFileURLs(value);
} else {
- QList<QWebSettingsPrivate *> settings = *::allSettings();
+ QList<QWebSettingsPrivate*> settings = *::allSettings();
for (int i = 0; i < settings.count(); ++i)
settings[i]->apply();
}
@@ -206,9 +205,9 @@ void QWebSettingsPrivate::apply()
Any setting changed on the default object is automatically applied to all
QWebPage instances where the particular setting is not overriden already.
*/
-QWebSettings *QWebSettings::globalSettings()
+QWebSettings* QWebSettings::globalSettings()
{
- static QWebSettings *global = 0;
+ static QWebSettings* global = 0;
if (!global)
global = new QWebSettings;
return global;
@@ -365,7 +364,7 @@ QWebSettings::QWebSettings()
/*!
\internal
*/
-QWebSettings::QWebSettings(WebCore::Settings *settings)
+QWebSettings::QWebSettings(WebCore::Settings* settings)
: d(new QWebSettingsPrivate(settings))
{
d->settings = settings;
@@ -400,7 +399,7 @@ int QWebSettings::fontSize(FontSize type) const
{
int defaultValue = 0;
if (d->settings) {
- QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
+ QWebSettingsPrivate* global = QWebSettings::globalSettings()->d;
defaultValue = global->fontSizes.value(type);
}
return d->fontSizes.value(type, defaultValue);
@@ -427,7 +426,7 @@ void QWebSettings::resetFontSize(FontSize type)
\sa userStyleSheetUrl()
*/
-void QWebSettings::setUserStyleSheetUrl(const QUrl &location)
+void QWebSettings::setUserStyleSheetUrl(const QUrl& location)
{
d->userStyleSheetLocation = location;
d->apply();
@@ -453,7 +452,7 @@ QUrl QWebSettings::userStyleSheetUrl() const
\sa defaultTextEncoding()
*/
-void QWebSettings::setDefaultTextEncoding(const QString &encoding)
+void QWebSettings::setDefaultTextEncoding(const QString& encoding)
{
d->defaultTextEncoding = encoding;
d->apply();
@@ -478,7 +477,7 @@ QString QWebSettings::defaultTextEncoding() const
Setting an empty path disables the icon database.
*/
-void QWebSettings::setIconDatabasePath(const QString &path)
+void QWebSettings::setIconDatabasePath(const QString& path)
{
WebCore::iconDatabase()->delayDatabaseCleanup();
@@ -501,11 +500,10 @@ void QWebSettings::setIconDatabasePath(const QString &path)
*/
QString QWebSettings::iconDatabasePath()
{
- if (WebCore::iconDatabase()->isEnabled() && WebCore::iconDatabase()->isOpen()) {
+ if (WebCore::iconDatabase()->isEnabled() && WebCore::iconDatabase()->isOpen())
return WebCore::iconDatabase()->databasePath();
- } else {
+ else
return QString();
- }
}
/*!
@@ -527,18 +525,18 @@ void QWebSettings::clearIconDatabase()
\sa setIconDatabasePath()
*/
-QIcon QWebSettings::iconForUrl(const QUrl &url)
+QIcon QWebSettings::iconForUrl(const QUrl& url)
{
WebCore::Image* image = WebCore::iconDatabase()->iconForPageURL(WebCore::KURL(url).string(),
WebCore::IntSize(16, 16));
- if (!image) {
+ if (!image)
return QPixmap();
- }
- QPixmap *icon = image->nativeImageForCurrentFrame();
- if (!icon) {
+
+ QPixmap* icon = image->nativeImageForCurrentFrame();
+ if (!icon)
return QPixmap();
- }
- return *icon;
+
+ return* icon;
}
/*!
@@ -550,9 +548,9 @@ QIcon QWebSettings::iconForUrl(const QUrl &url)
\sa webGraphic()
*/
-void QWebSettings::setWebGraphic(WebGraphic type, const QPixmap &graphic)
+void QWebSettings::setWebGraphic(WebGraphic type, const QPixmap& graphic)
{
- WebGraphicHash *h = graphics();
+ WebGraphicHash* h = graphics();
if (graphic.isNull())
h->remove(type);
else
@@ -641,7 +639,7 @@ int QWebSettings::maximumPagesInCache()
*/
void QWebSettings::setObjectCacheCapacities(int cacheMinDeadCapacity, int cacheMaxDead, int totalCapacity)
{
- bool disableCache = cacheMinDeadCapacity == 0 && cacheMaxDead == 0 && totalCapacity == 0;
+ bool disableCache = !cacheMinDeadCapacity && !cacheMaxDead && !totalCapacity;
WebCore::cache()->setDisabled(disableCache);
WebCore::cache()->setCapacities(qMax(0, cacheMinDeadCapacity),
@@ -653,7 +651,7 @@ void QWebSettings::setObjectCacheCapacities(int cacheMinDeadCapacity, int cacheM
Sets the actual font family to \a family for the specified generic family,
\a which.
*/
-void QWebSettings::setFontFamily(FontFamily which, const QString &family)
+void QWebSettings::setFontFamily(FontFamily which, const QString& family)
{
d->fontFamilies.insert(which, family);
d->apply();
@@ -667,7 +665,7 @@ QString QWebSettings::fontFamily(FontFamily which) const
{
QString defaultValue;
if (d->settings) {
- QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
+ QWebSettingsPrivate* global = QWebSettings::globalSettings()->d;
defaultValue = global->fontFamilies.value(which);
}
return d->fontFamilies.value(which, defaultValue);
@@ -708,7 +706,7 @@ bool QWebSettings::testAttribute(WebAttribute attr) const
{
bool defaultValue = false;
if (d->settings) {
- QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
+ QWebSettingsPrivate* global = QWebSettings::globalSettings()->d;
defaultValue = global->attributes.value(attr);
}
return d->attributes.value(attr, defaultValue);
@@ -789,7 +787,7 @@ qint64 QWebSettings::offlineStorageDefaultQuota()
/*
\internal
\relates QWebSettings
-
+
Sets the path for HTML5 offline web application cache storage to \a path.
\a path must point to an existing directory where the cache is stored.
@@ -808,7 +806,7 @@ void QWEBKIT_EXPORT qt_websettings_setOfflineWebApplicationCachePath(const QStri
/*
\internal
\relates QWebSettings
-
+
Returns the path of the HTML5 offline web application cache storage
or an empty string if the feature is disabled.
@@ -837,7 +835,7 @@ QString QWEBKIT_EXPORT qt_websettings_offlineWebApplicationCachePath()
*/
void QWEBKIT_EXPORT qt_websettings_setLocalStorageDatabasePath(QWebSettings* settings, const QString& path)
{
- QWebSettingsPrivate *d = settings->handle();
+ QWebSettingsPrivate* d = settings->handle();
d->localStorageDatabasePath = path;
d->apply();
}
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
index 7cbca25..63144cb 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
@@ -27,8 +27,7 @@
#include <QtGui/qicon.h>
#include <QtCore/qshareddata.h>
-namespace WebCore
-{
+namespace WebCore {
class Settings;
}
@@ -38,8 +37,7 @@ QT_BEGIN_NAMESPACE
class QUrl;
QT_END_NAMESPACE
-class QWEBKIT_EXPORT QWebSettings
-{
+class QWEBKIT_EXPORT QWebSettings {
public:
enum FontFamily {
StandardFont,
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
index 6c5860c..e1a0c98 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
@@ -30,8 +30,7 @@
#include "qdir.h"
#include "qfile.h"
-class QWebViewPrivate
-{
+class QWebViewPrivate {
public:
QWebViewPrivate(QWebView *view)
: view(view)
@@ -87,7 +86,7 @@ public:
\image qwebview-url.png
A web site can be loaded onto QWebView with the load() function. Like all
- Qt Widgets, the show() function must be invoked in order to display
+ Qt widgets, the show() function must be invoked in order to display
QWebView. The snippet below illustrates this:
\snippet webkitsnippets/simple/main.cpp Using QWebView
@@ -147,7 +146,8 @@ public:
if you do not require QWidget attributes. Nevertheless, QtWebKit depends
on QtGui, so you should use a QApplication instead of QCoreApplication.
- \sa {Previewer Example}, {Browser}
+ \sa {Previewer Example}, {Web Browser}, {Form Extractor Example},
+ {Google Chat Example}, {Fancy Browser Example}
*/
/*!
@@ -206,16 +206,15 @@ QWebPage *QWebView::page() const
\sa page()
*/
-void QWebView::setPage(QWebPage *page)
+void QWebView::setPage(QWebPage* page)
{
if (d->page == page)
return;
if (d->page) {
- if (d->page->parent() == this) {
+ if (d->page->parent() == this)
delete d->page;
- } else {
+ else
d->page->disconnect(this);
- }
}
d->page = page;
if (d->page) {
@@ -710,9 +709,8 @@ bool QWebView::event(QEvent *e)
}
#endif
#endif
- } else if (e->type() == QEvent::Leave) {
+ } else if (e->type() == QEvent::Leave)
d->page->event(e);
- }
}
return QWidget::event(e);
@@ -815,7 +813,7 @@ void QWebView::paintEvent(QPaintEvent *ev)
#ifdef QWEBKIT_TIME_RENDERING
int elapsed = time.elapsed();
- qDebug()<<"paint event on "<<ev->region()<<", took to render = "<<elapsed;
+ qDebug() << "paint event on " << ev->region() << ", took to render = " << elapsed;
#endif
}
@@ -1011,9 +1009,8 @@ void QWebView::inputMethodEvent(QInputMethodEvent *e)
*/
void QWebView::changeEvent(QEvent *e)
{
- if (d->page && e->type() == QEvent::PaletteChange) {
+ if (d->page && e->type() == QEvent::PaletteChange)
d->page->setPalette(palette());
- }
QWidget::changeEvent(e);
}
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
index 0dab925..e886144 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
@@ -40,8 +40,7 @@ class QWebPage;
class QWebViewPrivate;
class QWebNetworkRequest;
-class QWEBKIT_EXPORT QWebView : public QWidget
-{
+class QWEBKIT_EXPORT QWebView : public QWidget {
Q_OBJECT
Q_PROPERTY(QString title READ title)
Q_PROPERTY(QUrl url READ url WRITE setUrl)
@@ -54,27 +53,27 @@ class QWEBKIT_EXPORT QWebView : public QWidget
Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints)
Q_FLAGS(QPainter::RenderHints)
public:
- explicit QWebView(QWidget *parent = 0);
+ explicit QWebView(QWidget* parent = 0);
virtual ~QWebView();
- QWebPage *page() const;
- void setPage(QWebPage *page);
+ QWebPage* page() const;
+ void setPage(QWebPage* page);
- static QUrl guessUrlFromString(const QString &string);
+ static QUrl guessUrlFromString(const QString& string);
- void load(const QUrl &url);
+ void load(const QUrl& url);
#if QT_VERSION < 0x040400 && !defined(qdoc)
- void load(const QWebNetworkRequest &request);
+ void load(const QWebNetworkRequest& request);
#else
- void load(const QNetworkRequest &request,
+ void load(const QNetworkRequest& request,
QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation,
const QByteArray &body = QByteArray());
#endif
- void setHtml(const QString &html, const QUrl &baseUrl = QUrl());
- void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl());
+ void setHtml(const QString& html, const QUrl& baseUrl = QUrl());
+ void setContent(const QByteArray& data, const QString& mimeType = QString(), const QUrl& baseUrl = QUrl());
- QWebHistory *history() const;
- QWebSettings *settings() const;
+ QWebHistory* history() const;
+ QWebSettings* settings() const;
QString title() const;
void setUrl(const QUrl &url);
@@ -83,7 +82,7 @@ public:
QString selectedText() const;
- QAction *pageAction(QWebPage::WebAction action) const;
+ QAction* pageAction(QWebPage::WebAction action) const;
void triggerPageAction(QWebPage::WebAction action, bool checked = false);
bool isModified() const;
@@ -108,9 +107,9 @@ public:
void setRenderHints(QPainter::RenderHints hints);
void setRenderHint(QPainter::RenderHint hint, bool enabled = true);
- bool findText(const QString &subString, QWebPage::FindFlags options = 0);
+ bool findText(const QString& subString, QWebPage::FindFlags options = 0);
- virtual bool event(QEvent *);
+ virtual bool event(QEvent*);
public Q_SLOTS:
void stop();
@@ -118,7 +117,7 @@ public Q_SLOTS:
void forward();
void reload();
- void print(QPrinter *printer) const;
+ void print(QPrinter*) const;
Q_SIGNALS:
void loadStarted();
@@ -126,14 +125,14 @@ Q_SIGNALS:
void loadFinished(bool);
void titleChanged(const QString& title);
void statusBarMessage(const QString& text);
- void linkClicked(const QUrl &url);
+ void linkClicked(const QUrl&);
void selectionChanged();
void iconChanged();
- void urlChanged(const QUrl &url);
+ void urlChanged(const QUrl&);
protected:
- void resizeEvent(QResizeEvent *e);
- void paintEvent(QPaintEvent *ev);
+ void resizeEvent(QResizeEvent*);
+ void paintEvent(QPaintEvent*);
virtual QWebView *createWindow(QWebPage::WebWindowType type);
@@ -150,10 +149,10 @@ protected:
#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 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*);
@@ -162,7 +161,7 @@ protected:
private:
friend class QWebPage;
- QWebViewPrivate *d;
+ QWebViewPrivate* d;
};
#endif // QWEBVIEW_H