diff options
35 files changed, 0 insertions, 101 deletions
diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp index 81d90e7dfb..250576edcf 100644 --- a/src/libs/3rdparty/cplusplus/Parser.cpp +++ b/src/libs/3rdparty/cplusplus/Parser.cpp @@ -27,8 +27,6 @@ #include "ObjectiveCTypeQualifiers.h" #include "QtContextKeywords.h" -#include <utils/qtcfallthrough.h> - #include <unordered_map> #include <utility> diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp index 0e0a57f7a2..4b9d4e3c82 100644 --- a/src/libs/qmljs/parser/qmljslexer.cpp +++ b/src/libs/qmljs/parser/qmljslexer.cpp @@ -32,8 +32,6 @@ #include <QtCore/qvarlengtharray.h> #include <QtCore/qdebug.h> -#include <utils/qtcfallthrough.h> - QT_BEGIN_NAMESPACE Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); QT_END_NAMESPACE diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp index 70c1709406..8c34cdc4ac 100644 --- a/src/libs/qmljs/qmljscodeformatter.cpp +++ b/src/libs/qmljs/qmljscodeformatter.cpp @@ -30,8 +30,6 @@ #include <QTextBlock> #include <QTextDocument> -#include <utils/qtcfallthrough.h> - static Q_LOGGING_CATEGORY(formatterLog, "qtc.qmljs.formatter") namespace QmlJS { diff --git a/src/libs/qmljs/qmljsevaluate.cpp b/src/libs/qmljs/qmljsevaluate.cpp index 44414e27b9..26ba2e56b5 100644 --- a/src/libs/qmljs/qmljsevaluate.cpp +++ b/src/libs/qmljs/qmljsevaluate.cpp @@ -29,8 +29,6 @@ #include "qmljsvalueowner.h" #include "parser/qmljsast_p.h" -#include <utils/qtcfallthrough.h> - using namespace QmlJS; /*! diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 79ae1d59e9..95fc125d7c 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -37,7 +37,6 @@ #include <cplusplus/cppmodelmanagerbase.h> #include <utils/algorithm.h> #include <utils/hostosinfo.h> -#include <utils/qtcfallthrough.h> #include <utils/runextensions.h> #include <QDir> diff --git a/src/libs/utils/qtcfallthrough.h b/src/libs/utils/qtcfallthrough.h deleted file mode 100644 index 6eba622837..0000000000 --- a/src/libs/utils/qtcfallthrough.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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 <QtGlobal> - -#ifndef Q_FALLTHROUGH -#ifndef QT_HAS_CPP_ATTRIBUTE -#ifdef __has_cpp_attribute -# define QT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x) -#else -# define QT_HAS_CPP_ATTRIBUTE(x) 0 -#endif -#endif -#if defined(__cplusplus) -#if QT_HAS_CPP_ATTRIBUTE(fallthrough) -# define Q_FALLTHROUGH() [[fallthrough]] -#elif QT_HAS_CPP_ATTRIBUTE(clang::fallthrough) -# define Q_FALLTHROUGH() [[clang::fallthrough]] -#elif QT_HAS_CPP_ATTRIBUTE(gnu::fallthrough) -# define Q_FALLTHROUGH() [[gnu::fallthrough]] -#endif -#endif -#ifndef Q_FALLTHROUGH -# if (defined(Q_CC_GNU) && Q_CC_GNU >= 700) && !defined(Q_CC_INTEL) -# define Q_FALLTHROUGH() __attribute__((fallthrough)) -# else -# define Q_FALLTHROUGH() (void)0 -#endif -#endif -#endif diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index b554674c33..7de656218b 100644 --- a/src/libs/utils/utils-lib.pri +++ b/src/libs/utils/utils-lib.pri @@ -249,7 +249,6 @@ HEADERS += \ $$PWD/../3rdparty/optional/optional.hpp \ $$PWD/variant.h \ $$PWD/../3rdparty/variant/variant.hpp \ - $$PWD/qtcfallthrough.h \ $$PWD/highlightingitemdelegate.h \ $$PWD/fuzzymatcher.h \ $$PWD/textutils.h \ diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index a8ceaffc82..d6f02202e9 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -183,7 +183,6 @@ Project { "proxycredentialsdialog.cpp", "proxycredentialsdialog.h", "proxycredentialsdialog.ui", - "qtcfallthrough.h", "qtcassert.cpp", "qtcassert.h", "qtcolorbutton.cpp", diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp index 611bdd0333..b1cdac3a92 100644 --- a/src/plugins/autotest/testcodeparser.cpp +++ b/src/plugins/autotest/testcodeparser.cpp @@ -42,7 +42,6 @@ #include <utils/algorithm.h> #include <utils/mapreduce.h> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> #include <utils/runextensions.h> #include <QDirIterator> diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp index 92de5c8040..350ce9d5ab 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp @@ -54,7 +54,6 @@ #include <utils/textutils.h> #include <utils/mimetypes/mimedatabase.h> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> #include <QDirIterator> #include <QTextDocument> diff --git a/src/plugins/clangtools/clangstaticanalyzerlogfilereader.cpp b/src/plugins/clangtools/clangstaticanalyzerlogfilereader.cpp index d111412b17..ab166593cb 100644 --- a/src/plugins/clangtools/clangstaticanalyzerlogfilereader.cpp +++ b/src/plugins/clangtools/clangstaticanalyzerlogfilereader.cpp @@ -32,7 +32,6 @@ #include <QXmlStreamReader> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> namespace ClangTools { namespace Internal { diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 78c60ef2fe..fa0c3a59eb 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -57,7 +57,6 @@ #include <utils/fancylineedit.h> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> #include <QApplication> #include <QComboBox> diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 9c6c7d1841..93e6ed3c10 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -32,7 +32,6 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> #include <QDir> #include <QRegularExpression> diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index 064479b9d5..99e28529c1 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -29,7 +29,6 @@ #include <cplusplus/Lexer.h> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> #include <QDebug> #include <QMetaEnum> diff --git a/src/plugins/cpptools/cppqtstyleindenter.cpp b/src/plugins/cpptools/cppqtstyleindenter.cpp index 8f5993d2bf..a24db89297 100644 --- a/src/plugins/cpptools/cppqtstyleindenter.cpp +++ b/src/plugins/cpptools/cppqtstyleindenter.cpp @@ -29,8 +29,6 @@ #include "cpptoolssettings.h" #include "cppcodestylepreferences.h" -#include <utils/qtcfallthrough.h> - #include <QChar> #include <QTextDocument> #include <QTextBlock> diff --git a/src/plugins/debugger/namedemangler/parsetreenodes.cpp b/src/plugins/debugger/namedemangler/parsetreenodes.cpp index 4981791f71..d72212e607 100644 --- a/src/plugins/debugger/namedemangler/parsetreenodes.cpp +++ b/src/plugins/debugger/namedemangler/parsetreenodes.cpp @@ -27,8 +27,6 @@ #include "demanglerexceptions.h" -#include "../../../libs/utils/qtcfallthrough.h" - #include <iostream> #include <cctype> #include <cstring> diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 968c0ef0a6..fa69e81653 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -62,7 +62,6 @@ #include <utils/treemodel.h> #include <utils/basetreeview.h> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> #include <QDebug> #include <QDir> diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp index 2275807d22..d257605686 100644 --- a/src/plugins/debugger/watchutils.cpp +++ b/src/plugins/debugger/watchutils.cpp @@ -29,8 +29,6 @@ #include "watchutils.h" #include "watchdata.h" -#include <utils/qtcfallthrough.h> - #include <QDebug> #include <string.h> diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 66ee7fc7b4..7645921836 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -60,7 +60,6 @@ #include <utils/hostosinfo.h> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> #include <QDebug> #include <QFile> diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index 905c8de955..95d0ede5ec 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -33,7 +33,6 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> #include <utils/fileutils.h> -#include <utils/qtcfallthrough.h> #include "utils/runextensions.h" #include "utils/synchronousprocess.h" diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index 7835788c0b..a533cd81f7 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -26,7 +26,6 @@ #include "abi.h" #include <utils/fileutils.h> -#include <utils/qtcfallthrough.h> #include <QDebug> #include <QtEndian> diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 3bef5d6540..aead49aa6c 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -33,7 +33,6 @@ #include <utils/hostosinfo.h> #include <utils/optional.h> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> #include <utils/synchronousprocess.h> #include <utils/runextensions.h> #include <utils/temporarydirectory.h> diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index b9cba15c9e..c8e7ed1fa2 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -44,7 +44,6 @@ #include <utils/algorithm.h> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> namespace QmlDesigner { diff --git a/src/plugins/qmlprofiler/inputeventsmodel.cpp b/src/plugins/qmlprofiler/inputeventsmodel.cpp index 6af7623195..e6bb7d12d9 100644 --- a/src/plugins/qmlprofiler/inputeventsmodel.cpp +++ b/src/plugins/qmlprofiler/inputeventsmodel.cpp @@ -29,8 +29,6 @@ #include <timeline/timelineformattime.h> -#include <utils/qtcfallthrough.h> - #include <QKeyEvent> #include <QMouseEvent> #include <QMetaEnum> diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index ff828ae11e..9774aa6731 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -45,7 +45,6 @@ #include <qmldebug/qmldebugcommandlinearguments.h> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> #include <utils/url.h> #include <QMessageBox> diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 781c680a09..af2e13fdaf 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -72,8 +72,6 @@ #include <qtsupport/qtkitinformation.h> -#include <utils/qtcfallthrough.h> - #include <QApplication> #include <QDockWidget> #include <QFileDialog> diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index 7efdefa93a..c28f6a5e39 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -53,7 +53,6 @@ // Needed for the load&save actions in the context menu #include <debugger/analyzer/analyzermanager.h> #include <coreplugin/findplaceholder.h> -#include <utils/qtcfallthrough.h> #include <utils/styledbar.h> #include <utils/algorithm.h> diff --git a/src/plugins/scxmleditor/common/stateproperties.cpp b/src/plugins/scxmleditor/common/stateproperties.cpp index 11d8ca005b..ca9e2e4f09 100644 --- a/src/plugins/scxmleditor/common/stateproperties.cpp +++ b/src/plugins/scxmleditor/common/stateproperties.cpp @@ -30,7 +30,6 @@ #include "scxmluifactory.h" #include <coreplugin/minisplitter.h> -#include <utils/qtcfallthrough.h> #include <QHeaderView> #include <QLabel> diff --git a/src/plugins/scxmleditor/common/structuremodel.cpp b/src/plugins/scxmleditor/common/structuremodel.cpp index 318a524ab8..6249284180 100644 --- a/src/plugins/scxmleditor/common/structuremodel.cpp +++ b/src/plugins/scxmleditor/common/structuremodel.cpp @@ -27,8 +27,6 @@ #include "scxmldocument.h" #include "scxmltag.h" -#include <utils/qtcfallthrough.h> - #include <QMimeData> #include <QUndoStack> diff --git a/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp b/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp index 130c86bf5c..392301e61e 100644 --- a/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp +++ b/src/plugins/scxmleditor/plugin_interface/connectableitem.cpp @@ -33,8 +33,6 @@ #include "serializer.h" #include "stateitem.h" -#include <utils/qtcfallthrough.h> - #include <QDebug> #include <QPainter> #include <QPen> diff --git a/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp b/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp index 7ea007bdff..8386a5b86b 100644 --- a/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp @@ -26,8 +26,6 @@ #include "scattributeitemmodel.h" #include "mytypes.h" -#include <utils/qtcfallthrough.h> - #include <QBrush> using namespace ScxmlEditor::PluginInterface; diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp index 4bf84f8782..f4761c5351 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp @@ -29,7 +29,6 @@ #include "serializer.h" #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> #include <QAction> #include <QPointF> diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp index e9406e7ed0..6ddb4a4b00 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp +++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp @@ -30,7 +30,6 @@ #include <utils/fileutils.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> -#include <utils/qtcfallthrough.h> #include <QSettings> #include <QVariant> diff --git a/src/plugins/winrt/winrtrunnerhelper.cpp b/src/plugins/winrt/winrtrunnerhelper.cpp index 44dfd25710..3b23a875f0 100644 --- a/src/plugins/winrt/winrtrunnerhelper.cpp +++ b/src/plugins/winrt/winrtrunnerhelper.cpp @@ -37,7 +37,6 @@ #include <projectexplorer/target.h> #include <qtsupport/baseqtversion.h> #include <qtsupport/qtkitinformation.h> -#include <utils/qtcfallthrough.h> #include <utils/qtcprocess.h> #include <QDir> diff --git a/src/tools/clangbackend/source/tokeninfo.cpp b/src/tools/clangbackend/source/tokeninfo.cpp index ded5a4cc0e..9d9eea91b0 100644 --- a/src/tools/clangbackend/source/tokeninfo.cpp +++ b/src/tools/clangbackend/source/tokeninfo.cpp @@ -30,8 +30,6 @@ #include "sourcerange.h" #include "sourcerangecontainer.h" -#include <utils/qtcfallthrough.h> - #include <array> namespace ClangBackEnd { |