diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-27 14:48:51 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 03:18:16 +0200 |
commit | a85d343a39577cdf953d0759e356c59a77ae743f (patch) | |
tree | fdbd9229902d5efc0ca637dc79d6aa7cc5645635 /src/widgets/widgets/qtextedit.h | |
parent | 3b6bb13e6a197bb4ba85b397ae9d2b8c659d6b26 (diff) |
Widgets: Remove QT3_SUPPPORT.
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ie884f0cc9b3970b01c3c0c26600b1bcd92548077
Reviewed-on: http://codereview.qt-project.org/5629
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qtextedit.h')
-rw-r--r-- | src/widgets/widgets/qtextedit.h | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 69f5ac23d5..b3c1193c2b 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -50,10 +50,6 @@ #ifndef QT_NO_TEXTEDIT -#ifdef QT3_SUPPORT -#include <QtGui/qtextobject.h> -#include <QtGui/qtextlayout.h> -#endif QT_BEGIN_HEADER @@ -325,88 +321,6 @@ protected: virtual void scrollContentsBy(int dx, int dy); -#ifdef QT3_SUPPORT -Q_SIGNALS: - QT_MOC_COMPAT void currentFontChanged(const QFont &f); - QT_MOC_COMPAT void currentColorChanged(const QColor &c); - -public: - QT3_SUPPORT_CONSTRUCTOR QTextEdit(QWidget *parent, const char *name); - inline QT3_SUPPORT bool find(const QString &exp, bool cs, bool wo) - { - QTextDocument::FindFlags flags = 0; - if (cs) - flags |= QTextDocument::FindCaseSensitively; - if (wo) - flags |= QTextDocument::FindWholeWords; - return find(exp, flags); - } - - inline QT3_SUPPORT void sync() {} - - QT3_SUPPORT void moveCursor(CursorAction action, QTextCursor::MoveMode mode = QTextCursor::MoveAnchor); - QT3_SUPPORT void moveCursor(CursorAction action, bool select); - - enum KeyboardAction { - ActionBackspace, - ActionDelete, - ActionReturn, - ActionKill, - ActionWordBackspace, - ActionWordDelete - }; - - QT3_SUPPORT void doKeyboardAction(KeyboardAction action); - - QT3_SUPPORT QString text() const; - QT3_SUPPORT void setTextFormat(Qt::TextFormat); - QT3_SUPPORT Qt::TextFormat textFormat() const; - - inline QT3_SUPPORT void setBold(bool b) { setFontWeight(b ? QFont::Bold : QFont::Normal); } - inline QT3_SUPPORT void setUnderline(bool b) { setFontUnderline(b); } - inline QT3_SUPPORT void setItalic(bool i) { setFontItalic(i); } - inline QT3_SUPPORT void setFamily(const QString &family) { setFontFamily(family); } - inline QT3_SUPPORT void setPointSize(int size) { setFontPointSize(size); } - - inline QT3_SUPPORT bool italic() const { return fontItalic(); } - inline QT3_SUPPORT bool bold() const { return fontWeight() >= QFont::Bold; } - inline QT3_SUPPORT bool underline() const { return fontUnderline(); } - inline QT3_SUPPORT QString family() const { return fontFamily(); } - inline QT3_SUPPORT int pointSize() const { return (int)(fontPointSize()+0.5); } - - inline QT3_SUPPORT bool hasSelectedText() const - { return textCursor().hasSelection(); } - inline QT3_SUPPORT QString selectedText() const - { return textCursor().selectedText(); } - - inline QT3_SUPPORT bool isUndoAvailable() const - { return document()->isUndoAvailable(); } - inline QT3_SUPPORT bool isRedoAvailable() const - { return document()->isRedoAvailable(); } - - inline QT3_SUPPORT void insert(const QString &text) - { insertPlainText(text); } - - inline QT3_SUPPORT bool isModified() const - { return document()->isModified(); } - - inline QT3_SUPPORT QColor color() const - { return textColor(); } - -public Q_SLOTS: - inline QT_MOC_COMPAT void setModified(bool m = true) - { document()->setModified(m); } -public: - inline QT3_SUPPORT void undo() const - { document()->undo(); } - inline QT3_SUPPORT void redo() const - { document()->redo(); } - -public Q_SLOTS: - inline QT_MOC_COMPAT void setColor(const QColor &c) - { setTextColor(c); } - -#endif private: Q_DISABLE_COPY(QTextEdit) |