diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt index 37579263d0a..ae1c91364a8 100644 --- a/src/libs/utils/CMakeLists.txt +++ b/src/libs/utils/CMakeLists.txt @@ -27,7 +27,6 @@ add_qtc_library(Utils completingtextedit.cpp completingtextedit.h cpplanguage_details.h crumblepath.cpp crumblepath.h - declarationmacros.h delegates.cpp delegates.h detailsbutton.cpp detailsbutton.h detailswidget.cpp detailswidget.h diff --git a/src/libs/utils/declarationmacros.h b/src/libs/utils/declarationmacros.h deleted file mode 100644 index 4b7b8945443..00000000000 --- a/src/libs/utils/declarationmacros.h +++ /dev/null @@ -1,32 +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 - -#define UTILS_DELETE_MOVE_AND_COPY(Class) \ - Class(const Class&) = delete; \ - Class &operator=(const Class&) = delete; \ - Class(Class&&) = delete; \ - Class &operator=(Class&&) = delete; diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index d23fdc91289..b3e5adcf013 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -75,7 +75,6 @@ Project { "cpplanguage_details.h", "crumblepath.cpp", "crumblepath.h", - "declarationmacros.h", "delegates.cpp", "delegates.h", "detailsbutton.cpp", diff --git a/src/plugins/texteditor/codeassist/assistproposaliteminterface.h b/src/plugins/texteditor/codeassist/assistproposaliteminterface.h index b1fd5f3848c..bedc6a98691 100644 --- a/src/plugins/texteditor/codeassist/assistproposaliteminterface.h +++ b/src/plugins/texteditor/codeassist/assistproposaliteminterface.h @@ -27,8 +27,6 @@ #include "textdocumentmanipulatorinterface.h" -#include - QT_BEGIN_NAMESPACE class QIcon; class QString; @@ -54,7 +52,7 @@ public: AssistProposalItemInterface() = default; virtual ~AssistProposalItemInterface() noexcept = default; - UTILS_DELETE_MOVE_AND_COPY(AssistProposalItemInterface) + Q_DISABLE_COPY_MOVE(AssistProposalItemInterface) virtual QString text() const = 0; virtual QString filterText() const { return text(); }