From d5246a069b50ddb32ebce9e82da6f7f749d8b202 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 22 Oct 2014 17:24:26 +0200 Subject: [PATCH] Remove KitInformationMacroExpander Neither used nor needed anymore. Change-Id: I5f55af10eb5fe8aa4109c1fe0fc9f764f51c6b4a Reviewed-by: Tobias Hunger --- .../debugger/debuggerkitinformation.cpp | 1 - .../kitinformationmacroexpander.cpp | 52 ---------------- .../kitinformationmacroexpander.h | 59 ------------------- .../projectexplorer/projectexplorer.pro | 2 - .../projectexplorer/projectexplorer.qbs | 1 - src/plugins/qtsupport/qtkitinformation.cpp | 2 - 6 files changed, 117 deletions(-) delete mode 100644 src/plugins/projectexplorer/kitinformationmacroexpander.cpp delete mode 100644 src/plugins/projectexplorer/kitinformationmacroexpander.h diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index 6369444fd58..bbb7f73d1f5 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -35,7 +35,6 @@ #include #include -#include #include #include diff --git a/src/plugins/projectexplorer/kitinformationmacroexpander.cpp b/src/plugins/projectexplorer/kitinformationmacroexpander.cpp deleted file mode 100644 index f50c5d58edd..00000000000 --- a/src/plugins/projectexplorer/kitinformationmacroexpander.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** 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 Digia. For licensing terms and -** conditions see http://www.qt.io/licensing. For further information -** use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#include "kitinformationmacroexpander.h" - -#include - -namespace ProjectExplorer { - -KitInformationMacroExpander::KitInformationMacroExpander(const Kit *k) : - m_kit(k) -{ - QTC_CHECK(k); -} - -const Kit *KitInformationMacroExpander::kit() const -{ - return m_kit; -} - -// -------------------------------------------------------------------------- -// KitInformationMacroExpander: -// -------------------------------------------------------------------------- - -} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/kitinformationmacroexpander.h b/src/plugins/projectexplorer/kitinformationmacroexpander.h deleted file mode 100644 index f5dabd396f3..00000000000 --- a/src/plugins/projectexplorer/kitinformationmacroexpander.h +++ /dev/null @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** 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 Digia. For licensing terms and -** conditions see http://www.qt.io/licensing. For further information -** use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#ifndef KITINFORMATIONMACROEXPANDER_H -#define KITINFORMATIONMACROEXPANDER_H - -#include "projectexplorer_export.h" - -#include - -namespace ProjectExplorer { - -class Kit; - -// -------------------------------------------------------------------------- -// KitInformationMacroExpander: -// -------------------------------------------------------------------------- - -class PROJECTEXPLORER_EXPORT KitInformationMacroExpander : public Utils::MacroExpander -{ -public: - KitInformationMacroExpander(const Kit *k); - - const Kit *kit() const; - -private: - const Kit *m_kit; -}; - -} // namespace ProjectExplorer - -#endif // KITINFORMATIONMACROEXPANDER_H diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index 712a3197256..195fa457375 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/src/plugins/projectexplorer/projectexplorer.pro @@ -30,7 +30,6 @@ HEADERS += projectexplorer.h \ kitinformation.h \ kitinformationconfigwidget.h \ kitfeatureprovider.h \ - kitinformationmacroexpander.h \ kitmanager.h \ kitmanagerconfigwidget.h \ kitmodel.h \ @@ -179,7 +178,6 @@ SOURCES += projectexplorer.cpp \ kitconfigwidget.cpp \ kitinformation.cpp \ kitinformationconfigwidget.cpp \ - kitinformationmacroexpander.cpp \ kitmanager.cpp \ kitmanagerconfigwidget.cpp \ kitmodel.cpp \ diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 9115e7e5d4f..d3c29e7d6b5 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -92,7 +92,6 @@ QtcPlugin { "kitfeatureprovider.h", "kitinformation.cpp", "kitinformation.h", "kitinformationconfigwidget.cpp", "kitinformationconfigwidget.h", - "kitinformationmacroexpander.cpp", "kitinformationmacroexpander.h", "kitmanager.cpp", "kitmanager.h", "kitmanagerconfigwidget.cpp", "kitmanagerconfigwidget.h", "kitmodel.cpp", "kitmodel.h", diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index a8c49bddfb9..71b8fe089e6 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -35,8 +35,6 @@ #include "qtversionmanager.h" #include "qtparser.h" -#include - #include #include #include