diff options
| -rw-r--r-- | src/libs/utils/declarationmacros.h | 33 | ||||
| -rw-r--r-- | src/libs/utils/utils-lib.pri | 3 | ||||
| -rw-r--r-- | src/libs/utils/utils.qbs | 1 | ||||
| -rw-r--r-- | src/plugins/texteditor/codeassist/assistproposaliteminterface.h | 5 |
4 files changed, 41 insertions, 1 deletions
diff --git a/src/libs/utils/declarationmacros.h b/src/libs/utils/declarationmacros.h new file mode 100644 index 0000000000..24baaee135 --- /dev/null +++ b/src/libs/utils/declarationmacros.h @@ -0,0 +1,33 @@ +/**************************************************************************** +** +** 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-lib.pri b/src/libs/utils/utils-lib.pri index aa5149ab1f..891c8823c6 100644 --- a/src/libs/utils/utils-lib.pri +++ b/src/libs/utils/utils-lib.pri @@ -210,7 +210,8 @@ HEADERS += \ $$PWD/icon.h \ $$PWD/port.h \ $$PWD/functiontraits.h \ - $$PWD/mapreduce.h + $$PWD/mapreduce.h \ + $$PWD/declarationmacros.h FORMS += $$PWD/filewizardpage.ui \ $$PWD/projectintropage.ui \ diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 5a7443af9a..c4ca77e94f 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -64,6 +64,7 @@ QtcLibrary { "consoleprocess_p.h", "crumblepath.cpp", "crumblepath.h", + "declarationmacros.h", "detailsbutton.cpp", "detailsbutton.h", "detailswidget.cpp", diff --git a/src/plugins/texteditor/codeassist/assistproposaliteminterface.h b/src/plugins/texteditor/codeassist/assistproposaliteminterface.h index bf5155ed25..a195cd9585 100644 --- a/src/plugins/texteditor/codeassist/assistproposaliteminterface.h +++ b/src/plugins/texteditor/codeassist/assistproposaliteminterface.h @@ -28,6 +28,8 @@ #include "textdocumentmanipulatorinterface.h" +#include <utils/declarationmacros.h> + QT_BEGIN_NAMESPACE class QIcon; class QString; @@ -43,8 +45,11 @@ class TextEditorWidget; class TEXTEDITOR_EXPORT AssistProposalItemInterface { public: + AssistProposalItemInterface() = default; virtual ~AssistProposalItemInterface() Q_DECL_NOEXCEPT = default; + UTILS_DELETE_MOVE_AND_COPY(AssistProposalItemInterface) + virtual QString text() const = 0; virtual bool implicitlyApplies() const = 0; virtual bool prematurelyApplies(const QChar &typedCharacter) const = 0; |