inline trivial functions

src/shared/proparser/proitems.cpp

@@ -48,131 +48,26 @@ ProBlock::~ProBlock()
             delete itm;
 }
 
-void ProBlock::appendItem(ProItem *proitem)
-{
-    m_proitems << proitem;
-}
-
-QList<ProItem *> ProBlock::items() const
-{
-    return m_proitems;
-}
-
-void ProBlock::setBlockKind(int blockKind)
-{
-    m_blockKind = blockKind;
-}
-
-int ProBlock::blockKind() const
-{
-    return m_blockKind;
-}
-
 ProItem::ProItemKind ProBlock::kind() const
 {
     return ProItem::BlockKind;
 }
 
-// --------------- ProVariable ----------------
-ProVariable::ProVariable(const QString &name)
-{
-    m_variable = name;
-    m_variableKind = SetOperator;
-}
-
-void ProVariable::setVariableOperator(VariableOperator variableKind)
-{
-    m_variableKind = variableKind;
-}
-
-ProVariable::VariableOperator ProVariable::variableOperator() const
-{
-    return m_variableKind;
-}
-
-void ProVariable::setVariable(const QString &name)
-{
-    m_variable = name;
-}
-
-QString ProVariable::variable() const
-{
-    return m_variable;
-}
-
-void ProVariable::setValue(const QString &val)
-{
-    m_value = val;
-}
-
-QString ProVariable::value() const
-{
-    return m_value;
-}
-
 ProItem::ProItemKind ProVariable::kind() const
 {
     return ProItem::VariableKind;
 }
 
-// --------------- ProFunction ----------------
-ProFunction::ProFunction(const QString &text)
-{
-    m_text = text;
-}
-
-void ProFunction::setText(const QString &text)
-{
-    m_text = text;
-}
-
-QString ProFunction::text() const
-{
-    return m_text;
-}
-
 ProItem::ProItemKind ProFunction::kind() const
 {
     return ProItem::FunctionKind;
 }
 
-// --------------- ProCondition ----------------
-ProCondition::ProCondition(const QString &text)
-{
-    m_text = text;
-}
-
-void ProCondition::setText(const QString &text)
-{
-    m_text = text;
-}
-
-QString ProCondition::text() const
-{
-    return m_text;
-}
-
 ProItem::ProItemKind ProCondition::kind() const
 {
     return ProItem::ConditionKind;
 }
 
-// --------------- ProOperator ----------------
-ProOperator::ProOperator(OperatorKind operatorKind)
-{
-    m_operatorKind = operatorKind;
-}
-
-void ProOperator::setOperatorKind(OperatorKind operatorKind)
-{
-    m_operatorKind = operatorKind;
-}
-
-ProOperator::OperatorKind ProOperator::operatorKind() const
-{
-    return m_operatorKind;
-}
-
 ProItem::ProItemKind ProOperator::kind() const
 {
     return ProItem::OperatorKind;
@@ -192,19 +87,4 @@ ProFile::ProFile(const QString &fileName)
     m_directoryName = QString::fromRawData(fileName.constData(), nameOff);
 }
 
-QString ProFile::displayFileName() const
-{
-    return m_displayFileName;
-}
-
-QString ProFile::fileName() const
-{
-    return m_fileName;
-}
-
-QString ProFile::directoryName() const
-{
-    return m_directoryName;
-}
-
 QT_END_NAMESPACE

src/shared/proparser/proitems.h

@@ -83,11 +83,10 @@ public:
     ProBlock();
     ~ProBlock();
 
-    void appendItem(ProItem *proitem);
+    void appendItem(ProItem *proitem) { m_proitems << proitem; }
-    QList<ProItem *> items() const;
+    QList<ProItem *> items() const { return m_proitems; }
-
+    void setBlockKind(int blockKind) { m_blockKind = blockKind; }
-    void setBlockKind(int blockKind);
+    int blockKind() const { return m_blockKind; }
-    int blockKind() const;
 
     void ref() { ++m_refCount; }
     void deref() { if (!--m_refCount) delete this; }
@@ -111,16 +110,13 @@ public:
         UniqueAddOperator   = 4
     };
 
-    ProVariable(const QString &name);
+    ProVariable(const QString &name) : m_variableKind(SetOperator), m_variable(name) {}
-
+    void setVariableOperator(VariableOperator variableKind) { m_variableKind = variableKind; }
-    void setVariableOperator(VariableOperator variableKind);
+    VariableOperator variableOperator() const { return m_variableKind; }
-    VariableOperator variableOperator() const;
+    void setVariable(const QString &name) { m_variable = name; }
-
+    QString variable() const { return m_variable; }
-    void setVariable(const QString &name);
+    void setValue(const QString &value) { m_value = value; }
-    QString variable() const;
+    QString value() const { return m_value; }
-
-    void setValue(const QString &value);
-    QString value() const;
 
     ProItem::ProItemKind kind() const;
 
@@ -133,10 +129,9 @@ private:
 class ProFunction : public ProItem
 {
 public:
-    explicit ProFunction(const QString &text);
+    explicit ProFunction(const QString &text) : m_text(text) {}
-
+    void setText(const QString &text) { m_text = text; }
-    void setText(const QString &text);
+    QString text() const { return m_text; }
-    QString text() const;
 
     ProItem::ProItemKind kind() const;
 
@@ -147,10 +142,9 @@ private:
 class ProCondition : public ProItem
 {
 public:
-    explicit ProCondition(const QString &text);
+    explicit ProCondition(const QString &text) : m_text(text) {}
-
+    void setText(const QString &text) { m_text = text; }
-    void setText(const QString &text);
+    QString text() const { return m_text; }
-    QString text() const;
 
     ProItem::ProItemKind kind() const;
 
@@ -166,10 +160,9 @@ public:
         NotOperator     = 2
     };
 
-    explicit ProOperator(OperatorKind operatorKind);
+    explicit ProOperator(OperatorKind operatorKind) : m_operatorKind(operatorKind) {}
-
+    void setOperatorKind(OperatorKind operatorKind) { m_operatorKind = operatorKind; }
-    void setOperatorKind(OperatorKind operatorKind);
+    OperatorKind operatorKind() const { return m_operatorKind; }
-    OperatorKind operatorKind() const;
 
     ProItem::ProItemKind kind() const;
 
@@ -182,9 +175,9 @@ class ProFile : public ProBlock
 public:
     explicit ProFile(const QString &fileName);
 
-    QString displayFileName() const;
+    QString displayFileName() const { return m_displayFileName; }
-    QString fileName() const;
+    QString fileName() const { return m_fileName; }
-    QString directoryName() const;
+    QString directoryName() const { return m_directoryName; }
 
 private:
     QString m_fileName;