remove unused functions

This commit is contained in:
Oswald Buddenhagen
2010-02-03 10:08:45 +01:00
parent a2dbeecdec
commit 42fd31fb12
3 changed files with 6 additions and 35 deletions

View File

@@ -637,7 +637,7 @@ void ProFileEvaluator::Private::insertOperator(const char op)
void ProFileEvaluator::Private::enterScope(bool multiLine) void ProFileEvaluator::Private::enterScope(bool multiLine)
{ {
ProBlock *parent = currentBlock(); ProBlock *parent = currentBlock();
ProBlock *block = new ProBlock(parent); ProBlock *block = new ProBlock();
block->setLineNumber(m_lineNo); block->setLineNumber(m_lineNo);
parent->setBlockKind(ProBlock::ScopeKind); parent->setBlockKind(ProBlock::ScopeKind);
@@ -667,7 +667,7 @@ ProBlock *ProFileEvaluator::Private::currentBlock()
return m_block; return m_block;
ProBlock *parent = m_blockstack.top(); ProBlock *parent = m_blockstack.top();
m_block = new ProBlock(parent); m_block = new ProBlock();
m_block->setLineNumber(m_lineNo); m_block->setLineNumber(m_lineNo);
parent->appendItem(m_block); parent->appendItem(m_block);
@@ -2268,7 +2268,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
case T_REQUIRES: case T_REQUIRES:
#endif #endif
case T_EVAL: { case T_EVAL: {
ProBlock *pro = new ProBlock(0); ProBlock *pro = new ProBlock();
QString buf = args.join(QLatin1String(" ")); QString buf = args.join(QLatin1String(" "));
if (!readInternal(pro, buf, (ushort*)buf.data())) { if (!readInternal(pro, buf, (ushort*)buf.data())) {
delete pro; delete pro;

View File

@@ -33,12 +33,9 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
// --------------- ProBlock ---------------- ProBlock::ProBlock()
ProBlock::ProBlock(ProBlock *parent)
{ {
m_blockKind = 0; m_blockKind = 0;
m_parent = parent;
m_refCount = 1; m_refCount = 1;
} }
@@ -56,11 +53,6 @@ void ProBlock::appendItem(ProItem *proitem)
m_proitems << proitem; m_proitems << proitem;
} }
void ProBlock::setItems(const QList<ProItem *> &proitems)
{
m_proitems = proitems;
}
QList<ProItem *> ProBlock::items() const QList<ProItem *> ProBlock::items() const
{ {
return m_proitems; return m_proitems;
@@ -76,16 +68,6 @@ int ProBlock::blockKind() const
return m_blockKind; return m_blockKind;
} }
void ProBlock::setParent(ProBlock *parent)
{
m_parent = parent;
}
ProBlock *ProBlock::parent() const
{
return m_parent;
}
ProItem::ProItemKind ProBlock::kind() const ProItem::ProItemKind ProBlock::kind() const
{ {
return ProItem::BlockKind; return ProItem::BlockKind;
@@ -198,7 +180,7 @@ ProItem::ProItemKind ProOperator::kind() const
// --------------- ProFile ---------------- // --------------- ProFile ----------------
ProFile::ProFile(const QString &fileName) ProFile::ProFile(const QString &fileName)
: ProBlock(0) : ProBlock()
{ {
setBlockKind(ProBlock::ProFileKind); setBlockKind(ProBlock::ProFileKind);
m_fileName = fileName; m_fileName = fileName;
@@ -210,10 +192,6 @@ ProFile::ProFile(const QString &fileName)
m_directoryName = QString::fromRawData(fileName.constData(), nameOff); m_directoryName = QString::fromRawData(fileName.constData(), nameOff);
} }
ProFile::~ProFile()
{
}
QString ProFile::displayFileName() const QString ProFile::displayFileName() const
{ {
return m_displayFileName; return m_displayFileName;

View File

@@ -39,7 +39,6 @@ class ProItem
{ {
public: public:
enum ProItemKind { enum ProItemKind {
ValueKind,
FunctionKind, FunctionKind,
ConditionKind, ConditionKind,
OperatorKind, OperatorKind,
@@ -81,26 +80,21 @@ public:
SingleLine = 0x80 SingleLine = 0x80
}; };
ProBlock(ProBlock *parent); ProBlock();
~ProBlock(); ~ProBlock();
void appendItem(ProItem *proitem); void appendItem(ProItem *proitem);
void setItems(const QList<ProItem *> &proitems);
QList<ProItem *> items() const; QList<ProItem *> items() const;
void setBlockKind(int blockKind); void setBlockKind(int blockKind);
int blockKind() const; int blockKind() const;
void setParent(ProBlock *parent);
ProBlock *parent() const;
void ref() { ++m_refCount; } void ref() { ++m_refCount; }
void deref() { if (!--m_refCount) delete this; } void deref() { if (!--m_refCount) delete this; }
ProItem::ProItemKind kind() const; ProItem::ProItemKind kind() const;
private: private:
ProBlock *m_parent;
QList<ProItem *> m_proitems; QList<ProItem *> m_proitems;
int m_blockKind; int m_blockKind;
int m_refCount; int m_refCount;
@@ -187,7 +181,6 @@ class ProFile : public ProBlock
{ {
public: public:
explicit ProFile(const QString &fileName); explicit ProFile(const QString &fileName);
~ProFile();
QString displayFileName() const; QString displayFileName() const;
QString fileName() const; QString fileName() const;