From c0f2bc254e5111db8aeca4c8fbc5780df1af26c2 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 6 Feb 2017 15:38:18 +0100 Subject: [PATCH] C++: Sort source files in *.qbs This makes the diff smaller when adding new files with the wizards. Change-Id: Iabd35afc32f363c465c8d9b36c45d480ea666627 Reviewed-by: Christian Kandeler --- src/plugins/clangcodemodel/clangcodemodel.qbs | 4 +- src/plugins/classview/classview.qbs | 30 ++- src/plugins/cppeditor/cppeditor.qbs | 89 ++++--- src/plugins/cpptools/cpptools.qbs | 238 ++++++++++++------ src/tools/clangbackend/clangbackend.qbs | 2 +- 5 files changed, 242 insertions(+), 121 deletions(-) diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs index b2374c2f7a2..02ff530760f 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.qbs +++ b/src/plugins/clangcodemodel/clangcodemodel.qbs @@ -43,9 +43,9 @@ QtcPlugin { "clangassistproposalmodel.h", "clangbackendipcintegration.cpp", "clangbackendipcintegration.h", + "clangcodemodel.qrc", "clangcodemodelplugin.cpp", "clangcodemodelplugin.h", - "clangcodemodel.qrc", "clangcompletionassistinterface.cpp", "clangcompletionassistinterface.h", "clangcompletionassistprocessor.cpp", @@ -98,9 +98,9 @@ QtcPlugin { condition: qtc.testsEnabled prefix: "test/" files: [ - "data/clangtestdata.qrc", "clangcodecompletion_test.cpp", "clangcodecompletion_test.h", + "data/clangtestdata.qrc", ] } diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs index bc22d5ce687..4018d754d1c 100644 --- a/src/plugins/classview/classview.qbs +++ b/src/plugins/classview/classview.qbs @@ -14,16 +14,26 @@ QtcPlugin { files: [ "classviewconstants.h", - "classviewmanager.cpp", "classviewmanager.h", - "classviewnavigationwidget.cpp", "classviewnavigationwidget.h", - "classviewnavigationwidgetfactory.cpp", "classviewnavigationwidgetfactory.h", - "classviewparser.cpp", "classviewparser.h", - "classviewparsertreeitem.cpp", "classviewparsertreeitem.h", - "classviewplugin.cpp", "classviewplugin.h", - "classviewsymbolinformation.cpp", "classviewsymbolinformation.h", - "classviewsymbollocation.cpp", "classviewsymbollocation.h", - "classviewtreeitemmodel.cpp", "classviewtreeitemmodel.h", - "classviewutils.cpp", "classviewutils.h", + "classviewmanager.cpp", + "classviewmanager.h", + "classviewnavigationwidget.cpp", + "classviewnavigationwidget.h", + "classviewnavigationwidgetfactory.cpp", + "classviewnavigationwidgetfactory.h", + "classviewparser.cpp", + "classviewparser.h", + "classviewparsertreeitem.cpp", + "classviewparsertreeitem.h", + "classviewplugin.cpp", + "classviewplugin.h", + "classviewsymbolinformation.cpp", + "classviewsymbolinformation.h", + "classviewsymbollocation.cpp", + "classviewsymbollocation.h", + "classviewtreeitemmodel.cpp", + "classviewtreeitemmodel.h", + "classviewutils.cpp", + "classviewutils.h", ] } diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index e9cd5ed9e12..62a376cd417 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -20,47 +20,78 @@ QtcPlugin { ] files: [ - "cppautocompleter.cpp", "cppautocompleter.h", - "cppcanonicalsymbol.cpp", "cppcanonicalsymbol.h", - "cppcodemodelinspectordialog.cpp", "cppcodemodelinspectordialog.h", "cppcodemodelinspectordialog.ui", - "cppdocumentationcommenthelper.cpp", "cppdocumentationcommenthelper.h", - "cppeditor.cpp", "cppeditor.h", + "cppautocompleter.cpp", + "cppautocompleter.h", + "cppcanonicalsymbol.cpp", + "cppcanonicalsymbol.h", + "cppcodemodelinspectordialog.cpp", + "cppcodemodelinspectordialog.h", + "cppcodemodelinspectordialog.ui", + "cppdocumentationcommenthelper.cpp", + "cppdocumentationcommenthelper.h", + "cppeditor.cpp", + "cppeditor.h", "cppeditor.qrc", "cppeditor_global.h", "cppeditorconstants.h", - "cppeditordocument.cpp", "cppeditordocument.h", + "cppeditordocument.cpp", + "cppeditordocument.h", "cppeditorenums.h", - "cppeditorplugin.cpp", "cppeditorplugin.h", - "cppelementevaluator.cpp", "cppelementevaluator.h", - "cppfollowsymbolundercursor.cpp", "cppfollowsymbolundercursor.h", - "cppfunctiondecldeflink.cpp", "cppfunctiondecldeflink.h", - "cpphighlighter.cpp", "cpphighlighter.h", - "cpphoverhandler.cpp", "cpphoverhandler.h", - "cppincludehierarchy.cpp", "cppincludehierarchy.h", + "cppeditorplugin.cpp", + "cppeditorplugin.h", + "cppelementevaluator.cpp", + "cppelementevaluator.h", + "cppfollowsymbolundercursor.cpp", + "cppfollowsymbolundercursor.h", + "cppfunctiondecldeflink.cpp", + "cppfunctiondecldeflink.h", + "cpphighlighter.cpp", + "cpphighlighter.h", + "cpphoverhandler.cpp", + "cpphoverhandler.h", + "cppincludehierarchy.cpp", + "cppincludehierarchy.h", "cppinsertvirtualmethods.cpp", "cppinsertvirtualmethods.h", - "cpplocalrenaming.cpp", "cpplocalrenaming.h", - "cppminimizableinfobars.cpp", "cppminimizableinfobars.h", - "cppoutline.cpp", "cppoutline.h", - "cpppreprocessordialog.cpp", "cpppreprocessordialog.h", "cpppreprocessordialog.ui", - "cppparsecontext.cpp", "cppparsecontext.h", - "cppquickfix.cpp", "cppquickfix.h", - "cppquickfixassistant.cpp", "cppquickfixassistant.h", - "cppquickfixes.cpp", "cppquickfixes.h", - "cppsnippetprovider.cpp", "cppsnippetprovider.h", - "cpptypehierarchy.cpp", "cpptypehierarchy.h", - "cppuseselectionsupdater.cpp", "cppuseselectionsupdater.h", - "cppvirtualfunctionassistprovider.cpp", "cppvirtualfunctionassistprovider.h", - "cppvirtualfunctionproposalitem.cpp", "cppvirtualfunctionproposalitem.h", - "resourcepreviewhoverhandler.cpp", "resourcepreviewhoverhandler.h", + "cpplocalrenaming.cpp", + "cpplocalrenaming.h", + "cppminimizableinfobars.cpp", + "cppminimizableinfobars.h", + "cppoutline.cpp", + "cppoutline.h", + "cppparsecontext.cpp", + "cppparsecontext.h", + "cpppreprocessordialog.cpp", + "cpppreprocessordialog.h", + "cpppreprocessordialog.ui", + "cppquickfix.cpp", + "cppquickfix.h", + "cppquickfixassistant.cpp", + "cppquickfixassistant.h", + "cppquickfixes.cpp", + "cppquickfixes.h", + "cppsnippetprovider.cpp", + "cppsnippetprovider.h", + "cpptypehierarchy.cpp", + "cpptypehierarchy.h", + "cppuseselectionsupdater.cpp", + "cppuseselectionsupdater.h", + "cppvirtualfunctionassistprovider.cpp", + "cppvirtualfunctionassistprovider.h", + "cppvirtualfunctionproposalitem.cpp", + "cppvirtualfunctionproposalitem.h", + "resourcepreviewhoverhandler.cpp", + "resourcepreviewhoverhandler.h", ] Group { name: "Tests" condition: qtc.testsEnabled files: [ - "cppdoxygen_test.cpp", "cppdoxygen_test.h", - "cppeditortestcase.cpp", "cppeditortestcase.h", + "cppdoxygen_test.cpp", + "cppdoxygen_test.h", + "cppeditortestcase.cpp", + "cppeditortestcase.h", "cppincludehierarchy_test.cpp", "cppquickfix_test.cpp", "cppquickfix_test.h", diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs index c05db793a4f..a812ca1c12e 100644 --- a/src/plugins/cpptools/cpptools.qbs +++ b/src/plugins/cpptools/cpptools.qbs @@ -28,88 +28,165 @@ Project { } files: [ - "abstracteditorsupport.cpp", "abstracteditorsupport.h", - "baseeditordocumentparser.cpp", "baseeditordocumentparser.h", - "baseeditordocumentprocessor.cpp", "baseeditordocumentprocessor.h", - "builtineditordocumentparser.cpp", "builtineditordocumentparser.h", - "builtineditordocumentprocessor.cpp", "builtineditordocumentprocessor.h", - "builtinindexingsupport.cpp", "builtinindexingsupport.h", - "clangdiagnosticconfig.cpp", "clangdiagnosticconfig.h", - "clangdiagnosticconfigsmodel.cpp", "clangdiagnosticconfigsmodel.h", - "clangdiagnosticconfigswidget.cpp", "clangdiagnosticconfigswidget.h", + "abstracteditorsupport.cpp", + "abstracteditorsupport.h", + "baseeditordocumentparser.cpp", + "baseeditordocumentparser.h", + "baseeditordocumentprocessor.cpp", + "baseeditordocumentprocessor.h", + "builtineditordocumentparser.cpp", + "builtineditordocumentparser.h", + "builtineditordocumentprocessor.cpp", + "builtineditordocumentprocessor.h", + "builtinindexingsupport.cpp", + "builtinindexingsupport.h", + "clangcompileroptionsbuilder.cpp", + "clangcompileroptionsbuilder.h", + "clangdiagnosticconfig.cpp", + "clangdiagnosticconfig.h", + "clangdiagnosticconfigsmodel.cpp", + "clangdiagnosticconfigsmodel.h", + "clangdiagnosticconfigswidget.cpp", + "clangdiagnosticconfigswidget.h", "clangdiagnosticconfigswidget.ui", - "compileroptionsbuilder.cpp", "compileroptionsbuilder.h", - "cppchecksymbols.cpp", "cppchecksymbols.h", - "cppclassesfilter.cpp", "cppclassesfilter.h", - "cppcodeformatter.cpp", "cppcodeformatter.h", - "cppcodemodelinspectordumper.cpp", "cppcodemodelinspectordumper.h", - "cppcodemodelsettings.cpp", "cppcodemodelsettings.h", - "cppcodemodelsettingspage.cpp", "cppcodemodelsettingspage.h", "cppcodemodelsettingspage.ui", - "cppcodestylepreferences.cpp", "cppcodestylepreferences.h", - "cppcodestylepreferencesfactory.cpp", "cppcodestylepreferencesfactory.h", - "cppcodestylesettings.cpp", "cppcodestylesettings.h", - "cppcodestylesettingspage.cpp", "cppcodestylesettingspage.h", "cppcodestylesettingspage.ui", - "cppcompletionassist.cpp", "cppcompletionassist.h", - "cppcompletionassistprocessor.cpp", "cppcompletionassistprocessor.h", - "cppcompletionassistprovider.cpp", "cppcompletionassistprovider.h", - "cppcurrentdocumentfilter.cpp", "cppcurrentdocumentfilter.h", - "cppdoxygen.cpp", "cppdoxygen.h", - "cppeditoroutline.cpp", "cppeditoroutline.h", - "cppfileiterationorder.cpp", "cppfileiterationorder.h", - "cppfilesettingspage.cpp", "cppfilesettingspage.h", "cppfilesettingspage.ui", - "cppfindreferences.cpp", "cppfindreferences.h", - "cppfunctionsfilter.cpp", "cppfunctionsfilter.h", - "cppincludesfilter.cpp", "cppincludesfilter.h", - "cppindexingsupport.cpp", "cppindexingsupport.h", - "cpplocalsymbols.cpp", "cpplocalsymbols.h", - "cpplocatordata.cpp", "cpplocatordata.h", - "cpplocatorfilter.cpp", "cpplocatorfilter.h", - "cppmodelmanager.cpp", "cppmodelmanager.h", - "cppmodelmanagersupport.cpp", "cppmodelmanagersupport.h", - "cppmodelmanagersupportinternal.cpp", "cppmodelmanagersupportinternal.h", - "cpppointerdeclarationformatter.cpp", "cpppointerdeclarationformatter.h", - "cppprojectfile.cpp", "cppprojectfile.h", - "cppqtstyleindenter.cpp", "cppqtstyleindenter.h", - "cpprefactoringchanges.cpp", "cpprefactoringchanges.h", - "cppselectionchanger.cpp", "cppselectionchanger.h", - "cppsemanticinfo.cpp", "cppsemanticinfo.h", - "cppsemanticinfoupdater.cpp", "cppsemanticinfoupdater.h", - "cppsourceprocessor.cpp", "cppsourceprocessor.h", - "cpptoolsbridge.cpp", "cpptoolsbridge.h", - "cpptoolsbridgeinterface.h", - "cpptoolsbridgeqtcreatorimplementation.cpp", "cpptoolsbridgeqtcreatorimplementation.h", + "compileroptionsbuilder.cpp", + "compileroptionsbuilder.h", + "cppbaseprojectpartbuilder.cpp", + "cppbaseprojectpartbuilder.h", + "cppchecksymbols.cpp", + "cppchecksymbols.h", + "cppclassesfilter.cpp", + "cppclassesfilter.h", + "cppcodeformatter.cpp", + "cppcodeformatter.h", + "cppcodemodelinspectordumper.cpp", + "cppcodemodelinspectordumper.h", + "cppcodemodelsettings.cpp", + "cppcodemodelsettings.h", + "cppcodemodelsettingspage.cpp", + "cppcodemodelsettingspage.h", + "cppcodemodelsettingspage.ui", + "cppcodestylepreferences.cpp", + "cppcodestylepreferences.h", + "cppcodestylepreferencesfactory.cpp", + "cppcodestylepreferencesfactory.h", + "cppcodestylesettings.cpp", + "cppcodestylesettings.h", + "cppcodestylesettingspage.cpp", + "cppcodestylesettingspage.h", + "cppcodestylesettingspage.ui", + "cppcompletionassist.cpp", + "cppcompletionassist.h", + "cppcompletionassistprocessor.cpp", + "cppcompletionassistprocessor.h", + "cppcompletionassistprovider.cpp", + "cppcompletionassistprovider.h", + "cppcurrentdocumentfilter.cpp", + "cppcurrentdocumentfilter.h", + "cppdoxygen.cpp", + "cppdoxygen.h", + "cppeditoroutline.cpp", + "cppeditoroutline.h", + "cppfileiterationorder.cpp", + "cppfileiterationorder.h", + "cppfilesettingspage.cpp", + "cppfilesettingspage.h", + "cppfilesettingspage.ui", + "cppfindreferences.cpp", + "cppfindreferences.h", + "cppfunctionsfilter.cpp", + "cppfunctionsfilter.h", + "cppincludesfilter.cpp", + "cppincludesfilter.h", + "cppindexingsupport.cpp", + "cppindexingsupport.h", + "cpplocalsymbols.cpp", + "cpplocalsymbols.h", + "cpplocatordata.cpp", + "cpplocatordata.h", + "cpplocatorfilter.cpp", + "cpplocatorfilter.h", + "cppmodelmanager.cpp", + "cppmodelmanager.h", + "cppmodelmanagersupport.cpp", + "cppmodelmanagersupport.h", + "cppmodelmanagersupportinternal.cpp", + "cppmodelmanagersupportinternal.h", + "cpppointerdeclarationformatter.cpp", + "cpppointerdeclarationformatter.h", + "cppprojectfile.cpp", + "cppprojectfile.h", + "cppprojectfilecategorizer.cpp", + "cppprojectfilecategorizer.h", + "cppprojectinterface.h", + "cppprojectpartchooser.cpp", + "cppprojectpartchooser.h", + "cppqtstyleindenter.cpp", + "cppqtstyleindenter.h", + "cpprefactoringchanges.cpp", + "cpprefactoringchanges.h", + "cppselectionchanger.cpp", + "cppselectionchanger.h", + "cppsemanticinfo.cpp", + "cppsemanticinfo.h", + "cppsemanticinfoupdater.cpp", + "cppsemanticinfoupdater.h", + "cppsourceprocessor.cpp", + "cppsourceprocessor.h", "cpptools.qrc", "cpptools_global.h", "cpptools_utils.h", + "cpptoolsbridge.cpp", + "cpptoolsbridge.h", + "cpptoolsbridgeinterface.h", + "cpptoolsbridgeqtcreatorimplementation.cpp", + "cpptoolsbridgeqtcreatorimplementation.h", "cpptoolsconstants.h", - "cpptoolsjsextension.cpp", "cpptoolsjsextension.h", - "cpptoolsplugin.cpp", "cpptoolsplugin.h", - "cpptoolsreuse.cpp", "cpptoolsreuse.h", - "cpptoolssettings.cpp", "cpptoolssettings.h", - "cppworkingcopy.cpp", "cppworkingcopy.h", - "doxygengenerator.cpp", "doxygengenerator.h", - "editordocumenthandle.cpp", "editordocumenthandle.h", - "functionutils.cpp", "functionutils.h", - "generatedcodemodelsupport.cpp", "generatedcodemodelsupport.h", - "includeutils.cpp", "includeutils.h", - "indexitem.cpp", "indexitem.h", - "insertionpointlocator.cpp", "insertionpointlocator.h", - "projectinfo.cpp", "projectinfo.h", - "projectpart.cpp", "projectpart.h", - "projectpartbuilder.cpp", "projectpartbuilder.h", + "cpptoolsjsextension.cpp", + "cpptoolsjsextension.h", + "cpptoolsplugin.cpp", + "cpptoolsplugin.h", + "cpptoolsreuse.cpp", + "cpptoolsreuse.h", + "cpptoolssettings.cpp", + "cpptoolssettings.h", + "cppworkingcopy.cpp", + "cppworkingcopy.h", + "doxygengenerator.cpp", + "doxygengenerator.h", + "editordocumenthandle.cpp", + "editordocumenthandle.h", + "functionutils.cpp", + "functionutils.h", + "generatedcodemodelsupport.cpp", + "generatedcodemodelsupport.h", + "includeutils.cpp", + "includeutils.h", + "indexitem.cpp", + "indexitem.h", + "insertionpointlocator.cpp", + "insertionpointlocator.h", + "projectinfo.cpp", + "projectinfo.h", + "projectpart.cpp", + "projectpart.h", + "projectpartbuilder.cpp", + "projectpartbuilder.h", "projectpartheaderpath.h", - "searchsymbols.cpp", "searchsymbols.h", - "semantichighlighter.cpp", "semantichighlighter.h", - "senddocumenttracker.cpp", "senddocumenttracker.h", - "stringtable.cpp", "stringtable.h", - "symbolfinder.cpp", "symbolfinder.h", - "symbolsfindfilter.cpp", "symbolsfindfilter.h", - "typehierarchybuilder.cpp", "typehierarchybuilder.h", - "cppprojectfilecategorizer.cpp", "cppprojectfilecategorizer.h", - "cppprojectinterface.h", - "cppbaseprojectpartbuilder.cpp", "cppbaseprojectpartbuilder.h", - "clangcompileroptionsbuilder.cpp", "clangcompileroptionsbuilder.h", - "cppprojectpartchooser.cpp", "cppprojectpartchooser.h", + "searchsymbols.cpp", + "searchsymbols.h", + "semantichighlighter.cpp", + "semantichighlighter.h", + "senddocumenttracker.cpp", + "senddocumenttracker.h", + "stringtable.cpp", + "stringtable.h", + "symbolfinder.cpp", + "symbolfinder.h", + "symbolsfindfilter.cpp", + "symbolsfindfilter.h", + "typehierarchybuilder.cpp", + "typehierarchybuilder.h", ] Group { @@ -123,10 +200,13 @@ Project { "cpplocatorfilter_test.cpp", "cppmodelmanager_test.cpp", "cpppointerdeclarationformatter_test.cpp", - "cppsourceprocessertesthelper.cpp", "cppsourceprocessertesthelper.h", + "cppsourceprocessertesthelper.cpp", + "cppsourceprocessertesthelper.h", "cppsourceprocessor_test.cpp", - "cpptoolstestcase.cpp", "cpptoolstestcase.h", - "modelmanagertesthelper.cpp", "modelmanagertesthelper.h", + "cpptoolstestcase.cpp", + "cpptoolstestcase.h", + "modelmanagertesthelper.cpp", + "modelmanagertesthelper.h", "symbolsearcher_test.cpp", "typehierarchybuilder_test.cpp", ] diff --git a/src/tools/clangbackend/clangbackend.qbs b/src/tools/clangbackend/clangbackend.qbs index 54c54550917..457c218501a 100644 --- a/src/tools/clangbackend/clangbackend.qbs +++ b/src/tools/clangbackend/clangbackend.qbs @@ -17,8 +17,8 @@ QtcTool { Group { prefix: "../qtcreatorcrashhandler/" files: [ - "crashhandlersetup.h", "crashhandlersetup.cpp", + "crashhandlersetup.h", ] }