aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOrgad Shaneh <[email protected]>2019-05-06 23:58:42 +0300
committerOrgad Shaneh <[email protected]>2019-05-24 07:45:40 +0000
commit69b3e34bdcc43bc1ff85efe065fbd19ef97dbbaa (patch)
tree315551b18d865d0dd3ade3a05445dde7240d8f65 /src
parent274bbefeff4b03880d4996eb0e833834fdb8261b (diff)
ProParser: Fix inconsistent copy ctor/operator=
Detected by GCC9. Change-Id: Iff80e2b55e490dc1d16ae2ac000b761ad94c1297 Reviewed-by: Jörg Bornemann <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/shared/proparser/proitems.cpp5
-rw-r--r--src/shared/proparser/proitems.h1
-rw-r--r--src/shared/proparser/qmakeparser.h1
3 files changed, 0 insertions, 7 deletions
diff --git a/src/shared/proparser/proitems.cpp b/src/shared/proparser/proitems.cpp
index db4f386cae8..5d7f6ddb6f3 100644
--- a/src/shared/proparser/proitems.cpp
+++ b/src/shared/proparser/proitems.cpp
@@ -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) :
m_string(other.m_string), m_offset(other.m_offset), m_length(other.m_length), m_file(other.m_file), m_hash(0x80000000)
{
diff --git a/src/shared/proparser/proitems.h b/src/shared/proparser/proitems.h
index a7566be2205..3058b25c483 100644
--- a/src/shared/proparser/proitems.h
+++ b/src/shared/proparser/proitems.h
@@ -62,7 +62,6 @@ class ProFile;
class ProString {
public:
ProString();
- ProString(const ProString &other);
PROITEM_EXPLICIT ProString(const QString &str);
PROITEM_EXPLICIT ProString(const QStringRef &str);
PROITEM_EXPLICIT ProString(const char *str);
diff --git a/src/shared/proparser/qmakeparser.h b/src/shared/proparser/qmakeparser.h
index a0c1ca17f18..ab765c5d9bd 100644
--- a/src/shared/proparser/qmakeparser.h
+++ b/src/shared/proparser/qmakeparser.h
@@ -107,7 +107,6 @@ private:
struct BlockScope {
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
int braceLevel; // Nesting of braces in scope
bool special; // Single-line conditionals inside loops, etc. cannot have else branches