From 81c5906970fef776b5afe5467498b8890ddc90d5 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 13 Oct 2017 18:07:06 +0200 Subject: [PATCH] Valgrind: Remove dead code Change-Id: I77fdb0f07dabf742bccd88016463b01f45c011ca Reviewed-by: hjk --- src/plugins/valgrind/valgrind.pro | 2 -- src/plugins/valgrind/valgrind.qbs | 1 - src/plugins/valgrind/workarounds.cpp | 44 ---------------------------- src/plugins/valgrind/workarounds.h | 35 ---------------------- 4 files changed, 82 deletions(-) delete mode 100644 src/plugins/valgrind/workarounds.cpp delete mode 100644 src/plugins/valgrind/workarounds.h diff --git a/src/plugins/valgrind/valgrind.pro b/src/plugins/valgrind/valgrind.pro index 216e3568173..34b48f76c70 100644 --- a/src/plugins/valgrind/valgrind.pro +++ b/src/plugins/valgrind/valgrind.pro @@ -18,7 +18,6 @@ HEADERS += \ callgrindtool.h \ callgrindvisualisation.h \ callgrindengine.h \ - workarounds.h \ callgrindtextmark.h \ memchecktool.h \ memcheckerrorview.h \ @@ -37,7 +36,6 @@ SOURCES += \ callgrindtool.cpp \ callgrindvisualisation.cpp \ callgrindengine.cpp \ - workarounds.cpp \ callgrindtextmark.cpp \ memchecktool.cpp \ memcheckerrorview.cpp \ diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs index 5b7fb8f040c..5714d22261e 100644 --- a/src/plugins/valgrind/valgrind.qbs +++ b/src/plugins/valgrind/valgrind.qbs @@ -36,7 +36,6 @@ QtcPlugin { "valgrindplugin.cpp", "valgrindplugin.h", "valgrindrunner.cpp", "valgrindrunner.h", "valgrindsettings.cpp", "valgrindsettings.h", - "workarounds.cpp", "workarounds.h", ] } diff --git a/src/plugins/valgrind/workarounds.cpp b/src/plugins/valgrind/workarounds.cpp deleted file mode 100644 index c4c7ca3febc..00000000000 --- a/src/plugins/valgrind/workarounds.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "workarounds.h" - -#include - -#include - -QPalette panelPalette(const QPalette &oldPalette, bool lightColored) -{ - QColor color = Utils::StyleHelper::panelTextColor(lightColored); - QPalette pal = oldPalette; - pal.setBrush(QPalette::All, QPalette::WindowText, color); - pal.setBrush(QPalette::All, QPalette::ButtonText, color); - pal.setBrush(QPalette::All, QPalette::Foreground, color); - color.setAlpha(100); - pal.setBrush(QPalette::Disabled, QPalette::WindowText, color); - pal.setBrush(QPalette::Disabled, QPalette::ButtonText, color); - pal.setBrush(QPalette::Disabled, QPalette::Foreground, color); - return pal; -} diff --git a/src/plugins/valgrind/workarounds.h b/src/plugins/valgrind/workarounds.h deleted file mode 100644 index e65c8cca69d..00000000000 --- a/src/plugins/valgrind/workarounds.h +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include - -QT_BEGIN_NAMESPACE -class QPalette; -QT_END_NAMESPACE - -///FIXME: remove this once https://bugreports.qt.io/browse/QTCREATORBUG-3247 gets fixed -QPalette panelPalette(const QPalette &oldPalette, bool lightColored = false);