summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2014-10-08 12:45:32 +0200
committerMarc Mutz <marc.mutz@kdab.com>2014-10-09 09:42:27 +0200
commite5f528fb0ea09ec839853575c1154f9101303a84 (patch)
tree68eac46e461293db3c890b34ee3d0b6bb33fb537
parenta5b647804bcf780930e4f7e3271622281c20fde4 (diff)
Don't stream QStringLiterals into QDebug
Normal (C) string literals do just as well and use more than twice less space in the DATA section. Change-Id: Iafb0682a362c41dfd5b4d8b9137d88014d7992a2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/tools/qtimezone.cpp2
-rw-r--r--src/gui/painting/qpagelayout.cpp2
-rw-r--r--src/gui/painting/qpagesize.cpp2
-rw-r--r--src/platformsupport/linuxaccessibility/application.cpp14
4 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp
index 99061ea6ea..8f3db74131 100644
--- a/src/corelib/tools/qtimezone.cpp
+++ b/src/corelib/tools/qtimezone.cpp
@@ -954,7 +954,7 @@ QDataStream &operator>>(QDataStream &ds, QTimeZone &tz)
QDebug operator<<(QDebug dbg, const QTimeZone &tz)
{
//TODO Include backend and data version details?
- dbg.nospace() << QStringLiteral("QTimeZone(") << qPrintable(QString::fromUtf8(tz.id())) << ')';
+ dbg.nospace() << "QTimeZone(" << QString::fromUtf8(tz.id()) << ')';
return dbg.space();
}
#endif
diff --git a/src/gui/painting/qpagelayout.cpp b/src/gui/painting/qpagelayout.cpp
index c0f63795e4..4531a0558d 100644
--- a/src/gui/painting/qpagelayout.cpp
+++ b/src/gui/painting/qpagelayout.cpp
@@ -974,7 +974,7 @@ QDebug operator<<(QDebug dbg, const QPageLayout &layout)
.arg(units);
dbg.nospace() << output;
} else {
- dbg.nospace() << QStringLiteral("QPageLayout()");
+ dbg.nospace() << "QPageLayout()";
}
return dbg.space();
}
diff --git a/src/gui/painting/qpagesize.cpp b/src/gui/painting/qpagesize.cpp
index 2753d9351c..92a14119c8 100644
--- a/src/gui/painting/qpagesize.cpp
+++ b/src/gui/painting/qpagesize.cpp
@@ -1863,7 +1863,7 @@ QDebug operator<<(QDebug dbg, const QPageSize &pageSize)
.arg(pageSize.id());
dbg.nospace() << output;
} else {
- dbg.nospace() << QStringLiteral("QPageSize()");
+ dbg.nospace() << "QPageSize()";
}
return dbg.space();
}
diff --git a/src/platformsupport/linuxaccessibility/application.cpp b/src/platformsupport/linuxaccessibility/application.cpp
index 7d5d189379..dcf17143fa 100644
--- a/src/platformsupport/linuxaccessibility/application.cpp
+++ b/src/platformsupport/linuxaccessibility/application.cpp
@@ -166,11 +166,11 @@ bool QSpiApplicationAdaptor::eventFilter(QObject *target, QEvent *event)
de.modifiers |= 1 << ATSPI_MODIFIER_META;
#ifdef KEYBOARD_DEBUG
- qDebug() << QStringLiteral("Key event text:") << event->type() << de.text
- << QStringLiteral("native virtual key:") << de.id
- << QStringLiteral("hardware code/scancode:") << de.hardwareCode
- << QStringLiteral("modifiers:") << de.modifiers
- << QStringLiteral("text:") << de.text;
+ qDebug() << "Key event text:" << event->type() << de.text
+ << "native virtual key:" << de.id
+ << "hardware code/scancode:" << de.hardwareCode
+ << "modifiers:" << de.modifiers
+ << "text:" << de.text;
#endif
QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.a11y.atspi.Registry"),
@@ -202,7 +202,7 @@ QKeyEvent* QSpiApplicationAdaptor::copyKeyEvent(QKeyEvent* old)
void QSpiApplicationAdaptor::notifyKeyboardListenerCallback(const QDBusMessage& message)
{
if (!keyEvents.length()) {
- qWarning() << QStringLiteral("QSpiApplication::notifyKeyboardListenerCallback with no queued key called");
+ qWarning("QSpiApplication::notifyKeyboardListenerCallback with no queued key called");
return;
}
Q_ASSERT(message.arguments().length() == 1);
@@ -218,7 +218,7 @@ void QSpiApplicationAdaptor::notifyKeyboardListenerCallback(const QDBusMessage&
void QSpiApplicationAdaptor::notifyKeyboardListenerError(const QDBusError& error, const QDBusMessage& /*message*/)
{
- qWarning() << QStringLiteral("QSpiApplication::keyEventError ") << error.name() << error.message();
+ qWarning() << "QSpiApplication::keyEventError " << error.name() << error.message();
while (!keyEvents.isEmpty()) {
QPair<QPointer<QObject>, QKeyEvent*> event = keyEvents.dequeue();
if (event.first)