diff --git a/src/plugins/coreplugin/CMakeLists.txt b/src/plugins/coreplugin/CMakeLists.txt index 551507afc74..237a9d54dfd 100644 --- a/src/plugins/coreplugin/CMakeLists.txt +++ b/src/plugins/coreplugin/CMakeLists.txt @@ -85,7 +85,6 @@ add_qtc_plugin(Core helpmanager.cpp helpmanager.h helpmanager_implementation.h icontext.cpp icontext.h icore.cpp icore.h - id.cpp id.h idocument.cpp idocument.h idocumentfactory.cpp idocumentfactory.h ifilewizardextension.h diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index 2b2133ccaaa..fd472ed566e 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -20,7 +20,6 @@ SOURCES += corejsextensions.cpp \ fancytabwidget.cpp \ generalsettings.cpp \ themechooser.cpp \ - id.cpp \ icontext.cpp \ jsexpander.cpp \ messagemanager.cpp \ @@ -124,7 +123,6 @@ HEADERS += corejsextensions.h \ fancytabwidget.h \ generalsettings.h \ themechooser.h \ - id.h \ jsexpander.h \ messagemanager.h \ messageoutputwindow.h \ diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 10f6ba2286d..d77e6015139 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -92,8 +92,6 @@ Project { "icontext.h", "icore.cpp", "icore.h", - "id.cpp", - "id.h", "idocument.cpp", "idocument.h", "idocumentfactory.cpp", diff --git a/src/plugins/coreplugin/id.cpp b/src/plugins/coreplugin/id.cpp deleted file mode 100644 index 6f8a29f40c7..00000000000 --- a/src/plugins/coreplugin/id.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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 "id.h" - -/*! - \typedef Core::Id - - Use Utils::Id instead. -*/ diff --git a/src/plugins/coreplugin/id.h b/src/plugins/coreplugin/id.h deleted file mode 100644 index dbf790593d8..00000000000 --- a/src/plugins/coreplugin/id.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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 - -namespace Core { - -using Id = Utils::Id; - -} // Core diff --git a/tests/unit/unittest/CMakeLists.txt b/tests/unit/unittest/CMakeLists.txt index 9317c144202..ff0c1abaadc 100644 --- a/tests/unit/unittest/CMakeLists.txt +++ b/tests/unit/unittest/CMakeLists.txt @@ -428,7 +428,6 @@ extend_qtc_test(unittest DEFINES CORE_STATIC_LIBRARY SOURCES coreicons.cpp coreicons.h - id.h find/ifindfilter.cpp find/ifindfilter.h locator/ilocatorfilter.cpp locator/ilocatorfilter.h )