diff options
| -rw-r--r-- | src/plugins/cvs/cvscontrol.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/cvs/cvsplugin.h | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp index 03bdb43b771..93569700f93 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 a43b4f0f444..4c87edaf792 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 0329eecca9e..fbd1ab1a91b 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); |