diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h index bcd4c4856c942dbd8a7a8cd31b3277922cf831ad..7042a06b6886bfedbdd67783c2b0ef24f12cc7bf 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h +++ b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h @@ -32,17 +32,17 @@ namespace QmlProjectManager { namespace Constants { -const char * const QML_RC_ID("QmlProjectManager.QmlRunConfiguration"); -const char * const QML_RC_DISPLAY_NAME(QT_TRANSLATE_NOOP("QmlProjectManager::Internal::QmlRunConfiguration", "QML Viewer")); -const char * const QML_VIEWER_KEY("QmlProjectManager.QmlRunConfiguration.QDeclarativeViewer"); -const char * const QML_VIEWER_ARGUMENTS_KEY("QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"); -const char * const QML_VIEWER_TARGET_ID("QmlProjectManager.QmlTarget"); -const char * const QML_VIEWER_TARGET_DISPLAY_NAME("QML Viewer"); -const char * const QML_MAINSCRIPT_KEY("QmlProjectManager.QmlRunConfiguration.MainScript"); -const char * const QML_DEBUG_SERVER_ADDRESS_KEY("QmlProjectManager.QmlRunConfiguration.DebugServerAddress"); -const char * const QML_DEBUG_SERVER_PORT_KEY("QmlProjectManager.QmlRunConfiguration.DebugServerPort"); +const char * const QML_RC_ID = "QmlProjectManager.QmlRunConfiguration"; +const char * const QML_RC_DISPLAY_NAME = QT_TRANSLATE_NOOP("QmlProjectManager::Internal::QmlRunConfiguration", "QML Viewer"); +const char * const QML_VIEWER_KEY = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewer"; +const char * const QML_VIEWER_ARGUMENTS_KEY = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"; +const char * const QML_VIEWER_TARGET_ID = "QmlProjectManager.QmlTarget"; +const char * const QML_VIEWER_TARGET_DISPLAY_NAME = "QML Viewer"; +const char * const QML_MAINSCRIPT_KEY = "QmlProjectManager.QmlRunConfiguration.MainScript"; +const char * const QML_DEBUG_SERVER_ADDRESS_KEY = "QmlProjectManager.QmlRunConfiguration.DebugServerAddress"; +const char * const QML_DEBUG_SERVER_PORT_KEY = "QmlProjectManager.QmlRunConfiguration.DebugServerPort"; -const int QML_DEFAULT_DEBUG_SERVER_PORT(3768); +const int QML_DEFAULT_DEBUG_SERVER_PORT = 3768; } // namespace Constants } // namespace QmlProjectManager diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp index 640a96a85ea4236204958985581bd024e455735f..47ab035817456992728ce8fdce50b253c9a666a8 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp @@ -72,13 +72,13 @@ ProjectExplorer::RunConfiguration *QmlProjectRunConfigurationFactory::create(Pro { if (!canCreate(parent, id)) return 0; - QmlProjectTarget *qmlparent(static_cast<QmlProjectTarget *>(parent)); + QmlProjectTarget *qmlparent = static_cast<QmlProjectTarget *>(parent); return new QmlProjectRunConfiguration(qmlparent); } bool QmlProjectRunConfigurationFactory::canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const { - QString id(ProjectExplorer::idFromMap(map)); + QString id = ProjectExplorer::idFromMap(map); return canCreate(parent, id); } @@ -86,8 +86,8 @@ ProjectExplorer::RunConfiguration *QmlProjectRunConfigurationFactory::restore(Pr { if (!canRestore(parent, map)) return 0; - QmlProjectTarget *qmlparent(static_cast<QmlProjectTarget *>(parent)); - QmlProjectRunConfiguration *rc(new QmlProjectRunConfiguration(qmlparent)); + QmlProjectTarget *qmlparent = static_cast<QmlProjectTarget *>(parent); + QmlProjectRunConfiguration *rc = new QmlProjectRunConfiguration(qmlparent); if (rc->fromMap(map)) return rc; delete rc; @@ -104,7 +104,7 @@ ProjectExplorer::RunConfiguration *QmlProjectRunConfigurationFactory::clone(Proj { if (!canClone(parent, source)) return 0; - QmlProjectTarget *qmlparent(static_cast<QmlProjectTarget *>(parent)); + QmlProjectTarget *qmlparent = static_cast<QmlProjectTarget *>(parent); return new QmlProjectRunConfiguration(qmlparent, qobject_cast<QmlProjectRunConfiguration *>(source)); }