ClassView: Dissolve the internal 'Utils' class

It's regularly getting in my way, and it's rather a namespace anyway.

Also, move the functions that are only used once closer to their
place of use.

Change-Id: I97951aae1b69c04f391afbdd1b491a8a9173a977
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 3 insertions, 21 deletions

diff --git a/src/plugins/classview/classviewutils.h b/src/plugins/classview/classviewutils.h
index 9a731e90e0..f6acb7c624 100644
--- a/src/plugins/classview/classviewutils.h
+++ b/src/plugins/classview/classviewutils.h
@@ -27,6 +27,7 @@
 
 #include "classviewsymbollocation.h"
 #include "classviewsymbolinformation.h"
+
 #include <QVariant>
 #include <QList>
 #include <QSet>
@@ -36,27 +37,8 @@ QT_FORWARD_DECLARE_CLASS(QStandardItem)
 namespace ClassView {
 namespace Internal {
 
-class Utils
-{
-    //! Private constructor
-    Utils();
-public:
-
-    static QList<QVariant> locationsToRole(const QSet<SymbolLocation> &locations);
-
-    static QSet<SymbolLocation> roleToLocations(const QList<QVariant> &locations);
-
-    static int iconTypeSortOrder(int iconType);
-
-    static SymbolInformation symbolInformationFromItem(const QStandardItem *item);
-
-    static QStandardItem *setSymbolInformationToItem(const SymbolInformation &information,
-                                                     QStandardItem *item);
-
-    static void fetchItemToTarget(QStandardItem *item, const QStandardItem *target);
-
-    static void moveItemToTarget(QStandardItem *item, const QStandardItem *target);
-};
+QSet<SymbolLocation> roleToLocations(const QList<QVariant> &locations);
+SymbolInformation symbolInformationFromItem(const QStandardItem *item);
 
 } // namespace Internal
 } // namespace ClassView