From 2ca7aff0736564ee2a49616f26002be919ecdfb4 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 25 May 2023 09:48:03 +0200
Subject: [PATCH] Docker: Remove DockerPlugin::dockerApi()

Access is nowadays via DockerApi::instance()

Change-Id: Idc1530358771c3a008182661c263c30b68fe84be
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/docker/dockerplugin.cpp | 10 ----------
 src/plugins/docker/dockerplugin.h   |  6 ------
 2 files changed, 16 deletions(-)

diff --git a/src/plugins/docker/dockerplugin.cpp b/src/plugins/docker/dockerplugin.cpp
index cd2dd623bc8..7e47abd7b1f 100644
--- a/src/plugins/docker/dockerplugin.cpp
+++ b/src/plugins/docker/dockerplugin.cpp
@@ -31,24 +31,14 @@ public:
     DockerApi m_dockerApi{&m_settings};
 };
 
-static DockerPlugin *s_instance = nullptr;
-
 DockerPlugin::DockerPlugin()
 {
-    s_instance = this;
     FSEngine::registerDeviceScheme(Constants::DOCKER_DEVICE_SCHEME);
 }
 
-DockerApi *DockerPlugin::dockerApi()
-{
-    QTC_ASSERT(s_instance, return nullptr);
-    return &s_instance->d->m_dockerApi;
-}
-
 DockerPlugin::~DockerPlugin()
 {
     FSEngine::unregisterDeviceScheme(Constants::DOCKER_DEVICE_SCHEME);
-    s_instance = nullptr;
     delete d;
 }
 
diff --git a/src/plugins/docker/dockerplugin.h b/src/plugins/docker/dockerplugin.h
index c4ee04ac5af..267244709d8 100644
--- a/src/plugins/docker/dockerplugin.h
+++ b/src/plugins/docker/dockerplugin.h
@@ -3,12 +3,8 @@
 
 #pragma once
 
-#include "dockerapi.h"
-
 #include <extensionsystem/iplugin.h>
 
-#include <optional>
-
 namespace Docker::Internal {
 
 class DockerPlugin final : public ExtensionSystem::IPlugin
@@ -19,8 +15,6 @@ class DockerPlugin final : public ExtensionSystem::IPlugin
 public:
     DockerPlugin();
 
-    static DockerApi *dockerApi();
-
 private:
     ~DockerPlugin() final;