From eed531ff9ef52e167d162741c1fbc4d16a9c2560 Mon Sep 17 00:00:00 2001
From: Denis Mingulov <denis@mingulov.com>
Date: Tue, 17 Jan 2012 13:06:12 +0200
Subject: [PATCH] Valgrind plugin: fix for just partial usage of
coreplugin/coreconstants.h values
Valgrind plugin CallgrindTool and MemcheckTool modules sometime use
coreplugin/coreconstants.h values for icons (e.g. Core::Constants::ICON_REDO),
and sometime - an own constant is used like ":core/images/prev.png".
This commit is fixing this issue and changing everything to Core::Constants
usage.
Change-Id: I8d6f473a66a3181b03e2193314d17661df1d4cc1
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/valgrind/callgrindtool.cpp | 4 ++--
src/plugins/valgrind/memchecktool.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 0a7a2ebf218..e6c9913ca29 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -743,7 +743,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
// go back
action = new QAction(this);
action->setDisabled(true);
- action->setIcon(QIcon(QLatin1String(":core/images/prev.png")));
+ action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_PREV)));
action->setToolTip(tr("Go back one step in history. This will select the previously selected item."));
connect(action, SIGNAL(triggered(bool)), m_stackBrowser, SLOT(goBack()));
layout->addWidget(createToolButton(action));
@@ -752,7 +752,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
// go forward
action = new QAction(this);
action->setDisabled(true);
- action->setIcon(QIcon(QLatin1String(":core/images/next.png")));
+ action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_NEXT)));
action->setToolTip(tr("Go forward one step in history."));
connect(action, SIGNAL(triggered(bool)), m_stackBrowser, SLOT(goNext()));
layout->addWidget(createToolButton(action));
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index dd38bb8b7c7..bf25b4db9f2 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -413,7 +413,7 @@ QWidget *MemcheckTool::createWidgets()
// Go to previous leak.
action = new QAction(this);
action->setDisabled(true);
- action->setIcon(QIcon(QLatin1String(":core/images/prev.png")));
+ action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_PREV)));
action->setToolTip(tr("Go to previous leak."));
connect(action, SIGNAL(triggered(bool)), m_errorView, SLOT(goBack()));
button = new QToolButton;
@@ -424,7 +424,7 @@ QWidget *MemcheckTool::createWidgets()
// Go to next leak.
action = new QAction(this);
action->setDisabled(true);
- action->setIcon(QIcon(QLatin1String(":core/images/next.png")));
+ action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_NEXT)));
action->setToolTip(tr("Go to next leak."));
connect(action, SIGNAL(triggered(bool)), m_errorView, SLOT(goNext()));
button = new QToolButton;
--
GitLab