[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevelop/5.3] /: Include own headers first
From:       Friedrich W. H. Kossebau <null () kde ! org>
Date:       2018-09-10 16:43:57
Message-ID: E1fzPI5-0006TD-JV () code ! kde ! org
[Download RAW message or body]

Git commit 01f0e49ba200052da87c2fa4b4e6b8f856e4d72c by Friedrich W. H. Kossebau.
Committed on 10/09/2018 at 16:43.
Pushed by kossebau into branch '5.3'.

Include own headers first

M  +4    -3    kdevplatform/debugger/util/treeview.cpp
M  +1    -1    kdevplatform/language/codegen/templateengine.cpp
M  +2    -1    kdevplatform/language/duchain/definitions.cpp
M  +2    -1    kdevplatform/project/helper.cpp
M  +3    -1    kdevplatform/tests/json/declarationvalidator.cpp
M  +2    -2    kdevplatform/util/texteditorhelpers.cpp
M  +2    -2    plugins/cmake/cmakeextraargumentshistory.cpp
M  +7    -4    plugins/cmake/tests/kdevprojectopen.cpp
M  +2    -2    plugins/cppcheck/tests/test_cppcheckjob.cpp
M  +2    -2    plugins/custom-definesandincludes/kcm_widget/definesandincludesconfigpage.cpp
 M  +9    -8    plugins/ghprovider/ghdialog.cpp
M  +1    -1    plugins/ghprovider/ghlineedit.cpp
M  +4    -4    plugins/ghprovider/ghproviderplugin.cpp
M  +3    -3    plugins/ghprovider/ghproviderwidget.cpp
M  +2    -1    plugins/grepview/tests/test_findreplace.cpp
M  +8    -7    plugins/manpage/manpageplugin.cpp
M  +2    -1    plugins/qmljs/codecompletion/model.cpp
M  +2    -1    plugins/standardoutputview/tests/test_standardoutputview.cpp

https://commits.kde.org/kdevelop/01f0e49ba200052da87c2fa4b4e6b8f856e4d72c

diff --git a/kdevplatform/debugger/util/treeview.cpp \
b/kdevplatform/debugger/util/treeview.cpp index d2bd861e75..a451ab49fd 100644
--- a/kdevplatform/debugger/util/treeview.cpp
+++ b/kdevplatform/debugger/util/treeview.cpp
@@ -19,13 +19,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include "treeview.h"
+
+#include "treemodel.h"
+
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QSortFilterProxyModel>
 
-#include "treeview.h"
-#include "treemodel.h"
-
 using namespace KDevelop;
 
 AsyncTreeView::AsyncTreeView(TreeModel* model, QSortFilterProxyModel *proxy, QWidget \
                *parent = nullptr)
diff --git a/kdevplatform/language/codegen/templateengine.cpp \
b/kdevplatform/language/codegen/templateengine.cpp index e70b6b5c89..83bcb65c16 \
                100644
--- a/kdevplatform/language/codegen/templateengine.cpp
+++ b/kdevplatform/language/codegen/templateengine.cpp
@@ -20,9 +20,9 @@
  */
 
 #include "templateengine.h"
+#include "templateengine_p.h"
 
 #include "debug.h"
-#include "templateengine_p.h"
 
 #include "codedescription.h"
 #include "codedescriptionmetatypes.h"
diff --git a/kdevplatform/language/duchain/definitions.cpp \
b/kdevplatform/language/duchain/definitions.cpp index 9bc186bea1..69a00591e5 100644
--- a/kdevplatform/language/duchain/definitions.cpp
+++ b/kdevplatform/language/duchain/definitions.cpp
@@ -17,8 +17,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "appendedlist.h"
 #include "definitions.h"
+
+#include "appendedlist.h"
 #include "declaration.h"
 #include "declarationid.h"
 #include "duchainpointer.h"
diff --git a/kdevplatform/project/helper.cpp b/kdevplatform/project/helper.cpp
index 4bc71b53d8..98c458e28b 100644
--- a/kdevplatform/project/helper.cpp
+++ b/kdevplatform/project/helper.cpp
@@ -17,8 +17,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "debug.h"
 #include "helper.h"
+
+#include "debug.h"
 #include "path.h"
 
 #include <QApplication>
diff --git a/kdevplatform/tests/json/declarationvalidator.cpp \
b/kdevplatform/tests/json/declarationvalidator.cpp index 8908789f65..162bcbce09 \
                100644
--- a/kdevplatform/tests/json/declarationvalidator.cpp
+++ b/kdevplatform/tests/json/declarationvalidator.cpp
@@ -15,8 +15,10 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "language/duchain/declaration.h"
+
 #include "declarationvalidator.h"
+
+#include "language/duchain/declaration.h"
 #include "testsuite.h"
 #include "jsondeclarationtests.h"
 
diff --git a/kdevplatform/util/texteditorhelpers.cpp \
b/kdevplatform/util/texteditorhelpers.cpp index 3304ca0033..02c0530dbd 100644
--- a/kdevplatform/util/texteditorhelpers.cpp
+++ b/kdevplatform/util/texteditorhelpers.cpp
@@ -17,14 +17,14 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <cstdlib>
-
 #include "texteditorhelpers.h"
 
 #include <KTextEditor/View>
 
 #include <QRegularExpression>
 
+#include <cstdlib>
+
 namespace KDevelop {
 
 namespace {
diff --git a/plugins/cmake/cmakeextraargumentshistory.cpp \
b/plugins/cmake/cmakeextraargumentshistory.cpp index 14f5e87b15..344c57ff0a 100644
--- a/plugins/cmake/cmakeextraargumentshistory.cpp
+++ b/plugins/cmake/cmakeextraargumentshistory.cpp
@@ -18,11 +18,11 @@
  * 02110-1301, USA.
  */
 
+#include "cmakeextraargumentshistory.h"
+
 #include <KSharedConfig>
 #include <KConfigGroup>
 
-#include "cmakeextraargumentshistory.h"
-
 namespace {
 
 const int maxExtraArgumentsInHistory = 15;
diff --git a/plugins/cmake/tests/kdevprojectopen.cpp \
b/plugins/cmake/tests/kdevprojectopen.cpp index 991106dcc6..65f04d0978 100644
--- a/plugins/cmake/tests/kdevprojectopen.cpp
+++ b/plugins/cmake/tests/kdevprojectopen.cpp
@@ -17,14 +17,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <QApplication>
-#include <KLocalizedString>
-#include <KAboutData>
+#include "kdevprojectopen.h"
+
 #include <tests/autotestshell.h>
 #include <tests/testcore.h>
 #include <interfaces/iprojectcontroller.h>
-#include "kdevprojectopen.h"
 #include "testhelpers.h"
+
+#include <KLocalizedString>
+#include <KAboutData>
+
+#include <QApplication>
 #include <QDebug>
 #include <QCommandLineParser>
 
diff --git a/plugins/cppcheck/tests/test_cppcheckjob.cpp \
b/plugins/cppcheck/tests/test_cppcheckjob.cpp index ebd5ecd167..5b50b6b321 100644
--- a/plugins/cppcheck/tests/test_cppcheckjob.cpp
+++ b/plugins/cppcheck/tests/test_cppcheckjob.cpp
@@ -16,12 +16,12 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA   \
                *
  *************************************************************************************/
  
+#include "test_cppcheckjob.h"
+
 #include <QTest>
 #include <tests/testcore.h>
 #include <tests/autotestshell.h>
 
-#include "test_cppcheckjob.h"
-
 #include "job.h"
 #include "parameters.h"
 
diff --git a/plugins/custom-definesandincludes/kcm_widget/definesandincludesconfigpage.cpp \
b/plugins/custom-definesandincludes/kcm_widget/definesandincludesconfigpage.cpp index \
                32a289eac6..a046fb6e3a 100644
--- a/plugins/custom-definesandincludes/kcm_widget/definesandincludesconfigpage.cpp
+++ b/plugins/custom-definesandincludes/kcm_widget/definesandincludesconfigpage.cpp
@@ -16,6 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>. *
  ************************************************************************/
 
+#include "definesandincludesconfigpage.h"
+
 #include <QVBoxLayout>
 #include <QIcon>
 
@@ -29,8 +31,6 @@
 #include <interfaces/idocument.h>
 #include <project/projectmodel.h>
 
-#include "definesandincludesconfigpage.h"
-
 DefinesAndIncludesConfigPage::DefinesAndIncludesConfigPage(KDevelop::IPlugin* \
                plugin, const KDevelop::ProjectConfigOptions& options, QWidget* \
                parent)
     : ProjectConfigPage<CustomDefinesAndIncludes>(plugin, options, parent)
 {
diff --git a/plugins/ghprovider/ghdialog.cpp b/plugins/ghprovider/ghdialog.cpp
index dc2f6e73db..0a4cdb488a 100644
--- a/plugins/ghprovider/ghdialog.cpp
+++ b/plugins/ghprovider/ghdialog.cpp
@@ -17,6 +17,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "ghdialog.h"
+
+#include <ghaccount.h>
+#include <ghresource.h>
+
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KPasswordDialog>
+
 #include <QLabel>
 #include <QDialogButtonBox>
 #include <QPushButton>
@@ -24,14 +33,6 @@
 #include <QPointer>
 #include <QInputDialog>
 
-#include <KLocalizedString>
-#include <KMessageBox>
-#include <KPasswordDialog>
-
-#include <ghdialog.h>
-#include <ghaccount.h>
-#include <ghresource.h>
-
 static QString invalidAccountText()
 {
     return i18n("You have not authorized KDevelop to use your GitHub account. "
diff --git a/plugins/ghprovider/ghlineedit.cpp b/plugins/ghprovider/ghlineedit.cpp
index 4852091ed5..9463d72f02 100644
--- a/plugins/ghprovider/ghlineedit.cpp
+++ b/plugins/ghprovider/ghlineedit.cpp
@@ -17,10 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "ghlineedit.h"
 
 #include <QKeyEvent>
 #include <QTimer>
-#include <ghlineedit.h>
 
 
 namespace gh
diff --git a/plugins/ghprovider/ghproviderplugin.cpp \
b/plugins/ghprovider/ghproviderplugin.cpp index 94fbda6de6..d318d6dead 100644
--- a/plugins/ghprovider/ghproviderplugin.cpp
+++ b/plugins/ghprovider/ghproviderplugin.cpp
@@ -17,14 +17,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
-#include <KLocalizedString>
-#include <KPluginFactory>
+#include <ghproviderplugin.h>
 
 #include <debug.h>
-#include <ghproviderplugin.h>
 #include <ghproviderwidget.h>
 
+#include <KLocalizedString>
+#include <KPluginFactory>
+
 using namespace KDevelop;
 
 K_PLUGIN_FACTORY_WITH_JSON(KDevGHProviderFactory, "kdevghprovider.json", \
                registerPlugin<gh::ProviderPlugin>();)
diff --git a/plugins/ghprovider/ghproviderwidget.cpp \
b/plugins/ghprovider/ghproviderwidget.cpp index 4fe5671316..06978574ba 100644
--- a/plugins/ghprovider/ghproviderwidget.cpp
+++ b/plugins/ghprovider/ghproviderwidget.cpp
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <KMessageBox>
+#include <ghproviderwidget.h>
 
 #include <QLabel>
 #include <QListView>
@@ -30,15 +30,15 @@
 #include <interfaces/iplugincontroller.h>
 #include <vcs/interfaces/ibasicversioncontrol.h>
 #include <vcs/vcslocation.h>
-#include <KLocalizedString>
 
 #include <ghaccount.h>
 #include <ghdialog.h>
 #include <ghresource.h>
 #include <ghlineedit.h>
 #include <ghprovidermodel.h>
-#include <ghproviderwidget.h>
 
+#include <KLocalizedString>
+#include <KMessageBox>
 
 using namespace KDevelop;
 namespace gh
diff --git a/plugins/grepview/tests/test_findreplace.cpp \
b/plugins/grepview/tests/test_findreplace.cpp index 334fccf235..ec76295e08 100644
--- a/plugins/grepview/tests/test_findreplace.cpp
+++ b/plugins/grepview/tests/test_findreplace.cpp
@@ -10,6 +10,8 @@
 *                                                                         *
 ***************************************************************************/
 
+#include "test_findreplace.h"
+
 #include <QTest>
 #include <QRegExp>
 
@@ -19,7 +21,6 @@
 #include <tests/testcore.h>
 #include <tests/autotestshell.h>
 
-#include "test_findreplace.h"
 #include "../grepjob.h"
 #include "../grepviewplugin.h"
 #include "../grepoutputmodel.h"
diff --git a/plugins/manpage/manpageplugin.cpp b/plugins/manpage/manpageplugin.cpp
index 3bbbf9ca7f..691c6e92d9 100644
--- a/plugins/manpage/manpageplugin.cpp
+++ b/plugins/manpage/manpageplugin.cpp
@@ -18,9 +18,14 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <KPluginFactory>
+#include "manpageplugin.h"
+
+#include "manpagedocumentation.h"
+#include "manpagemodel.h"
 
 #include <interfaces/idocumentation.h>
+#include <interfaces/icore.h>
+#include <interfaces/iprojectcontroller.h>
 
 #include <language/duchain/duchain.h>
 #include <language/duchain/declaration.h>
@@ -33,15 +38,11 @@
 #include <language/duchain/classmemberdeclaration.h>
 #include <language/duchain/classfunctiondeclaration.h>
 
+#include <KPluginFactory>
+
 #include <QFile>
 #include <QStringListModel>
 
-#include <interfaces/icore.h>
-#include <interfaces/iprojectcontroller.h>
-
-#include "manpageplugin.h"
-#include "manpagedocumentation.h"
-#include "manpagemodel.h"
 
 using namespace KDevelop;
 
diff --git a/plugins/qmljs/codecompletion/model.cpp \
b/plugins/qmljs/codecompletion/model.cpp index 2429dda651..f7715dfbb0 100644
--- a/plugins/qmljs/codecompletion/model.cpp
+++ b/plugins/qmljs/codecompletion/model.cpp
@@ -20,9 +20,10 @@
  *
  */
 
-#include "worker.h"
 #include "model.h"
 
+#include "worker.h"
+
 namespace QmlJS {
 
 CodeCompletionModel::CodeCompletionModel(QObject* parent)
diff --git a/plugins/standardoutputview/tests/test_standardoutputview.cpp \
b/plugins/standardoutputview/tests/test_standardoutputview.cpp index \
                c75ff97757..d20838ff86 100644
--- a/plugins/standardoutputview/tests/test_standardoutputview.cpp
+++ b/plugins/standardoutputview/tests/test_standardoutputview.cpp
@@ -16,6 +16,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "test_standardoutputview.h"
+
 #include <QAction>
 #include <QStackedWidget>
 #include <QStandardItemModel>
@@ -34,7 +36,6 @@
 #include <interfaces/iplugincontroller.h>
 #include <outputview/ioutputview.h>
 
-#include "test_standardoutputview.h"
 #include "../outputwidget.h"
 #include "../toolviewdata.h"
 


[prev in list] [next in list] [prev in thread] [next in thread]