Separate out textFormat property from setText() function and remove

isEmpty() function in QStaticText

To make the return value of text() more intuitively clearer, and to make
the API more readable, I've separated out the text format into a
separate property. The isEmpty() function seemed out-of-place in the
API, as suggested by reviews, so it has been removed.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h
index 7498ad4218..8eeb068605 100644
--- a/src/gui/text/qstatictext.h
+++ b/src/gui/text/qstatictext.h
@@ -65,9 +65,12 @@ public:
     QStaticText(const QStaticText &other);
     ~QStaticText();
 
-    void setText(const QString &text, Qt::TextFormat textFormat = Qt::AutoText);
+    void setText(const QString &text);
     QString text() const;
 
+    void setTextFormat(Qt::TextFormat textFormat);
+    Qt::TextFormat textFormat() const;
+
     void setMaximumSize(const QSizeF &maximumSize);
     QSizeF maximumSize() const;
 
@@ -82,8 +85,6 @@ public:
     bool operator==(const QStaticText &) const;
     bool operator!=(const QStaticText &) const;
 
-    bool isEmpty() const;
-
 private:
     void detach();