From 7a2b1f724b6d2c60b4f89a09491a9a95d8eee243 Mon Sep 17 00:00:00 2001 From: Burak Hancerli Date: Mon, 8 May 2023 15:56:55 +0200 Subject: [PATCH] QmlDesigner: Change the raw pointer to uniqeptr and rename the main file Change-Id: I751359d65735b1be9b3e6b27946c23c278a78a6e Reviewed-by: Marco Bubke --- src/tools/qml2puppet/CMakeLists.txt | 2 +- .../qml2puppet/{main.cpp => qml2puppetmain.cpp} | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) rename src/tools/qml2puppet/qml2puppet/{main.cpp => qml2puppetmain.cpp} (62%) diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt index 98b1ebdf458..4f08b1fe355 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -45,7 +45,7 @@ add_qtc_executable(qml2puppet INCLUDES ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} SOURCES - qml2puppet/main.cpp + qml2puppet/qml2puppetmain.cpp qml2puppet/qmlbase.h qml2puppet/appmetadata.h qml2puppet/qmlpuppet.h qml2puppet/qmlpuppet.cpp qml2puppet/configcrashpad.h qmlpuppet.qrc diff --git a/src/tools/qml2puppet/qml2puppet/main.cpp b/src/tools/qml2puppet/qml2puppet/qml2puppetmain.cpp similarity index 62% rename from src/tools/qml2puppet/qml2puppet/main.cpp rename to src/tools/qml2puppet/qml2puppet/qml2puppetmain.cpp index 763bf77b5dc..5896df39e1f 100644 --- a/src/tools/qml2puppet/qml2puppet/main.cpp +++ b/src/tools/qml2puppet/qml2puppet/qml2puppetmain.cpp @@ -7,25 +7,24 @@ #include "runner/qmlruntime.h" #endif -QmlBase *getQmlRunner(int &argc, char **argv) +auto getQmlRunner(int &argc, char **argv) { #ifdef ENABLE_INTERNAL_QML_RUNTIME + QString qmlRuntime("--qml-runtime"); for (int i = 0; i < argc; i++) { - if (!strcmp(argv[i], "--qml-runtime")){ + if (!qmlRuntime.compare(QString::fromLocal8Bit(argv[i]))) { qInfo() << "Starting QML Runtime"; - return new QmlRuntime(argc, argv); + return std::unique_ptr(new QmlRuntime(argc, argv)); } } #endif qInfo() << "Starting QML Puppet"; - return new QmlPuppet(argc, argv); + return std::unique_ptr(new QmlPuppet(argc, argv)); } int main(int argc, char *argv[]) { QDSMeta::Logging::registerMessageHandler(); QDSMeta::AppInfo::registerAppInfo("Qml2Puppet"); - - QmlBase *qmlRunner = getQmlRunner(argc, argv); - return qmlRunner->run(); + return getQmlRunner(argc, argv)->run(); }