whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor methods QTextEdit/QPlainTextEdit::inputMethodQuery(). 

Replace if / else if chain by switch() and return the value
instead of reassigning it.

Change-Id: Ib87c54bbf9911a58d3ae764b71f19f33d59590ce
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
bb10
Friedemann Kleint 2016-03-24 14:47:53 +01:00
parent 086317d72a
commit 8875e9fe82
2 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/widgets/widgets/qplaintextedit.cpp
View File

@ -2188,27 +2188,25 @@ QVariant QPlainTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const
/*!\internal
*/
QVariant QPlainTextEdit::inputMethodQuery(Qt::InputMethodQuery property, QVariant argument) const
QVariant QPlainTextEdit::inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const
{
Q_D(const QPlainTextEdit);
QVariant v;
switch (property) {
case Qt::ImHints:
v = QWidget::inputMethodQuery(property);
break;
if (query == Qt::ImHints)
return QWidget::inputMethodQuery(query);
const QVariant v = d->control->inputMethodQuery(query, argument);
const QPointF offset = contentOffset();
switch (v.type()) {
case QVariant::RectF:
return v.toRectF().translated(offset);
case QVariant::PointF:
return v.toPointF() + offset;
case QVariant::Rect:
return v.toRect().translated(offset.toPoint());
case QVariant::Point:
return v.toPoint() + offset.toPoint();
default:
v = d->control->inputMethodQuery(property, argument);
const QPointF offset = contentOffset();
if (v.type() == QVariant::RectF)
v = v.toRectF().translated(offset);
else if (v.type() == QVariant::PointF)
v = v.toPointF() + offset;
else if (v.type() == QVariant::Rect)
v = v.toRect().translated(offset.toPoint());
else if (v.type() == QVariant::Point)
v = v.toPoint() + offset.toPoint();
break;
}
return v;
}

30
src/widgets/widgets/qtextedit.cpp
View File

@ -1719,24 +1719,22 @@ QVariant QTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const
QVariant QTextEdit::inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const
{
Q_D(const QTextEdit);
QVariant v;
switch (query) {
case Qt::ImHints:
v = QWidget::inputMethodQuery(query);
break;
if (query == Qt::ImHints)
return QWidget::inputMethodQuery(query);
const QVariant v = d->control->inputMethodQuery(query, argument);
const QPointF offset(-d->horizontalOffset(), -d->verticalOffset());
switch (v.type()) {
case QVariant::RectF:
return v.toRectF().translated(offset);
case QVariant::PointF:
return v.toPointF() + offset;
case QVariant::Rect:
return v.toRect().translated(offset.toPoint());
case QVariant::Point:
return v.toPoint() + offset.toPoint();
default:
v = d->control->inputMethodQuery(query, argument);
const QPointF offset(-d->horizontalOffset(), -d->verticalOffset());
if (v.type() == QVariant::RectF)
v = v.toRectF().translated(offset);
else if (v.type() == QVariant::PointF)
v = v.toPointF() + offset;
else if (v.type() == QVariant::Rect)
v = v.toRect().translated(offset.toPoint());
else if (v.type() == QVariant::Point)
v = v.toPoint() + offset.toPoint();
break;
}
return v;
}