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

VcsBase: Adjusting incompatible signal/slot

Browse Source 
This is a fix for

QObject::connect: No such slot
VcsBase::VcsBaseOutputWindow::appendCommand(QString,QString,QStringList)
in command.cpp:323

Change-Id: I6c68456081c323ec1d4bf67f13982c71c25ade3a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Alessandro Portale
2014-07-17 00:20:36 +02:00
committed by Orgad Shaneh
parent 16ac3928a0
commit c4a2e0a8fa
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/vcsbase/command.cpp
View File

@@ -319,8 +319,8 @@ public:
connect(this, SIGNAL(append(QString)), outputWindow, SLOT(append(QString))); connect(this, SIGNAL(append(QString)), outputWindow, SLOT(append(QString)));
connect(this, SIGNAL(appendSilently(QString)), outputWindow, SLOT(appendSilently(QString))); connect(this, SIGNAL(appendSilently(QString)), outputWindow, SLOT(appendSilently(QString)));
connect(this, SIGNAL(appendError(QString)), outputWindow, SLOT(appendError(QString))); connect(this, SIGNAL(appendError(QString)), outputWindow, SLOT(appendError(QString)));
connect(this, SIGNAL(appendCommand(QString,QString,QStringList)), connect(this, SIGNAL(appendCommand(QString,Utils::FileName,QStringList)),
outputWindow, SLOT(appendCommand(QString,QString,QStringList))); outputWindow, SLOT(appendCommand(QString,Utils::FileName,QStringList)));
connect(this, SIGNAL(appendMessage(QString)), outputWindow, SLOT(appendMessage(QString))); connect(this, SIGNAL(appendMessage(QString)), outputWindow, SLOT(appendMessage(QString)));
} }
@@ -329,7 +329,7 @@ signals:
void appendSilently(const QString &text); void appendSilently(const QString &text);
void appendError(const QString &text); void appendError(const QString &text);
void appendCommand(const QString &workingDirectory, void appendCommand(const QString &workingDirectory,
const QString &binary, const Utils::FileName &binary,
const QStringList &args); const QStringList &args);
void appendMessage(const QString &text); void appendMessage(const QString &text);
}; };
@@ -346,7 +346,7 @@ Utils::SynchronousProcessResponse Command::runVcs(const QStringList &arguments,
} }
if (!(d->m_flags & VcsBasePlugin::SuppressCommandLogging)) if (!(d->m_flags & VcsBasePlugin::SuppressCommandLogging))
emit outputProxy.appendCommand(d->m_workingDirectory, d->m_binaryPath.toString(), arguments); emit outputProxy.appendCommand(d->m_workingDirectory, d->m_binaryPath, arguments);
const bool sshPromptConfigured = !d->m_sshPasswordPrompt.isEmpty(); const bool sshPromptConfigured = !d->m_sshPasswordPrompt.isEmpty();
if (debugExecution) { if (debugExecution) {
@@ -525,7 +525,7 @@ bool Command::runFullySynchronous(const QStringList &arguments, int timeoutMS,
OutputProxy outputProxy; OutputProxy outputProxy;
if (!(d->m_flags & VcsBasePlugin::SuppressCommandLogging)) if (!(d->m_flags & VcsBasePlugin::SuppressCommandLogging))
emit outputProxy.appendCommand(d->m_workingDirectory, d->m_binaryPath.toUserOutput(), arguments); emit outputProxy.appendCommand(d->m_workingDirectory, d->m_binaryPath, arguments);
// TODO tell the document manager about expected repository changes // TODO tell the document manager about expected repository changes
// if (d->m_flags & ExpectRepoChanges) // if (d->m_flags & ExpectRepoChanges)