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

Utils: move code model icons to utils

Browse Source 
In preperation for the language server protocol support.

Change-Id: Iee4ccd53a86d9afdb357972ea62b75ace2edcb1d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
David Schulz
2018-07-25 10:00:38 +02:00
parent 5d67a471e0
commit 141f19a652
63 changed files with 423 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/classview/classviewnavigationwidget.cpp
View File

@@ -173,7 +173,7 @@ QList<QToolButton *> NavigationWidget::createToolButtons()
// create a button
fullProjectsModeButton = new QToolButton();
fullProjectsModeButton->setIcon(
CPlusPlus::Icons::iconForType(CPlusPlus::Icons::ClassIconType));
::Utils::CodeModelIcon::iconForType(::Utils::CodeModelIcon::Class));
fullProjectsModeButton->setCheckable(true);
fullProjectsModeButton->setToolTip(tr("Show Subprojects"));

2
src/plugins/classview/classviewtreeitemmodel.cpp
View File

@@ -62,7 +62,7 @@ QVariant TreeItemModel::data(const QModelIndex &index, int role) const
bool ok = false;
int type = iconType.toInt(&ok);
if (ok && type >= 0)
return CPlusPlus::Icons::iconForType(static_cast<CPlusPlus::Icons::IconType>(type));
return ::Utils::CodeModelIcon::iconForType(static_cast<::Utils::CodeModelIcon::Type>(type));
}
}
break;

46
src/plugins/classview/classviewutils.cpp
View File

@@ -43,29 +43,29 @@ namespace Constants {
//! Default icon sort order
const int IconSortOrder[] = {
CPlusPlus::Icons::NamespaceIconType,
CPlusPlus::Icons::EnumIconType,
CPlusPlus::Icons::ClassIconType,
CPlusPlus::Icons::FuncPublicIconType,
CPlusPlus::Icons::FuncProtectedIconType,
CPlusPlus::Icons::FuncPrivateIconType,
CPlusPlus::Icons::FuncPublicStaticIconType,
CPlusPlus::Icons::FuncProtectedStaticIconType,
CPlusPlus::Icons::FuncPrivateStaticIconType,
CPlusPlus::Icons::SignalIconType,
CPlusPlus::Icons::SlotPublicIconType,
CPlusPlus::Icons::SlotProtectedIconType,
CPlusPlus::Icons::SlotPrivateIconType,
CPlusPlus::Icons::VarPublicIconType,
CPlusPlus::Icons::VarProtectedIconType,
CPlusPlus::Icons::VarPrivateIconType,
CPlusPlus::Icons::VarPublicStaticIconType,
CPlusPlus::Icons::VarProtectedStaticIconType,
CPlusPlus::Icons::VarPrivateStaticIconType,
CPlusPlus::Icons::EnumeratorIconType,
CPlusPlus::Icons::KeywordIconType,
CPlusPlus::Icons::MacroIconType,
CPlusPlus::Icons::UnknownIconType
Utils::CodeModelIcon::Namespace,
Utils::CodeModelIcon::Enum,
Utils::CodeModelIcon::Class,
Utils::CodeModelIcon::FuncPublic,
Utils::CodeModelIcon::FuncProtected,
Utils::CodeModelIcon::FuncPrivate,
Utils::CodeModelIcon::FuncPublicStatic,
Utils::CodeModelIcon::FuncProtectedStatic,
Utils::CodeModelIcon::FuncPrivateStatic,
Utils::CodeModelIcon::Signal,
Utils::CodeModelIcon::SlotPublic,
Utils::CodeModelIcon::SlotProtected,
Utils::CodeModelIcon::SlotPrivate,
Utils::CodeModelIcon::VarPublic,
Utils::CodeModelIcon::VarProtected,
Utils::CodeModelIcon::VarPrivate,
Utils::CodeModelIcon::VarPublicStatic,
Utils::CodeModelIcon::VarProtectedStatic,
Utils::CodeModelIcon::VarPrivateStatic,
Utils::CodeModelIcon::Enumerator,
Utils::CodeModelIcon::Keyword,
Utils::CodeModelIcon::Macro,
Utils::CodeModelIcon::Unknown
};
} // namespace Constants