summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-19 11:49:37 +0300
committerAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-28 18:00:47 +0000
commit0f27d11285bbc22c4f440315ba3a9b7627fc449b (patch)
tree3e384b64c92b33cd6475bf7e91d659ac67f71463 /src/platformsupport/linuxaccessibility/atspiadaptor.cpp
parent58f8dd4f92e0e647ed530554d7edf3d1a901f552 (diff)
Don't use QStringLiteral in comparisons
For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/platformsupport/linuxaccessibility/atspiadaptor.cpp')
-rw-r--r--src/platformsupport/linuxaccessibility/atspiadaptor.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index 0293c74fb9..f902ec230b 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -1961,71 +1961,71 @@ namespace
// https://bugzilla.gnome.org/show_bug.cgi?id=744553 "ATK docs provide no guidance for allowed values of some text attributes"
// specifically for "weight", "invalid", "language" and value range for colors
- if (ia2Name == QStringLiteral("background-color")) {
+ if (ia2Name == QLatin1String("background-color")) {
name = QStringLiteral("bg-color");
value = atspiColor(value);
- } else if (ia2Name == QStringLiteral("font-family")) {
+ } else if (ia2Name == QLatin1String("font-family")) {
name = QStringLiteral("family-name");
- } else if (ia2Name == QStringLiteral("color")) {
+ } else if (ia2Name == QLatin1String("color")) {
name = QStringLiteral("fg-color");
value = atspiColor(value);
- } else if (ia2Name == QStringLiteral("text-align")) {
+ } else if (ia2Name == QLatin1String("text-align")) {
name = QStringLiteral("justification");
- if (value == QStringLiteral("justify")) {
+ if (value == QLatin1String("justify")) {
value = QStringLiteral("fill");
} else {
- if (value != QStringLiteral("left") &&
- value != QStringLiteral("right") &&
- value != QStringLiteral("center")
+ if (value != QLatin1String("left") &&
+ value != QLatin1String("right") &&
+ value != QLatin1String("center")
) {
value = QString();
qAtspiDebug() << "Unknown text-align attribute value \"" << value << "\" cannot be translated to AT-SPI.";
}
}
- } else if (ia2Name == QStringLiteral("font-size")) {
+ } else if (ia2Name == QLatin1String("font-size")) {
name = QStringLiteral("size");
value = atspiSize(value);
- } else if (ia2Name == QStringLiteral("font-style")) {
+ } else if (ia2Name == QLatin1String("font-style")) {
name = QStringLiteral("style");
- if (value != QStringLiteral("normal") &&
- value != QStringLiteral("italic") &&
- value != QStringLiteral("oblique")
+ if (value != QLatin1String("normal") &&
+ value != QLatin1String("italic") &&
+ value != QLatin1String("oblique")
) {
value = QString();
qAtspiDebug() << "Unknown font-style attribute value \"" << value << "\" cannot be translated to AT-SPI.";
}
- } else if (ia2Name == QStringLiteral("text-underline-type")) {
+ } else if (ia2Name == QLatin1String("text-underline-type")) {
name = QStringLiteral("underline");
- if (value != QStringLiteral("none") &&
- value != QStringLiteral("single") &&
- value != QStringLiteral("double")
+ if (value != QLatin1String("none") &&
+ value != QLatin1String("single") &&
+ value != QLatin1String("double")
) {
value = QString();
qAtspiDebug() << "Unknown text-underline-type attribute value \"" << value << "\" cannot be translated to AT-SPI.";
}
- } else if (ia2Name == QStringLiteral("font-weight")) {
+ } else if (ia2Name == QLatin1String("font-weight")) {
name = QStringLiteral("weight");
- if (value == QStringLiteral("normal"))
+ if (value == QLatin1String("normal"))
// Orca seems to accept all IAccessible2 values except for "normal"
// (on which it produces traceback and fails to read any following text attributes),
// but that is the default value, so omit it anyway
value = QString();
- } else if (ia2Name == QStringLiteral("text-position")) {
+ } else if (ia2Name == QLatin1String("text-position")) {
name = QStringLiteral("vertical-align");
- if (value != QStringLiteral("baseline") &&
- value != QStringLiteral("super") &&
- value != QStringLiteral("sub")
+ if (value != QLatin1String("baseline") &&
+ value != QLatin1String("super") &&
+ value != QLatin1String("sub")
) {
value = QString();
qAtspiDebug() << "Unknown text-position attribute value \"" << value << "\" cannot be translated to AT-SPI.";
}
- } else if (ia2Name == QStringLiteral("writing-mode")) {
+ } else if (ia2Name == QLatin1String("writing-mode")) {
name = QStringLiteral("direction");
- if (value == QStringLiteral("lr"))
+ if (value == QLatin1String("lr"))
value = QStringLiteral("ltr");
- else if (value == QStringLiteral("rl"))
+ else if (value == QLatin1String("rl"))
value = QStringLiteral("rtl");
- else if (value == QStringLiteral("tb")) {
+ else if (value == QLatin1String("tb")) {
// IAccessible2 docs refer to XSL, which specifies "tb" is shorthand for "tb-rl"; so at least give a hint about the horizontal direction (ATK does not support vertical direction in this attribute (yet))
value = QStringLiteral("rtl");
qAtspiDebug() << "writing-mode attribute value \"tb\" translated only w.r.t. horizontal direction; vertical direction ignored";
@@ -2033,9 +2033,9 @@ namespace
value = QString();
qAtspiDebug() << "Unknown writing-mode attribute value \"" << value << "\" cannot be translated to AT-SPI.";
}
- } else if (ia2Name == QStringLiteral("language")) {
+ } else if (ia2Name == QLatin1String("language")) {
// OK - ATK has no docs on the format of the value, IAccessible2 has reasonable format - leave it at that now
- } else if (ia2Name == QStringLiteral("invalid")) {
+ } else if (ia2Name == QLatin1String("invalid")) {
// OK - ATK docs are vague but suggest they support the same range of values as IAccessible2
} else {
// attribute we know nothing about