From fd1e8c80f8f62d1d96f809ef292eb452491da98c Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 8 Mar 2012 15:01:53 +0100 Subject: [PATCH] Debugger: Use QStringLiteral where appropriate Change-Id: I5c33113783834ef0c7292f5f19f12d8c68f42141 Reviewed-by: Aurindam Jana --- src/qml/debugger/qdebugmessageservice.cpp | 2 +- src/qml/debugger/qqmldebugserver.cpp | 24 ++++++++++++------------ src/qml/debugger/qqmldebugservice.cpp | 4 ++-- src/qml/debugger/qqmlenginedebugservice.cpp | 16 ++++++++-------- src/qml/debugger/qqmlinspectorservice.cpp | 2 +- src/qml/debugger/qqmlprofilerservice.cpp | 2 +- src/qml/debugger/qv8debugservice.cpp | 2 +- src/qml/debugger/qv8profilerservice.cpp | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/qml/debugger/qdebugmessageservice.cpp b/src/qml/debugger/qdebugmessageservice.cpp index dcaa514..a41f95c 100644 --- a/src/qml/debugger/qdebugmessageservice.cpp +++ b/src/qml/debugger/qdebugmessageservice.cpp @@ -69,7 +69,7 @@ public: QDebugMessageService::QDebugMessageService(QObject *parent) : QQmlDebugService(*(new QDebugMessageServicePrivate()), - QLatin1String("DebugMessages"), 2, parent) + QStringLiteral("DebugMessages"), 2, parent) { Q_D(QDebugMessageService); diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp index e70632d..23b69af 100644 --- a/src/qml/debugger/qqmldebugserver.cpp +++ b/src/qml/debugger/qqmldebugserver.cpp @@ -155,7 +155,7 @@ void QQmlDebugServerPrivate::advertisePlugins() pluginNames << service->name(); pluginVersions << service->version(); } - out << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << pluginNames << pluginVersions; + out << QString(QStringLiteral("QDeclarativeDebugClient")) << 1 << pluginNames << pluginVersions; } QMetaObject::invokeMethod(q, "_q_sendMessages", Qt::QueuedConnection, Q_ARG(QList, QList() << message)); @@ -217,8 +217,8 @@ void QQmlDebugServerThread::run() connection->setPort(m_port, m_block); } else { QCoreApplicationPrivate *appD = static_cast(QObjectPrivate::get(qApp)); - qWarning() << QString::fromAscii("QML Debugger: Ignoring \"-qmljsdebugger=%1\". " - "Remote debugger plugin has not been found.").arg(appD->qmljsDebugArgumentsString()); + qWarning() << QString(QLatin1String("QML Debugger: Ignoring \"-qmljsdebugger=%1\". " + "Remote debugger plugin has not been found.")).arg(appD->qmljsDebugArgumentsString()); } exec(); @@ -262,9 +262,9 @@ QQmlDebugServer *QQmlDebugServer::instance() // format: qmljsdebugger=port:3768[,block] OR qmljsdebugger=ost[,block] if (!appD->qmljsDebugArgumentsString().isEmpty()) { if (!QQmlEnginePrivate::qml_debugging_enabled) { - qWarning() << QString::fromLatin1( + qWarning() << QString(QLatin1String( "QML Debugger: Ignoring \"-qmljsdebugger=%1\". " - "Debugging has not been enabled.").arg( + "Debugging has not been enabled.")).arg( appD->qmljsDebugArgumentsString()); return 0; } @@ -273,9 +273,9 @@ QQmlDebugServer *QQmlDebugServer::instance() if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) { int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(',')); port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok); - pluginName = QLatin1String("qmldbg_tcp"); + pluginName = QStringLiteral("qmldbg_tcp"); } else if (appD->qmljsDebugArgumentsString().contains(QLatin1String("ost"))) { - pluginName = QLatin1String("qmldbg_ost"); + pluginName = QStringLiteral("qmldbg_ost"); ok = true; } @@ -298,17 +298,17 @@ QQmlDebugServer *QQmlDebugServer::instance() } } else { - qWarning() << QString::fromLatin1( + qWarning() << QString(QLatin1String( "QML Debugger: Ignoring \"-qmljsdebugger=%1\". " - "Format is -qmljsdebugger=port:[,block]").arg( + "Format is -qmljsdebugger=port:[,block]")).arg( appD->qmljsDebugArgumentsString()); } } #else if (!appD->qmljsDebugArgumentsString().isEmpty()) { - qWarning() << QString::fromLatin1( + qWarning() << QString(QLatin1String( "QML Debugger: Ignoring \"-qmljsdebugger=%1\". " - "QtQml is not configured for debugging.").arg( + "QtQml is not configured for debugging.")).arg( appD->qmljsDebugArgumentsString()); } #endif @@ -373,7 +373,7 @@ void QQmlDebugServer::receiveMessage(const QByteArray &message) pluginVersions << service->version(); } - out << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << pluginNames << pluginVersions; + out << QString(QStringLiteral("QDeclarativeDebugClient")) << 0 << protocolVersion << pluginNames << pluginVersions; } d->connection->send(QList() << helloAnswer); diff --git a/src/qml/debugger/qqmldebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp index a1cc4fe..4594849 100644 --- a/src/qml/debugger/qqmldebugservice.cpp +++ b/src/qml/debugger/qqmldebugservice.cpp @@ -216,11 +216,11 @@ bool QQmlDebugService::hasDebuggingClient() QString QQmlDebugService::objectToString(QObject *obj) { if(!obj) - return QLatin1String("NULL"); + return QStringLiteral("NULL"); QString objectName = obj->objectName(); if(objectName.isEmpty()) - objectName = QLatin1String(""); + objectName = QStringLiteral(""); QString rv = QString::fromUtf8(obj->metaObject()->className()) + QLatin1String(": ") + objectName; diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp index 114d7ef..9653cf6 100644 --- a/src/qml/debugger/qqmlenginedebugservice.cpp +++ b/src/qml/debugger/qqmlenginedebugservice.cpp @@ -67,7 +67,7 @@ QQmlEngineDebugService *QQmlEngineDebugService::instance() } QQmlEngineDebugService::QQmlEngineDebugService(QObject *parent) - : QQmlDebugService(QLatin1String("QDeclarativeEngine"), 1, parent), + : QQmlDebugService(QStringLiteral("QDeclarativeEngine"), 1, parent), m_watch(new QQmlWatcher(this)), m_statesDelegate(0) { @@ -206,12 +206,12 @@ QVariant QQmlEngineDebugService::valueContents(const QVariant &value) const if (o) { QString name = o->objectName(); if (name.isEmpty()) - name = QLatin1String(""); + name = QStringLiteral(""); return name; } } - return QLatin1String(""); + return QStringLiteral(""); } void QQmlEngineDebugService::buildObjectDump(QDataStream &message, @@ -247,7 +247,7 @@ void QQmlEngineDebugService::buildObjectDump(QDataStream &message, prop.value = expr->expression(); QObject *scope = expr->scopeObject(); if (scope) { - QString sig = QLatin1String(scope->metaObject()->method(signal->index()).signature()); + QString sig = QString::fromLatin1(scope->metaObject()->method(signal->index()).signature()); int lparen = sig.indexOf(QLatin1Char('(')); if (lparen >= 0) { QString methodName = sig.mid(0, lparen); @@ -510,11 +510,11 @@ void QQmlEngineDebugService::processMessage(const QByteArray &message) bool undefined = false; QVariant value = exprObj.evaluate(&undefined); if (undefined) - result = QLatin1String(""); + result = QString(QStringLiteral("")); else result = valueContents(value); } else { - result = QLatin1String(""); + result = QString(QStringLiteral("")); } QByteArray reply; @@ -667,11 +667,11 @@ void QQmlEngineDebugService::setMethodBody(int objectId, const QString &method, QString paramStr; for (int ii = 0; ii < paramNames.count(); ++ii) { - if (ii != 0) paramStr.append(QLatin1String(",")); + if (ii != 0) paramStr.append(QLatin1Char(',')); paramStr.append(QString::fromUtf8(paramNames.at(ii))); } - QString jsfunction = QLatin1String("(function ") + method + QLatin1String("(") + paramStr + + QString jsfunction = QLatin1String("(function ") + method + QLatin1Char('(') + paramStr + QLatin1String(") {"); jsfunction += body; jsfunction += QLatin1String("\n})"); diff --git a/src/qml/debugger/qqmlinspectorservice.cpp b/src/qml/debugger/qqmlinspectorservice.cpp index c494045..5426745 100644 --- a/src/qml/debugger/qqmlinspectorservice.cpp +++ b/src/qml/debugger/qqmlinspectorservice.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC(QQmlInspectorService, serviceInstance) QQmlInspectorService::QQmlInspectorService() - : QQmlDebugService(QLatin1String("QDeclarativeObserverMode"), 1) + : QQmlDebugService(QStringLiteral("QDeclarativeObserverMode"), 1) , m_currentInspectorPlugin(0) { registerService(); diff --git a/src/qml/debugger/qqmlprofilerservice.cpp b/src/qml/debugger/qqmlprofilerservice.cpp index 2731d20..c643073 100644 --- a/src/qml/debugger/qqmlprofilerservice.cpp +++ b/src/qml/debugger/qqmlprofilerservice.cpp @@ -77,7 +77,7 @@ QByteArray QQmlProfilerData::toByteArray() const } QQmlProfilerService::QQmlProfilerService() - : QQmlDebugService(QLatin1String("CanvasFrameRate"), 1), + : QQmlDebugService(QStringLiteral("CanvasFrameRate"), 1), m_enabled(false), m_messageReceived(false) { m_timer.start(); diff --git a/src/qml/debugger/qv8debugservice.cpp b/src/qml/debugger/qv8debugservice.cpp index ee60bff..a6aeda3 100644 --- a/src/qml/debugger/qv8debugservice.cpp +++ b/src/qml/debugger/qv8debugservice.cpp @@ -120,7 +120,7 @@ public: QV8DebugService::QV8DebugService(QObject *parent) : QQmlDebugService(*(new QV8DebugServicePrivate()), - QLatin1String("V8Debugger"), 2, parent) + QStringLiteral("V8Debugger"), 2, parent) { Q_D(QV8DebugService); v8ServiceInstancePtr = this; diff --git a/src/qml/debugger/qv8profilerservice.cpp b/src/qml/debugger/qv8profilerservice.cpp index 6473a2f..6208676 100644 --- a/src/qml/debugger/qv8profilerservice.cpp +++ b/src/qml/debugger/qv8profilerservice.cpp @@ -101,7 +101,7 @@ public: }; QV8ProfilerService::QV8ProfilerService(QObject *parent) - : QQmlDebugService(*(new QV8ProfilerServicePrivate()), QLatin1String("V8Profiler"), 1, parent) + : QQmlDebugService(*(new QV8ProfilerServicePrivate()), QStringLiteral("V8Profiler"), 1, parent) { Q_D(QV8ProfilerService); -- 2.7.4