Doc cleanup.

2 files changed, 11 insertions, 80 deletions

diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index 797e6cb..868e009 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -165,8 +165,8 @@ public:
     public:
         WindowObjectList(QFxWebViewPrivate *p)
             : priv(p) {}
-        virtual void append(QObject *v) { 
-            QmlConcreteList<QObject *>::append(v); 
+        virtual void append(QObject *v) {
+            QmlConcreteList<QObject *>::append(v);
             priv->updateWindowObjects();
         }
     private:
@@ -279,10 +279,6 @@ void QFxWebView::componentComplete()
     \qmlproperty real WebView::progress
     This property holds the progress of loading the current URL, from 0 to 1.
 */
-/*!
-    \property QFxWebView::progress
-    \brief the progress of loading the current URL, from 0 to 1.
-*/
 qreal QFxWebView::progress() const
 {
     Q_D(const QFxWebView);
@@ -320,18 +316,6 @@ void QFxWebView::doLoadFinished(bool ok)
     before the change is notified, as this only happens when
     loading of the URL successfully starts.
 */
-/*!
-    \property QFxWebView::url
-    \brief the URL to the page displayed in this item.
-
-    \sa urlChanged()
-*/
-/*!
-    \fn void QFxWebView::urlChanged()
-
-    Emitted when loading of the URL successfully starts after
-    setUrl() is called.
-*/
 QUrl QFxWebView::url() const
 {
     return page()->mainFrame()->url();
@@ -363,10 +347,6 @@ void QFxWebView::setUrl(const QUrl &url)
     \qmlproperty int WebView::idealWidth
     This property holds the ideal width for displaying the current URL.
 */
-/*!
-    \property QFxWebView::idealWidth
-    \brief the ideal width for displaying the current URL.
-*/
 int QFxWebView::idealWidth() const
 {
     Q_D(const QFxWebView);
@@ -386,10 +366,6 @@ void QFxWebView::setIdealWidth(int iw)
     \qmlproperty int WebView::idealHeight
     This property holds the ideal height for displaying the current URL.
 */
-/*!
-    \property QFxWebView::idealHeight
-    \brief the ideal height for displaying the current URL.
-*/
 int QFxWebView::idealHeight() const
 {
     Q_D(const QFxWebView);
@@ -408,15 +384,9 @@ void QFxWebView::setIdealHeight(int ih)
 /*!
   \qmlproperty bool WebView::interactive
 
-  This property holds controls whether the item responds to mouse and
+  This property controls whether the item responds to mouse and
   key events.
 */
-
-/*!
-  \property QFxWebView::interactive
-
-  \brief controls whether the item responds to mouse and key events.
-*/
 bool QFxWebView::interactive() const
 {
     Q_D(const QFxWebView);
@@ -431,10 +401,10 @@ void QFxWebView::setInteractive(bool i)
     emit interactiveChanged();
 }
 
-/*! 
-    Evaluates the \a scriptSource JavaScript inside the main frame 
+/*!
+    Evaluates the \a scriptSource JavaScript inside the main frame
     context and returns the result of the last executed statement.
-*/  
+*/
 QVariant QFxWebView::evaluateJavaScript(const QString &scriptSource)
 {
     return this->page()->mainFrame()->evaluateJavaScript(scriptSource);
@@ -460,7 +430,7 @@ void QFxWebView::expandToWebPage()
     }
 }
 
-void QFxWebView::geometryChanged(const QRectF &newGeometry, 
+void QFxWebView::geometryChanged(const QRectF &newGeometry,
                                  const QRectF &oldGeometry)
 {
     if (newGeometry.size() != oldGeometry.size())
@@ -484,14 +454,6 @@ void QFxWebView::paintPage(const QRect& r)
   allow. The default is 0.1 megapixels. The cache will not be larger
   than the (unscaled) size of the WebView.
 */
-
-/*!
-  \property QFxWebView::cacheSize
-
-  The maximum number of pixels of image cache to allow. The default
-  is 0.1 megapixels. The cache will not be larger than the (unscaled)
-  size of the QFxWebView.
-*/
 int QFxWebView::cacheSize() const
 {
     Q_D(const QFxWebView);
@@ -535,7 +497,7 @@ void QFxWebView::setCacheSize(int pixels)
 
     \qml
     WebView {
-        javaScriptWindowObjects: Object { 
+        javaScriptWindowObjects: Object {
             WebView.windowObjectName: "coordinates"
         }
     }
@@ -546,15 +508,6 @@ void QFxWebView::setCacheSize(int pixels)
 
     If Javascript is not enabled for this page, then this property does nothing.
 */
-
-/*!
-    \property QFxWebView::javaScriptWindowObjects
-
-    The list of object that are available from within
-    the webview's JavaScript context.
-
-    \sa QWebFrame::addToJavaScriptWindowObject
-*/
 QmlList<QObject *> *QFxWebView::javaScriptWindowObjects()
 {
     Q_D(QFxWebView);
@@ -862,14 +815,6 @@ QAction *QFxWebView::stopAction() const
 
     By default, this property contains an empty string.
 */
-/*!
-    \property QFxWebView::title
-    This property holds the title of the web page currently viewed
-
-    By default, this property contains an empty string.
-
-    \sa titleChanged()
-*/
 QString QFxWebView::title() const
 {
     return page()->mainFrame()->title();
@@ -881,14 +826,6 @@ QString QFxWebView::title() const
     \qmlproperty pixmap WebView::icon
     This property holds the icon associated with the web page currently viewed
 */
-/*!
-    \property QFxWebView::icon
-    \brief the icon associated with the web page currently viewed
-
-    By default, this property contains a null icon.
-
-    \sa iconChanged(), QWebSettings::iconForUrl()
-*/
 QPixmap QFxWebView::icon() const
 {
     return page()->mainFrame()->icon().pixmap(QSize(256,256));
@@ -899,18 +836,11 @@ QPixmap QFxWebView::icon() const
     \qmlproperty real WebView::textSizeMultiplier
     This property holds the multiplier used to scale the text in a Web page
 */
-/*!
-    Sets the value of the multiplier used to scale the text in a Web page to
-    the \a factor specified.
-*/
 void QFxWebView::setTextSizeMultiplier(qreal factor)
 {
     page()->mainFrame()->setTextSizeMultiplier(factor);
 }
 
-/*!
-    Returns the value of the multiplier used to scale the text in a Web page.
-*/
 qreal QFxWebView::textSizeMultiplier() const
 {
     return page()->mainFrame()->textSizeMultiplier();
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h
index 9003377..ef5a395 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qfxwebview.h
@@ -92,6 +92,7 @@ class Q_DECLARATIVE_EXPORT QFxWebView : public QFxPaintedItem
 
     Q_PROPERTY(int idealWidth READ idealWidth WRITE setIdealWidth NOTIFY idealWidthChanged)
     Q_PROPERTY(int idealHeight READ idealHeight WRITE setIdealHeight NOTIFY idealHeightChanged)
+    Q_PROPERTY(int cacheSize READ cacheSize WRITE setCacheSize)
     Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
 
@@ -186,7 +187,7 @@ Q_SIGNALS:
     void doubleClick();
 
 public Q_SLOTS:
-    QVariant evaluateJavaScript (const QString&); 
+    QVariant evaluateJavaScript (const QString&);
 
 private Q_SLOTS:
     void expandToWebPage();
@@ -209,7 +210,7 @@ protected:
     void keyPressEvent(QKeyEvent* event);
     void keyReleaseEvent(QKeyEvent* event);
     void timerEvent(QTimerEvent *event);
-    virtual void geometryChanged(const QRectF &newGeometry, 
+    virtual void geometryChanged(const QRectF &newGeometry,
                                  const QRectF &oldGeometry);
 
 private: