diff options
Diffstat (limited to 'src/plugins/modeleditor')
-rw-r--r-- | src/plugins/modeleditor/componentviewcontroller.cpp | 17 | ||||
-rw-r--r-- | src/plugins/modeleditor/componentviewcontroller.h | 1 | ||||
-rw-r--r-- | src/plugins/modeleditor/pxnodeutilities.cpp | 18 | ||||
-rw-r--r-- | src/plugins/modeleditor/pxnodeutilities.h | 1 |
4 files changed, 20 insertions, 17 deletions
diff --git a/src/plugins/modeleditor/componentviewcontroller.cpp b/src/plugins/modeleditor/componentviewcontroller.cpp index 828b261656..82c5290a1e 100644 --- a/src/plugins/modeleditor/componentviewcontroller.cpp +++ b/src/plugins/modeleditor/componentviewcontroller.cpp @@ -344,7 +344,7 @@ void ComponentViewController::doCreateComponentModel(const QString &filePath, qm case CppTools::ProjectFile::CXXHeader: case CppTools::ProjectFile::ObjCHeader: case CppTools::ProjectFile::ObjCXXHeader: - isSource = scanHeaders && !isProxyHeader(file); + isSource = scanHeaders && !d->pxnodeUtilities->isProxyHeader(file); break; case CppTools::ProjectFile::Unclassified: case CppTools::ProjectFile::Unsupported: @@ -374,20 +374,5 @@ void ComponentViewController::doCreateComponentModel(const QString &filePath, qm } } -bool ComponentViewController::isProxyHeader(const QString &file) const -{ - CppTools::CppModelManager *cppModelManager = CppTools::CppModelManager::instance(); - CPlusPlus::Snapshot snapshot = cppModelManager->snapshot(); - - CPlusPlus::Document::Ptr document = snapshot.document(file); - if (document) { - QList<CPlusPlus::Document::Include> includes = document->resolvedIncludes(); - if (includes.count() != 1) - return false; - return QFileInfo(includes.at(0).resolvedFileName()).fileName() == QFileInfo(file).fileName(); - } - return false; -} - } // namespace Internal } // namespace ModelEditor diff --git a/src/plugins/modeleditor/componentviewcontroller.h b/src/plugins/modeleditor/componentviewcontroller.h index f7437d3c10..7214c90723 100644 --- a/src/plugins/modeleditor/componentviewcontroller.h +++ b/src/plugins/modeleditor/componentviewcontroller.h @@ -64,7 +64,6 @@ public: private: void doCreateComponentModel(const QString &filePath, qmt::MDiagram *diagram, const QString &anchorFolder, bool scanHeaders); - bool isProxyHeader(const QString &file) const; ComponentViewControllerPrivate *d; }; diff --git a/src/plugins/modeleditor/pxnodeutilities.cpp b/src/plugins/modeleditor/pxnodeutilities.cpp index cfd071aac7..ffea4ad61f 100644 --- a/src/plugins/modeleditor/pxnodeutilities.cpp +++ b/src/plugins/modeleditor/pxnodeutilities.cpp @@ -30,6 +30,9 @@ #include "qmt/tasks/diagramscenecontroller.h" #include "qmt/model_controller/modelcontroller.h" +#include <cpptools/cppmodelmanager.h> +#include <cplusplus/CppDocument.h> + #include <projectexplorer/projectnodes.h> #include <utils/qtcassert.h> @@ -234,5 +237,20 @@ qmt::MObject *PxNodeUtilities::findSameObject(const QStringList &relativeElement return nullptr; } +bool PxNodeUtilities::isProxyHeader(const QString &file) const +{ + CppTools::CppModelManager *cppModelManager = CppTools::CppModelManager::instance(); + CPlusPlus::Snapshot snapshot = cppModelManager->snapshot(); + + CPlusPlus::Document::Ptr document = snapshot.document(file); + if (document) { + QList<CPlusPlus::Document::Include> includes = document->resolvedIncludes(); + if (includes.count() != 1) + return false; + return QFileInfo(includes.at(0).resolvedFileName()).fileName() == QFileInfo(file).fileName(); + } + return false; +} + } // namespace Internal } // namespace ModelEditor diff --git a/src/plugins/modeleditor/pxnodeutilities.h b/src/plugins/modeleditor/pxnodeutilities.h index d79079cfaf..7dc04b8a0d 100644 --- a/src/plugins/modeleditor/pxnodeutilities.h +++ b/src/plugins/modeleditor/pxnodeutilities.h @@ -56,6 +56,7 @@ public: const QStringList &relativeElements); qmt::MObject *findSameObject(const QStringList &relativeElements, const qmt::MObject *object); + bool isProxyHeader(const QString &file) const; private: PxNodeUtilitiesPrivate *d; |