diff options
author | Alessandro Portale <[email protected]> | 2015-11-23 16:41:54 +0100 |
---|---|---|
committer | Alessandro Portale <[email protected]> | 2015-11-25 12:30:52 +0000 |
commit | 033862f3057818df3123d07fc6cb34e193250c53 (patch) | |
tree | 884de0b3b8ac16e548e4f585bd8c821aa890f8b4 /src/plugins/debugger/breakhandler.cpp | |
parent | 00c75cd7ebde4f191c15e92550db369163a95b68 (diff) |
Themed Icons: Introduce Utils::Icon
Instead of describing icons via file name or in the themed icons case
via
a string that is a list of mask/color pairs, we have now a class for it.
Icons are now listed in per-plugin *icons.h headers.
RunControl::m_icon was The only place left where an icon property was in
fact a string. This patch changes that member to be a Utils::Icon.
Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177
Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/debugger/breakhandler.cpp')
-rw-r--r-- | src/plugins/debugger/breakhandler.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 6f913f5a1c1..5629c9bee82 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -33,6 +33,7 @@ #include "debuggeractions.h" #include "debuggercore.h" #include "debuggerengine.h" +#include "debuggericons.h" #include "debuggerinternalconstants.h" #include "debuggerstringutils.h" #include "simplifytype.h" @@ -265,39 +266,39 @@ BreakHandler::BreakHandler() QIcon BreakHandler::breakpointIcon() { - static QIcon icon(_(":/debugger/images/breakpoint_16.png")); + static QIcon icon = Icons::BREAKPOINT.icon(); return icon; } QIcon BreakHandler::disabledBreakpointIcon() { - static QIcon icon(_(":/debugger/images/breakpoint_disabled_16.png")); + static QIcon icon = Icons::BREAKPOINT_DISABLED.icon(); return icon; } QIcon BreakHandler::pendingBreakpointIcon() { - static QIcon icon(_(":/debugger/images/breakpoint_pending_16.png")); + static QIcon icon = Icons::BREAKPOINT_PENDING.icon(); return icon; } QIcon BreakHandler::watchpointIcon() { - static QIcon icon(_(":/debugger/images/watchpoint.png")); + static QIcon icon = Icons::WATCHPOINT.icon(); return icon; } QIcon BreakHandler::tracepointIcon() { - static QIcon icon(_(":/debugger/images/tracepoint.png")); + static QIcon icon = Icons::TRACEPOINT.icon(); return icon; } QIcon BreakHandler::emptyIcon() { - static QIcon icon(_(":/debugger/images/breakpoint_pending_16.png")); - //static QIcon icon(_(":/debugger/images/watchpoint.png")); - //static QIcon icon(_(":/debugger/images/debugger_empty_14.png")); + static QIcon icon = Icons::BREAKPOINT_PENDING.icon(); + //static QIcon icon = Icons::WATCHPOINT.icon(); + //static QIcon icon = Icons::EMPTY.icon(); return icon; } |