feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Axivion: Use ProjectExplorer namespace

Browse Source 
Change-Id: I78172705c07a14cd4f9adf92e240c3d99b894b2d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Jarek Kobus
2024-02-03 21:05:01 +01:00
parent d21c550daa
commit ffcef524a6
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/axivion/axivionplugin.cpp
View File

@@ -47,6 +47,7 @@
constexpr char AxivionTextMarkId[] = "AxivionTextMark"; constexpr char AxivionTextMarkId[] = "AxivionTextMark";
using namespace Core; using namespace Core;
using namespace ProjectExplorer;
using namespace Tasking; using namespace Tasking;
using namespace TextEditor; using namespace TextEditor;
using namespace Utils; using namespace Utils;
@@ -135,7 +136,7 @@ public:
void handleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors); void handleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
void onStartupProjectChanged(); void onStartupProjectChanged();
void fetchProjectInfo(const QString &projectName); void fetchProjectInfo(const QString &projectName);
void handleOpenedDocs(ProjectExplorer::Project *project); void handleOpenedDocs(Project *project);
void onDocumentOpened(IDocument *doc); void onDocumentOpened(IDocument *doc);
void onDocumentClosed(IDocument * doc); void onDocumentClosed(IDocument * doc);
void clearAllMarks(); void clearAllMarks();
@@ -237,7 +238,7 @@ void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSs
void AxivionPluginPrivate::onStartupProjectChanged() void AxivionPluginPrivate::onStartupProjectChanged()
{ {
ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::startupProject(); Project *project = ProjectManager::startupProject();
if (!project) { if (!project) {
clearAllMarks(); clearAllMarks();
m_currentProjectInfo = {}; m_currentProjectInfo = {};
@@ -513,12 +514,12 @@ void AxivionPluginPrivate::fetchProjectInfo(const QString &projectName)
m_currentProjectInfo = data; m_currentProjectInfo = data;
m_axivionOutputPane.updateDashboard(); m_axivionOutputPane.updateDashboard();
// handle already opened documents // handle already opened documents
if (auto buildSystem = ProjectExplorer::ProjectManager::startupBuildSystem(); if (auto buildSystem = ProjectManager::startupBuildSystem();
!buildSystem || !buildSystem->isParsing()) { !buildSystem || !buildSystem->isParsing()) {
handleOpenedDocs(nullptr); handleOpenedDocs(nullptr);
} else { } else {
connect(ProjectExplorer::ProjectManager::instance(), connect(ProjectManager::instance(),
&ProjectExplorer::ProjectManager::projectFinishedParsing, &ProjectManager::projectFinishedParsing,
this, &AxivionPluginPrivate::handleOpenedDocs); this, &AxivionPluginPrivate::handleOpenedDocs);
} }
}; };
@@ -558,16 +559,15 @@ void AxivionPluginPrivate::fetchIssueInfo(const QString &id)
m_issueInfoRunner.start(issueHtmlRecipe(QString("SV") + id, ruleHandler)); m_issueInfoRunner.start(issueHtmlRecipe(QString("SV") + id, ruleHandler));
} }
void AxivionPluginPrivate::handleOpenedDocs(ProjectExplorer::Project *project) void AxivionPluginPrivate::handleOpenedDocs(Project *project)
{ {
if (project && ProjectExplorer::ProjectManager::startupProject() != project) if (project && ProjectManager::startupProject() != project)
return; return;
const QList<IDocument *> openDocuments = DocumentModel::openedDocuments(); const QList<IDocument *> openDocuments = DocumentModel::openedDocuments();
for (IDocument *doc : openDocuments) for (IDocument *doc : openDocuments)
onDocumentOpened(doc); onDocumentOpened(doc);
if (project) if (project)
disconnect(ProjectExplorer::ProjectManager::instance(), disconnect(ProjectManager::instance(), &ProjectManager::projectFinishedParsing,
&ProjectExplorer::ProjectManager::projectFinishedParsing,
this, &AxivionPluginPrivate::handleOpenedDocs); this, &AxivionPluginPrivate::handleOpenedDocs);
} }
@@ -583,7 +583,7 @@ void AxivionPluginPrivate::onDocumentOpened(IDocument *doc)
if (!m_currentProjectInfo) // we do not have a project info (yet) if (!m_currentProjectInfo) // we do not have a project info (yet)
return; return;
ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::startupProject(); Project *project = ProjectManager::startupProject();
// TODO: Sometimes the isKnownFile() returns false after opening a session. // TODO: Sometimes the isKnownFile() returns false after opening a session.
// This happens randomly on linux. // This happens randomly on linux.
if (!doc || !project->isKnownFile(doc->filePath())) if (!doc || !project->isKnownFile(doc->filePath()))
@@ -656,7 +656,7 @@ void AxivionPluginPrivate::handleIssuesForFile(const IssuesList &issues)
if (issues.issues.isEmpty()) if (issues.issues.isEmpty())
return; return;
ProjectExplorer::Project *project = ProjectExplorer::ProjectManager::startupProject(); Project *project = ProjectManager::startupProject();
if (!project) if (!project)
return; return;
@@ -690,8 +690,7 @@ class AxivionPlugin final : public ExtensionSystem::IPlugin
AxivionProjectSettings::setupProjectPanel(); AxivionProjectSettings::setupProjectPanel();
connect(ProjectExplorer::ProjectManager::instance(), connect(ProjectManager::instance(), &ProjectManager::startupProjectChanged,
&ProjectExplorer::ProjectManager::startupProjectChanged,
dd, &AxivionPluginPrivate::onStartupProjectChanged); dd, &AxivionPluginPrivate::onStartupProjectChanged);
connect(EditorManager::instance(), &EditorManager::documentOpened, connect(EditorManager::instance(), &EditorManager::documentOpened,
dd, &AxivionPluginPrivate::onDocumentOpened); dd, &AxivionPluginPrivate::onDocumentOpened);