split some classes to different namespaces to improve code base

No significant changes applied.

* function syntax has been changed to another one, any function may be called
  by using the following construction:

      $aw_function_name<some args here if any>{{function body if any}}

* rewrite travis.yml

sources/awesome-widget/plugin/awkeys.cpp

@@ -18,23 +18,15 @@
 #include "awkeys.h"
 
 #include <QtConcurrent/QtConcurrent>
-#include <QDir>
-#include <QInputDialog>
 #include <QJSEngine>
-#include <QNetworkInterface>
 #include <QRegExp>
-#include <QSettings>
-#include <QStandardPaths>
 #include <QThread>
 
 #include "awdataaggregator.h"
 #include "awdataengineaggregator.h"
 #include "awdebug.h"
+#include "awkeyoperations.h"
 #include "awkeysaggregator.h"
-#include "extquotes.h"
-#include "extscript.h"
-#include "extupgrade.h"
-#include "extweather.h"
 #include "graphicalitem.h"
 #include "version.h"
 
@@ -52,6 +44,10 @@ AWKeys::AWKeys(QObject *parent)
 
     aggregator = new AWKeysAggregator(this);
     dataAggregator = new AWDataAggregator(this);
+    keyOperator = new AWKeyOperations(this);
+    // update key data if required
+    connect(keyOperator, SIGNAL(updateKeys(QStringList)), this,
+            SLOT(reinitKeys(QStringList)));
     // transfer signal from AWDataAggregator object to QML ui
     connect(dataAggregator, SIGNAL(toolTipPainted(const QString)), this,
             SIGNAL(needToolTipToBeUpdated(const QString)));
@@ -63,18 +59,12 @@ AWKeys::~AWKeys()
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    // extensions
-    delete graphicalItems;
-    delete extQuotes;
-    delete extScripts;
-    delete extUpgrade;
-    delete extWeather;
-
     // core
     delete dataEngineAggregator;
     delete m_threadPool;
     delete aggregator;
     delete dataAggregator;
+    delete keyOperator;
 }
 
 
@@ -94,7 +84,7 @@ void AWKeys::initKeys(const QString currentPattern, const int interval,
     qCDebug(LOG_AW) << "Queue limit" << limit;
 
     // init
-    m_pattern = currentPattern;
+    keyOperator->setPattern(currentPattern);
     if (dataEngineAggregator == nullptr) {
         dataEngineAggregator = new AWDataEngineAggregator(this, interval);
         connect(this, SIGNAL(dropSourceFromDataengine(QString)),
@@ -103,7 +93,7 @@ void AWKeys::initKeys(const QString currentPattern, const int interval,
         dataEngineAggregator->setInterval(interval);
     m_threadPool->setMaxThreadCount(limit == 0 ? QThread::idealThreadCount()
                                                : limit);
-    updateCache();
+    keyOperator->updateCache();
 
     return dataEngineAggregator->reconnectSources();
 }
@@ -128,9 +118,7 @@ void AWKeys::setWrapNewLines(const bool wrap)
 
 void AWKeys::updateCache()
 {
-    // update network and hdd list
-    addKeyToCache(QString("hdd"));
-    addKeyToCache(QString("net"));
+    return keyOperator->updateCache();
 }
 
 
@@ -139,161 +127,7 @@ QStringList AWKeys::dictKeys(const bool sorted, const QString regexp) const
     qCDebug(LOG_AW) << "Should be sorted" << sorted;
     qCDebug(LOG_AW) << "Filter" << regexp;
 
-    QStringList allKeys;
-    // weather
-    for (int i = extWeather->activeItems().count() - 1; i >= 0; i--) {
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("weatherId")));
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("weather")));
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("humidity")));
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("pressure")));
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("temperature")));
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("timestamp")));
-    }
-    // time
-    allKeys.append(QString("time"));
-    allKeys.append(QString("isotime"));
-    allKeys.append(QString("shorttime"));
-    allKeys.append(QString("longtime"));
-    allKeys.append(QString("ctime"));
-    // uptime
-    allKeys.append(QString("uptime"));
-    allKeys.append(QString("cuptime"));
-    // cpuclock & cpu
-    for (int i = QThread::idealThreadCount() - 1; i >= 0; i--) {
-        allKeys.append(QString("cpucl%1").arg(i));
-        allKeys.append(QString("cpu%1").arg(i));
-    }
-    allKeys.append(QString("cpucl"));
-    allKeys.append(QString("cpu"));
-    // temperature
-    for (int i = m_devices[QString("temp")].count() - 1; i >= 0; i--)
-        allKeys.append(QString("temp%1").arg(i));
-    // gputemp
-    allKeys.append(QString("gputemp"));
-    // gpu
-    allKeys.append(QString("gpu"));
-    // memory
-    allKeys.append(QString("memmb"));
-    allKeys.append(QString("memgb"));
-    allKeys.append(QString("memfreemb"));
-    allKeys.append(QString("memfreegb"));
-    allKeys.append(QString("memtotmb"));
-    allKeys.append(QString("memtotgb"));
-    allKeys.append(QString("memusedmb"));
-    allKeys.append(QString("memusedgb"));
-    allKeys.append(QString("mem"));
-    // swap
-    allKeys.append(QString("swapmb"));
-    allKeys.append(QString("swapgb"));
-    allKeys.append(QString("swapfreemb"));
-    allKeys.append(QString("swapfreegb"));
-    allKeys.append(QString("swaptotmb"));
-    allKeys.append(QString("swaptotgb"));
-    allKeys.append(QString("swap"));
-    // hdd
-    for (int i = m_devices[QString("mount")].count() - 1; i >= 0; i--) {
-        allKeys.append(QString("hddmb%1").arg(i));
-        allKeys.append(QString("hddgb%1").arg(i));
-        allKeys.append(QString("hddfreemb%1").arg(i));
-        allKeys.append(QString("hddfreegb%1").arg(i));
-        allKeys.append(QString("hddtotmb%1").arg(i));
-        allKeys.append(QString("hddtotgb%1").arg(i));
-        allKeys.append(QString("hdd%1").arg(i));
-    }
-    // hdd speed
-    for (int i = m_devices[QString("disk")].count() - 1; i >= 0; i--) {
-        allKeys.append(QString("hddr%1").arg(i));
-        allKeys.append(QString("hddw%1").arg(i));
-    }
-    // hdd temp
-    for (int i = m_devices[QString("hdd")].count() - 1; i >= 0; i--)
-        allKeys.append(QString("hddtemp%1").arg(i));
-    // network
-    for (int i = m_devices[QString("net")].count() - 1; i >= 0; i--) {
-        allKeys.append(QString("downunits%1").arg(i));
-        allKeys.append(QString("upunits%1").arg(i));
-        allKeys.append(QString("downkb%1").arg(i));
-        allKeys.append(QString("down%1").arg(i));
-        allKeys.append(QString("upkb%1").arg(i));
-        allKeys.append(QString("up%1").arg(i));
-    }
-    allKeys.append(QString("downunits"));
-    allKeys.append(QString("upunits"));
-    allKeys.append(QString("downkb"));
-    allKeys.append(QString("down"));
-    allKeys.append(QString("upkb"));
-    allKeys.append(QString("up"));
-    allKeys.append(QString("netdev"));
-    // battery
-    allKeys.append(QString("ac"));
-    QStringList allBatteryDevices
-        = QDir(QString("/sys/class/power_supply"))
-              .entryList(QStringList() << QString("BAT*"),
-                         QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
-    for (int i = allBatteryDevices.count() - 1; i >= 0; i--)
-        allKeys.append(QString("bat%1").arg(i));
-    allKeys.append(QString("bat"));
-    // player
-    allKeys.append(QString("album"));
-    allKeys.append(QString("artist"));
-    allKeys.append(QString("duration"));
-    allKeys.append(QString("progress"));
-    allKeys.append(QString("title"));
-    allKeys.append(QString("dalbum"));
-    allKeys.append(QString("dartist"));
-    allKeys.append(QString("dtitle"));
-    allKeys.append(QString("salbum"));
-    allKeys.append(QString("sartist"));
-    allKeys.append(QString("stitle"));
-    // ps
-    allKeys.append(QString("pscount"));
-    allKeys.append(QString("pstotal"));
-    allKeys.append(QString("ps"));
-    // package manager
-    for (int i = extUpgrade->activeItems().count() - 1; i >= 0; i--)
-        allKeys.append(
-            extUpgrade->activeItems().at(i)->tag(QString("pkgcount")));
-    // quotes
-    for (int i = extQuotes->activeItems().count() - 1; i >= 0; i--) {
-        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("ask")));
-        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("askchg")));
-        allKeys.append(
-            extQuotes->activeItems().at(i)->tag(QString("percaskchg")));
-        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("bid")));
-        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("bidchg")));
-        allKeys.append(
-            extQuotes->activeItems().at(i)->tag(QString("percbidchg")));
-        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("price")));
-        allKeys.append(
-            extQuotes->activeItems().at(i)->tag(QString("pricechg")));
-        allKeys.append(
-            extQuotes->activeItems().at(i)->tag(QString("percpricechg")));
-    }
-    // custom
-    for (int i = extScripts->activeItems().count() - 1; i >= 0; i--)
-        allKeys.append(extScripts->activeItems().at(i)->tag(QString("custom")));
-    // desktop
-    allKeys.append(QString("desktop"));
-    allKeys.append(QString("ndesktop"));
-    allKeys.append(QString("tdesktops"));
-    // load average
-    allKeys.append(QString("la15"));
-    allKeys.append(QString("la5"));
-    allKeys.append(QString("la1"));
-    // bars
-    QStringList graphicalItemsKeys;
-    for (auto item : graphicalItems->items())
-        graphicalItemsKeys.append(item->tag());
-    graphicalItemsKeys.sort();
-    for (int i = graphicalItemsKeys.count() - 1; i >= 0; i--)
-        allKeys.append(graphicalItemsKeys.at(i));
-
+    QStringList allKeys = keyOperator->dictKeys();
     // sort if required
     if (sorted)
         allKeys.sort();
@@ -304,7 +138,7 @@ QStringList AWKeys::dictKeys(const bool sorted, const QString regexp) const
 
 QStringList AWKeys::getHddDevices() const
 {
-    QStringList devices = m_devices[QString("hdd")];
+    QStringList devices = keyOperator->devices(QString("hdd"));
     // required by selector in the UI
     devices.insert(0, QString("disable"));
     devices.insert(0, QString("auto"));
@@ -317,51 +151,7 @@ QString AWKeys::infoByKey(QString key) const
 {
     qCDebug(LOG_AW) << "Requested key" << key;
 
-    key.remove(QRegExp(QString("^bar[0-9]{1,}")));
-    if (key.startsWith(QString("custom")))
-        return extScripts->itemByTagNumber(
-                             key.remove(QString("custom")).toInt())
-            ->uniq();
-    else if (key.contains(QRegExp(QString("^hdd[rw]"))))
-        return QString("%1").arg(m_devices[QString(
-            "disk")][key.remove(QRegExp(QString("hdd[rw]"))).toInt()]);
-    else if (key.contains(QRegExp(
-                 QString("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))))
-        return QString("%1").arg(m_devices[QString(
-            "mount")][key
-                          .remove(QRegExp(QString(
-                              "^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)")))
-                          .toInt()]);
-    else if (key.startsWith(QString("hddtemp")))
-        return QString("%1").arg(
-            m_devices[QString("hdd")][key.remove(QString("hddtemp")).toInt()]);
-    else if (key.contains(QRegExp(QString("^(down|up)[0-9]"))))
-        return QString("%1").arg(m_devices[QString(
-            "net")][key.remove(QRegExp(QString("^(down|up)"))).toInt()]);
-    else if (key.startsWith(QString("pkgcount")))
-        return extUpgrade->itemByTagNumber(
-                             key.remove(QString("pkgcount")).toInt())
-            ->uniq();
-    else if (key.contains(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)"))))
-        return extQuotes->itemByTagNumber(
-                            key.remove(QRegExp(QString(
-                                           "(^|perc)(ask|bid|price)(chg|)")))
-                                .toInt())
-            ->uniq();
-    else if (key.contains(QRegExp(
-                 QString("(weather|weatherId|humidity|pressure|temperature)"))))
-        return extWeather
-            ->itemByTagNumber(
-                key
-                    .remove(QRegExp(QString(
-                        "(weather|weatherId|humidity|pressure|temperature)")))
-                    .toInt())
-            ->uniq();
-    else if (key.startsWith(QString("temp")))
-        return QString("%1").arg(
-            m_devices[QString("temp")][key.remove(QString("temp")).toInt()]);
-
-    return QString("(none)");
+    return keyOperator->infoByKey(key);
 }
 
 
@@ -379,19 +169,7 @@ void AWKeys::editItem(const QString type)
 {
     qCDebug(LOG_AW) << "Item type" << type;
 
-    if (type == QString("graphicalitem")) {
-        graphicalItems->setConfigArgs(dictKeys(
-            true, QString("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)")));
-        return graphicalItems->editItems();
-    } else if (type == QString("extquotes")) {
-        return extQuotes->editItems();
-    } else if (type == QString("extscript")) {
-        return extScripts->editItems();
-    } else if (type == QString("extupgrade")) {
-        return extUpgrade->editItems();
-    } else if (type == QString("extweather")) {
-        return extWeather->editItems();
-    }
+    return keyOperator->editItem(type);
 }
 
 
@@ -399,21 +177,7 @@ void AWKeys::addDevice(const QString source)
 {
     qCDebug(LOG_AW) << "Source" << source;
 
-    QRegExp diskRegexp
-        = QRegExp(QString("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)"));
-    QRegExp mountRegexp = QRegExp(QString("partitions/.*/filllevel"));
-
-    if (source.contains(diskRegexp)) {
-        QString device = source;
-        device.remove(QString("/Rate/rblk"));
-        addKeyToCache(QString("disk"), device);
-    } else if (source.contains(mountRegexp)) {
-        QString device = source;
-        device.remove(QString("partitions")).remove(QString("/filllevel"));
-        addKeyToCache(QString("mount"), device);
-    } else if (source.startsWith(QString("lmsensors"))) {
-        addKeyToCache(QString("temp"), source);
-    }
+    return keyOperator->addDevice(source);
 }
 
 
@@ -432,73 +196,15 @@ void AWKeys::dataUpdated(const QString &sourceName,
 }
 
 
-void AWKeys::loadKeysFromCache()
+void AWKeys::reinitKeys(const QStringList currentKeys)
 {
-    QString fileName = QString("%1/awesomewidgets.ndx")
-                           .arg(QStandardPaths::writableLocation(
-                               QStandardPaths::GenericCacheLocation));
-    qCInfo(LOG_AW) << "Cache file" << fileName;
-    QSettings cache(fileName, QSettings::IniFormat);
-
-    for (auto group : cache.childGroups()) {
-        cache.beginGroup(group);
-        m_devices.remove(group);
-        for (auto key : cache.allKeys())
-            m_devices[group].append(cache.value(key).toString());
-        cache.endGroup();
-    }
-
-    return reinitKeys();
-}
-
-
-void AWKeys::reinitKeys()
-{
-    // renew extensions
-    // delete them if any
-    delete graphicalItems;
-    graphicalItems = nullptr;
-    delete extQuotes;
-    extQuotes = nullptr;
-    delete extScripts;
-    extScripts = nullptr;
-    delete extUpgrade;
-    extUpgrade = nullptr;
-    delete extWeather;
-    extWeather = nullptr;
-    // create
-    graphicalItems
-        = new ExtItemAggregator<GraphicalItem>(nullptr, QString("desktops"));
-    extQuotes = new ExtItemAggregator<ExtQuotes>(nullptr, QString("quotes"));
-    extScripts = new ExtItemAggregator<ExtScript>(nullptr, QString("scripts"));
-    extUpgrade = new ExtItemAggregator<ExtUpgrade>(nullptr, QString("upgrade"));
-    extWeather = new ExtItemAggregator<ExtWeather>(nullptr, QString("weather"));
-
-    // init
-    QStringList allKeys = dictKeys();
-
-#ifdef BUILD_TESTING
-    // not documented feature - place all available tags
-    m_pattern = m_pattern.replace(QString("$ALL"), [allKeys]() {
-        QStringList strings;
-        for (auto tag : allKeys)
-            strings.append(QString("%1: $%1").arg(tag));
-        return strings.join(QString(" | "));
-    }());
-#endif /* BUILD_TESTING */
-
-    // apply aw_* functions
-    m_pattern = insertKeyCount(m_pattern);
-    m_pattern = insertKeyNames(m_pattern);
-    m_pattern = insertKeys(m_pattern);
-    // wrap templates
-    expandTemplates();
+    qCDebug(LOG_AW) << "Update found keys by using list" << currentKeys;
 
     // append lists
     // bars
-    m_foundBars = [allKeys](const QString pattern) {
+    m_foundBars = [currentKeys](const QString pattern) {
         QStringList selectedKeys;
-        for (auto key : allKeys)
+        for (auto key : currentKeys)
             if ((key.startsWith(QString("bar")))
                 && (pattern.contains(QString("$%1").arg(key)))) {
                 qCInfo(LOG_AW) << "Found bar" << key;
@@ -507,12 +213,12 @@ void AWKeys::reinitKeys()
         if (selectedKeys.isEmpty())
             qCWarning(LOG_AW) << "No bars found";
         return selectedKeys;
-    }(m_pattern);
+    }(keyOperator->pattern());
 
     // main key list
-    m_foundKeys = [allKeys](const QString pattern) {
+    m_foundKeys = [currentKeys](const QString pattern) {
         QStringList selectedKeys;
-        for (auto key : allKeys)
+        for (auto key : currentKeys)
             if ((!key.startsWith(QString("bar")))
                 && (pattern.contains(QString("$%1").arg(key)))) {
                 qCInfo(LOG_AW) << "Found key" << key;
@@ -521,7 +227,7 @@ void AWKeys::reinitKeys()
         if (selectedKeys.isEmpty())
             qCWarning(LOG_AW) << "No keys found";
         return selectedKeys;
-    }(m_pattern);
+    }(keyOperator->pattern());
 
     // lambdas
     m_foundLambdas = [](const QString pattern) {
@@ -536,7 +242,7 @@ void AWKeys::reinitKeys()
         while (it.hasNext()) {
             QRegularExpressionMatch match = it.next();
             QString lambda = match.captured();
-            // drop brakets
+            // drop brackets
             lambda.remove(QRegExp(QString("^\\$\\{\\{")));
             lambda.remove(QRegExp(QString("\\}\\}$")));
             // append
@@ -546,10 +252,10 @@ void AWKeys::reinitKeys()
         if (selectedKeys.isEmpty())
             qCWarning(LOG_AW) << "No lambdas found";
         return selectedKeys;
-    }(m_pattern);
+    }(keyOperator->pattern());
 
     // set key data to aggregator
-    aggregator->setDevices(m_devices);
+    aggregator->setDevices(keyOperator->devices());
 }
 
 
@@ -557,7 +263,7 @@ void AWKeys::updateTextData()
 {
     QFuture<QString> text = QtConcurrent::run(m_threadPool, [this]() {
         calculateValues();
-        return parsePattern(m_pattern);
+        return parsePattern(keyOperator->pattern());
     });
 
     emit(needTextToBeUpdated(text));
@@ -565,69 +271,14 @@ void AWKeys::updateTextData()
 }
 
 
-void AWKeys::addKeyToCache(const QString type, const QString key)
-{
-    qCDebug(LOG_AW) << "Key type" << type;
-    qCDebug(LOG_AW) << "Key" << key;
-
-    QString fileName = QString("%1/awesomewidgets.ndx")
-                           .arg(QStandardPaths::writableLocation(
-                               QStandardPaths::GenericCacheLocation));
-    qCInfo(LOG_AW) << "Cache file" << fileName;
-    QSettings cache(fileName, QSettings::IniFormat);
-
-    cache.beginGroup(type);
-    QStringList cachedValues;
-    for (auto key : cache.allKeys())
-        cachedValues.append(cache.value(key).toString());
-
-    if (type == QString("hdd")) {
-        QStringList allDevices
-            = QDir(QString("/dev")).entryList(QDir::System, QDir::Name);
-        QStringList devices
-            = allDevices.filter(QRegExp(QString("^[hms]d[a-z]$")));
-        for (auto dev : devices) {
-            QString device = QString("/dev/%1").arg(dev);
-            if (cachedValues.contains(device))
-                continue;
-            qCInfo(LOG_AW) << "Found new key" << device << "for type" << type;
-            cache.setValue(
-                QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
-                device);
-        }
-    } else if (type == QString("net")) {
-        QList<QNetworkInterface> rawInterfaceList
-            = QNetworkInterface::allInterfaces();
-        for (auto interface : rawInterfaceList) {
-            QString device = interface.name();
-            if (cachedValues.contains(device))
-                continue;
-            qCInfo(LOG_AW) << "Found new key" << device << "for type" << type;
-            cache.setValue(
-                QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
-                device);
-        }
-    } else {
-        if (cachedValues.contains(key))
-            return;
-        qCInfo(LOG_AW) << "Found new key" << key << "for type" << type;
-        cache.setValue(
-            QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), key);
-    }
-    cache.endGroup();
-
-    cache.sync();
-    return loadKeysFromCache();
-}
-
-
 // HACK this method is required since I could not define some values by using
 // specified pattern. Usually they are values which depend on several others
 void AWKeys::calculateValues()
 {
     // hddtot*
-    for (auto device : m_devices[QString("mount")]) {
-        int index = m_devices[QString("mount")].indexOf(device);
+    QStringList mountDevices = keyOperator->devices(QString("mount"));
+    for (auto device : mountDevices) {
+        int index = mountDevices.indexOf(device);
         values[QString("hddtotmb%1").arg(index)] = QString("%1").arg(
             values[QString("hddfreemb%1").arg(index)].toFloat()
                 + values[QString("hddmb%1").arg(index)].toFloat(),
@@ -654,7 +305,8 @@ void AWKeys::calculateValues()
                             5, 'f', 1);
 
     // up, down, upkb, downkb, upunits, downunits
-    int netIndex = m_devices[QString("net")].indexOf(values[QString("netdev")]);
+    int netIndex = keyOperator->devices(QString("net"))
+                       .indexOf(values[QString("netdev")]);
     values[QString("down")] = values[QString("down%1").arg(netIndex)];
     values[QString("downkb")] = values[QString("downkb%1").arg(netIndex)];
     values[QString("downunits")] = values[QString("downunits%1").arg(netIndex)];
@@ -699,136 +351,6 @@ void AWKeys::calculateValues()
 }
 
 
-void AWKeys::expandTemplates()
-{
-    // match the following construction $template{{some code here}}
-    QRegularExpression templatesRegexp(
-        QString("\\$template\\{\\{((?!\\$template\\{\\{).)*?\\}\\}"));
-    templatesRegexp.setPatternOptions(
-        QRegularExpression::DotMatchesEverythingOption);
-
-    QRegularExpressionMatchIterator it = templatesRegexp.globalMatch(m_pattern);
-    while (it.hasNext()) {
-        QRegularExpressionMatch match = it.next();
-        QString fullTemplate = match.captured();
-
-        // drop additional markers
-        QString templ = fullTemplate;
-        templ.remove(QRegExp(QString("^\\$template\\{\\{")));
-        templ.remove(QRegExp(QString("\\}\\}$")));
-
-        QJSEngine engine;
-        qCInfo(LOG_AW) << "Expression" << templ;
-        QJSValue result = engine.evaluate(templ);
-        QString templateResult = QString("");
-        if (result.isError()) {
-            qCWarning(LOG_AW) << "Uncaught exception at line"
-                              << result.property("lineNumber").toInt() << ":"
-                              << result.toString();
-        } else {
-            templateResult = result.toString();
-        }
-
-        // replace template
-        m_pattern.replace(fullTemplate, templateResult);
-    }
-}
-
-
-QString AWKeys::insertKeyCount(QString code) const
-{
-    qCDebug(LOG_AW) << "Looking for count in code" << code;
-
-    QRegularExpression countRegexp(QString("aw_count\\(((?!\\aw_count\\().)*?\\)"));
-    countRegexp.setPatternOptions(
-        QRegularExpression::DotMatchesEverythingOption);
-
-    QRegularExpressionMatchIterator it = countRegexp.globalMatch(code);
-    while (it.hasNext()) {
-        QRegularExpressionMatch match = it.next();
-        QString count = match.captured();
-
-        // get regexp to search
-        QString regex = count;
-        regex.remove(QRegExp(QString("^aw_count\\(")));
-        regex.remove(QRegExp(QString("\\)$")));
-        qCInfo(LOG_AW) << "Looking for" << regex;
-
-        code.replace(count, QString::number(dictKeys(false, regex).count()));
-    }
-
-    return code;
-}
-
-
-QString AWKeys::insertKeyNames(QString code) const
-{
-    qCDebug(LOG_AW) << "Looking for keys in code" << code;
-
-    QRegularExpression keysRegexp(QString("aw_names\\(((?!\\aw_names\\().)*?\\)"));
-    keysRegexp.setPatternOptions(
-        QRegularExpression::DotMatchesEverythingOption);
-
-    QRegularExpressionMatchIterator it = keysRegexp.globalMatch(code);
-    while (it.hasNext()) {
-        QRegularExpressionMatch match = it.next();
-        QString keys = match.captured();
-
-        // get regexp to search
-        QString condition = keys;
-        condition.remove(QRegExp(QString("^aw_names\\(")));
-        condition.remove(QRegExp(QString("\\)$")));
-        QStringList conditionList = condition.split(QChar(','));
-        // regexp
-        QString regex = conditionList.at(0);
-        // separator to join
-        QString separator = conditionList.size() == 1 ? QString("") : conditionList.at(1);
-        qCInfo(LOG_AW) << "Looking for" << regex << "with separator" << separator;
-
-        code.replace(keys, dictKeys(true, regex).join(separator));
-    }
-
-    return code;
-}
-
-
-QString AWKeys::insertKeys(QString code) const
-{
-    qCDebug(LOG_AW) << "Looking for keys in code" << code;
-
-    QRegularExpression keysRegexp(QString("aw_keys\\(((?!\\aw_keys\\().)*?\\)"));
-    keysRegexp.setPatternOptions(
-        QRegularExpression::DotMatchesEverythingOption);
-
-    QRegularExpressionMatchIterator it = keysRegexp.globalMatch(code);
-    while (it.hasNext()) {
-        QRegularExpressionMatch match = it.next();
-        QString keys = match.captured();
-
-        // get regexp to search
-        QString condition = keys;
-        condition.remove(QRegExp(QString("^aw_keys\\(")));
-        condition.remove(QRegExp(QString("\\)$")));
-        QStringList conditionList = condition.split(QChar(','));
-        // regexp
-        QString regex = conditionList.at(0);
-        // separator to join
-        QString separator = conditionList.size() == 1 ? QString("") : conditionList.at(1);
-        qCInfo(LOG_AW) << "Looking for" << regex << "with separator" << separator;
-
-        // find keys and add $ at the beginning of the line
-        QStringList foundKeys = dictKeys(true, regex);
-        std::for_each(foundKeys.begin(), foundKeys.end(), [](QString &value) {
-            value = QString("$%1").arg(value);
-        });
-
-        code.replace(keys, foundKeys.join(separator));
-    }
-
-    return code;
-}
-
-
 QString AWKeys::parsePattern(QString pattern) const
 {
     // screen sign
@@ -850,7 +372,7 @@ QString AWKeys::parsePattern(QString pattern) const
 
     // bars
     for (auto bar : m_foundBars) {
-        GraphicalItem *item = graphicalItems->itemByTag(bar);
+        GraphicalItem *item = keyOperator->giByKey(bar);
         QString key = bar;
         key.remove(QRegExp(QString("^bar[0-9]{1,}")));
         if (item->type() == GraphicalItem::Graph)