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

VcsBase - fix QSignalMapper

Browse Source 
Force QSignalMapper to work.

Change-Id: Ic93a73c3e54ebfe5296cdd537cdc2aeff5c4b4df
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Nikita Baryshnikov
2013-06-13 14:46:17 +03:00
committed by Tobias Hunger
parent 1bb0466fb1
commit 814748dbda
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -93,7 +93,7 @@ public:
void saveSettings(); void saveSettings();
void bindCommandToEditor(Command *cmd, VcsBaseEditorWidget *editor); void bindCommandToEditor(Command *cmd, VcsBaseEditorWidget *editor);
void commandFinishedGotoLine(QObject *editorObject); void commandFinishedGotoLine(QWidget *editorObject);
VcsBaseClientSettings *m_clientSettings; VcsBaseClientSettings *m_clientSettings;
QSignalMapper *m_cmdFinishedMapper; QSignalMapper *m_cmdFinishedMapper;
@@ -146,7 +146,7 @@ void VcsBaseClientPrivate::bindCommandToEditor(Command *cmd, VcsBaseEditorWidget
m_cmdFinishedMapper->setMapping(cmd, editor); m_cmdFinishedMapper->setMapping(cmd, editor);
} }
void VcsBaseClientPrivate::commandFinishedGotoLine(QObject *editorObject) void VcsBaseClientPrivate::commandFinishedGotoLine(QWidget *editorObject)
{ {
VcsBase::VcsBaseEditorWidget *editor = qobject_cast<VcsBase::VcsBaseEditorWidget *>(editorObject); VcsBase::VcsBaseEditorWidget *editor = qobject_cast<VcsBase::VcsBaseEditorWidget *>(editorObject);
Command *cmd = qobject_cast<Command *>(m_cmdFinishedMapper->mapping(editor)); Command *cmd = qobject_cast<Command *>(m_cmdFinishedMapper->mapping(editor));
@@ -172,7 +172,7 @@ VcsBaseClient::VcsBaseClient(VcsBaseClientSettings *settings) :
{ {
qRegisterMetaType<QVariant>(); qRegisterMetaType<QVariant>();
connect(Core::ICore::instance(), SIGNAL(saveSettingsRequested()), this, SLOT(saveSettings())); 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() VcsBaseClient::~VcsBaseClient()
@@ -327,7 +327,6 @@ void VcsBaseClient::annotate(const QString &workingDir, const QString &file,
int lineNumber /* = -1 */, int lineNumber /* = -1 */,
const QStringList &extraOptions) const QStringList &extraOptions)
{ {
Q_UNUSED(lineNumber)
const QString vcsCmdString = vcsCommandString(AnnotateCommand); const QString vcsCmdString = vcsCommandString(AnnotateCommand);
QStringList args; QStringList args;
args << vcsCmdString << revisionSpec(revision) << extraOptions << file; args << vcsCmdString << revisionSpec(revision) << extraOptions << file;

2
src/plugins/vcsbase/vcsbaseclient.h
View File

@@ -195,7 +195,7 @@ private:
Q_PRIVATE_SLOT(d, void statusParser(QByteArray)) Q_PRIVATE_SLOT(d, void statusParser(QByteArray))
Q_PRIVATE_SLOT(d, void annotateRevision(QString, QString, int)) Q_PRIVATE_SLOT(d, void annotateRevision(QString, QString, int))
Q_PRIVATE_SLOT(d, void saveSettings()) Q_PRIVATE_SLOT(d, void saveSettings())
Q_PRIVATE_SLOT(d, void commandFinishedGotoLine(QObject *)) Q_PRIVATE_SLOT(d, void commandFinishedGotoLine(QWidget *))
}; };
} //namespace VcsBase } //namespace VcsBase