From 814748dbda3c056458d5e6bd93765dc48e51b0ea Mon Sep 17 00:00:00 2001 From: Nikita Baryshnikov Date: Thu, 13 Jun 2013 14:46:17 +0300 Subject: [PATCH] VcsBase - fix QSignalMapper Force QSignalMapper to work. Change-Id: Ic93a73c3e54ebfe5296cdd537cdc2aeff5c4b4df Reviewed-by: Tobias Hunger --- src/plugins/vcsbase/vcsbaseclient.cpp | 7 +++---- src/plugins/vcsbase/vcsbaseclient.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index bf4b8ce6e13..dfa3acd7d30 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -93,7 +93,7 @@ public: void saveSettings(); void bindCommandToEditor(Command *cmd, VcsBaseEditorWidget *editor); - void commandFinishedGotoLine(QObject *editorObject); + void commandFinishedGotoLine(QWidget *editorObject); VcsBaseClientSettings *m_clientSettings; QSignalMapper *m_cmdFinishedMapper; @@ -146,7 +146,7 @@ void VcsBaseClientPrivate::bindCommandToEditor(Command *cmd, VcsBaseEditorWidget m_cmdFinishedMapper->setMapping(cmd, editor); } -void VcsBaseClientPrivate::commandFinishedGotoLine(QObject *editorObject) +void VcsBaseClientPrivate::commandFinishedGotoLine(QWidget *editorObject) { VcsBase::VcsBaseEditorWidget *editor = qobject_cast(editorObject); Command *cmd = qobject_cast(m_cmdFinishedMapper->mapping(editor)); @@ -172,7 +172,7 @@ VcsBaseClient::VcsBaseClient(VcsBaseClientSettings *settings) : { qRegisterMetaType(); connect(Core::ICore::instance(), SIGNAL(saveSettingsRequested()), this, SLOT(saveSettings())); - connect(d->m_cmdFinishedMapper, SIGNAL(mapped(QObject*)), this, SLOT(commandFinishedGotoLine(QObject*))); + connect(d->m_cmdFinishedMapper, SIGNAL(mapped(QWidget*)), this, SLOT(commandFinishedGotoLine(QWidget*))); } VcsBaseClient::~VcsBaseClient() @@ -327,7 +327,6 @@ void VcsBaseClient::annotate(const QString &workingDir, const QString &file, int lineNumber /* = -1 */, const QStringList &extraOptions) { - Q_UNUSED(lineNumber) const QString vcsCmdString = vcsCommandString(AnnotateCommand); QStringList args; args << vcsCmdString << revisionSpec(revision) << extraOptions << file; diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h index 114fcd8e055..cdd02c6362e 100644 --- a/src/plugins/vcsbase/vcsbaseclient.h +++ b/src/plugins/vcsbase/vcsbaseclient.h @@ -195,7 +195,7 @@ private: Q_PRIVATE_SLOT(d, void statusParser(QByteArray)) Q_PRIVATE_SLOT(d, void annotateRevision(QString, QString, int)) Q_PRIVATE_SLOT(d, void saveSettings()) - Q_PRIVATE_SLOT(d, void commandFinishedGotoLine(QObject *)) + Q_PRIVATE_SLOT(d, void commandFinishedGotoLine(QWidget *)) }; } //namespace VcsBase