Cvs: Drop direct access to plugin singleton data

Not needed anymore.

Change-Id: Icb00cddf01ebfe7054cb85efc76f46578e3f1a1e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

3 files changed, 1 insertions, 9 deletions

diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp
index 03bdb43b77..93569700f9 100644
--- a/src/plugins/cvs/cvscontrol.cpp
+++ b/src/plugins/cvs/cvscontrol.cpp
@@ -143,7 +143,7 @@ Core::ShellCommand *CvsControl::createInitialCheckoutCommand(const QString &url,
 {
     QTC_ASSERT(localName == url, return nullptr);
 
-    const CvsSettings settings = CvsPluginPrivate::instance()->client()->settings();
+    const CvsSettings settings = m_plugin->client()->settings();
 
     QStringList args;
     args << QLatin1String("checkout") << url << extraArgs;
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index a43b4f0f44..4c87edaf79 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -1174,12 +1174,6 @@ IEditor *CvsPluginPrivate::showOutputInEditor(const QString& title, const QStrin
     return editor;
 }
 
-CvsPluginPrivate *CvsPluginPrivate::instance()
-{
-    QTC_ASSERT(dd, return dd);
-    return dd;
-}
-
 bool CvsPluginPrivate::vcsAdd(const QString &workingDir, const QString &rawFileName)
 {
     QStringList args;
diff --git a/src/plugins/cvs/cvsplugin.h b/src/plugins/cvs/cvsplugin.h
index 0329eecca9..fbd1ab1a91 100644
--- a/src/plugins/cvs/cvsplugin.h
+++ b/src/plugins/cvs/cvsplugin.h
@@ -82,8 +82,6 @@ public:
     // cvs 'edit' is used to implement 'open' (cvsnt).
     bool edit(const QString &topLevel, const QStringList &files);
 
-    static CvsPluginPrivate *instance();
-
     void vcsAnnotate(const QString &workingDirectory, const QString &file,
                      const QString &revision, int lineNumber);