From 212f373cae37dbec39d711e7f0417ab9c4589123 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 8 Oct 2024 09:22:56 +0200 Subject: [PATCH] Core: Move CredentialQuery from Axivion into Core plugin Change-Id: I9febc0d5f8f141b77435fc0877522791d41aaadd Reviewed-by: hjk Reviewed-by: Marcus Tillmanns --- src/plugins/axivion/CMakeLists.txt | 3 +-- src/plugins/axivion/axivion.qbs | 3 --- src/plugins/axivion/axivionplugin.cpp | 2 +- src/plugins/coreplugin/CMakeLists.txt | 4 +++- src/plugins/coreplugin/coreplugin.qbs | 3 +++ .../{axivion => coreplugin}/credentialquery.cpp | 4 ++-- src/plugins/{axivion => coreplugin}/credentialquery.h | 10 ++++++---- 7 files changed, 16 insertions(+), 13 deletions(-) rename src/plugins/{axivion => coreplugin}/credentialquery.cpp (96%) rename src/plugins/{axivion => coreplugin}/credentialquery.h (86%) diff --git a/src/plugins/axivion/CMakeLists.txt b/src/plugins/axivion/CMakeLists.txt index a08aa434284..e427a425c58 100644 --- a/src/plugins/axivion/CMakeLists.txt +++ b/src/plugins/axivion/CMakeLists.txt @@ -1,14 +1,13 @@ add_qtc_plugin(Axivion PLUGIN_DEPENDS Core Debugger ProjectExplorer TextEditor - DEPENDS Qt::Network Qt::Widgets ExtensionSystem Utils qtkeychain + DEPENDS Qt::Network Qt::Widgets ExtensionSystem Utils SOURCES axivion.qrc axivionperspective.cpp axivionperspective.h axivionplugin.cpp axivionplugin.h axivionsettings.cpp axivionsettings.h axiviontr.h - credentialquery.h credentialquery.cpp dashboard/dto.cpp dashboard/dto.h dashboard/concat.cpp dashboard/concat.h dashboard/error.h dashboard/error.cpp diff --git a/src/plugins/axivion/axivion.qbs b/src/plugins/axivion/axivion.qbs index 671b292d9c5..f61fa928407 100644 --- a/src/plugins/axivion/axivion.qbs +++ b/src/plugins/axivion/axivion.qbs @@ -9,7 +9,6 @@ QtcPlugin { Depends { name: "ProjectExplorer" } Depends { name: "TextEditor" } Depends { name: "Utils" } - Depends { name: "qtkeychain" } Depends { name: "Qt.widgets" } Depends { name: "Qt.network" } @@ -22,8 +21,6 @@ QtcPlugin { "axivionsettings.cpp", "axivionsettings.h", "axiviontr.h", - "credentialquery.cpp", - "credentialquery.h", "dynamiclistmodel.cpp", "dynamiclistmodel.h", "issueheaderview.cpp", diff --git a/src/plugins/axivion/axivionplugin.cpp b/src/plugins/axivion/axivionplugin.cpp index 79fe71c770f..6ec2eca29f0 100644 --- a/src/plugins/axivion/axivionplugin.cpp +++ b/src/plugins/axivion/axivionplugin.cpp @@ -6,10 +6,10 @@ #include "axivionperspective.h" #include "axivionsettings.h" #include "axiviontr.h" -#include "credentialquery.h" #include "dashboard/dto.h" #include "dashboard/error.h" +#include #include #include #include diff --git a/src/plugins/coreplugin/CMakeLists.txt b/src/plugins/coreplugin/CMakeLists.txt index eddbd316f37..5db7fb3362e 100644 --- a/src/plugins/coreplugin/CMakeLists.txt +++ b/src/plugins/coreplugin/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(Core - DEPENDS Qt::PrintSupport Qt::Qml Qt::Sql Qt::Gui Qt::GuiPrivate TerminalLib + DEPENDS Qt::PrintSupport Qt::Qml Qt::Sql Qt::Gui Qt::GuiPrivate TerminalLib qtkeychain PUBLIC_DEPENDS Aggregation ExtensionSystem Utils SOURCES actionmanager/actioncontainer.cpp @@ -29,6 +29,8 @@ add_qtc_plugin(Core coreplugin.cpp coreplugin.h coreplugintr.h + credentialquery.cpp + credentialquery.h designmode.cpp designmode.h dialogs/addtovcsdialog.cpp diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 41edaff0de7..96316a9c9df 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -16,6 +16,7 @@ QtcPlugin { Depends { name: "Utils" } Depends { name: "Aggregation" } Depends { name: "TerminalLib" } + Depends { name: "qtkeychain" } cpp.dynamicLibraries: { if (qbs.targetOS.contains("windows")) @@ -43,6 +44,8 @@ QtcPlugin { "coreplugin.cpp", "coreplugin.h", "coreplugintr.h", + "credentialquery.cpp", + "credentialquery.h", "designmode.cpp", "designmode.h", "diffservice.cpp", diff --git a/src/plugins/axivion/credentialquery.cpp b/src/plugins/coreplugin/credentialquery.cpp similarity index 96% rename from src/plugins/axivion/credentialquery.cpp rename to src/plugins/coreplugin/credentialquery.cpp index f183c083736..92c1ddfa359 100644 --- a/src/plugins/axivion/credentialquery.cpp +++ b/src/plugins/coreplugin/credentialquery.cpp @@ -8,7 +8,7 @@ using namespace QKeychain; using namespace Tasking; -namespace Axivion::Internal { +namespace Core { CredentialQueryTaskAdapter::~CredentialQueryTaskAdapter() = default; @@ -51,4 +51,4 @@ void CredentialQueryTaskAdapter::start() job->start(); } -} // Axivion::Internal +} // Core diff --git a/src/plugins/axivion/credentialquery.h b/src/plugins/coreplugin/credentialquery.h similarity index 86% rename from src/plugins/axivion/credentialquery.h rename to src/plugins/coreplugin/credentialquery.h index d8a958ab53e..22ec24921f5 100644 --- a/src/plugins/axivion/credentialquery.h +++ b/src/plugins/coreplugin/credentialquery.h @@ -3,13 +3,15 @@ #pragma once +#include "core_global.h" + #include -namespace Axivion::Internal { +namespace Core { enum class CredentialOperation { Get, Set, Delete }; -class CredentialQuery +class CORE_EXPORT CredentialQuery { public: void setOperation(CredentialOperation operation) { m_operation = operation; } @@ -30,7 +32,7 @@ private: friend class CredentialQueryTaskAdapter; }; -class CredentialQueryTaskAdapter final : public Tasking::TaskAdapter +class CORE_EXPORT CredentialQueryTaskAdapter final : public Tasking::TaskAdapter { private: ~CredentialQueryTaskAdapter(); @@ -40,4 +42,4 @@ private: using CredentialQueryTask = Tasking::CustomTask; -} // Axivion::Internal +} // Core