diff options
55 files changed, 31 insertions, 100 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 2ceb7c8186b..4c7bd6b91ff 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -25,7 +25,6 @@ #include "LookupContext.h" -#include "ResolveExpression.h" #include "Overview.h" #include "DeprecatedGenTemplateInstance.h" #include "CppRewriter.h" @@ -38,7 +37,6 @@ #include <cplusplus/Control.h> #include <utils/algorithm.h> -#include <utils/porting.h> #include <QStack> #include <QHash> diff --git a/src/libs/cplusplus/LookupItem.h b/src/libs/cplusplus/LookupItem.h index 4bfcd17f139..4e98d426625 100644 --- a/src/libs/cplusplus/LookupItem.h +++ b/src/libs/cplusplus/LookupItem.h @@ -26,7 +26,6 @@ #pragma once #include <cplusplus/FullySpecifiedType.h> -#include <utils/porting.h> #include <QHash> diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp index c9e01ad8a4f..d471fc9286b 100644 --- a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp +++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp @@ -38,7 +38,6 @@ #include "qmt/infrastructure/qmtassert.h" #include <utils/algorithm.h> -#include <utils/porting.h> #include <QSet> diff --git a/src/libs/modelinglib/qmt/style/objectvisuals.h b/src/libs/modelinglib/qmt/style/objectvisuals.h index 95fc21f2e4d..10255871c3f 100644 --- a/src/libs/modelinglib/qmt/style/objectvisuals.h +++ b/src/libs/modelinglib/qmt/style/objectvisuals.h @@ -27,8 +27,6 @@ #include "qmt/diagram/dobject.h" -#include <utils/porting.h> - #include <QColor> namespace qmt { diff --git a/src/libs/qmldebug/qmldebugconnection.cpp b/src/libs/qmldebug/qmldebugconnection.cpp index cf41b4275ad..bbd2948be62 100644 --- a/src/libs/qmldebug/qmldebugconnection.cpp +++ b/src/libs/qmldebug/qmldebugconnection.cpp @@ -27,7 +27,6 @@ #include "qmldebugclient.h" #include "qpacketprotocol.h" -#include <utils/porting.h> #include <utils/temporaryfile.h> #include <QLocalServer> diff --git a/src/libs/qmleditorwidgets/customcolordialog.h b/src/libs/qmleditorwidgets/customcolordialog.h index 708f661130b..9da32c95c56 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.h +++ b/src/libs/qmleditorwidgets/customcolordialog.h @@ -27,8 +27,6 @@ #include "qmleditorwidgets_global.h" -#include <utils/porting.h> - #include <QFrame> QT_BEGIN_NAMESPACE diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp index ac080305421..786e63b1f2e 100644 --- a/src/libs/qmljs/qmljscodeformatter.cpp +++ b/src/libs/qmljs/qmljscodeformatter.cpp @@ -25,8 +25,6 @@ #include "qmljscodeformatter.h" -#include <utils/porting.h> - #include <QLoggingCategory> #include <QMetaEnum> #include <QTextBlock> @@ -229,7 +227,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block) break; case property_list_open: { - const QStringView tok = Utils::midView(m_currentLine, + const QStringView tok = QStringView(m_currentLine).mid( m_currentToken.begin(), m_currentToken.length); if (tok == QLatin1String(">")) @@ -876,7 +874,7 @@ int CodeFormatter::column(int index) const QStringView CodeFormatter::currentTokenText() const { - return Utils::midView(m_currentLine, m_currentToken.begin(), m_currentToken.length); + return QStringView(m_currentLine).mid(m_currentToken.begin(), m_currentToken.length); } void CodeFormatter::turnInto(int newState) @@ -950,7 +948,7 @@ int CodeFormatter::tokenizeBlock(const QTextBlock &block) CodeFormatter::TokenKind CodeFormatter::extendedTokenKind(const QmlJS::Token &token) const { const int kind = token.kind; - const QStringView text = Utils::midView(m_currentLine, token.begin(), token.length); + const QStringView text = QStringView(m_currentLine).mid(token.begin(), token.length); if (kind == Identifier) { if (text == QLatin1String("as")) diff --git a/src/libs/qmljs/qmljscompletioncontextfinder.cpp b/src/libs/qmljs/qmljscompletioncontextfinder.cpp index dcfe255ec92..597cf75f3a4 100644 --- a/src/libs/qmljs/qmljscompletioncontextfinder.cpp +++ b/src/libs/qmljs/qmljscompletioncontextfinder.cpp @@ -26,8 +26,6 @@ #include "qmljscompletioncontextfinder.h" #include "qmljsscanner.h" -#include <utils/porting.h> - #include <QTextDocument> #include <QStringList> @@ -163,7 +161,7 @@ void CompletionContextFinder::checkBinding() break; case Token::Identifier: { - const QStringView tokenString = Utils::midView(*yyLine, token.begin(), token.length); + const QStringView tokenString = QStringView(*yyLine).mid(token.begin(), token.length); dotExpected = false; if (identifierExpected) { m_bindingPropertyName.prepend(tokenString.toString()); @@ -233,7 +231,7 @@ void CompletionContextFinder::checkImport() switch (token.kind) { case Token::Identifier: { - const QStringView tokenString = Utils::midView(*yyLine, token.begin(), token.length); + const QStringView tokenString = QStringView(*yyLine).mid(token.begin(), token.length); if (tokenString == QLatin1String("as")) { isInLibVersionImport = 0; if (state == Unknown) { diff --git a/src/libs/qmljs/qmljsdialect.h b/src/libs/qmljs/qmljsdialect.h index 4c73e3e8026..dfd09a2c3bb 100644 --- a/src/libs/qmljs/qmljsdialect.h +++ b/src/libs/qmljs/qmljsdialect.h @@ -27,8 +27,7 @@ #include "qmljs_global.h" -#include <utils/fileutils.h> -#include <utils/porting.h> +#include <utils/filepath.h> #include <QDebug> #include <QString> diff --git a/src/libs/qmljs/qmljsimportdependencies.h b/src/libs/qmljs/qmljsimportdependencies.h index a9f88a220f2..2491c9fe8e7 100644 --- a/src/libs/qmljs/qmljsimportdependencies.h +++ b/src/libs/qmljs/qmljsimportdependencies.h @@ -29,7 +29,6 @@ #include "qmljsdialect.h" #include <languageutils/componentversion.h> -#include <utils/porting.h> #include <QObject> #include <QString> diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h index 16c5cc4e119..a99a248cd61 100644 --- a/src/libs/qmljs/qmljsinterpreter.h +++ b/src/libs/qmljs/qmljsinterpreter.h @@ -31,7 +31,6 @@ #include <qmljs/parser/qmljsastfwd_p.h> #include <languageutils/fakemetaobject.h> -#include <utils/porting.h> #include <QFileInfoList> #include <QHash> diff --git a/src/libs/qmljs/qmljslineinfo.cpp b/src/libs/qmljs/qmljslineinfo.cpp index 610b6435363..5b04d7660c7 100644 --- a/src/libs/qmljs/qmljslineinfo.cpp +++ b/src/libs/qmljs/qmljslineinfo.cpp @@ -64,8 +64,6 @@ #include <qmljs/qmljslineinfo.h> #include <qmljs/qmljsscanner.h> -#include <utils/porting.h> - using namespace QmlJS; /* @@ -281,7 +279,7 @@ Token LineInfo::lastToken() const QStringView LineInfo::tokenText(const Token &token) const { - return Utils::midView(yyLinizerState.line, token.offset, token.length); + return QStringView(yyLinizerState.line).mid(token.offset, token.length); } /* diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index 1e4d2f1ffa0..bb719250dc3 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -34,7 +34,6 @@ #include <utils/algorithm.h> #include <utils/filepath.h> -#include <utils/porting.h> #include <utils/qrcparser.h> #include <QDir> diff --git a/src/libs/utils/infobar.h b/src/libs/utils/infobar.h index 844a007c647..d27274d9d52 100644 --- a/src/libs/utils/infobar.h +++ b/src/libs/utils/infobar.h @@ -31,6 +31,7 @@ #include <QObject> #include <QSet> +#include <QVariant> #include <functional> diff --git a/src/libs/utils/mimetypes2/mimemagicrule.cpp b/src/libs/utils/mimetypes2/mimemagicrule.cpp index 5db88c2f717..2f78acd9e8e 100644 --- a/src/libs/utils/mimetypes2/mimemagicrule.cpp +++ b/src/libs/utils/mimetypes2/mimemagicrule.cpp @@ -264,10 +264,9 @@ MimeMagicRule::MimeMagicRule(const QString &type, // Parse for offset as "1" or "1:10" const int colonIndex = offsets.indexOf(QLatin1Char(':')); const QStringView startPosStr - = Utils::midView(offsets, 0, colonIndex); // \ These decay to returning 'offsets' - const QStringView endPosStr = Utils::midView(offsets, - colonIndex - + 1); // / unchanged when colonIndex == -1 + = QStringView(offsets).mid(0, colonIndex); // \ These decay to returning 'offsets' + const QStringView endPosStr = QStringView(offsets) + .mid(colonIndex + 1); // / unchanged when colonIndex == -1 if (Q_UNLIKELY(!MimeTypeParserBase::parseNumber(startPosStr, &m_startPos, errorString)) || Q_UNLIKELY(!MimeTypeParserBase::parseNumber(endPosStr, &m_endPos, errorString))) { m_type = Invalid; diff --git a/src/libs/utils/mimetypes2/mimeutils.cpp b/src/libs/utils/mimetypes2/mimeutils.cpp index 676398bb140..5d0392140db 100644 --- a/src/libs/utils/mimetypes2/mimeutils.cpp +++ b/src/libs/utils/mimetypes2/mimeutils.cpp @@ -42,10 +42,11 @@ #include "mimedatabase.h" #include "mimedatabase_p.h" #include "mimemagicrule_p.h" -#include "mimeprovider_p.h" #include "filepath.h" +#include <QUrl> + namespace Utils { MimeType mimeTypeForName(const QString &nameOrAlias) diff --git a/src/libs/utils/porting.h b/src/libs/utils/porting.h index 27fe5de59c4..bf447ec15e8 100644 --- a/src/libs/utils/porting.h +++ b/src/libs/utils/porting.h @@ -27,9 +27,6 @@ #include "utils_global.h" -#ifdef QT_GUI_LIB -#include <QEnterEvent> -#endif #include <QString> namespace Utils { diff --git a/src/plugins/clangtools/clangtoolsdiagnostic.h b/src/plugins/clangtools/clangtoolsdiagnostic.h index 54b48e0eeb3..c8b0cb43755 100644 --- a/src/plugins/clangtools/clangtoolsdiagnostic.h +++ b/src/plugins/clangtools/clangtoolsdiagnostic.h @@ -27,8 +27,6 @@ #include <debugger/analyzer/diagnosticlocation.h> -#include <utils/porting.h> - #include <QMetaType> #include <QString> #include <QVector> diff --git a/src/plugins/classview/classviewsymbolinformation.h b/src/plugins/classview/classviewsymbolinformation.h index 422cc2b5e48..48d832094dc 100644 --- a/src/plugins/classview/classviewsymbolinformation.h +++ b/src/plugins/classview/classviewsymbolinformation.h @@ -25,8 +25,6 @@ #pragma once -#include <utils/porting.h> - #include <QMetaType> #include <QString> diff --git a/src/plugins/classview/classviewsymbollocation.h b/src/plugins/classview/classviewsymbollocation.h index 85e82d720c5..1c922859119 100644 --- a/src/plugins/classview/classviewsymbollocation.h +++ b/src/plugins/classview/classviewsymbollocation.h @@ -25,8 +25,6 @@ #pragma once -#include <utils/porting.h> - #include <QMetaType> #include <QString> diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h index 6620859a792..41df7102502 100644 --- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h +++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h @@ -28,7 +28,6 @@ #include "cmake_global.h" #include <utils/optional.h> -#include <utils/porting.h> #include <QByteArray> #include <QStringList> diff --git a/src/plugins/coreplugin/fancytabwidget.h b/src/plugins/coreplugin/fancytabwidget.h index 3c6a57f3e21..ba721aecca7 100644 --- a/src/plugins/coreplugin/fancytabwidget.h +++ b/src/plugins/coreplugin/fancytabwidget.h @@ -26,7 +26,6 @@ #pragma once #include <utils/infobar.h> -#include <utils/porting.h> #include <QIcon> #include <QWidget> diff --git a/src/plugins/coreplugin/menubarfilter.cpp b/src/plugins/coreplugin/menubarfilter.cpp index e4fe969460f..3fffdcf4f83 100644 --- a/src/plugins/coreplugin/menubarfilter.cpp +++ b/src/plugins/coreplugin/menubarfilter.cpp @@ -32,7 +32,6 @@ #include "locator/locatormanager.h" #include <utils/algorithm.h> -#include <utils/porting.h> #include <utils/qtcassert.h> #include <utils/stringutils.h> diff --git a/src/plugins/cpaster/pastebindotcomprotocol.cpp b/src/plugins/cpaster/pastebindotcomprotocol.cpp index 30490608e37..5a13021254a 100644 --- a/src/plugins/cpaster/pastebindotcomprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcomprotocol.cpp @@ -25,7 +25,6 @@ #include "pastebindotcomprotocol.h" -#include <utils/porting.h> #include <utils/qtcassert.h> #include <QDebug> diff --git a/src/plugins/cppcheck/cppcheckdiagnostic.h b/src/plugins/cppcheck/cppcheckdiagnostic.h index d72bdc73a8b..e33f3c48863 100644 --- a/src/plugins/cppcheck/cppcheckdiagnostic.h +++ b/src/plugins/cppcheck/cppcheckdiagnostic.h @@ -26,7 +26,6 @@ #pragma once #include <utils/fileutils.h> -#include <utils/porting.h> namespace Cppcheck { namespace Internal { diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp index e5da3db210f..f7a0a58e718 100644 --- a/src/plugins/cppeditor/cpphighlighter.cpp +++ b/src/plugins/cppeditor/cpphighlighter.cpp @@ -34,8 +34,6 @@ #include <cplusplus/SimpleLexer.h> #include <cplusplus/Lexer.h> -#include <utils/porting.h> - #include <QTextDocument> using namespace CppEditor; @@ -160,9 +158,9 @@ void CppHighlighter::highlightBlock(const QString &text) formatForCategory(C_PREPROCESSOR)); expectPreprocessorKeyword = true; } else if (highlightCurrentWordAsPreprocessor && (tk.isKeyword() || tk.is(T_IDENTIFIER)) - && isPPKeyword(Utils::midView(text, tk.utf16charsBegin(), tk.utf16chars()))) { + && isPPKeyword(QStringView(text).mid(tk.utf16charsBegin(), tk.utf16chars()))) { setFormat(tk.utf16charsBegin(), tk.utf16chars(), formatForCategory(C_PREPROCESSOR)); - const QStringView ppKeyword = Utils::midView(text, tk.utf16charsBegin(), tk.utf16chars()); + const QStringView ppKeyword = QStringView(text).mid(tk.utf16charsBegin(), tk.utf16chars()); if (ppKeyword == QLatin1String("error") || ppKeyword == QLatin1String("warning") || ppKeyword == QLatin1String("pragma")) { @@ -221,7 +219,7 @@ void CppHighlighter::highlightBlock(const QString &text) } else if (i == 0 && tokens.size() > 1 && tk.is(T_IDENTIFIER) && tokens.at(1).is(T_COLON)) { setFormat(tk.utf16charsBegin(), tk.utf16chars(), formatForCategory(C_LABEL)); } else if (tk.is(T_IDENTIFIER)) { - highlightWord(Utils::midView(text, tk.utf16charsBegin(), tk.utf16chars()), + highlightWord(QStringView(text).mid(tk.utf16charsBegin(), tk.utf16chars()), tk.utf16charsBegin(), tk.utf16chars()); } diff --git a/src/plugins/cppeditor/cpptoolsreuse.cpp b/src/plugins/cppeditor/cpptoolsreuse.cpp index 91794a18384..09115f3daf3 100644 --- a/src/plugins/cppeditor/cpptoolsreuse.cpp +++ b/src/plugins/cppeditor/cpptoolsreuse.cpp @@ -50,7 +50,6 @@ #include <cplusplus/Overview.h> #include <cplusplus/SimpleLexer.h> #include <utils/algorithm.h> -#include <utils/porting.h> #include <utils/textutils.h> #include <utils/qtcassert.h> @@ -321,8 +320,8 @@ bool isInCommentOrString(const TextEditor::AssistInterface *interface, && tokens.at(1).kind() == T_IDENTIFIER) { const QString &line = tc.block().text(); const Token &idToken = tokens.at(1); - QStringView identifier = Utils::midView(line, idToken.utf16charsBegin(), - idToken.utf16chars()); + QStringView identifier = QStringView(line).mid(idToken.utf16charsBegin(), + idToken.utf16chars()); if (identifier == QLatin1String("include") || identifier == QLatin1String("include_next") || (features.objCEnabled && identifier == QLatin1String("import"))) { diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index a5025c1af4f..cc0934cb87d 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -1010,7 +1010,7 @@ void CdbEngine::runCommand(const DebuggerCommand &dbgCmd) QList<QStringView> splittedArguments; int maxArgumentSize = maxCommandLength - prefix.length() - maxTokenLength; while (argumentSplitPos < arguments.size()) { - splittedArguments << midView(arguments, argumentSplitPos, maxArgumentSize); + splittedArguments << QStringView(arguments).mid(argumentSplitPos, maxArgumentSize); argumentSplitPos += splittedArguments.last().length(); } QTC_CHECK(argumentSplitPos == arguments.size()); diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index 977cbb0654c..69f8353bedc 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -49,7 +49,6 @@ #include <texteditor/textdocument.h> #include <utils/algorithm.h> -#include <utils/porting.h> #include <utils/qtcassert.h> #include <utils/tooltip/tooltip.h> #include <utils/stringutils.h> diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index e6ac63f2721..b8b3df2e707 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -27,7 +27,6 @@ #include <utils/algorithm.h> #include <utils/differ.h> -#include <utils/porting.h> #include <QFutureInterfaceBase> #include <QRegularExpression> diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index 21922c1f033..196676c6c9f 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -45,7 +45,6 @@ #include <coreplugin/find/highlightscrollbarcontroller.h> #include <coreplugin/minisplitter.h> -#include <utils/porting.h> #include <utils/tooltip/tooltip.h> using namespace Core; diff --git a/src/plugins/glsleditor/glslhighlighter.cpp b/src/plugins/glsleditor/glslhighlighter.cpp index 19cbb32691e..d9d795beec2 100644 --- a/src/plugins/glsleditor/glslhighlighter.cpp +++ b/src/plugins/glsleditor/glslhighlighter.cpp @@ -31,8 +31,6 @@ #include <texteditor/textdocumentlayout.h> #include <texteditor/textdocument.h> -#include <utils/porting.h> - #include <QDebug> using namespace TextEditor; @@ -155,7 +153,7 @@ void GlslHighlighter::highlightBlock(const QString &text) highlightAsPreprocessor = true; } else if (highlightCurrentWordAsPreprocessor - && isPPKeyword(Utils::midView(text, tk.begin(), tk.length))) { + && isPPKeyword(QStringView(text).mid(tk.begin(), tk.length))) { setFormat(tk.begin(), tk.length, formatForCategory(C_PREPROCESSOR)); } else if (tk.is(GLSL::Parser::T_NUMBER)) { diff --git a/src/plugins/ios/iosprobe.h b/src/plugins/ios/iosprobe.h index ceebca74561..aae1e0c5f99 100644 --- a/src/plugins/ios/iosprobe.h +++ b/src/plugins/ios/iosprobe.h @@ -25,13 +25,12 @@ #pragma once -#include <utils/porting.h> +#include <utils/filepath.h> #include <QSettings> #include <QSharedPointer> #include <QString> #include <QStringList> -#include <utils/fileutils.h> namespace Ios { diff --git a/src/plugins/modeleditor/dragtool.h b/src/plugins/modeleditor/dragtool.h index 543874a72fb..ef860f26196 100644 --- a/src/plugins/modeleditor/dragtool.h +++ b/src/plugins/modeleditor/dragtool.h @@ -25,8 +25,6 @@ #pragma once -#include <utils/porting.h> - #include <QWidget> #include <QIcon> diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp index 69756fbdeea..58c5d0b60aa 100644 --- a/src/plugins/modeleditor/modelindexer.cpp +++ b/src/plugins/modeleditor/modelindexer.cpp @@ -44,7 +44,6 @@ #include <projectexplorer/projectnodes.h> #include <utils/mimeutils.h> -#include <utils/porting.h> #include <utils/qtcassert.h> #include <QQueue> diff --git a/src/plugins/modeleditor/modelindexer.h b/src/plugins/modeleditor/modelindexer.h index 7b81e9b0daa..20b872d99ca 100644 --- a/src/plugins/modeleditor/modelindexer.h +++ b/src/plugins/modeleditor/modelindexer.h @@ -25,8 +25,6 @@ #pragma once -#include <utils/porting.h> - #include <QObject> namespace qmt { class Uid; } diff --git a/src/plugins/projectexplorer/buildtargetinfo.h b/src/plugins/projectexplorer/buildtargetinfo.h index 4d3c186c677..ffbf8dfee64 100644 --- a/src/plugins/projectexplorer/buildtargetinfo.h +++ b/src/plugins/projectexplorer/buildtargetinfo.h @@ -29,7 +29,6 @@ #include <utils/environment.h> #include <utils/filepath.h> -#include <utils/porting.h> #include <QList> diff --git a/src/plugins/projectexplorer/deployablefile.h b/src/plugins/projectexplorer/deployablefile.h index ca35affa890..1c5c4703201 100644 --- a/src/plugins/projectexplorer/deployablefile.h +++ b/src/plugins/projectexplorer/deployablefile.h @@ -27,8 +27,7 @@ #include "projectexplorer_export.h" -#include <utils/fileutils.h> -#include <utils/porting.h> +#include <utils/filepath.h> #include <QString> diff --git a/src/plugins/projectexplorer/expanddata.h b/src/plugins/projectexplorer/expanddata.h index 36ed3a97f0c..7e02ecf47f9 100644 --- a/src/plugins/projectexplorer/expanddata.h +++ b/src/plugins/projectexplorer/expanddata.h @@ -25,8 +25,6 @@ #pragma once -#include <utils/porting.h> - #include <QString> #include <QHash> #include <QDebug> diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h index fa7be257759..a7706918860 100644 --- a/src/plugins/projectexplorer/task.h +++ b/src/plugins/projectexplorer/task.h @@ -29,7 +29,6 @@ #include <utils/id.h> #include <utils/fileutils.h> -#include <utils/porting.h> #include <QIcon> #include <QMetaType> diff --git a/src/plugins/python/pipsupport.h b/src/plugins/python/pipsupport.h index 9aeded08ab0..75dd9809a52 100644 --- a/src/plugins/python/pipsupport.h +++ b/src/plugins/python/pipsupport.h @@ -30,6 +30,7 @@ #include <QFutureWatcher> #include <QTimer> +#include <QUrl> namespace Python { namespace Internal { diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h index 810cd754949..c463be7ba26 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h @@ -31,7 +31,6 @@ #include <coreplugin/idocument.h> #include <cppeditor/generatedcodemodelsupport.h> -#include <utils/porting.h> #include <utils/textfileformat.h> #include <QFutureWatcher> diff --git a/src/plugins/qmldesigner/designercore/include/import.h b/src/plugins/qmldesigner/designercore/include/import.h index 09b61ef25b7..8b9a0445737 100644 --- a/src/plugins/qmldesigner/designercore/include/import.h +++ b/src/plugins/qmldesigner/designercore/include/import.h @@ -25,8 +25,6 @@ #pragma once -#include <utils/porting.h> - #include <QString> #include <QStringList> #include <QMetaType> diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h index 3f92e1160c2..2ab96d7a4be 100644 --- a/src/plugins/qmldesigner/designercore/include/model.h +++ b/src/plugins/qmldesigner/designercore/include/model.h @@ -29,6 +29,7 @@ #include <documentmessage.h> +#include <QMimeData> #include <QObject> #include <QPair> diff --git a/src/plugins/qmldesigner/designercore/model/internalnode_p.h b/src/plugins/qmldesigner/designercore/model/internalnode_p.h index b5f5aba9251..f6b1f3fe5a5 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnode_p.h +++ b/src/plugins/qmldesigner/designercore/model/internalnode_p.h @@ -38,8 +38,6 @@ #include "internalnodeproperty.h" #include "internalnodeabstractproperty.h" -#include <utils/porting.h> - namespace QmlDesigner { namespace Internal { diff --git a/src/plugins/qmljseditor/qmljsautocompleter.cpp b/src/plugins/qmljseditor/qmljsautocompleter.cpp index 60ebeb68a64..d8304420657 100644 --- a/src/plugins/qmljseditor/qmljsautocompleter.cpp +++ b/src/plugins/qmljseditor/qmljsautocompleter.cpp @@ -27,10 +27,6 @@ #include <qmljs/qmljsscanner.h> -#include <utils/porting.h> - -#include <QChar> -#include <QLatin1Char> #include <QTextDocument> #include <QTextCursor> #include <QTextBlock> @@ -175,7 +171,7 @@ bool AutoCompleter::contextAllowsAutoBrackets(const QTextCursor &cursor, case Token::String: { const QString blockText = cursor.block().text(); - const QStringView tokenText = Utils::midView(blockText, token.offset, token.length); + const QStringView tokenText = QStringView(blockText).mid(token.offset, token.length); QChar quote = tokenText.at(0); // if a string literal doesn't start with a quote, it must be multiline if (quote != QLatin1Char('"') && quote != QLatin1Char('\'')) { @@ -219,7 +215,7 @@ bool AutoCompleter::contextAllowsAutoQuotes(const QTextCursor &cursor, case Token::String: { const QString blockText = cursor.block().text(); - const QStringView tokenText = Utils::midView(blockText, token.offset, token.length); + const QStringView tokenText = QStringView(blockText).mid(token.offset, token.length); QChar quote = tokenText.at(0); // if a string literal doesn't start with a quote, it must be multiline if (quote != QLatin1Char('"') && quote != QLatin1Char('\'')) { diff --git a/src/plugins/qmljseditor/qmljshighlighter.cpp b/src/plugins/qmljseditor/qmljshighlighter.cpp index 86f8cfbd64c..0472236dc3f 100644 --- a/src/plugins/qmljseditor/qmljshighlighter.cpp +++ b/src/plugins/qmljseditor/qmljshighlighter.cpp @@ -27,7 +27,6 @@ #include <QSet> -#include <utils/porting.h> #include <utils/qtcassert.h> using namespace QmlJS; @@ -77,7 +76,7 @@ void QmlJSHighlighter::highlightBlock(const QString &text) case Token::Comment: if (m_inMultilineComment - && Utils::midView(text, token.end() - 2, 2) == QLatin1String("*/")) { + && QStringView(text).mid(token.end() - 2, 2) == QLatin1String("*/")) { onClosingParenthesis(QLatin1Char('-'), token.end() - 1, index == tokens.size()-1); m_inMultilineComment = false; } else if (!m_inMultilineComment @@ -121,7 +120,7 @@ void QmlJSHighlighter::highlightBlock(const QString &text) if (!m_qmlEnabled) break; - const QStringView spell = Utils::midView(text, token.offset, token.length); + const QStringView spell = QStringView(text).mid(token.offset, token.length); if (maybeQmlKeyword(spell)) { // check the previous token @@ -131,7 +130,7 @@ void QmlJSHighlighter::highlightBlock(const QString &text) break; } } - if (Utils::midView(text, token.offset, token.length) == QLatin1String("enum")) { + if (QStringView(text).mid(token.offset, token.length) == QLatin1String("enum")) { setFormat(token.offset, token.length, formatForCategory(C_KEYWORD)); break; } @@ -139,7 +138,7 @@ void QmlJSHighlighter::highlightBlock(const QString &text) const Token &previousToken = tokens.at(index - 1); if (previousToken.is(Token::Identifier) && text.at(previousToken.offset) == QLatin1Char('p') - && Utils::midView(text, previousToken.offset, previousToken.length) + && QStringView(text).mid(previousToken.offset, previousToken.length) == QLatin1String("property")) { setFormat(token.offset, token.length, formatForCategory(C_KEYWORD)); break; @@ -148,7 +147,7 @@ void QmlJSHighlighter::highlightBlock(const QString &text) const Token &previousToken = tokens.at(0); if (previousToken.is(Token::Identifier) && text.at(previousToken.offset) == QLatin1Char('e') - && Utils::midView(text, previousToken.offset, previousToken.length) + && QStringView(text).mid(previousToken.offset, previousToken.length) == QLatin1String("enum")) { setFormat(token.offset, token.length, formatForCategory(C_ENUMERATION)); break; diff --git a/src/plugins/scxmleditor/common/colorthemeview.h b/src/plugins/scxmleditor/common/colorthemeview.h index 505fe8415ce..35e40540966 100644 --- a/src/plugins/scxmleditor/common/colorthemeview.h +++ b/src/plugins/scxmleditor/common/colorthemeview.h @@ -25,8 +25,6 @@ #pragma once -#include <utils/porting.h> - #include <QFrame> #include <QPen> diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h index 1fdbb74c4a7..f1f3deb3b17 100644 --- a/src/plugins/texteditor/texteditor.h +++ b/src/plugins/texteditor/texteditor.h @@ -41,7 +41,6 @@ #include <utils/elidinglabel.h> #include <utils/link.h> #include <utils/multitextcursor.h> -#include <utils/porting.h> #include <utils/uncommentselection.h> #include <QPlainTextEdit> diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index a3c5cc9cfa3..8a2be2d6049 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -45,7 +45,6 @@ #include <texteditor/textdocument.h> #include <texteditor/textdocumentlayout.h> #include <utils/algorithm.h> -#include <utils/porting.h> #include <utils/progressindicator.h> #include <utils/qtcassert.h> #include <utils/shellcommand.h> diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 938e776ac87..d75a0b0bb51 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -46,7 +46,6 @@ #include <utils/fileutils.h> #include <utils/hostosinfo.h> #include <utils/icon.h> -#include <utils/porting.h> #include <utils/qtcassert.h> #include <utils/styledbar.h> #include <utils/theme/theme.h> diff --git a/src/shared/proparser/qmakeglobals.h b/src/shared/proparser/qmakeglobals.h index a5c2c8ff36f..1a3fc996195 100644 --- a/src/shared/proparser/qmakeglobals.h +++ b/src/shared/proparser/qmakeglobals.h @@ -27,7 +27,6 @@ #include "qmake_global.h" #include "proitems.h" -#include <utils/porting.h> #ifdef QT_BUILD_QMAKE # include <property.h> diff --git a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp index 46562a17e2d..cf24be1d8f1 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp @@ -47,8 +47,6 @@ #include <unistd.h> #include <sys/prctl.h> -#include <utils/porting.h> - // Enable compilation with older header that doesn't contain this constant // for running on newer libraries that do support it #ifndef PR_SET_PTRACER diff --git a/tests/auto/mapreduce/tst_mapreduce.cpp b/tests/auto/mapreduce/tst_mapreduce.cpp index f8c7ad62985..77c8122e957 100644 --- a/tests/auto/mapreduce/tst_mapreduce.cpp +++ b/tests/auto/mapreduce/tst_mapreduce.cpp @@ -25,7 +25,6 @@ #include <utils/algorithm.h> #include <utils/mapreduce.h> -#include <utils/porting.h> #include <QThreadPool> #include <QtTest> diff --git a/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp b/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp index ec7bb43f1ba..23042aaaa94 100644 --- a/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp +++ b/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp @@ -30,7 +30,6 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> #include <utils/launcherinterface.h> -#include <utils/porting.h> #include <utils/processinfo.h> #include <utils/processinterface.h> #include <utils/qtcassert.h> |