QDeclarativeTextInput cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 720fcf3..88fd7fc 100644 (file)
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -865,18 +865,18 @@ bool QDeclarativeTextInput::hasAcceptableInput() const
     while editing, otherwise displays asterisks.
     \endlist
 */
-QDeclarativeTextInput::EchoMode QDeclarativeTextInput::echoMode() const
+QLineEdit::EchoMode QDeclarativeTextInput::echoMode() const
 {
     Q_D(const QDeclarativeTextInput);
-    return (QDeclarativeTextInput::EchoMode)d->control->echoMode();
+    return d->control->echoMode();
 }
 
-void QDeclarativeTextInput::setEchoMode(QDeclarativeTextInput::EchoMode echo)
+void QDeclarativeTextInput::setEchoMode(QLineEdit::EchoMode echo)
 {
     Q_D(QDeclarativeTextInput);
     if (echoMode() == echo)
         return;
-    d->control->setEchoMode((uint)echo);
+    d->control->setEchoMode(echo);
     q_textChanged();
     emit echoModeChanged(echoMode());
 }
@@ -1389,8 +1389,8 @@ void QDeclarativeTextInput::setPasswordCharacter(const QString &str)
     if(str.length() < 1)
         return;
     d->control->setPasswordCharacter(str.constData()[0]);
-    EchoMode echoMode_ = echoMode();
-    if (echoMode_ == Password || echoMode_ == PasswordEchoOnEdit) {
+    QLineEdit::EchoMode echoMode_ = echoMode();
+    if (echoMode_ == QLineEdit::Password || echoMode_ == QLineEdit::PasswordEchoOnEdit) {
         updateSize();
     }
     emit passwordCharacterChanged();

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
index 91782d4..1a09c71 100644 (file)
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
@@ -36,9 +36,9 @@
 
 #include "qdeclarativetext_p.h"
 #include "qdeclarativeimplicitsizeitem_p.h"
-
-#include <QGraphicsSceneEvent>
-#include <QValidator>
+#include "qgraphicssceneevent.h"
+#include "qvalidator.h"
+#include "qlineedit.h"
 
 #ifndef QT_NO_LINEEDIT
 
@@ -53,7 +53,6 @@ class Q_AUTOTEST_EXPORT QDeclarativeTextInput : public QDeclarativeImplicitSizeP
 {
     Q_OBJECT
     Q_ENUMS(HAlignment)
-    Q_ENUMS(EchoMode)
     Q_ENUMS(SelectionMode)
 
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
@@ -78,7 +77,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeTextInput : public QDeclarativeImplicitSizeP
     Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask NOTIFY inputMaskChanged)
 
     Q_PROPERTY(bool acceptableInput READ hasAcceptableInput NOTIFY acceptableInputChanged)
-    Q_PROPERTY(EchoMode echoMode READ echoMode WRITE setEchoMode NOTIFY echoModeChanged)
+    Q_PROPERTY(QLineEdit::EchoMode echoMode READ echoMode WRITE setEchoMode NOTIFY echoModeChanged)
     Q_PROPERTY(bool activeFocusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY activeFocusOnPressChanged)
     Q_PROPERTY(QString passwordCharacter READ passwordCharacter WRITE setPasswordCharacter NOTIFY passwordCharacterChanged)
     Q_PROPERTY(QString displayText READ displayText NOTIFY displayTextChanged)
@@ -92,13 +91,6 @@ public:
     QDeclarativeTextInput(QDeclarativeItem* parent=0);
     ~QDeclarativeTextInput();
 
-    enum EchoMode {//To match QLineEdit::EchoMode
-        Normal,
-        NoEcho,
-        Password,
-        PasswordEchoOnEdit
-    };
-
     enum HAlignment {
         AlignLeft = Qt::AlignLeft,
         AlignRight = Qt::AlignRight,
@@ -171,8 +163,8 @@ public:
     QString inputMask() const;
     void setInputMask(const QString &im);
 
-    EchoMode echoMode() const;
-    void setEchoMode(EchoMode echo);
+    QLineEdit::EchoMode echoMode() const;
+    void setEchoMode(QLineEdit::EchoMode echo);
 
     QString passwordCharacter() const;
     void setPasswordCharacter(const QString &str);
@@ -223,7 +215,7 @@ Q_SIGNALS:
     void maximumLengthChanged(int maximumLength);
     void validatorChanged();
     void inputMaskChanged(const QString &inputMask);
-    void echoModeChanged(EchoMode echoMode);
+    void echoModeChanged(QLineEdit::EchoMode echoMode);
     void passwordCharacterChanged();
     void displayTextChanged();
     void activeFocusOnPressChanged(bool activeFocusOnPress);

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
index 05cdd4b..d8b03d6 100644 (file)
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
@@ -35,14 +35,10 @@
 #define QDECLARATIVETEXTINPUT_P_H
 
 #include "qdeclarativetextinput_p.h"
-
 #include "qdeclarativeimplicitsizeitem_p_p.h"
-
-#include <qdeclarative.h>
-
-#include <QPointer>
-
-#include <qlinecontrol_p.h>
+#include "qdeclarative.h"
+#include "qpointer.h"
+#include "qlinecontrol_p.h"
 
 //
 //  W A R N I N G