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, 7 insertions, 5 deletions

diff --git a/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp b/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
index 1457a3c1..3f5583ea 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
@@ -83,10 +83,12 @@ QVariant ChooserModelBase::data(const QModelIndex &index, int role) const
 
         switch (role) {
         case Qt::DecorationRole:
-            if (!item.iconSource.isEmpty())
-                return resourceImageUrl() + item.iconSource;
-            else
-                return resourceImageUrl() + CStudioObjectTypes::GetNormalIconName(item.iconType);
+            if (!item.iconSource.isEmpty()) {
+                return StudioUtils::resourceImageUrl() + item.iconSource;
+            } else {
+                return StudioUtils::resourceImageUrl()
+                        + CStudioObjectTypes::GetNormalIconName(item.iconType);
+            }
 
         case IsExpandableRole:
             return false;
@@ -112,7 +114,7 @@ QVariant ChooserModelBase::data(const QModelIndex &index, int role) const
         switch (role) {
         case Qt::DecorationRole: {
             QString path = item.index.data(QFileSystemModel::FilePathRole).toString();
-            return resourceImageUrl() + getIconName(path);
+            return StudioUtils::resourceImageUrl() + getIconName(path);
         }
 
         case IsExpandableRole: {