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

RemoteLinux: Modernize

Browse Source 
modernize-*

Change-Id: Ifdf0e781c63941625ca032a8e1752082f4abc3ce
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Alessandro Portale
2018-11-24 17:06:01 +01:00
parent 77c729bb8a
commit f52f25e150
34 changed files with 119 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/remotelinux/publickeydeploymentdialog.cpp
View File

@@ -55,7 +55,7 @@ PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(const IDevice
tr("Choose Public Key File"), dir,
tr("Public Key Files (*.pub);;All Files (*)"));
if (publicKeyFileName.isEmpty())
return 0;
return nullptr;
return new PublicKeyDeploymentDialog(deviceConfig, publicKeyFileName, parent);
}
@@ -114,7 +114,7 @@ void PublicKeyDeploymentDialog::handleDeploymentFinished(const QString &errorMsg
void PublicKeyDeploymentDialog::handleCanceled()
{
disconnect(&d->keyDeployer, 0, this, 0);
disconnect(&d->keyDeployer, nullptr, this, nullptr);
d->keyDeployer.stopDeployment();
if (d->done)
accept();