feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Canonicalize some includes

Browse Source 
Our canonical style is
    #include <utils/fileutils.h>
rather than
    #include "utils/fileutils.h"
Which makes sense, as such headers will never be found in the local
directory.

Change-Id: I4ca46e90d6c4d19d4b1f235f4c79caad864ef222
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-01-08 16:05:57 +01:00
committed by Orgad Shaneh
parent 4c19157204
commit c6a6c12f05
34 changed files with 63 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/languageserverprotocol/lsptypes.cpp
View File

@@ -26,7 +26,7 @@
#include "lsptypes.h" #include "lsptypes.h"
#include "lsputils.h" #include "lsputils.h"
#include "utils/mimetypes/mimedatabase.h" #include <utils/mimetypes/mimedatabase.h>
#include <QHash> #include <QHash>
#include <QTextBlock> #include <QTextBlock>

2
src/libs/modelinglib/qmt/infrastructure/qmtassert.h
View File

@@ -25,7 +25,7 @@
#pragma once #pragma once
#include "utils/qtcassert.h" #include <utils/qtcassert.h>
#define QMT_CHECK(condition) QTC_CHECK(condition) #define QMT_CHECK(condition) QTC_CHECK(condition)
#define QMT_ASSERT(condition, action) QTC_ASSERT(condition, action) #define QMT_ASSERT(condition, action) QTC_ASSERT(condition, action)

2
src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp
View File

@@ -32,7 +32,7 @@
#include "qmt/infrastructure/qmtassert.h" #include "qmt/infrastructure/qmtassert.h"
#include "qmt/style/style.h" #include "qmt/style/style.h"
#include "utils/algorithm.h" #include <utils/algorithm.h>
#include <QHash> #include <QHash>
#include <QPainter> #include <QPainter>

2
src/libs/qmldebug/qmlenginecontrolclient.cpp
View File

@@ -25,7 +25,7 @@
#include "qmlenginecontrolclient.h" #include "qmlenginecontrolclient.h"
#include "qpacketprotocol.h" #include "qpacketprotocol.h"
#include "utils/qtcassert.h" #include <utils/qtcassert.h>
#include <functional> #include <functional>

2
src/plugins/android/adbcommandswidget.cpp
View File

@@ -25,7 +25,7 @@
#include "adbcommandswidget.h" #include "adbcommandswidget.h"
#include "ui_adbcommandswidget.h" #include "ui_adbcommandswidget.h"
#include "utils/utilsicons.h" #include <utils/utilsicons.h>
#include <QGroupBox> #include <QGroupBox>
#include <QItemSelectionModel> #include <QItemSelectionModel>

10
src/plugins/android/androidavdmanager.cpp
View File

@@ -26,11 +26,11 @@
#include "androidtoolmanager.h" #include "androidtoolmanager.h"
#include "coreplugin/icore.h" #include <coreplugin/icore.h>
#include "utils/algorithm.h" #include <utils/algorithm.h>
#include "utils/qtcassert.h" #include <utils/qtcassert.h>
#include "utils/runextensions.h" #include <utils/runextensions.h>
#include "utils/synchronousprocess.h" #include <utils/synchronousprocess.h>
#include <QApplication> #include <QApplication>
#include <QFileInfo> #include <QFileInfo>

10
src/plugins/android/androidsdkmanager.cpp
View File

@@ -28,11 +28,11 @@
#include "androidmanager.h" #include "androidmanager.h"
#include "androidtoolmanager.h" #include "androidtoolmanager.h"
#include "utils/algorithm.h" #include <utils/algorithm.h>
#include "utils/qtcassert.h" #include <utils/qtcassert.h>
#include "utils/runextensions.h" #include <utils/runextensions.h>
#include "utils/synchronousprocess.h" #include <utils/synchronousprocess.h>
#include "utils/qtcprocess.h" #include <utils/qtcprocess.h>
#include <QFutureWatcher> #include <QFutureWatcher>
#include <QLoggingCategory> #include <QLoggingCategory>

3
src/plugins/android/androidsdkmanager.h
View File

@@ -24,9 +24,10 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include "utils/fileutils.h"
#include "androidsdkpackage.h" #include "androidsdkpackage.h"
#include <utils/fileutils.h>
#include <QObject> #include <QObject>
#include <QFuture> #include <QFuture>

10
src/plugins/android/androidsdkmanagerwidget.cpp
View File

@@ -29,11 +29,11 @@
#include "androidsdkmanager.h" #include "androidsdkmanager.h"
#include "androidsdkmodel.h" #include "androidsdkmodel.h"
#include "utils/runextensions.h" #include <utils/runextensions.h>
#include "utils/outputformatter.h" #include <utils/outputformatter.h>
#include "utils/runextensions.h" #include <utils/runextensions.h>
#include "utils/qtcassert.h" #include <utils/qtcassert.h>
#include "utils/utilsicons.h" #include <utils/utilsicons.h>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QLabel> #include <QLabel>

6
src/plugins/android/androidsdkmodel.cpp
View File

@@ -26,9 +26,9 @@
#include "androidmanager.h" #include "androidmanager.h"
#include "androidsdkmanager.h" #include "androidsdkmanager.h"
#include "utils/algorithm.h" #include <utils/algorithm.h>
#include "utils/qtcassert.h" #include <utils/qtcassert.h>
#include "utils/utilsicons.h" #include <utils/utilsicons.h>
#include <QIcon> #include <QIcon>

2
src/plugins/android/androidsdkpackage.cpp
View File

@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "androidsdkpackage.h" #include "androidsdkpackage.h"
#include "utils/algorithm.h" #include <utils/algorithm.h>
namespace Android { namespace Android {

2
src/plugins/android/androidsdkpackage.h
View File

@@ -22,7 +22,7 @@
** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
** **
****************************************************************************/ ****************************************************************************/
#include "utils/fileutils.h" #include <utils/fileutils.h>
#include <QList> #include <QList>
#include <QObject> #include <QObject>

10
src/plugins/android/androidtoolmanager.cpp
View File

@@ -26,11 +26,11 @@
#include "androidmanager.h" #include "androidmanager.h"
#include "utils/algorithm.h" #include <utils/algorithm.h>
#include "utils/environment.h" #include <utils/environment.h>
#include "utils/qtcassert.h" #include <utils/qtcassert.h>
#include "utils/runextensions.h" #include <utils/runextensions.h>
#include "utils/synchronousprocess.h" #include <utils/synchronousprocess.h>
#include <QLoggingCategory> #include <QLoggingCategory>

3
src/plugins/android/androidtoolmanager.h
View File

@@ -24,9 +24,10 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include "utils/fileutils.h"
#include "androidconfigurations.h" #include "androidconfigurations.h"
#include <utils/fileutils.h>
#include <QStringList> #include <QStringList>
#include <memory> #include <memory>

2
src/plugins/autotest/gtest/gtestoutputreader.cpp
View File

@@ -27,7 +27,7 @@
#include "gtestresult.h" #include "gtestresult.h"
#include "../testtreemodel.h" #include "../testtreemodel.h"
#include "../testtreeitem.h" #include "../testtreeitem.h"
#include "utils/hostosinfo.h" #include <utils/hostosinfo.h>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>

2
src/plugins/cmakeprojectmanager/treescanner.h
View File

@@ -28,7 +28,7 @@
#include "projectexplorer/projectnodes.h" #include "projectexplorer/projectnodes.h"
#include <utils/mimetypes/mimedatabase.h> #include <utils/mimetypes/mimedatabase.h>
#include "utils/fileutils.h" #include <utils/fileutils.h>
#include <QObject> #include <QObject>
#include <QFuture> #include <QFuture>

4
src/plugins/coreplugin/actionmanager/actioncontainer.h
View File

@@ -25,8 +25,8 @@
#pragma once #pragma once
#include "coreplugin/core_global.h" #include "../core_global.h"
#include "coreplugin/icontext.h" #include "../icontext.h"
#include <QObject> #include <QObject>

8
src/plugins/coreplugin/actionmanager/actionmanager.h
View File

@@ -25,10 +25,10 @@
#pragma once #pragma once
#include "coreplugin/core_global.h" #include "../core_global.h"
#include "coreplugin/coreconstants.h" #include "../coreconstants.h"
#include "coreplugin/icontext.h" #include "../icontext.h"
#include <coreplugin/actionmanager/command.h> #include "command.h"
#include <QObject> #include <QObject>
#include <QList> #include <QList>

2
src/plugins/coreplugin/dialogs/externaltoolconfig.h
View File

@@ -25,7 +25,7 @@
#pragma once #pragma once
#include "coreplugin/externaltool.h" #include "../externaltool.h"
#include <QWidget> #include <QWidget>
#include <QAbstractItemModel> #include <QAbstractItemModel>

2
src/plugins/coreplugin/editormanager/editorview.h
View File

@@ -25,7 +25,7 @@
#pragma once #pragma once
#include "coreplugin/id.h" #include "../id.h"
#include <utils/dropsupport.h> #include <utils/dropsupport.h>

2
src/plugins/coreplugin/fileutils.h
View File

@@ -25,7 +25,7 @@
#pragma once #pragma once
#include "coreplugin/core_global.h" #include "core_global.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QWidget; class QWidget;

2
src/plugins/coreplugin/generatedfile.h
View File

@@ -25,7 +25,7 @@
#pragma once #pragma once
#include "coreplugin/id.h" #include "id.h"
#include <QSharedDataPointer> #include <QSharedDataPointer>
#include <QList> #include <QList>

2
src/plugins/coreplugin/patchtool.h
View File

@@ -25,7 +25,7 @@
#pragma once #pragma once
#include "coreplugin/core_global.h" #include "core_global.h"
#include <QString> #include <QString>

2
src/plugins/ios/iosbuildconfiguration.cpp
View File

@@ -36,7 +36,7 @@
#include "qmakeprojectmanager/qmakebuildinfo.h" #include "qmakeprojectmanager/qmakebuildinfo.h"
#include "qmakeprojectmanager/qmakeprojectmanagerconstants.h" #include "qmakeprojectmanager/qmakeprojectmanagerconstants.h"
#include "utils/algorithm.h" #include <utils/algorithm.h>
using namespace QmakeProjectManager; using namespace QmakeProjectManager;
using namespace ProjectExplorer; using namespace ProjectExplorer;

2
src/plugins/ios/iosbuildsettingswidget.h
View File

@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include "coreplugin/id.h" #include <coreplugin/id.h>
#include "projectexplorer/namedwidget.h" #include "projectexplorer/namedwidget.h"
#include <QWidget> #include <QWidget>

2
src/plugins/ios/iossimulatorfactory.cpp
View File

@@ -28,7 +28,7 @@
#include "iosconstants.h" #include "iosconstants.h"
#include "iossimulator.h" #include "iossimulator.h"
#include "utils/qtcassert.h" #include <utils/qtcassert.h>
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {

4
src/plugins/ios/iostoolhandler.cpp
View File

@@ -33,8 +33,8 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include "utils/runextensions.h" #include <utils/runextensions.h>
#include "utils/synchronousprocess.h" #include <utils/synchronousprocess.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDir> #include <QDir>

8
src/plugins/ios/simulatorcontrol.cpp
View File

@@ -26,10 +26,10 @@
#include "simulatorcontrol.h" #include "simulatorcontrol.h"
#include "iosconfigurations.h" #include "iosconfigurations.h"
#include "utils/algorithm.h" #include <utils/algorithm.h>
#include "utils/runextensions.h" #include <utils/runextensions.h>
#include "utils/qtcassert.h" #include <utils/qtcassert.h>
#include "utils/synchronousprocess.h" #include <utils/synchronousprocess.h>
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>

3
src/plugins/ios/simulatorcontrol.h
View File

@@ -24,9 +24,10 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include <utils/fileutils.h>
#include <QObject> #include <QObject>
#include <QFuture> #include <QFuture>
#include "utils/fileutils.h"
#include <QDebug> #include <QDebug>
#include <memory> #include <memory>

2
src/plugins/modeleditor/editordiagramview.h
View File

@@ -26,7 +26,7 @@
#pragma once #pragma once
#include "qmt/diagram_widgets_ui/diagramview.h" #include "qmt/diagram_widgets_ui/diagramview.h"
#include "utils/dropsupport.h" #include <utils/dropsupport.h>
namespace ModelEditor { namespace ModelEditor {
namespace Internal { namespace Internal {

2
src/plugins/modeleditor/extpropertiesmview.cpp
View File

@@ -29,7 +29,7 @@
#include "qmt/project/project.h" #include "qmt/project/project.h"
#include "qmt/project_controller/projectcontroller.h" #include "qmt/project_controller/projectcontroller.h"
#include "utils/pathchooser.h" #include <utils/pathchooser.h>
#include <QLabel> #include <QLabel>
#include <QFileInfo> #include <QFileInfo>

2
src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
View File

@@ -26,7 +26,7 @@
#include "remotelinuxenvironmentaspect.h" #include "remotelinuxenvironmentaspect.h"
#include "remotelinuxenvironmentaspectwidget.h" #include "remotelinuxenvironmentaspectwidget.h"
#include "utils/algorithm.h" #include <utils/algorithm.h>
namespace RemoteLinux { namespace RemoteLinux {

2
src/plugins/texteditor/basefilefind.h
View File

@@ -26,7 +26,7 @@
#pragma once #pragma once
#include "texteditor_global.h" #include "texteditor_global.h"
#include "utils/filesearch.h" #include <utils/filesearch.h>
#include <coreplugin/find/ifindfilter.h> #include <coreplugin/find/ifindfilter.h>
#include <coreplugin/find/searchresultwindow.h> #include <coreplugin/find/searchresultwindow.h>

2
src/plugins/texteditor/codeassist/documentcontentcompletion.cpp
View File

@@ -32,7 +32,7 @@
#include "iassistprocessor.h" #include "iassistprocessor.h"
#include "../snippets/snippetassistcollector.h" #include "../snippets/snippetassistcollector.h"
#include "utils/runextensions.h" #include <utils/runextensions.h>
#include <QElapsedTimer> #include <QElapsedTimer>
#include <QRegularExpression> #include <QRegularExpression>