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

RemoteLinux: Avoid unneded qtsupport #include in deploymenttimeinfo.cpp

Browse Source 
And de-noise the file a bit.

Change-Id: I11f0dc83aae87dd397fa8a69ec3b909c4467740c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-08-09 11:36:34 +02:00
parent 87f496d091
commit a88970db34
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/remotelinux/deploymenttimeinfo.cpp
View File

@@ -22,16 +22,16 @@
** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
** **
****************************************************************************/ ****************************************************************************/
#include "deploymenttimeinfo.h" #include "deploymenttimeinfo.h"
#include <projectexplorer/deployablefile.h> #include <projectexplorer/deployablefile.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qtsupport/qtkitinformation.h>
#include <ssh/sshconnection.h> #include <ssh/sshconnection.h>
#include <ssh/sshconnectionmanager.h> #include <ssh/sshconnectionmanager.h>
#include <QPointer>
#include <QDateTime> #include <QDateTime>
#include <QFileInfo> #include <QFileInfo>
@@ -51,11 +51,7 @@ const char LastDeployedRemoteTimesKey[] = "RemoteLinux.LastDeployedRemoteTimes";
class DeployParameters class DeployParameters
{ {
public: public:
DeployParameters(const DeployableFile &d, const QString &h, const QString &s)
: file(d), host(h), sysroot(s) {}
bool operator==(const DeployParameters &other) const { bool operator==(const DeployParameters &other) const {
return file == other.file && host == other.host && sysroot == other.sysroot; return file == other.file && host == other.host && sysroot == other.sysroot;
} }
@@ -81,8 +77,8 @@ public:
}; };
QHash<DeployParameters, Timestamps> lastDeployed; QHash<DeployParameters, Timestamps> lastDeployed;
DeployParameters parameters(const ProjectExplorer::DeployableFile &deployableFile, DeployParameters parameters(const DeployableFile &deployableFile,
const ProjectExplorer::Kit *kit) const const Kit *kit) const
{ {
QString systemRoot; QString systemRoot;
QString host; QString host;
@@ -93,7 +89,7 @@ public:
host = deviceConfiguration->sshParameters().host(); host = deviceConfiguration->sshParameters().host();
} }
return DeployParameters(deployableFile, host, systemRoot); return DeployParameters{deployableFile, host, systemRoot};
} }
}; };
@@ -117,7 +113,7 @@ void DeploymentTimeInfo::saveDeploymentTimeStamp(const DeployableFile &deployabl
} }
bool DeploymentTimeInfo::hasLocalFileChanged(const DeployableFile &deployableFile, bool DeploymentTimeInfo::hasLocalFileChanged(const DeployableFile &deployableFile,
const ProjectExplorer::Kit *kit) const const Kit *kit) const
{ {
const auto &lastDeployed = d->lastDeployed.value(d->parameters(deployableFile, kit)); const auto &lastDeployed = d->lastDeployed.value(d->parameters(deployableFile, kit));
const QDateTime lastModified = deployableFile.localFilePath().toFileInfo().lastModified(); const QDateTime lastModified = deployableFile.localFilePath().toFileInfo().lastModified();
@@ -125,7 +121,7 @@ bool DeploymentTimeInfo::hasLocalFileChanged(const DeployableFile &deployableFil
} }
bool DeploymentTimeInfo::hasRemoteFileChanged(const DeployableFile &deployableFile, bool DeploymentTimeInfo::hasRemoteFileChanged(const DeployableFile &deployableFile,
const ProjectExplorer::Kit *kit, const Kit *kit,
const QDateTime &remoteTimestamp) const const QDateTime &remoteTimestamp) const
{ {
const auto &lastDeployed = d->lastDeployed.value(d->parameters(deployableFile, kit)); const auto &lastDeployed = d->lastDeployed.value(d->parameters(deployableFile, kit));
@@ -185,7 +181,7 @@ void DeploymentTimeInfo::importDeployTimes(const QVariantMap &map)
for (int i = 0; i < elemCount; ++i) { for (int i = 0; i < elemCount; ++i) {
const DeployableFile df(fileList.at(i).toString(), remotePathList.at(i).toString()); const DeployableFile df(fileList.at(i).toString(), remotePathList.at(i).toString());
const DeployParameters dp(df, hostList.at(i).toString(), sysrootList.at(i).toString()); const DeployParameters dp{df, hostList.at(i).toString(), sysrootList.at(i).toString()};
d->lastDeployed.insert(dp, { localTimesList.at(i).toDateTime(), d->lastDeployed.insert(dp, { localTimesList.at(i).toDateTime(),
remoteTimesList.length() > i remoteTimesList.length() > i
? remoteTimesList.at(i).toDateTime() ? remoteTimesList.at(i).toDateTime()