feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: Remove duplicated icons

Browse Source 
This change makes qmljs reuse the equivalent icons from CPlusPlus.

Change-Id: I955fc0dd08282ed0556d804a59108a34e1212521
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-04-07 00:00:54 +02:00
parent 5e274c6f54
commit 89ada77ea0
10 changed files with 27 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libs/qmljs/qmljsicons.cpp
View File

@@ -25,6 +25,8 @@
#include "qmljsicons.h"
#include <cplusplus/Icons.h>
#include <QDir>
#include <QHash>
#include <QIcon>
@@ -47,10 +49,6 @@ Icons *Icons::m_instance = 0;
class IconsPrivate
{
public:
QIcon elementIcon;
QIcon propertyIcon;
QIcon publicMemberIcon;
QIcon functionDeclarationIcon;
QHash<QPair<QString,QString>,QIcon> iconHash;
QString resourcePath;
};
@@ -60,10 +58,6 @@ public:
Icons::Icons()
: d(new IconsPrivate)
{
d->elementIcon = QIcon(QLatin1String(":/qmljs/images/element.png"));
d->propertyIcon = QIcon(QLatin1String(":/qmljs/images/property.png"));
d->publicMemberIcon = QIcon(QLatin1String(":/qmljs/images/publicmember.png"));
d->functionDeclarationIcon = QIcon(QLatin1String(":/qmljs/images/func.png"));
}
Icons::~Icons()
@@ -117,7 +111,7 @@ QIcon Icons::icon(const QString &packageName, const QString typeName) const
return d->iconHash.value(element);
}
QIcon Icons::icon(Node *node) const
QIcon Icons::icon(Node *node)
{
if (dynamic_cast<AST::UiObjectDefinition*>(node))
return objectDefinitionIcon();
@@ -127,22 +121,22 @@ QIcon Icons::icon(Node *node) const
return QIcon();
}
QIcon Icons::objectDefinitionIcon() const
QIcon Icons::objectDefinitionIcon()
{
return d->elementIcon;
return CPlusPlus::Icons::iconForType(CPlusPlus::Icons::ClassIconType);
}
QIcon Icons::scriptBindingIcon() const
QIcon Icons::scriptBindingIcon()
{
return d->propertyIcon;
return CPlusPlus::Icons::iconForType(CPlusPlus::Icons::VarPublicIconType);
}
QIcon Icons::publicMemberIcon() const
QIcon Icons::publicMemberIcon()
{
return d->publicMemberIcon;
return CPlusPlus::Icons::iconForType(CPlusPlus::Icons::FuncPublicIconType);
}
QIcon Icons::functionDeclarationIcon() const
QIcon Icons::functionDeclarationIcon()
{
return d->functionDeclarationIcon;
return CPlusPlus::Icons::iconForType(CPlusPlus::Icons::FuncPublicIconType);
}