Utils: Introduce a FilePath constructor from char arrays

Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for
decorations in user code.

At the same time, drop some convenience constructors and functions
in CommandLine and Icon essentially serving the same purpose.

Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-10 16:19:02 +02:00
parent 98cba6e50c
commit 7c28c4f744
109 changed files with 452 additions and 483 deletions

View File

@@ -29,231 +29,231 @@ namespace Utils {
namespace Icons {
const Icon HOME({
{QLatin1String(":/utils/images/home.png"), Theme::PanelTextColorDark}}, Icon::Tint);
{":/utils/images/home.png", Theme::PanelTextColorDark}}, Icon::Tint);
const Icon HOME_TOOLBAR({
{QLatin1String(":/utils/images/home.png"), Theme::IconsBaseColor}});
{":/utils/images/home.png", Theme::IconsBaseColor}});
const Icon EDIT_CLEAR({
{QLatin1String(":/utils/images/editclear.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/editclear.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon EDIT_CLEAR_TOOLBAR({
{QLatin1String(":/utils/images/editclear.png"), Theme::IconsBaseColor}});
{":/utils/images/editclear.png", Theme::IconsBaseColor}});
const Icon LOCKED_TOOLBAR({
{QLatin1String(":/utils/images/locked.png"), Theme::IconsBaseColor}});
{":/utils/images/locked.png", Theme::IconsBaseColor}});
const Icon LOCKED({
{QLatin1String(":/utils/images/locked.png"), Theme::PanelTextColorDark}}, Icon::Tint);
{":/utils/images/locked.png", Theme::PanelTextColorDark}}, Icon::Tint);
const Icon UNLOCKED_TOOLBAR({
{QLatin1String(":/utils/images/unlocked.png"), Theme::IconsBaseColor}});
{":/utils/images/unlocked.png", Theme::IconsBaseColor}});
const Icon UNLOCKED({
{QLatin1String(":/utils/images/unlocked.png"), Theme::PanelTextColorDark}}, Icon::Tint);
{":/utils/images/unlocked.png", Theme::PanelTextColorDark}}, Icon::Tint);
const Icon PINNED({
{QLatin1String(":/utils/images/pinned.png"), Theme::PanelTextColorDark}}, Icon::Tint);
{":/utils/images/pinned.png", Theme::PanelTextColorDark}}, Icon::Tint);
const Icon NEXT({
{QLatin1String(":/utils/images/next.png"), Theme::IconsWarningColor}}, Icon::MenuTintedStyle);
{":/utils/images/next.png", Theme::IconsWarningColor}}, Icon::MenuTintedStyle);
const Icon NEXT_TOOLBAR({
{QLatin1String(":/utils/images/next.png"), Theme::IconsNavigationArrowsColor}});
{":/utils/images/next.png", Theme::IconsNavigationArrowsColor}});
const Icon PREV({
{QLatin1String(":/utils/images/prev.png"), Theme::IconsWarningColor}}, Icon::MenuTintedStyle);
{":/utils/images/prev.png", Theme::IconsWarningColor}}, Icon::MenuTintedStyle);
const Icon PREV_TOOLBAR({
{QLatin1String(":/utils/images/prev.png"), Theme::IconsNavigationArrowsColor}});
{":/utils/images/prev.png", Theme::IconsNavigationArrowsColor}});
const Icon PROJECT({
{QLatin1String(":/utils/images/project.png"), Theme::PanelTextColorDark}}, Icon::Tint);
{":/utils/images/project.png", Theme::PanelTextColorDark}}, Icon::Tint);
const Icon ZOOM({
{QLatin1String(":/utils/images/zoom.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/zoom.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon ZOOM_TOOLBAR({
{QLatin1String(":/utils/images/zoom.png"), Theme::IconsBaseColor}});
{":/utils/images/zoom.png", Theme::IconsBaseColor}});
const Icon ZOOMIN_TOOLBAR({
{QLatin1String(":/utils/images/zoom.png"), Theme::IconsBaseColor},
{QLatin1String(":/utils/images/zoomin_overlay.png"), Theme::IconsBaseColor}});
{":/utils/images/zoom.png", Theme::IconsBaseColor},
{":/utils/images/zoomin_overlay.png", Theme::IconsBaseColor}});
const Icon ZOOMOUT_TOOLBAR({
{QLatin1String(":/utils/images/zoom.png"), Theme::IconsBaseColor},
{QLatin1String(":/utils/images/zoomout_overlay.png"), Theme::IconsBaseColor}});
{":/utils/images/zoom.png", Theme::IconsBaseColor},
{":/utils/images/zoomout_overlay.png", Theme::IconsBaseColor}});
const Icon FITTOVIEW_TOOLBAR({
{QLatin1String(":/utils/images/fittoview.png"), Theme::IconsBaseColor}});
{":/utils/images/fittoview.png", Theme::IconsBaseColor}});
const Icon OK({
{QLatin1String(":/utils/images/ok.png"), Theme::IconsRunColor}}, Icon::Tint);
{":/utils/images/ok.png", Theme::IconsRunColor}}, Icon::Tint);
const Icon NOTLOADED({
{QLatin1String(":/utils/images/notloaded.png"), Theme::IconsErrorColor}}, Icon::Tint);
{":/utils/images/notloaded.png", Theme::IconsErrorColor}}, Icon::Tint);
const Icon BROKEN({
{QLatin1String(":/utils/images/broken.png"), Theme::IconsErrorColor}}, Icon::Tint);
{":/utils/images/broken.png", Theme::IconsErrorColor}}, Icon::Tint);
const Icon CRITICAL({
{QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal},
{QLatin1String(":/utils/images/error.png"), Theme::IconsErrorColor}}, Icon::Tint);
{":/utils/images/warningfill.png", Theme::BackgroundColorNormal},
{":/utils/images/error.png", Theme::IconsErrorColor}}, Icon::Tint);
const Icon BOOKMARK({
{QLatin1String(":/utils/images/bookmark.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/bookmark.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon BOOKMARK_TOOLBAR({
{QLatin1String(":/utils/images/bookmark.png"), Theme::IconsBaseColor}});
{":/utils/images/bookmark.png", Theme::IconsBaseColor}});
const Icon BOOKMARK_TEXTEDITOR({
{QLatin1String(":/utils/images/bookmark.png"), Theme::Bookmarks_TextMarkColor}}, Icon::Tint);
{":/utils/images/bookmark.png", Theme::Bookmarks_TextMarkColor}}, Icon::Tint);
const Icon SNAPSHOT_TOOLBAR({
{QLatin1String(":/utils/images/snapshot.png"), Theme::IconsBaseColor}});
{":/utils/images/snapshot.png", Theme::IconsBaseColor}});
const Icon NEWSEARCH_TOOLBAR({
{QLatin1String(":/utils/images/zoom.png"), Theme::IconsBaseColor},
{QLatin1String(":/utils/images/iconoverlay_add_small.png"), Theme::IconsRunColor}});
{":/utils/images/zoom.png", Theme::IconsBaseColor},
{":/utils/images/iconoverlay_add_small.png", Theme::IconsRunColor}});
const Icon SETTINGS_TOOLBAR({
{QLatin1String(":/utils/images/settings.png"), Theme::IconsBaseColor}});
{":/utils/images/settings.png", Theme::IconsBaseColor}});
const Icon NEWFILE({
{QLatin1String(":/utils/images/filenew.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/filenew.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon OPENFILE({
{QLatin1String(":/utils/images/fileopen.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/fileopen.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon OPENFILE_TOOLBAR({
{QLatin1String(":/utils/images/fileopen.png"), Theme::IconsBaseColor}});
{":/utils/images/fileopen.png", Theme::IconsBaseColor}});
const Icon SAVEFILE({
{QLatin1String(":/utils/images/filesave.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/filesave.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon SAVEFILE_TOOLBAR({
{QLatin1String(":/utils/images/filesave.png"), Theme::IconsBaseColor}});
{":/utils/images/filesave.png", Theme::IconsBaseColor}});
const Icon EXPORTFILE_TOOLBAR({
{QLatin1String(":/utils/images/fileexport.png"), Theme::IconsBaseColor}});
{":/utils/images/fileexport.png", Theme::IconsBaseColor}});
const Icon MULTIEXPORTFILE_TOOLBAR({
{QLatin1String(":/utils/images/filemultiexport.png"), Theme::IconsBaseColor}});
{":/utils/images/filemultiexport.png", Theme::IconsBaseColor}});
const Icon UNKNOWN_FILE({
{QLatin1String(":/utils/images/unknownfile.png"), Theme::IconsBaseColor}});
{":/utils/images/unknownfile.png", Theme::IconsBaseColor}});
const Icon DIR({
{QLatin1String(":/utils/images/dir.png"), Theme::IconsBaseColor}});
{":/utils/images/dir.png", Theme::IconsBaseColor}});
const Icon UNDO({
{QLatin1String(":/utils/images/undo.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/undo.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon UNDO_TOOLBAR({
{QLatin1String(":/utils/images/undo.png"), Theme::IconsBaseColor}});
{":/utils/images/undo.png", Theme::IconsBaseColor}});
const Icon REDO({
{QLatin1String(":/utils/images/redo.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/redo.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon REDO_TOOLBAR({
{QLatin1String(":/utils/images/redo.png"), Theme::IconsBaseColor}});
{":/utils/images/redo.png", Theme::IconsBaseColor}});
const Icon COPY({
{QLatin1String(":/utils/images/editcopy.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/editcopy.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon COPY_TOOLBAR({
{QLatin1String(":/utils/images/editcopy.png"), Theme::IconsBaseColor}});
{":/utils/images/editcopy.png", Theme::IconsBaseColor}});
const Icon PASTE({
{QLatin1String(":/utils/images/editpaste.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/editpaste.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon PASTE_TOOLBAR({
{QLatin1String(":/utils/images/editpaste.png"), Theme::IconsBaseColor}});
{":/utils/images/editpaste.png", Theme::IconsBaseColor}});
const Icon CUT({
{QLatin1String(":/utils/images/editcut.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/editcut.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon CUT_TOOLBAR({
{QLatin1String(":/utils/images/editcut.png"), Theme::IconsBaseColor}});
{":/utils/images/editcut.png", Theme::IconsBaseColor}});
const Icon RESET({
{QLatin1String(":/utils/images/reset.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/reset.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon RESET_TOOLBAR({
{QLatin1String(":/utils/images/reset.png"), Theme::IconsBaseColor}});
{":/utils/images/reset.png", Theme::IconsBaseColor}});
const Icon ARROW_UP({
{QLatin1String(":/utils/images/arrowup.png"), Theme::IconsBaseColor}});
{":/utils/images/arrowup.png", Theme::IconsBaseColor}});
const Icon ARROW_DOWN({
{QLatin1String(":/utils/images/arrowdown.png"), Theme::IconsBaseColor}});
{":/utils/images/arrowdown.png", Theme::IconsBaseColor}});
const Icon MINUS({
{QLatin1String(":/utils/images/minus.png"), Theme::IconsBaseColor}});
{":/utils/images/minus.png", Theme::IconsBaseColor}});
const Icon PLUS_TOOLBAR({
{QLatin1String(":/utils/images/plus.png"), Theme::IconsBaseColor}});
{":/utils/images/plus.png", Theme::IconsBaseColor}});
const Icon PLUS({
{QLatin1String(":/utils/images/plus.png"), Theme::PaletteText}}, Icon::Tint);
{":/utils/images/plus.png", Theme::PaletteText}}, Icon::Tint);
const Icon MAGNIFIER({
{QLatin1String(":/utils/images/magnifier.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/magnifier.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon CLEAN({
{QLatin1String(":/utils/images/clean_pane_small.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/clean_pane_small.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon CLEAN_TOOLBAR({
{QLatin1String(":/utils/images/clean_pane_small.png"), Theme::IconsBaseColor}});
{":/utils/images/clean_pane_small.png", Theme::IconsBaseColor}});
const Icon RELOAD({
{QLatin1String(":/utils/images/reload_gray.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/reload_gray.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon RELOAD_TOOLBAR({
{QLatin1String(":/utils/images/reload_gray.png"), Theme::IconsBaseColor}});
{":/utils/images/reload_gray.png", Theme::IconsBaseColor}});
const Icon TOGGLE_LEFT_SIDEBAR({
{QLatin1String(":/utils/images/leftsidebaricon.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
{":/utils/images/leftsidebaricon.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
const Icon TOGGLE_LEFT_SIDEBAR_TOOLBAR({
{QLatin1String(":/utils/images/leftsidebaricon.png"), Theme::IconsBaseColor}});
{":/utils/images/leftsidebaricon.png", Theme::IconsBaseColor}});
const Icon TOGGLE_RIGHT_SIDEBAR({
{QLatin1String(":/utils/images/rightsidebaricon.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
{":/utils/images/rightsidebaricon.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
const Icon TOGGLE_RIGHT_SIDEBAR_TOOLBAR({
{QLatin1String(":/utils/images/rightsidebaricon.png"), Theme::IconsBaseColor}});
{":/utils/images/rightsidebaricon.png", Theme::IconsBaseColor}});
const Icon CLOSE_TOOLBAR({
{QLatin1String(":/utils/images/close.png"), Theme::IconsBaseColor}});
{":/utils/images/close.png", Theme::IconsBaseColor}});
const Icon CLOSE_FOREGROUND({
{QLatin1String(":/utils/images/close.png"), Theme::PanelTextColorDark}}, Icon::Tint);
{":/utils/images/close.png", Theme::PanelTextColorDark}}, Icon::Tint);
const Icon CLOSE_BACKGROUND({
{QLatin1String(":/utils/images/close.png"), Theme::PanelTextColorLight}}, Icon::Tint);
{":/utils/images/close.png", Theme::PanelTextColorLight}}, Icon::Tint);
const Icon SPLIT_HORIZONTAL({
{QLatin1String(":/utils/images/splitbutton_horizontal.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
{":/utils/images/splitbutton_horizontal.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
const Icon SPLIT_HORIZONTAL_TOOLBAR({
{QLatin1String(":/utils/images/splitbutton_horizontal.png"), Theme::IconsBaseColor}});
{":/utils/images/splitbutton_horizontal.png", Theme::IconsBaseColor}});
const Icon SPLIT_VERTICAL({
{QLatin1String(":/utils/images/splitbutton_vertical.png"), Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
{":/utils/images/splitbutton_vertical.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle);
const Icon SPLIT_VERTICAL_TOOLBAR({
{QLatin1String(":/utils/images/splitbutton_vertical.png"), Theme::IconsBaseColor}});
{":/utils/images/splitbutton_vertical.png", Theme::IconsBaseColor}});
const Icon CLOSE_SPLIT_TOP({
{QLatin1String(":/utils/images/splitbutton_closetop.png"), Theme::IconsBaseColor}});
{":/utils/images/splitbutton_closetop.png", Theme::IconsBaseColor}});
const Icon CLOSE_SPLIT_BOTTOM({
{QLatin1String(":/utils/images/splitbutton_closebottom.png"), Theme::IconsBaseColor}});
{":/utils/images/splitbutton_closebottom.png", Theme::IconsBaseColor}});
const Icon CLOSE_SPLIT_LEFT({
{QLatin1String(":/utils/images/splitbutton_closeleft.png"), Theme::IconsBaseColor}});
{":/utils/images/splitbutton_closeleft.png", Theme::IconsBaseColor}});
const Icon CLOSE_SPLIT_RIGHT({
{QLatin1String(":/utils/images/splitbutton_closeright.png"), Theme::IconsBaseColor}});
{":/utils/images/splitbutton_closeright.png", Theme::IconsBaseColor}});
const Icon FILTER({
{QLatin1String(":/utils/images/filtericon.png"), Theme::IconsBaseColor},
{QLatin1String(":/utils/images/toolbuttonexpandarrow.png"), Theme::IconsBaseColor}});
{":/utils/images/filtericon.png", Theme::IconsBaseColor},
{":/utils/images/toolbuttonexpandarrow.png", Theme::IconsBaseColor}});
const Icon LINK({
{QLatin1String(":/utils/images/linkicon.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/linkicon.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon LINK_TOOLBAR({
{QLatin1String(":/utils/images/linkicon.png"), Theme::IconsBaseColor}});
{":/utils/images/linkicon.png", Theme::IconsBaseColor}});
const Icon SORT_ALPHABETICALLY_TOOLBAR({
{QLatin1String(":/utils/images/sort_alphabetically.png"), Theme::IconsBaseColor}});
{":/utils/images/sort_alphabetically.png", Theme::IconsBaseColor}});
const Icon TOGGLE_PROGRESSDETAILS_TOOLBAR({
{QLatin1String(":/utils/images/toggleprogressdetails.png"), Theme::IconsBaseColor}});
{":/utils/images/toggleprogressdetails.png", Theme::IconsBaseColor}});
const Icon ONLINE({
{QLatin1String(":/utils/images/online.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/online.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon ONLINE_TOOLBAR({
{QLatin1String(":/utils/images/online.png"), Theme::IconsBaseColor}});
{":/utils/images/online.png", Theme::IconsBaseColor}});
const Icon DOWNLOAD({
{QLatin1String(":/utils/images/download.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/download.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon WARNING({
{QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal},
{QLatin1String(":/utils/images/warning.png"), Theme::IconsWarningColor}}, Icon::Tint);
{":/utils/images/warningfill.png", Theme::BackgroundColorNormal},
{":/utils/images/warning.png", Theme::IconsWarningColor}}, Icon::Tint);
const Icon WARNING_TOOLBAR({
{QLatin1String(":/utils/images/warning.png"), Theme::IconsWarningToolBarColor}});
{":/utils/images/warning.png", Theme::IconsWarningToolBarColor}});
const Icon CRITICAL_TOOLBAR({
{QLatin1String(":/utils/images/error.png"), Theme::IconsErrorToolBarColor}});
{":/utils/images/error.png", Theme::IconsErrorToolBarColor}});
const Icon ERROR_TASKBAR({
{QLatin1String(":/utils/images/compile_error_taskbar.png"), Theme::IconsErrorColor}}, Icon::Tint);
{":/utils/images/compile_error_taskbar.png", Theme::IconsErrorColor}}, Icon::Tint);
const Icon INFO({
{QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal},
{QLatin1String(":/utils/images/info.png"), Theme::IconsInfoColor}}, Icon::Tint);
{":/utils/images/warningfill.png", Theme::BackgroundColorNormal},
{":/utils/images/info.png", Theme::IconsInfoColor}}, Icon::Tint);
const Icon INFO_TOOLBAR({
{QLatin1String(":/utils/images/info.png"), Theme::IconsInfoToolBarColor}});
{":/utils/images/info.png", Theme::IconsInfoToolBarColor}});
const Icon EXPAND_ALL_TOOLBAR({
{QLatin1String(":/find/images/expand.png"), Theme::IconsBaseColor}});
{":/find/images/expand.png", Theme::IconsBaseColor}});
const Icon TOOLBAR_EXTENSION({
{QLatin1String(":/utils/images/extension.png"), Theme::IconsBaseColor}});
{":/utils/images/extension.png", Theme::IconsBaseColor}});
const Icon RUN_SMALL({
{QLatin1String(":/utils/images/run_small.png"), Theme::IconsRunColor}}, Icon::MenuTintedStyle);
{":/utils/images/run_small.png", Theme::IconsRunColor}}, Icon::MenuTintedStyle);
const Icon RUN_SMALL_TOOLBAR({
{QLatin1String(":/utils/images/run_small.png"), Theme::IconsRunToolBarColor}});
{":/utils/images/run_small.png", Theme::IconsRunToolBarColor}});
const Icon STOP_SMALL({
{QLatin1String(":/utils/images/stop_small.png"), Theme::IconsStopColor}}, Icon::MenuTintedStyle);
{":/utils/images/stop_small.png", Theme::IconsStopColor}}, Icon::MenuTintedStyle);
const Icon STOP_SMALL_TOOLBAR({
{QLatin1String(":/utils/images/stop_small.png"), Theme::IconsStopToolBarColor}});
{":/utils/images/stop_small.png", Theme::IconsStopToolBarColor}});
const Icon INTERRUPT_SMALL({
{QLatin1String(":/utils/images/interrupt_small.png"), Theme::IconsInterruptColor}}, Icon::MenuTintedStyle);
{":/utils/images/interrupt_small.png", Theme::IconsInterruptColor}}, Icon::MenuTintedStyle);
const Icon INTERRUPT_SMALL_TOOLBAR({
{QLatin1String(":/utils/images/interrupt_small.png"), Theme::IconsInterruptToolBarColor}});
{":/utils/images/interrupt_small.png", Theme::IconsInterruptToolBarColor}});
const Icon BOUNDING_RECT({
{QLatin1String(":/utils/images/boundingrect.png"), Theme::IconsBaseColor}});
{":/utils/images/boundingrect.png", Theme::IconsBaseColor}});
const Icon EYE_OPEN_TOOLBAR({
{QLatin1String(":/utils/images/eye_open.png"), Theme::IconsBaseColor}});
{":/utils/images/eye_open.png", Theme::IconsBaseColor}});
const Icon EYE_CLOSED_TOOLBAR({
{QLatin1String(":/utils/images/eye_closed.png"), Theme::IconsBaseColor}});
{":/utils/images/eye_closed.png", Theme::IconsBaseColor}});
const Icon REPLACE({
{QLatin1String(":/utils/images/replace_a.png"), Theme::PanelTextColorMid},
{QLatin1String(":/utils/images/replace_b.png"), Theme::IconsInfoColor}}, Icon::Tint);
{":/utils/images/replace_a.png", Theme::PanelTextColorMid},
{":/utils/images/replace_b.png", Theme::IconsInfoColor}}, Icon::Tint);
const Icon EXPAND({
{QLatin1String(":/utils/images/expand.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/expand.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon EXPAND_TOOLBAR({
{QLatin1String(":/utils/images/expand.png"), Theme::IconsBaseColor}});
{":/utils/images/expand.png", Theme::IconsBaseColor}});
const Icon COLLAPSE({
{QLatin1String(":/utils/images/collapse.png"), Theme::PanelTextColorMid}}, Icon::Tint);
{":/utils/images/collapse.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon COLLAPSE_TOOLBAR({
{QLatin1String(":/utils/images/collapse.png"), Theme::IconsBaseColor}});
{":/utils/images/collapse.png", Theme::IconsBaseColor}});
const Icon PAN_TOOLBAR({
{QLatin1String(":/utils/images/pan.png"), Theme::IconsBaseColor}});
{":/utils/images/pan.png", Theme::IconsBaseColor}});
const Icon EMPTY14(":/utils/images/empty14.png");
const Icon EMPTY16(":/utils/images/empty16.png");
const Icon OVERLAY_ADD({
@@ -300,44 +300,44 @@ const Icon MACOS_TOUCHBAR_CLEAR(
QIcon CodeModelIcon::iconForType(CodeModelIcon::Type type)
{
static const IconStringMaskAndColor classRelationIcon {
QLatin1String(":/codemodel/images/classrelation.png"), Theme::IconsCodeModelOverlayForegroundColor};
static const IconStringMaskAndColor classRelationBackgroundIcon {
QLatin1String(":/codemodel/images/classrelationbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
static const IconStringMaskAndColor classMemberFunctionIcon {
QLatin1String(":/codemodel/images/classmemberfunction.png"), Theme::IconsCodeModelFunctionColor};
static const IconStringMaskAndColor classMemberVariableIcon {
QLatin1String(":/codemodel/images/classmembervariable.png"), Theme::IconsCodeModelVariableColor};
static const IconStringMaskAndColor functionIcon {
QLatin1String(":/codemodel/images/member.png"), Theme::IconsCodeModelFunctionColor};
static const IconStringMaskAndColor variableIcon {
QLatin1String(":/codemodel/images/member.png"), Theme::IconsCodeModelVariableColor};
static const IconStringMaskAndColor signalIcon {
QLatin1String(":/codemodel/images/signal.png"), Theme::IconsCodeModelFunctionColor};
static const IconStringMaskAndColor slotIcon {
QLatin1String(":/codemodel/images/slot.png"), Theme::IconsCodeModelFunctionColor};
static const IconStringMaskAndColor propertyIcon {
QLatin1String(":/codemodel/images/property.png"), Theme::IconsCodeModelOverlayForegroundColor};
static const IconStringMaskAndColor propertyBackgroundIcon {
QLatin1String(":/codemodel/images/propertybackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
static const IconStringMaskAndColor protectedIcon {
QLatin1String(":/codemodel/images/protected.png"), Theme::IconsCodeModelOverlayForegroundColor};
static const IconStringMaskAndColor protectedBackgroundIcon {
QLatin1String(":/codemodel/images/protectedbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
static const IconStringMaskAndColor privateIcon {
QLatin1String(":/codemodel/images/private.png"), Theme::IconsCodeModelOverlayForegroundColor};
static const IconStringMaskAndColor privateBackgroundIcon {
QLatin1String(":/codemodel/images/privatebackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
static const IconStringMaskAndColor staticIcon {
QLatin1String(":/codemodel/images/static.png"), Theme::IconsCodeModelOverlayForegroundColor};
static const IconStringMaskAndColor staticBackgroundIcon {
QLatin1String(":/codemodel/images/staticbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
static const IconMaskAndColor classRelationIcon {
":/codemodel/images/classrelation.png", Theme::IconsCodeModelOverlayForegroundColor};
static const IconMaskAndColor classRelationBackgroundIcon {
":/codemodel/images/classrelationbackground.png", Theme::IconsCodeModelOverlayBackgroundColor};
static const IconMaskAndColor classMemberFunctionIcon {
":/codemodel/images/classmemberfunction.png", Theme::IconsCodeModelFunctionColor};
static const IconMaskAndColor classMemberVariableIcon {
":/codemodel/images/classmembervariable.png", Theme::IconsCodeModelVariableColor};
static const IconMaskAndColor functionIcon {
":/codemodel/images/member.png", Theme::IconsCodeModelFunctionColor};
static const IconMaskAndColor variableIcon {
":/codemodel/images/member.png", Theme::IconsCodeModelVariableColor};
static const IconMaskAndColor signalIcon {
":/codemodel/images/signal.png", Theme::IconsCodeModelFunctionColor};
static const IconMaskAndColor slotIcon {
":/codemodel/images/slot.png", Theme::IconsCodeModelFunctionColor};
static const IconMaskAndColor propertyIcon {
":/codemodel/images/property.png", Theme::IconsCodeModelOverlayForegroundColor};
static const IconMaskAndColor propertyBackgroundIcon {
":/codemodel/images/propertybackground.png", Theme::IconsCodeModelOverlayBackgroundColor};
static const IconMaskAndColor protectedIcon {
":/codemodel/images/protected.png", Theme::IconsCodeModelOverlayForegroundColor};
static const IconMaskAndColor protectedBackgroundIcon {
":/codemodel/images/protectedbackground.png", Theme::IconsCodeModelOverlayBackgroundColor};
static const IconMaskAndColor privateIcon {
":/codemodel/images/private.png", Theme::IconsCodeModelOverlayForegroundColor};
static const IconMaskAndColor privateBackgroundIcon {
":/codemodel/images/privatebackground.png", Theme::IconsCodeModelOverlayBackgroundColor};
static const IconMaskAndColor staticIcon {
":/codemodel/images/static.png", Theme::IconsCodeModelOverlayForegroundColor};
static const IconMaskAndColor staticBackgroundIcon {
":/codemodel/images/staticbackground.png", Theme::IconsCodeModelOverlayBackgroundColor};
switch (type) {
case Class: {
const static QIcon icon(Icon({
classRelationBackgroundIcon, classRelationIcon,
{QLatin1String(":/codemodel/images/classparent.png"), Theme::IconsCodeModelClassColor},
{":/codemodel/images/classparent.png", Theme::IconsCodeModelClassColor},
classMemberFunctionIcon, classMemberVariableIcon
}, Icon::Tint).icon());
return icon;
@@ -345,20 +345,20 @@ QIcon CodeModelIcon::iconForType(CodeModelIcon::Type type)
case Struct: {
const static QIcon icon(Icon({
classRelationBackgroundIcon, classRelationIcon,
{QLatin1String(":/codemodel/images/classparent.png"), Theme::IconsCodeModelStructColor},
{":/codemodel/images/classparent.png", Theme::IconsCodeModelStructColor},
classMemberFunctionIcon, classMemberVariableIcon
}, Icon::Tint).icon());
return icon;
}
case Enum: {
const static QIcon icon(Icon({
{QLatin1String(":/codemodel/images/enum.png"), Theme::IconsCodeModelEnumColor}
{":/codemodel/images/enum.png", Theme::IconsCodeModelEnumColor}
}, Icon::Tint).icon());
return icon;
}
case Enumerator: {
const static QIcon icon(Icon({
{QLatin1String(":/codemodel/images/enumerator.png"), Theme::IconsCodeModelEnumColor}
{":/codemodel/images/enumerator.png", Theme::IconsCodeModelEnumColor}
}, Icon::Tint).icon());
return icon;
}
@@ -399,7 +399,7 @@ QIcon CodeModelIcon::iconForType(CodeModelIcon::Type type)
}
case Namespace: {
const static QIcon icon(Icon({
{QLatin1String(":/utils/images/namespace.png"), Theme::IconsCodeModelKeywordColor}
{":/utils/images/namespace.png", Theme::IconsCodeModelKeywordColor}
}, Icon::Tint).icon());
return icon;
}
@@ -465,13 +465,13 @@ QIcon CodeModelIcon::iconForType(CodeModelIcon::Type type)
}
case Keyword: {
const static QIcon icon(Icon({
{QLatin1String(":/codemodel/images/keyword.png"), Theme::IconsCodeModelKeywordColor}
{":/codemodel/images/keyword.png", Theme::IconsCodeModelKeywordColor}
}, Icon::Tint).icon());
return icon;
}
case Macro: {
const static QIcon icon(Icon({
{QLatin1String(":/codemodel/images/macro.png"), Theme::IconsCodeModelMacroColor}
{":/codemodel/images/macro.png", Theme::IconsCodeModelMacroColor}
}, Icon::Tint).icon());
return icon;
}