diff options
| -rw-r--r-- | dicealias.cpp | 9 | ||||
| -rw-r--r-- | include/dicealias.h | 1 | ||||
| -rw-r--r-- | node/listaliasnode.cpp | 6 | ||||
| -rw-r--r-- | node/listaliasnode.h | 4 |
4 files changed, 15 insertions, 5 deletions
diff --git a/dicealias.cpp b/dicealias.cpp index 24c3fee..e6ee180 100644 --- a/dicealias.cpp +++ b/dicealias.cpp @@ -142,6 +142,15 @@ DiceAlias::DiceAlias(QString cmd, QString key, bool isReplace, bool isEnable) DiceAlias::~DiceAlias() {} +DiceAlias::DiceAlias(const DiceAlias& alias) +{ + m_command= alias.getCommand(); + m_comment= alias.getComment(); + m_value= alias.getValue(); + m_isEnable= alias.isEnable(); + m_type= alias.isReplace() ? REPLACE : REGEXP; +} + bool DiceAlias::resolved(QString& str) { if(!m_isEnable) diff --git a/include/dicealias.h b/include/dicealias.h index a7fdf10..6825cdf 100644 --- a/include/dicealias.h +++ b/include/dicealias.h @@ -42,6 +42,7 @@ public: * @param isReplace */ DiceAlias(QString pattern, QString remplacement, bool isReplace= true, bool isEnable= true); + DiceAlias(const DiceAlias& alias); /** * @brief ~DiceAlias */ diff --git a/node/listaliasnode.cpp b/node/listaliasnode.cpp index 8673e9d..a8e4125 100644 --- a/node/listaliasnode.cpp +++ b/node/listaliasnode.cpp @@ -20,7 +20,7 @@ *************************************************************************/ #include "listaliasnode.h" -ListAliasNode::ListAliasNode(QList<DiceAlias*>* apAlias) : m_aliasList(apAlias) +ListAliasNode::ListAliasNode(const QList<DiceAlias*>& apAlias) : m_aliasList(apAlias) { m_result= new StringResult(); } @@ -46,7 +46,7 @@ void ListAliasNode::run(ExecutionNode* previous) QString ListAliasNode::buildList() const { QString result(QObject::tr("List of Alias:\n")); - for(auto& key : *m_aliasList) + for(auto& key : m_aliasList) { result+= QString("%1 : %2 # %3\n").arg(key->getCommand(), key->getValue(), key->getComment()); } @@ -55,7 +55,7 @@ QString ListAliasNode::buildList() const QString ListAliasNode::toString(bool wl) const { QStringList resultList; - for(auto& key : *m_aliasList) + for(auto& key : m_aliasList) { resultList << "{" << key->getCommand() << key->getValue() << "}"; } diff --git a/node/listaliasnode.h b/node/listaliasnode.h index b618557..b8b549c 100644 --- a/node/listaliasnode.h +++ b/node/listaliasnode.h @@ -31,7 +31,7 @@ class ListAliasNode : public ExecutionNode { public: - ListAliasNode(QList<DiceAlias*>* mapAlias); + ListAliasNode(const QList<DiceAlias*>& mapAlias); /** * @brief run * @param previous @@ -57,7 +57,7 @@ public: virtual ExecutionNode* getCopy() const; private: - QList<DiceAlias*>* m_aliasList; + const QList<DiceAlias*>& m_aliasList; }; #endif // LISTALIASNODE_H |