diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2009-04-29 04:33:52 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2009-04-29 04:33:52 (GMT) |
commit | e79ce618a079c7f1664959da5d9d13b5f4e1d370 (patch) | |
tree | dabf9efe361c27cec4377de04e1a24ae3eca03fb /src/declarative/fx/qfxwebview.cpp | |
parent | f49f040660fd004ea6289cdc3a92a7ad42338237 (diff) | |
parent | 9ba03ca32ae12f8b135f3b4f80c445edc3e6b55e (diff) | |
download | Qt-e79ce618a079c7f1664959da5d9d13b5f4e1d370.zip Qt-e79ce618a079c7f1664959da5d9d13b5f4e1d370.tar.gz Qt-e79ce618a079c7f1664959da5d9d13b5f4e1d370.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxwebview.cpp')
-rw-r--r-- | src/declarative/fx/qfxwebview.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp index 8af4158..b2ad06c 100644 --- a/src/declarative/fx/qfxwebview.cpp +++ b/src/declarative/fx/qfxwebview.cpp @@ -361,7 +361,7 @@ QString QFxWebView::url() const void QFxWebView::setUrl(const QString &n) { Q_D(QFxWebView); - if(n == page()->mainFrame()->url().toString()) + if (n == page()->mainFrame()->url().toString()) return; page()->setViewportSize(QSize( @@ -399,7 +399,7 @@ int QFxWebView::idealWidth() const void QFxWebView::setIdealWidth(int iw) { Q_D(QFxWebView); - if(d->idealwidth == iw) return; + if (d->idealwidth == iw) return; d->idealwidth = iw; expandToWebPage(); emit idealWidthChanged(); @@ -422,7 +422,7 @@ int QFxWebView::idealHeight() const void QFxWebView::setIdealHeight(int ih) { Q_D(QFxWebView); - if(d->idealheight == ih) return; + if (d->idealheight == ih) return; d->idealheight = ih; expandToWebPage(); emit idealHeightChanged(); @@ -449,7 +449,7 @@ bool QFxWebView::interactive() const void QFxWebView::setInteractive(bool i) { Q_D(QFxWebView); - if(d->interactive == i) return; + if (d->interactive == i) return; d->interactive = i; emit interactiveChanged(); } @@ -471,7 +471,7 @@ bool QFxWebView::smooth() const void QFxWebView::setSmooth(bool i) { Q_D(QFxWebView); - if(d->smooth == i) return; + if (d->smooth == i) return; d->smooth = i; update(); } @@ -506,7 +506,7 @@ void QFxWebView::expandToWebPage() void QFxWebView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { - if(newGeometry.size() != oldGeometry.size()) + if (newGeometry.size() != oldGeometry.size()) expandToWebPage(); QFxItem::geometryChanged(newGeometry, oldGeometry); } |