summaryrefslogtreecommitdiff
path: root/src/plugins/subversion
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2016-11-26 21:52:49 +0200
committerOrgad Shaneh <orgads@gmail.com>2016-11-28 09:38:12 +0000
commit5832f52ceefb9ee19842af4513ae00ee7d311e31 (patch)
tree0ed1a117b154151354b2d4b7036dde81ffe7b0ac /src/plugins/subversion
parent565aed03a24e315847421272d582b7fd3b7ff04d (diff)
downloadqt-creator-5832f52ceefb9ee19842af4513ae00ee7d311e31.tar.gz
VCS: Replace describe slots with lambdas
Change-Id: I05ca25aad8be43fdfa15d3fb5eaaa9bf753ee79f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/subversion')
-rw-r--r--src/plugins/subversion/subversionplugin.cpp6
-rw-r--r--src/plugins/subversion/subversionplugin.h6
2 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 2abc041d12..bdc7654d9e 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -224,11 +224,13 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters,
[]() { return new SubversionSubmitEditor(&submitParameters); }));
- static const char *describeSlot = SLOT(describe(QString,QString));
+ const auto describeFunc = [this](const QString &source, const QString &id) {
+ describe(source, id);
+ };
const int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]);
const auto widgetCreator = []() { return new SubversionEditorWidget; };
for (int i = 0; i < editorCount; i++)
- addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, this, describeSlot));
+ addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc));
const QString prefix = QLatin1String("svn");
m_commandLocator = new CommandLocator("Subversion", prefix, prefix);
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index 3c614eeb7c..f9312cbcd4 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -94,13 +94,13 @@ public:
SubversionResponse runSvn(const QString &workingDir,
const QStringList &arguments, int timeOutS,
unsigned flags, QTextCodec *outputCodec = 0) const;
+ void describe(const QString &source, const QString &changeNr);
+ void vcsAnnotate(const QString &workingDir, const QString &file,
+ const QString &revision = QString(), int lineNumber = -1);
public slots:
void annotateVersion(const QString &workingDirectory, const QString &file,
const QString &revision, int lineNumber);
- void describe(const QString &source, const QString &changeNr);
- void vcsAnnotate(const QString &workingDir, const QString &file,
- const QString &revision = QString(), int lineNumber = -1);
#ifdef WITH_TESTS
private slots: