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

Cvs: Drop direct access to plugin singleton data

Browse Source 
Not needed anymore.

Change-Id: Icb00cddf01ebfe7054cb85efc76f46578e3f1a1e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2020-01-24 13:51:01 +01:00
parent 4f8f156aa1
commit 68f90d1c67
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cvs/cvscontrol.cpp
View File

@@ -143,7 +143,7 @@ Core::ShellCommand *CvsControl::createInitialCheckoutCommand(const QString &url,
{ {
QTC_ASSERT(localName == url, return nullptr); QTC_ASSERT(localName == url, return nullptr);
const CvsSettings settings = CvsPluginPrivate::instance()->client()->settings(); const CvsSettings settings = m_plugin->client()->settings();
QStringList args; QStringList args;
args << QLatin1String("checkout") << url << extraArgs; args << QLatin1String("checkout") << url << extraArgs;

6
src/plugins/cvs/cvsplugin.cpp
View File

@@ -1174,12 +1174,6 @@ IEditor *CvsPluginPrivate::showOutputInEditor(const QString& title, const QStrin
return editor; return editor;
} }
CvsPluginPrivate *CvsPluginPrivate::instance()
{
QTC_ASSERT(dd, return dd);
return dd;
}
bool CvsPluginPrivate::vcsAdd(const QString &workingDir, const QString &rawFileName) bool CvsPluginPrivate::vcsAdd(const QString &workingDir, const QString &rawFileName)
{ {
QStringList args; QStringList args;

2
src/plugins/cvs/cvsplugin.h
View File

@@ -82,8 +82,6 @@ public:
// cvs 'edit' is used to implement 'open' (cvsnt). // cvs 'edit' is used to implement 'open' (cvsnt).
bool edit(const QString &topLevel, const QStringList &files); bool edit(const QString &topLevel, const QStringList &files);
static CvsPluginPrivate *instance();
void vcsAnnotate(const QString &workingDirectory, const QString &file, void vcsAnnotate(const QString &workingDirectory, const QString &file,
const QString &revision, int lineNumber); const QString &revision, int lineNumber);