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

d-ptr style

Browse Source 
Change-Id: I9bae06c72d71d77b4a43f87217b7c3f8077a1fd1
Reviewed-on: http://codereview.qt-project.org/5075
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-09-16 11:33:48 +02:00
committed by hjk
parent aea628a973
commit 1285a63852
8 changed files with 96 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
View File

@@ -53,13 +53,13 @@ public:
} // namespace Internal
AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, const QString &id)
: BuildStep(bsl, id), m_d(new Internal::AbstractRemoteLinuxDeployStepPrivate)
: BuildStep(bsl, id), d(new Internal::AbstractRemoteLinuxDeployStepPrivate)
{
}
AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl,
AbstractRemoteLinuxDeployStep *other)
: BuildStep(bsl, other), m_d(new Internal::AbstractRemoteLinuxDeployStepPrivate)
: BuildStep(bsl, other), d(new Internal::AbstractRemoteLinuxDeployStepPrivate)
{
}
@@ -96,18 +96,18 @@ void AbstractRemoteLinuxDeployStep::run(QFutureInterface<bool> &fi)
connect(deployService(), SIGNAL(stdErrData(QString)), SLOT(handleStdErrData(QString)));
connect(deployService(), SIGNAL(finished()), SLOT(handleFinished()));
m_d->hasError = false;
m_d->future = fi;
d->hasError = false;
d->future = fi;
deployService()->start();
}
void AbstractRemoteLinuxDeployStep::cancel()
{
if (m_d->hasError)
if (d->hasError)
return;
emit addOutput(tr("User requests deployment to stop; cleaning up."), MessageOutput);
m_d->hasError = true;
d->hasError = true;
deployService()->stop();
}
@@ -130,17 +130,17 @@ void AbstractRemoteLinuxDeployStep::handleErrorMessage(const QString &message)
{
emit addTask(Task(Task::Error, message, QString(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
m_d->hasError = true;
d->hasError = true;
}
void AbstractRemoteLinuxDeployStep::handleFinished()
{
if (m_d->hasError)
if (d->hasError)
emit addOutput(tr("Deploy step failed."), ErrorMessageOutput);
else
emit addOutput(tr("Deploy step finished."), MessageOutput);
disconnect(deployService(), 0, this, 0);
m_d->future.reportResult(!m_d->hasError);
d->future.reportResult(!d->hasError);
emit finished();
}