Clean up StudioUtils

Made StudioUtils a class of static functions instead of global
functions. Also cleaned up the code a bit where changes happened
because of this change.

Change-Id: Ic583dd25bf228c7e344be6664b6651958d84906e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

1 files changed, 12 insertions, 11 deletions

diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
index bf077a4e..abde42ea 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
@@ -217,19 +217,20 @@ void InspectorControlView::mousePressEvent(QMouseEvent *event)
 void InspectorControlView::initialize()
 {
     CStudioPreferences::setQmlContextProperties(rootContext());
-    rootContext()->setContextProperty("_parentView"_L1, this);
-    rootContext()->setContextProperty("_inspectorModel"_L1, m_inspectorControlModel);
-    rootContext()->setContextProperty("_resDir"_L1, resourceImageUrl());
-    rootContext()->setContextProperty("_tabOrderHandler"_L1, tabOrderHandler());
-    rootContext()->setContextProperty("_mouseHelper"_L1, &m_mouseHelper);
-
-    qmlRegisterUncreatableType<qt3dsdm::DataModelDataType>("Qt3DStudio", 1, 0, "DataModelDataType",
-                                                         "DataModelDataType is an enum container");
+    rootContext()->setContextProperty(QStringLiteral("_parentView"), this);
+    rootContext()->setContextProperty(QStringLiteral("_inspectorModel"), m_inspectorControlModel);
+    rootContext()->setContextProperty(QStringLiteral("_resDir"), StudioUtils::resourceImageUrl());
+    rootContext()->setContextProperty(QStringLiteral("_tabOrderHandler"), tabOrderHandler());
+    rootContext()->setContextProperty(QStringLiteral("_mouseHelper"), &m_mouseHelper);
+
+    qmlRegisterUncreatableType<qt3dsdm::DataModelDataType>(
+                "Qt3DStudio", 1, 0, "DataModelDataType",
+                QStringLiteral("DataModelDataType is an enum container"));
     qmlRegisterUncreatableType<qt3dsdm::AdditionalMetaDataType>(
                 "Qt3DStudio", 1, 0, "AdditionalMetaDataType",
-                "AdditionalMetaDataType is an enum container");
-    engine()->addImportPath(qmlImportPath());
-    setSource(QUrl("qrc:/Palettes/Inspector/InspectorControlView.qml"_L1));
+                QStringLiteral("AdditionalMetaDataType is an enum container"));
+    engine()->addImportPath(StudioUtils::qmlImportPath());
+    setSource(QUrl(QStringLiteral("qrc:/Palettes/Inspector/InspectorControlView.qml")));
 }
 
 QAbstractItemModel *InspectorControlView::inspectorControlModel() const