diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2013-04-02 11:52:31 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-04-10 11:43:22 +0200 |
commit | ddafdf55de659cc27624f4d5c3288425adc59de0 (patch) | |
tree | 41505ece2ca3ae5bdb01ec0039aea7c886874e15 /src | |
parent | a189ec5537f42c6c683515235ca79a6f4ceae237 (diff) | |
download | qt-creator-ddafdf55de659cc27624f4d5c3288425adc59de0.tar.gz |
CppTools: Rename files to comply with coding standard
Rename ModelManagerInterface.(h|cpp) to cppmodelmanagerinterface.(h|cpp).
Rename TypeHierarchyBuilder.(h|cpp) to typehierarchybuilder.(h|cpp).
Change-Id: I035d833fd205d7460819bd0fb7031294359032f9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src')
32 files changed, 38 insertions, 38 deletions
diff --git a/src/plugins/analyzerbase/analyzerutils.cpp b/src/plugins/analyzerbase/analyzerutils.cpp index cb221f0458..65e6745799 100644 --- a/src/plugins/analyzerbase/analyzerutils.cpp +++ b/src/plugins/analyzerbase/analyzerutils.cpp @@ -31,13 +31,14 @@ #include "analyzerconstants.h" -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <texteditor/basetexteditor.h> #include <utils/qtcassert.h> #include <cplusplus/ExpressionUnderCursor.h> #include <cplusplus/TypeOfExpression.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <QTextCursor> diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp index 4257a5248c..2b4db4d846 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp @@ -49,7 +49,7 @@ #include <projectexplorer/target.h> #include <projectexplorer/headerpath.h> #include <extensionsystem/pluginmanager.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <coreplugin/icore.h> #include <coreplugin/icontext.h> #include <utils/qtcassert.h> diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp index d9918dd1ca..d2d718b1d4 100644 --- a/src/plugins/classview/classviewmanager.cpp +++ b/src/plugins/classview/classviewmanager.cpp @@ -37,7 +37,7 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/session.h> #include <texteditor/basetexteditor.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cpptoolsconstants.h> #include <coreplugin/icore.h> #include <coreplugin/progressmanager/progressmanager.h> diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp index 623ff78bd8..e312696faa 100644 --- a/src/plugins/classview/classviewparser.cpp +++ b/src/plugins/classview/classviewparser.cpp @@ -38,7 +38,7 @@ #include <cplusplus/Name.h> // other -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <cplusplus/Overview.h> #include <cplusplus/Icons.h> #include <projectexplorer/projectexplorer.h> diff --git a/src/plugins/classview/classviewparser.h b/src/plugins/classview/classviewparser.h index fbf12963e5..b8ab34dde8 100644 --- a/src/plugins/classview/classviewparser.h +++ b/src/plugins/classview/classviewparser.h @@ -35,7 +35,6 @@ #include "classviewparsertreeitem.h" #include <cplusplus/CPlusPlusForwardDeclarations.h> -#include <cpptools/ModelManagerInterface.h> #include <cplusplus/CppDocument.h> // might be changed to forward declaration - is not done to be less dependent diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 823f17f374..d59fbd26ea 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -51,7 +51,7 @@ #include <qtsupport/customexecutablerunconfiguration.h> #include <qtsupport/baseqtversion.h> #include <qtsupport/qtkitinformation.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <extensionsystem/pluginmanager.h> #include <utils/qtcassert.h> #include <utils/stringutils.h> diff --git a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp index 0e134c133a..f490b2554c 100644 --- a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp @@ -31,7 +31,7 @@ #include "cmakeproject.h" #include "cmakebuildconfiguration.h" -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <projectexplorer/target.h> #include <QProcess> diff --git a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h index 96dc647cc6..c6d7f3c24c 100644 --- a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h +++ b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h @@ -30,11 +30,12 @@ #ifndef CMAKEUICODEMODELSUPPORT_H #define CMAKEUICODEMODELSUPPORT_H -#include <cpptools/ModelManagerInterface.h> #include <cpptools/uicodecompletionsupport.h> #include <QDateTime> +namespace CppTools { class CppModelManagerInterface; } + namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp index ce4473f106..54238f45b2 100644 --- a/src/plugins/cppeditor/cppelementevaluator.cpp +++ b/src/plugins/cppeditor/cppelementevaluator.cpp @@ -30,7 +30,7 @@ #include "cppelementevaluator.h" #include <cpptools/cpptoolsreuse.h> -#include <cpptools/TypeHierarchyBuilder.h> +#include <cpptools/typehierarchybuilder.h> #include <cplusplus/ExpressionUnderCursor.h> #include <cplusplus/Icons.h> diff --git a/src/plugins/cpptools/abstracteditorsupport.cpp b/src/plugins/cpptools/abstracteditorsupport.cpp index b1a149c13b..6410473e34 100644 --- a/src/plugins/cpptools/abstracteditorsupport.cpp +++ b/src/plugins/cpptools/abstracteditorsupport.cpp @@ -30,8 +30,7 @@ #include "abstracteditorsupport.h" #include "cppfilesettingspage.h" -#include "ModelManagerInterface.h" - +#include "cppmodelmanagerinterface.h" #include <cplusplus/Overview.h> #include <QDebug> diff --git a/src/plugins/cpptools/builtinindexingsupport.h b/src/plugins/cpptools/builtinindexingsupport.h index 8bd3b2ad69..53b70c40db 100644 --- a/src/plugins/cpptools/builtinindexingsupport.h +++ b/src/plugins/cpptools/builtinindexingsupport.h @@ -31,7 +31,7 @@ #define BUILTININDEXINGSUPPORT_H #include "cppindexingsupport.h" -#include "ModelManagerInterface.h" +#include "cppmodelmanagerinterface.h" #include <QFutureSynchronizer> diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index 09e66d02ae..4d8283c145 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -30,7 +30,7 @@ #include "cppfindreferences.h" #include "cpptoolsconstants.h" -#include "ModelManagerInterface.h" +#include "cppmodelmanagerinterface.h" #include <coreplugin/icore.h> #include <coreplugin/progressmanager/futureprogress.h> diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index 44b4e34773..768129286d 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -32,7 +32,7 @@ #include "cpptools_global.h" #include "cpptoolsconstants.h" -#include "ModelManagerInterface.h" +#include "cppmodelmanagerinterface.h" #include <projectexplorer/project.h> #include <texteditor/basetexteditor.h> diff --git a/src/plugins/cpptools/ModelManagerInterface.cpp b/src/plugins/cpptools/cppmodelmanagerinterface.cpp index 9799277180..da9cc55605 100644 --- a/src/plugins/cpptools/ModelManagerInterface.cpp +++ b/src/plugins/cpptools/cppmodelmanagerinterface.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "ModelManagerInterface.h" +#include "cppmodelmanagerinterface.h" #include <cplusplus/pp-engine.h> diff --git a/src/plugins/cpptools/ModelManagerInterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h index aa25ab5d06..aa25ab5d06 100644 --- a/src/plugins/cpptools/ModelManagerInterface.h +++ b/src/plugins/cpptools/cppmodelmanagerinterface.h diff --git a/src/plugins/cpptools/cpprefactoringchanges.h b/src/plugins/cpptools/cpprefactoringchanges.h index d01637a607..833553a19d 100644 --- a/src/plugins/cpptools/cpprefactoringchanges.h +++ b/src/plugins/cpptools/cpprefactoringchanges.h @@ -31,7 +31,7 @@ #define CPPREFACTORINGCHANGES_H #include "cpptools_global.h" -#include "ModelManagerInterface.h" +#include "cppmodelmanagerinterface.h" #include <texteditor/refactoringchanges.h> diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro index ff8999f7fd..f77e869d68 100644 --- a/src/plugins/cpptools/cpptools.pro +++ b/src/plugins/cpptools/cpptools.pro @@ -6,6 +6,7 @@ HEADERS += completionsettingspage.h \ cppcurrentdocumentfilter.h \ cppfunctionsfilter.h \ cppmodelmanager.h \ + cppmodelmanagerinterface.h \ cpplocatorfilter.h \ cpptools_global.h \ cpptoolsconstants.h \ @@ -39,8 +40,7 @@ HEADERS += completionsettingspage.h \ cpplocalsymbols.h \ cppsemanticinfo.h \ cppcompletionassistprovider.h \ - ModelManagerInterface.h \ - TypeHierarchyBuilder.h \ + typehierarchybuilder.h \ cppindexingsupport.h \ builtinindexingsupport.h \ cpppointerdeclarationformatter.h \ @@ -51,6 +51,7 @@ SOURCES += completionsettingspage.cpp \ cppcurrentdocumentfilter.cpp \ cppfunctionsfilter.cpp \ cppmodelmanager.cpp \ + cppmodelmanagerinterface.cpp \ cpplocatorfilter.cpp \ cpptoolseditorsupport.cpp \ cpptoolsplugin.cpp \ @@ -82,8 +83,7 @@ SOURCES += completionsettingspage.cpp \ cpplocalsymbols.cpp \ cppsemanticinfo.cpp \ cppcompletionassistprovider.cpp \ - ModelManagerInterface.cpp \ - TypeHierarchyBuilder.cpp \ + typehierarchybuilder.cpp \ cppindexingsupport.cpp \ builtinindexingsupport.cpp \ cpppointerdeclarationformatter.cpp \ diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs index 6d3f78642e..a6a98539b8 100644 --- a/src/plugins/cpptools/cpptools.qbs +++ b/src/plugins/cpptools/cpptools.qbs @@ -17,10 +17,6 @@ QtcPlugin { Depends { name: "LanguageUtils" } files: [ - "ModelManagerInterface.cpp", - "ModelManagerInterface.h", - "TypeHierarchyBuilder.cpp", - "TypeHierarchyBuilder.h", "abstracteditorsupport.cpp", "abstracteditorsupport.h", "commentssettings.cpp", @@ -72,6 +68,8 @@ QtcPlugin { "cpplocatorfilter.h", "cppmodelmanager.cpp", "cppmodelmanager.h", + "cppmodelmanagerinterface.cpp", + "cppmodelmanagerinterface.h", "cppqtstyleindenter.cpp", "cppqtstyleindenter.h", "cpppointerdeclarationformatter.cpp", @@ -102,6 +100,8 @@ QtcPlugin { "symbolfinder.h", "symbolsfindfilter.cpp", "symbolsfindfilter.h", + "typehierarchybuilder.cpp", + "typehierarchybuilder.h", "uicodecompletionsupport.cpp", "uicodecompletionsupport.h", "builtinindexingsupport.cpp", diff --git a/src/plugins/cpptools/TypeHierarchyBuilder.cpp b/src/plugins/cpptools/typehierarchybuilder.cpp index 8fbce81509..29e8ac5c7e 100644 --- a/src/plugins/cpptools/TypeHierarchyBuilder.cpp +++ b/src/plugins/cpptools/typehierarchybuilder.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "TypeHierarchyBuilder.h" +#include "typehierarchybuilder.h" #include <cplusplus/DependencyTable.h> #include <cplusplus/FindUsages.h> diff --git a/src/plugins/cpptools/TypeHierarchyBuilder.h b/src/plugins/cpptools/typehierarchybuilder.h index ccbd8ac830..64a6501a9d 100644 --- a/src/plugins/cpptools/TypeHierarchyBuilder.h +++ b/src/plugins/cpptools/typehierarchybuilder.h @@ -31,7 +31,7 @@ #define CPPTOOLS_TYPEHIERARCHYBUILDER_H #include "cpptools_global.h" -#include "ModelManagerInterface.h" +#include "cppmodelmanagerinterface.h" #include <cplusplus/Overview.h> diff --git a/src/plugins/cpptools/uicodecompletionsupport.h b/src/plugins/cpptools/uicodecompletionsupport.h index 219e13bc94..6bfd86430f 100644 --- a/src/plugins/cpptools/uicodecompletionsupport.h +++ b/src/plugins/cpptools/uicodecompletionsupport.h @@ -33,7 +33,7 @@ #include "cpptools_global.h" #include "abstracteditorsupport.h" -#include "ModelManagerInterface.h" +#include "cppmodelmanagerinterface.h" #include <QDateTime> #include <QProcess> diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 2f4f2b35c4..78bcff49d2 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -65,7 +65,7 @@ #include <utils/hostosinfo.h> #include <cplusplus/findcdbbreakpoint.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <QDir> #include <QMessageBox> diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index cb8a253519..88e4fd0328 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -77,7 +77,7 @@ #include <coreplugin/modemanager.h> #include <cppeditor/cppeditorconstants.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <extensionsystem/invoker.h> diff --git a/src/plugins/debugger/sourceutils.cpp b/src/plugins/debugger/sourceutils.cpp index 85d8db624a..c495151e41 100644 --- a/src/plugins/debugger/sourceutils.cpp +++ b/src/plugins/debugger/sourceutils.cpp @@ -36,7 +36,7 @@ #include <cpptools/abstracteditorsupport.h> #include <cpptools/cppprojectfile.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <cplusplus/ExpressionUnderCursor.h> #include <cplusplus/Overview.h> diff --git a/src/plugins/designer/codemodelhelpers.cpp b/src/plugins/designer/codemodelhelpers.cpp index 2a4225033f..ffb136080b 100644 --- a/src/plugins/designer/codemodelhelpers.cpp +++ b/src/plugins/designer/codemodelhelpers.cpp @@ -29,7 +29,7 @@ #include "codemodelhelpers.h" -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/project.h> diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index d08c6686dc..ea3b11a373 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -38,7 +38,7 @@ #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> #include <cpptools/cpptoolsconstants.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <extensionsystem/pluginmanager.h> #include <projectexplorer/abi.h> #include <projectexplorer/buildsteplist.h> diff --git a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp index 3c1337e229..5bbe9e61bd 100644 --- a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp +++ b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp @@ -32,7 +32,7 @@ #include <qmljs/qmljsinterpreter.h> #include <cplusplus/Overview.h> #include <cplusplus/TypeOfExpression.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <QDebug> diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index 1dd9ce9c85..18de28ba27 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -37,7 +37,7 @@ #include <coreplugin/icore.h> #include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/messagemanager.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <qmljs/qmljsbind.h> #include <texteditor/basetexteditor.h> #include <projectexplorer/buildconfiguration.h> diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index d504611e68..ee10f0d4e3 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -51,7 +51,7 @@ #include <qtsupport/profilereader.h> #include <qtsupport/qtkitinformation.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <utils/hostosinfo.h> #include <utils/stringutils.h> diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 948ad8937a..ef4e079a26 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -41,7 +41,7 @@ #include <coreplugin/icontext.h> #include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/documentmanager.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <qmljstools/qmljsmodelmanager.h> #include <projectexplorer/buildtargetinfo.h> #include <projectexplorer/deploymentdata.h> diff --git a/src/plugins/todo/cpptodoitemsscanner.h b/src/plugins/todo/cpptodoitemsscanner.h index f1368593cf..8b74469805 100644 --- a/src/plugins/todo/cpptodoitemsscanner.h +++ b/src/plugins/todo/cpptodoitemsscanner.h @@ -33,7 +33,7 @@ #include "todoitemsscanner.h" -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> namespace Todo { namespace Internal { diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 4eda4e1ecf..34c390200c 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -39,7 +39,7 @@ #include "vcsplugin.h" #include <aggregation/aggregate.h> -#include <cpptools/ModelManagerInterface.h> +#include <cpptools/cppmodelmanagerinterface.h> #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> #include <utils/checkablemessagebox.h> |