aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicktextinput_p_p.h
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2012-01-10 11:52:43 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-12 09:33:32 +0100
commit9d73bf289e2719d781670baad1733989a56d7f40 (patch)
tree468c8a6258343874f0781b30c07287485fa4cbaf /src/quick/items/qquicktextinput_p_p.h
parent316e5db8a403ce8493e22361c446a003a5c3770c (diff)
Add undo and redo functions to TextInput and TextEdit.
The functionality already existed and was usable through keyboard short cuts but was not accessible through API. Task-number: QTBUG-16191 Change-Id: I080fa2ddb76668a7a632aa7477004f99037ea68b Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextinput_p_p.h')
-rw-r--r--src/quick/items/qquicktextinput_p_p.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h
index b20b8c44f2..03d825d108 100644
--- a/src/quick/items/qquicktextinput_p_p.h
+++ b/src/quick/items/qquicktextinput_p_p.h
@@ -113,6 +113,8 @@ public:
, selectByMouse(false)
, canPaste(false)
, canPasteValid(false)
+ , canUndo(false)
+ , canRedo(false)
, hAlignImplicit(true)
, selectPressed(false)
, textLayoutDirty(true)
@@ -237,6 +239,8 @@ public:
bool selectByMouse:1;
bool canPaste:1;
bool canPasteValid:1;
+ bool canUndo:1;
+ bool canRedo:1;
bool hAlignImplicit:1;
bool selectPressed:1;
bool textLayoutDirty:1;
@@ -349,8 +353,6 @@ public:
void insert(const QString &);
void clear();
- void undo() { internalUndo(); finishChange(-1, true); }
- void redo() { internalRedo(); finishChange(); }
void selectWordAtPos(int);
void setCursorPosition(int pos) { if (pos <= m_text.length()) moveCursor(qMax(0, pos)); }
@@ -422,6 +424,7 @@ private:
void internalUndo(int until = -1);
void internalRedo();
+ void emitUndoRedoChanged();
void emitCursorPositionChanged();