From 4a1b89df051a071266a1993bea59d4b8d4331a7d Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 11 Nov 2016 03:39:25 +0000 Subject: [PATCH] various cleanups Signed-off-by: Ivailo Monev --- src/core/global/qnamespace.h | 1 - src/gui/dialogs/qinputdialog.cpp | 7 +----- src/gui/kernel/qevent.h | 42 ------------------------------- src/gui/kernel/qkeymapper_p.h | 3 +-- src/gui/kernel/qkeymapper_x11.cpp | 17 ++++--------- src/gui/kernel/qwidget_p.h | 3 --- src/gui/text/qtextcontrol.cpp | 17 ------------- src/gui/text/qtextcursor.cpp | 4 +-- src/gui/widgets/qlinecontrol_p.h | 6 ----- 9 files changed, 9 insertions(+), 91 deletions(-) diff --git a/src/core/global/qnamespace.h b/src/core/global/qnamespace.h index 291c96d67..28fe4c1ec 100644 --- a/src/core/global/qnamespace.h +++ b/src/core/global/qnamespace.h @@ -1018,7 +1018,6 @@ public: LastCursor = DragLinkCursor, BitmapCursor = 24, CustomCursor = 25 - }; enum TextFormat { diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp index a93647a34..ca036e405 100644 --- a/src/gui/dialogs/qinputdialog.cpp +++ b/src/gui/dialogs/qinputdialog.cpp @@ -245,9 +245,7 @@ void QInputDialogPrivate::ensureLineEdit() Q_Q(QInputDialog); if (!lineEdit) { lineEdit = new QLineEdit(q); -#ifndef QT_NO_IM - qt_widget_private(lineEdit)->inheritsInputMethodHints = 1; -#endif + lineEdit->hide(); QObject::connect(lineEdit, SIGNAL(textChanged(QString)), q, SLOT(_q_textChanged(QString))); @@ -259,9 +257,6 @@ void QInputDialogPrivate::ensureComboBox() Q_Q(QInputDialog); if (!comboBox) { comboBox = new QComboBox(q); -#ifndef QT_NO_IM - qt_widget_private(comboBox)->inheritsInputMethodHints = 1; -#endif comboBox->hide(); QObject::connect(comboBox, SIGNAL(editTextChanged(QString)), q, SLOT(_q_textChanged(QString))); diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 5254d7e9b..6f9b44982 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -372,48 +372,6 @@ protected: }; #endif // QT_NO_CONTEXTMENU -#ifndef QT_NO_INPUTMETHOD -class Q_GUI_EXPORT QInputMethodEvent : public QEvent -{ -public: - enum AttributeType { - TextFormat, - Cursor, - Language, - Ruby, - Selection - }; - class Attribute { - public: - Attribute(AttributeType t, int s, int l, QVariant val) : type(t), start(s), length(l), value(val) {} - AttributeType type; - - int start; - int length; - QVariant value; - }; - QInputMethodEvent(); - QInputMethodEvent(const QString &preeditText, const QList &attributes); - void setCommitString(const QString &commitString, int replaceFrom = 0, int replaceLength = 0); - - inline const QList &attributes() const { return attrs; } - inline const QString &preeditString() const { return preedit; } - - inline const QString &commitString() const { return commit; } - inline int replacementStart() const { return replace_from; } - inline int replacementLength() const { return replace_length; } - - QInputMethodEvent(const QInputMethodEvent &other); - -private: - QString preedit; - QList attrs; - QString commit; - int replace_from; - int replace_length; -}; -#endif // QT_NO_INPUTMETHOD - #ifndef QT_NO_DRAGANDDROP class QMimeData; diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h index c1a967d90..be14506fb 100644 --- a/src/gui/kernel/qkeymapper_p.h +++ b/src/gui/kernel/qkeymapper_p.h @@ -58,7 +58,6 @@ #include #include #include -#include QT_BEGIN_NAMESPACE @@ -72,7 +71,7 @@ public: static QKeyMapper *instance(); static void changeKeyboard(); - static bool sendKeyEvent(QWidget *widget, bool grab, + static bool sendKeyEvent(QWidget *widget, QEvent::Type type, int code, Qt::KeyboardModifiers modifiers, const QString &text, bool autorepeat, int count, quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers); diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp index 720c276e2..4be33ede4 100644 --- a/src/gui/kernel/qkeymapper_x11.cpp +++ b/src/gui/kernel/qkeymapper_x11.cpp @@ -1228,7 +1228,7 @@ static Bool qt_keyrelease_scanner(Display *, XEvent *event, XPointer arg) } #endif -bool QKeyMapperPrivate::translateKeyEvent(QWidget *keyWidget, const XEvent *event, bool grab) +bool QKeyMapperPrivate::translateKeyEvent(QWidget *keyWidget, const XEvent *event) { int code = -1; int count = 0; @@ -1337,14 +1337,8 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *keyWidget, const XEvent *even } } - // autorepeat compression makes sense for all widgets (Windows - // does it automatically ....) - if (event->type == XKeyPress && text.length() <= 1 -#ifndef QT_NO_IM - // input methods need discrete key events - && !qic -#endif// QT_NO_IM - ) { + // autorepeat compression makes sense for all widgets + if (event->type == XKeyPress && text.length() <= 1) { XEvent dummy; for (;;) { @@ -1363,12 +1357,12 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *keyWidget, const XEvent *even } } - return QKeyMapper::sendKeyEvent(keyWidget, grab, type, code, modifiers, text, autor, + return QKeyMapper::sendKeyEvent(keyWidget, type, code, modifiers, text, autor, qMax(qMax(count,1), int(text.length())), event->xkey.keycode, keysym, event->xkey.state); } -bool QKeyMapper::sendKeyEvent(QWidget *keyWidget, bool grab, +bool QKeyMapper::sendKeyEvent(QWidget *keyWidget, QEvent::Type type, int code, Qt::KeyboardModifiers modifiers, const QString &text, bool autorepeat, int count, quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers) @@ -1391,7 +1385,6 @@ bool QKeyMapper::sendKeyEvent(QWidget *keyWidget, bool grab, return true; } - Q_UNUSED(grab); QKeyEvent e(type, code, modifiers, nativeScanCode, nativeVirtualKey, nativeModifiers, text, autorepeat, qMax(qMax(count,1), int(text.length()))); diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index e6b81c3f5..a50e637b5 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -636,9 +636,6 @@ public: uint isMoved : 1; uint isGLWidget : 1; uint usesDoubleBufferedGLContext : 1; -#ifndef QT_NO_IM - uint inheritsInputMethodHints : 1; -#endif uint inSetParent : 1; // *************************** Platform specific ************************************ diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index c13bdde27..4c8ada853 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1662,13 +1662,6 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons if (cursor.position() != oldCursorPos) emit q->cursorPositionChanged(); _q_updateCurrentCharFormatAndSelection(); -#ifndef QT_NO_IM - if (contextWidget) { - if (QInputContext *ic = inputContext()) { - ic->update(); - } - } -#endif //QT_NO_IM } else { //emit q->visibilityRequest(QRectF(mousePos, QSizeF(1, 1))); if (cursor.position() != oldCursorPos) { @@ -2982,16 +2975,6 @@ void QTextControlPrivate::_q_copyLink() #endif } -#ifndef QT_NO_IM -QInputContext *QTextControlPrivate::inputContext() -{ - QInputContext *ctx = contextWidget->inputContext(); - if (!ctx && contextWidget->parentWidget()) - ctx = contextWidget->parentWidget()->inputContext(); - return ctx; -} -#endif - int QTextControl::hitTest(const QPointF &point, Qt::HitTestAccuracy accuracy) const { Q_D(const QTextControl); diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp index 78fa2d861..a6cd308ab 100644 --- a/src/gui/text/qtextcursor.cpp +++ b/src/gui/text/qtextcursor.cpp @@ -2572,7 +2572,7 @@ int QTextCursor::columnNumber() const if (layout->lineCount() == 0) return relativePos; - QTextLine line = layout->lineForTextPosition(relativePos); + const QTextLine line = layout->lineForTextPosition(relativePos); if (!line.isValid()) return 0; return relativePos - line.textStart(); @@ -2586,7 +2586,7 @@ QTextDocument *QTextCursor::document() const { if (d->priv) return d->priv->document(); - return 0; // document went away + return Q_NULLPTR; // document went away } /*! diff --git a/src/gui/widgets/qlinecontrol_p.h b/src/gui/widgets/qlinecontrol_p.h index 481b8f3ee..b08f6e80b 100644 --- a/src/gui/widgets/qlinecontrol_p.h +++ b/src/gui/widgets/qlinecontrol_p.h @@ -267,12 +267,6 @@ public: moveCursor(nextMaskBlank(0)); } - // input methods -#ifndef QT_NO_IM - bool composeMode() const { return !m_textLayout.preeditAreaText().isEmpty(); } - void setPreeditArea(int cursor, const QString &text) { m_textLayout.setPreeditArea(cursor, text); } -#endif - QString preeditAreaText() const { return m_textLayout.preeditAreaText(); } void updatePasswordEchoEditing(bool editing);