From cc1ed420c21f192be159a42878645e395db140bb Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 11 Jan 2016 11:54:27 +0100 Subject: [PATCH] Clang: Break dependency to visible Core::EditorManager::visibleEditors() Change-Id: I4157cd190a8c00b07c0e2f3eeeab18409f2405b7 Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/cpptoolsbridge.cpp | 7 +++++++ src/plugins/cpptools/cpptoolsbridge.h | 5 +++++ src/plugins/cpptools/cpptoolsbridgeinterface.h | 6 ++++++ .../cpptools/cpptoolsbridgeqtcreatorimplementation.cpp | 7 +++++++ .../cpptools/cpptoolsbridgeqtcreatorimplementation.h | 1 + 5 files changed, 26 insertions(+) diff --git a/src/plugins/cpptools/cpptoolsbridge.cpp b/src/plugins/cpptools/cpptoolsbridge.cpp index f6c6b3a9cd2..aacb7153ab5 100644 --- a/src/plugins/cpptools/cpptoolsbridge.cpp +++ b/src/plugins/cpptools/cpptoolsbridge.cpp @@ -27,6 +27,8 @@ #include "cpptoolsbridgeinterface.h" +#include + namespace CppTools { std::unique_ptr CppToolsBridge::m_interface; @@ -56,4 +58,9 @@ void CppToolsBridge::finishedRefreshingSourceFiles(const QSet &filePath m_interface->finishedRefreshingSourceFiles(filePaths); } +QList CppToolsBridge::visibleEditors() +{ + return m_interface->visibleEditors(); +} + } // namespace CppTools diff --git a/src/plugins/cpptools/cpptoolsbridge.h b/src/plugins/cpptools/cpptoolsbridge.h index 9be602b1d96..ba351778502 100644 --- a/src/plugins/cpptools/cpptoolsbridge.h +++ b/src/plugins/cpptools/cpptoolsbridge.h @@ -32,6 +32,10 @@ #include +namespace Core { +class IEditor; +} + namespace CppTools { class CppEditorDocumentHandle; class BaseEditorDocumentProcessor; @@ -47,6 +51,7 @@ public: static QString projectPartIdForFile(const QString &filePath); static BaseEditorDocumentProcessor *baseEditorDocumentProcessor(const QString &filePath); static void finishedRefreshingSourceFiles(const QSet &filePaths); + static QList visibleEditors(); private: static std::unique_ptr m_interface; diff --git a/src/plugins/cpptools/cpptoolsbridgeinterface.h b/src/plugins/cpptools/cpptoolsbridgeinterface.h index b990271ea29..ef9ad386967 100644 --- a/src/plugins/cpptools/cpptoolsbridgeinterface.h +++ b/src/plugins/cpptools/cpptoolsbridgeinterface.h @@ -32,6 +32,10 @@ QT_BEGIN_NAMESPACE class QString; QT_END_NAMESPACE +namespace Core { +class IEditor; +} + namespace CppTools { class CppEditorDocumentHandle; class BaseEditorDocumentProcessor; @@ -44,6 +48,8 @@ public: virtual QString projectPartIdForFile(const QString &filePath) const = 0; virtual BaseEditorDocumentProcessor *baseEditorDocumentProcessor(const QString &filePath) const = 0; virtual void finishedRefreshingSourceFiles(const QSet &filePaths) const = 0; + virtual QList visibleEditors() const = 0; + }; } // namespace CppTools diff --git a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp b/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp index 42ca871ded6..7b9eb69ca13 100644 --- a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp +++ b/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp @@ -30,6 +30,8 @@ #include "projectpart.h" #include "editordocumenthandle.h" +#include + namespace CppTools { namespace Internal { @@ -86,6 +88,11 @@ void CppToolsBridgeQtCreatorImplementation::finishedRefreshingSourceFiles( CppModelManager::instance()->finishedRefreshingSourceFiles(filePaths); } +QList CppToolsBridgeQtCreatorImplementation::visibleEditors() const +{ + return Core::EditorManager::visibleEditors(); +} + } // namespace Internal } // namespace CppTools diff --git a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.h b/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.h index 3279eb6e863..88a657dfa57 100644 --- a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.h +++ b/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.h @@ -39,6 +39,7 @@ public: QString projectPartIdForFile(const QString &filePath) const override; BaseEditorDocumentProcessor *baseEditorDocumentProcessor(const QString &filePath) const override; void finishedRefreshingSourceFiles(const QSet &filePaths) const override; + QList visibleEditors() const override; }; } // namespace Internal