diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 8301832971f72dfe438d137c56b7edb9065d8fd2..75a8d8ccf1e84db55de7fd96b5dfd28d6f84140f 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -637,7 +637,7 @@ void ProFileEvaluator::Private::insertOperator(const char op) void ProFileEvaluator::Private::enterScope(bool multiLine) { ProBlock *parent = currentBlock(); - ProBlock *block = new ProBlock(parent); + ProBlock *block = new ProBlock(); block->setLineNumber(m_lineNo); parent->setBlockKind(ProBlock::ScopeKind); @@ -667,7 +667,7 @@ ProBlock *ProFileEvaluator::Private::currentBlock() return m_block; ProBlock *parent = m_blockstack.top(); - m_block = new ProBlock(parent); + m_block = new ProBlock(); m_block->setLineNumber(m_lineNo); parent->appendItem(m_block); @@ -2268,7 +2268,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( case T_REQUIRES: #endif case T_EVAL: { - ProBlock *pro = new ProBlock(0); + ProBlock *pro = new ProBlock(); QString buf = args.join(QLatin1String(" ")); if (!readInternal(pro, buf, (ushort*)buf.data())) { delete pro; diff --git a/src/shared/proparser/proitems.cpp b/src/shared/proparser/proitems.cpp index 09838f12fd858662a5066233d9bcdf2f44ec78ea..9107d41f963a2355d94d502bf8a2be3f38762282 100644 --- a/src/shared/proparser/proitems.cpp +++ b/src/shared/proparser/proitems.cpp @@ -33,12 +33,9 @@ QT_BEGIN_NAMESPACE -// --------------- ProBlock ---------------- - -ProBlock::ProBlock(ProBlock *parent) +ProBlock::ProBlock() { m_blockKind = 0; - m_parent = parent; m_refCount = 1; } @@ -56,11 +53,6 @@ void ProBlock::appendItem(ProItem *proitem) m_proitems << proitem; } -void ProBlock::setItems(const QList<ProItem *> &proitems) -{ - m_proitems = proitems; -} - QList<ProItem *> ProBlock::items() const { return m_proitems; @@ -76,16 +68,6 @@ int ProBlock::blockKind() const return m_blockKind; } -void ProBlock::setParent(ProBlock *parent) -{ - m_parent = parent; -} - -ProBlock *ProBlock::parent() const -{ - return m_parent; -} - ProItem::ProItemKind ProBlock::kind() const { return ProItem::BlockKind; @@ -198,7 +180,7 @@ ProItem::ProItemKind ProOperator::kind() const // --------------- ProFile ---------------- ProFile::ProFile(const QString &fileName) - : ProBlock(0) + : ProBlock() { setBlockKind(ProBlock::ProFileKind); m_fileName = fileName; @@ -210,10 +192,6 @@ ProFile::ProFile(const QString &fileName) m_directoryName = QString::fromRawData(fileName.constData(), nameOff); } -ProFile::~ProFile() -{ -} - QString ProFile::displayFileName() const { return m_displayFileName; diff --git a/src/shared/proparser/proitems.h b/src/shared/proparser/proitems.h index 8130e1e3c38b84606de7f019e62364928bafd537..dfec8c52a4e80cb77a8c6fcb314be822657b0428 100644 --- a/src/shared/proparser/proitems.h +++ b/src/shared/proparser/proitems.h @@ -39,7 +39,6 @@ class ProItem { public: enum ProItemKind { - ValueKind, FunctionKind, ConditionKind, OperatorKind, @@ -81,26 +80,21 @@ public: SingleLine = 0x80 }; - ProBlock(ProBlock *parent); + ProBlock(); ~ProBlock(); void appendItem(ProItem *proitem); - void setItems(const QList<ProItem *> &proitems); QList<ProItem *> items() const; void setBlockKind(int blockKind); int blockKind() const; - void setParent(ProBlock *parent); - ProBlock *parent() const; - void ref() { ++m_refCount; } void deref() { if (!--m_refCount) delete this; } ProItem::ProItemKind kind() const; private: - ProBlock *m_parent; QList<ProItem *> m_proitems; int m_blockKind; int m_refCount; @@ -187,7 +181,6 @@ class ProFile : public ProBlock { public: explicit ProFile(const QString &fileName); - ~ProFile(); QString displayFileName() const; QString fileName() const;