forked from qt-creator/qt-creator
Remove Core::Id
Moved to Utils in 4.13, and the compatibility typedef is ugly. Remove it now. Change-Id: I0d80165b427448eaf7ee6cc1c0a6a34a85b7083b Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -85,7 +85,6 @@ add_qtc_plugin(Core
|
|||||||
helpmanager.cpp helpmanager.h helpmanager_implementation.h
|
helpmanager.cpp helpmanager.h helpmanager_implementation.h
|
||||||
icontext.cpp icontext.h
|
icontext.cpp icontext.h
|
||||||
icore.cpp icore.h
|
icore.cpp icore.h
|
||||||
id.cpp id.h
|
|
||||||
idocument.cpp idocument.h
|
idocument.cpp idocument.h
|
||||||
idocumentfactory.cpp idocumentfactory.h
|
idocumentfactory.cpp idocumentfactory.h
|
||||||
ifilewizardextension.h
|
ifilewizardextension.h
|
||||||
|
@@ -20,7 +20,6 @@ SOURCES += corejsextensions.cpp \
|
|||||||
fancytabwidget.cpp \
|
fancytabwidget.cpp \
|
||||||
generalsettings.cpp \
|
generalsettings.cpp \
|
||||||
themechooser.cpp \
|
themechooser.cpp \
|
||||||
id.cpp \
|
|
||||||
icontext.cpp \
|
icontext.cpp \
|
||||||
jsexpander.cpp \
|
jsexpander.cpp \
|
||||||
messagemanager.cpp \
|
messagemanager.cpp \
|
||||||
@@ -124,7 +123,6 @@ HEADERS += corejsextensions.h \
|
|||||||
fancytabwidget.h \
|
fancytabwidget.h \
|
||||||
generalsettings.h \
|
generalsettings.h \
|
||||||
themechooser.h \
|
themechooser.h \
|
||||||
id.h \
|
|
||||||
jsexpander.h \
|
jsexpander.h \
|
||||||
messagemanager.h \
|
messagemanager.h \
|
||||||
messageoutputwindow.h \
|
messageoutputwindow.h \
|
||||||
|
@@ -92,8 +92,6 @@ Project {
|
|||||||
"icontext.h",
|
"icontext.h",
|
||||||
"icore.cpp",
|
"icore.cpp",
|
||||||
"icore.h",
|
"icore.h",
|
||||||
"id.cpp",
|
|
||||||
"id.h",
|
|
||||||
"idocument.cpp",
|
"idocument.cpp",
|
||||||
"idocument.h",
|
"idocument.h",
|
||||||
"idocumentfactory.cpp",
|
"idocumentfactory.cpp",
|
||||||
|
@@ -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.
|
|
||||||
*/
|
|
@@ -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 <utils/id.h>
|
|
||||||
|
|
||||||
namespace Core {
|
|
||||||
|
|
||||||
using Id = Utils::Id;
|
|
||||||
|
|
||||||
} // Core
|
|
@@ -428,7 +428,6 @@ extend_qtc_test(unittest
|
|||||||
DEFINES CORE_STATIC_LIBRARY
|
DEFINES CORE_STATIC_LIBRARY
|
||||||
SOURCES
|
SOURCES
|
||||||
coreicons.cpp coreicons.h
|
coreicons.cpp coreicons.h
|
||||||
id.h
|
|
||||||
find/ifindfilter.cpp find/ifindfilter.h
|
find/ifindfilter.cpp find/ifindfilter.h
|
||||||
locator/ilocatorfilter.cpp locator/ilocatorfilter.h
|
locator/ilocatorfilter.cpp locator/ilocatorfilter.h
|
||||||
)
|
)
|
||||||
|
Reference in New Issue
Block a user