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>
This commit is contained in:
hjk
2019-11-15 18:42:11 +01:00
parent 3ecf3d9575
commit 3c6c61d1c8
8 changed files with 138 additions and 227 deletions

View File

@@ -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