Some Text cleanup.

3 files changed, 12 insertions, 16 deletions

diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp
index 11fef69..216374c 100644
--- a/src/declarative/fx/qfxtext.cpp
+++ b/src/declarative/fx/qfxtext.cpp
@@ -480,13 +480,6 @@ void QFxText::setElideMode(Qt::TextElideMode mode)
     d->updateSize();
 }
 
-
-QString QFxText::activeLink() const
-{
-    Q_D(const QFxText);
-    return d->activeLink;
-}
-
 void QFxText::geometryChanged(const QRectF &newGeometry,
                               const QRectF &oldGeometry)
 {
@@ -854,6 +847,12 @@ void QFxText::mousePressEvent(QGraphicsSceneMouseEvent *event)
 }
 
 /*!
+    \qmlsignal Text::linkActivated(link)
+
+    This handler is called when the user clicks on a link embedded in the text.
+*/
+
+/*!
   \overload
   Handles the given mouse \a event.
  */
diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h
index edf6031..4349432 100644
--- a/src/declarative/fx/qfxtext.h
+++ b/src/declarative/fx/qfxtext.h
@@ -68,7 +68,6 @@ class Q_DECLARATIVE_EXPORT QFxText : public QFxItem
     Q_PROPERTY(bool wrap READ wrap WRITE setWrap)
     Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat)
     Q_PROPERTY(Qt::TextElideMode elide READ elideMode WRITE setElideMode)
-    Q_PROPERTY(QString activeLink READ activeLink)
 
 public:
     QFxText(QFxItem *parent=0);
@@ -84,9 +83,9 @@ public:
                       Outline,
                       Raised,
                       Sunken };
-    enum TextFormat { AutoText,
-                      PlainText,
-                      RichText };
+    enum TextFormat { PlainText = Qt::PlainText,
+                      RichText = Qt::RichText,
+                      AutoText = Qt::AutoText};
 
     QString text() const;
     void setText(const QString &);
@@ -118,8 +117,6 @@ public:
     Qt::TextElideMode elideMode() const;
     void setElideMode(Qt::TextElideMode);
 
-    QString activeLink() const;
-
     void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
 
     virtual void componentComplete();
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h
index f2f163b..752a174 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qfxtextedit.h
@@ -103,9 +103,9 @@ public:
     };
 
     enum TextFormat {
-        AutoText,
-        PlainText,
-        RichText,
+        PlainText = Qt::PlainText,
+        RichText = Qt::RichText,
+        AutoText = Qt::AutoText
     };
 
     QString text() const;