Utils: Get rid of UTILS_DELETE_MOVE_AND_COPY

Use Q_DISABLE_COPY_MOVE, it exactly the same.

Change-Id: I574d52a0abdf9101f86054f881f6ce0cd498bb36
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-05-24 21:00:27 +02:00
parent 8a6c033ede
commit 7dd51acdfa
4 changed files with 1 additions and 37 deletions

View File

@@ -27,7 +27,6 @@ add_qtc_library(Utils
completingtextedit.cpp completingtextedit.h completingtextedit.cpp completingtextedit.h
cpplanguage_details.h cpplanguage_details.h
crumblepath.cpp crumblepath.h crumblepath.cpp crumblepath.h
declarationmacros.h
delegates.cpp delegates.h delegates.cpp delegates.h
detailsbutton.cpp detailsbutton.h detailsbutton.cpp detailsbutton.h
detailswidget.cpp detailswidget.h detailswidget.cpp detailswidget.h

View File

@@ -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;

View File

@@ -75,7 +75,6 @@ Project {
"cpplanguage_details.h", "cpplanguage_details.h",
"crumblepath.cpp", "crumblepath.cpp",
"crumblepath.h", "crumblepath.h",
"declarationmacros.h",
"delegates.cpp", "delegates.cpp",
"delegates.h", "delegates.h",
"detailsbutton.cpp", "detailsbutton.cpp",

View File

@@ -27,8 +27,6 @@
#include "textdocumentmanipulatorinterface.h" #include "textdocumentmanipulatorinterface.h"
#include <utils/declarationmacros.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QIcon; class QIcon;
class QString; class QString;
@@ -54,7 +52,7 @@ public:
AssistProposalItemInterface() = default; AssistProposalItemInterface() = default;
virtual ~AssistProposalItemInterface() noexcept = default; virtual ~AssistProposalItemInterface() noexcept = default;
UTILS_DELETE_MOVE_AND_COPY(AssistProposalItemInterface) Q_DISABLE_COPY_MOVE(AssistProposalItemInterface)
virtual QString text() const = 0; virtual QString text() const = 0;
virtual QString filterText() const { return text(); } virtual QString filterText() const { return text(); }