1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Baseline test framework: follow rule of zero for PlatformInfo type

Browse Source 
The compiler generated special functions are just fine.

Pick-to: 6.3 6.2
Change-Id: I64fba1fac59f55d2a82ab18e32c1a2b854df72f0
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Volker Hilsheimer 2022-01-17 23:24:11 +01:00
parent 5cd35711a2
commit ad4c0ac5fb
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/baseline/shared/baselineprotocol.cpp
View File

@ -53,11 +53,6 @@ const QString PI_QtBuildMode(QLS("QtBuildMode"));
const QString PI_GitCommit(QLS("GitCommit")); const QString PI_GitCommit(QLS("GitCommit"));
const QString PI_GitBranch(QLS("GitBranch")); const QString PI_GitBranch(QLS("GitBranch"));
PlatformInfo::PlatformInfo()
: QMap<QString, QString>(), adHoc(true)
{
}
PlatformInfo PlatformInfo::localHostInfo() PlatformInfo PlatformInfo::localHostInfo()
{ {
PlatformInfo pi; PlatformInfo pi;
@ -105,23 +100,6 @@ PlatformInfo PlatformInfo::localHostInfo()
} }
PlatformInfo::PlatformInfo(const PlatformInfo &other)
: QMap<QString, QString>(other)
{
orides = other.orides;
adHoc = other.adHoc;
}
PlatformInfo &PlatformInfo::operator=(const PlatformInfo &other)
{
QMap<QString, QString>::operator=(other);
orides = other.orides;
adHoc = other.adHoc;
return *this;
}
void PlatformInfo::addOverride(const QString& key, const QString& value) void PlatformInfo::addOverride(const QString& key, const QString& value)
{ {
orides.append(key); orides.append(key);

8
tests/baseline/shared/baselineprotocol.h
View File

@ -57,12 +57,6 @@ extern const QString PI_GitBranch;
class PlatformInfo : public QMap<QString, QString> class PlatformInfo : public QMap<QString, QString>
{ {
public: public:
PlatformInfo();
PlatformInfo(const PlatformInfo &other);
~PlatformInfo()
{}
PlatformInfo &operator=(const PlatformInfo &other);
static PlatformInfo localHostInfo(); static PlatformInfo localHostInfo();
void addOverride(const QString& key, const QString& value); void addOverride(const QString& key, const QString& value);
@ -72,7 +66,7 @@ public:
private: private:
QStringList orides; QStringList orides;
bool adHoc; bool adHoc = true;
friend QDataStream & operator<< (QDataStream &stream, const PlatformInfo &pi); friend QDataStream & operator<< (QDataStream &stream, const PlatformInfo &pi);
friend QDataStream & operator>> (QDataStream &stream, PlatformInfo& pi); friend QDataStream & operator>> (QDataStream &stream, PlatformInfo& pi);
}; };