forked from qt-creator/qt-creator
ProParser: Fix inconsistent copy ctor/operator=
Detected by GCC9. Change-Id: Iff80e2b55e490dc1d16ae2ac000b761ad94c1297 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
committed by
Orgad Shaneh
parent
274bbefeff
commit
69b3e34bdc
@@ -50,11 +50,6 @@ ProString::ProString() :
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
ProString::ProString(const ProString &other) :
|
|
||||||
m_string(other.m_string), m_offset(other.m_offset), m_length(other.m_length), m_file(other.m_file), m_hash(other.m_hash)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ProString::ProString(const ProString &other, OmitPreHashing) :
|
ProString::ProString(const ProString &other, OmitPreHashing) :
|
||||||
m_string(other.m_string), m_offset(other.m_offset), m_length(other.m_length), m_file(other.m_file), m_hash(0x80000000)
|
m_string(other.m_string), m_offset(other.m_offset), m_length(other.m_length), m_file(other.m_file), m_hash(0x80000000)
|
||||||
{
|
{
|
||||||
|
@@ -62,7 +62,6 @@ class ProFile;
|
|||||||
class ProString {
|
class ProString {
|
||||||
public:
|
public:
|
||||||
ProString();
|
ProString();
|
||||||
ProString(const ProString &other);
|
|
||||||
PROITEM_EXPLICIT ProString(const QString &str);
|
PROITEM_EXPLICIT ProString(const QString &str);
|
||||||
PROITEM_EXPLICIT ProString(const QStringRef &str);
|
PROITEM_EXPLICIT ProString(const QStringRef &str);
|
||||||
PROITEM_EXPLICIT ProString(const char *str);
|
PROITEM_EXPLICIT ProString(const char *str);
|
||||||
|
@@ -107,7 +107,6 @@ private:
|
|||||||
|
|
||||||
struct BlockScope {
|
struct BlockScope {
|
||||||
BlockScope() : start(0), braceLevel(0), special(false), inBranch(false), nest(NestNone) {}
|
BlockScope() : start(0), braceLevel(0), special(false), inBranch(false), nest(NestNone) {}
|
||||||
BlockScope(const BlockScope &other) { *this = other; }
|
|
||||||
ushort *start; // Where this block started; store length here
|
ushort *start; // Where this block started; store length here
|
||||||
int braceLevel; // Nesting of braces in scope
|
int braceLevel; // Nesting of braces in scope
|
||||||
bool special; // Single-line conditionals inside loops, etc. cannot have else branches
|
bool special; // Single-line conditionals inside loops, etc. cannot have else branches
|
||||||
|
Reference in New Issue
Block a user