ProjectExplorer: Add deploymentdata.cpp

We will add more code to the DeploymentData class, and we don't want it
all to be inline.

Change-Id: I5d51d5d44078e6a38262925be21d447ebd8f629e
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2018-11-14 09:18:57 +01:00
parent 54efabd6e9
commit 2cac5c0f0c
4 changed files with 77 additions and 39 deletions

View File

@@ -0,0 +1,68 @@
/****************************************************************************
**
** Copyright (C) 2018 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "deploymentdata.h"
#include <utils/algorithm.h>
namespace ProjectExplorer {
void DeploymentData::setLocalInstallRoot(const Utils::FileName &installRoot)
{
m_localInstallRoot = installRoot;
}
void DeploymentData::addFile(const DeployableFile &file)
{
for (int i = 0; i < m_files.size(); ++i) {
if (m_files.at(i).localFilePath() == file.localFilePath()) {
m_files[i] = file;
return;
}
}
m_files << file;
}
void DeploymentData::addFile(const QString &localFilePath, const QString &remoteDirectory,
DeployableFile::Type type)
{
addFile(DeployableFile(localFilePath, remoteDirectory, type));
}
DeployableFile DeploymentData::deployableForLocalFile(const QString &localFilePath) const
{
return Utils::findOrDefault(m_files, [&localFilePath](const DeployableFile &d) {
return d.localFilePath().toString() == localFilePath;
});
}
bool DeploymentData::operator==(const DeploymentData &other) const
{
return m_files.toSet() == other.m_files.toSet()
&& m_localInstallRoot == other.m_localInstallRoot;
}
} // namespace ProjectExplorer

View File

@@ -28,10 +28,7 @@
#include "deployablefile.h"
#include "projectexplorer_export.h"
#include <utils/algorithm.h>
#include <QList>
#include <QSet>
namespace ProjectExplorer {
@@ -39,55 +36,26 @@ class PROJECTEXPLORER_EXPORT DeploymentData
{
public:
void setFileList(const QList<DeployableFile> &files) { m_files = files; }
QList<DeployableFile> allFiles() const { return m_files; }
void setLocalInstallRoot(const Utils::FileName &installRoot)
{
m_localInstallRoot = installRoot;
}
void setLocalInstallRoot(const Utils::FileName &installRoot);
Utils::FileName localInstallRoot() const { return m_localInstallRoot; }
void addFile(const DeployableFile &file)
{
for (int i = 0; i < m_files.size(); ++i) {
if (m_files.at(i).localFilePath() == file.localFilePath()) {
m_files[i] = file;
return;
}
}
m_files << file;
}
void addFile(const DeployableFile &file);
void addFile(const QString &localFilePath, const QString &remoteDirectory,
DeployableFile::Type type = DeployableFile::TypeNormal)
{
addFile(DeployableFile(localFilePath, remoteDirectory, type));
}
DeployableFile::Type type = DeployableFile::TypeNormal);
int fileCount() const { return m_files.count(); }
DeployableFile fileAt(int index) const { return m_files.at(index); }
QList<DeployableFile> allFiles() const { return m_files; }
DeployableFile deployableForLocalFile(const QString &localFilePath) const;
DeployableFile deployableForLocalFile(const QString &localFilePath) const
{
return Utils::findOrDefault(m_files, [&localFilePath](const DeployableFile &d) {
return d.localFilePath().toString() == localFilePath;
});
}
bool operator==(const DeploymentData &other) const
{
return m_files.toSet() == other.m_files.toSet()
&& m_localInstallRoot == other.m_localInstallRoot;
}
bool operator==(const DeploymentData &other) const;
private:
QList<DeployableFile> m_files;
Utils::FileName m_localInstallRoot;
};
inline bool operator!=(const DeploymentData &d1, const DeploymentData &d2)
{
return !(d1 == d2);
}
inline bool operator!=(const DeploymentData &d1, const DeploymentData &d2) { return !(d1 == d2); }
} // namespace ProjectExplorer

View File

@@ -274,6 +274,7 @@ SOURCES += projectexplorer.cpp \
devicesupport/desktopdeviceconfigurationwidget.cpp \
devicesupport/desktopprocesssignaloperation.cpp \
deployablefile.cpp \
deploymentdata.cpp \
deploymentdatamodel.cpp \
deploymentdataview.cpp \
customtoolchain.cpp \

View File

@@ -54,6 +54,7 @@ Project {
"dependenciespanel.cpp", "dependenciespanel.h",
"deployablefile.cpp", "deployablefile.h",
"deployconfiguration.cpp", "deployconfiguration.h",
"deploymentdata.cpp",
"deploymentdata.h",
"deploymentdataview.cpp",
"deploymentdataview.h",