summaryrefslogtreecommitdiffstats
path: root/src/interfaceframework
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2023-05-03 18:50:57 +0200
committerDominik Holland <dominik.holland@qt.io>2023-05-09 17:36:00 +0000
commit3b217d39211f03e47c9849750e2290612f108cda (patch)
tree3292472682df995a37d9fe7e10c64052aca73eb5 /src/interfaceframework
parentdd397cd60c9f65a79e1560d4ab59af57168ee856 (diff)
Start using the new literal operator from Qt::StringLiterals
Change-Id: I4f5d723d01dc8e8e410920f96e6a445b194ac389 Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'src/interfaceframework')
-rw-r--r--src/interfaceframework/qifabstractfeature.cpp4
-rw-r--r--src/interfaceframework/qifconfiguration.cpp4
-rw-r--r--src/interfaceframework/qiffilterandbrowsemodel.cpp4
-rw-r--r--src/interfaceframework/qifpendingreply.cpp6
-rw-r--r--src/interfaceframework/qifpendingreply.h6
-rw-r--r--src/interfaceframework/qifqmlconversion_helper.cpp14
-rw-r--r--src/interfaceframework/qifservicemanager.cpp20
-rw-r--r--src/interfaceframework/qifsimulationengine.cpp10
-rw-r--r--src/interfaceframework/qifsimulationglobalobject.cpp36
-rw-r--r--src/interfaceframework/qifsimulationproxy.cpp4
-rw-r--r--src/interfaceframework/qtinterfaceframeworkmodule.cpp8
-rw-r--r--src/interfaceframework/queryparser/qifqueryterm.cpp14
12 files changed, 76 insertions, 54 deletions
diff --git a/src/interfaceframework/qifabstractfeature.cpp b/src/interfaceframework/qifabstractfeature.cpp
index 19ac815c..5e16273a 100644
--- a/src/interfaceframework/qifabstractfeature.cpp
+++ b/src/interfaceframework/qifabstractfeature.cpp
@@ -16,6 +16,8 @@
#include <QDebug>
#include <QMetaEnum>
+using namespace Qt::StringLiterals;
+
QT_BEGIN_NAMESPACE
QIfAbstractFeaturePrivate::QIfAbstractFeaturePrivate(const QString &interfaceName, QIfAbstractFeature *parent)
@@ -534,7 +536,7 @@ void QIfAbstractFeature::setError(QIfAbstractFeature::Error error, const QString
{
Q_D(QIfAbstractFeature);
d->m_error = error;
- d->m_errorMessage = errorText() + QStringLiteral(" ") + message;
+ d->m_errorMessage = errorText() + u" "_s + message;
if (d->m_error == QIfAbstractFeature::NoError)
d->m_errorMessage.clear();
emit errorChanged(d->m_error, d->m_errorMessage);
diff --git a/src/interfaceframework/qifconfiguration.cpp b/src/interfaceframework/qifconfiguration.cpp
index 3361aa3e..dfbcdaf4 100644
--- a/src/interfaceframework/qifconfiguration.cpp
+++ b/src/interfaceframework/qifconfiguration.cpp
@@ -10,6 +10,8 @@
#include <QLibraryInfo>
#include <QDir>
+using namespace Qt::StringLiterals;
+
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(qLcIfConfig, "qt.if.configuration");
@@ -22,7 +24,7 @@ if (!d->m_settingsObject) { \
QIfConfigurationManager::QIfConfigurationManager()
{
- const QString configFileName = QStringLiteral("qtifconfig.ini");
+ const QString configFileName = u"qtifconfig.ini"_s;
const QString configPath
= QDir(QLibraryInfo::path(QLibraryInfo::DataPath)).absoluteFilePath(configFileName);
diff --git a/src/interfaceframework/qiffilterandbrowsemodel.cpp b/src/interfaceframework/qiffilterandbrowsemodel.cpp
index 9df810cd..f804e98c 100644
--- a/src/interfaceframework/qiffilterandbrowsemodel.cpp
+++ b/src/interfaceframework/qiffilterandbrowsemodel.cpp
@@ -13,6 +13,8 @@
#include <QDebug>
#include <QMetaObject>
+using namespace Qt::StringLiterals;
+
QT_BEGIN_NAMESPACE
QIfFilterAndBrowseModelPrivate::QIfFilterAndBrowseModelPrivate(const QString &interface, QIfFilterAndBrowseModel *model)
@@ -48,7 +50,7 @@ void QIfFilterAndBrowseModelPrivate::parseQuery()
}
if (!m_capabilities.testFlag(QtInterfaceFrameworkModule::SupportsFiltering) && !m_capabilities.testFlag(QtInterfaceFrameworkModule::SupportsSorting)) {
- qtif_qmlOrCppWarning(q_ptr, QStringLiteral("The backend doesn't support filtering or sorting. Changing the query will have no effect"));
+ qtif_qmlOrCppWarning(q_ptr, u"The backend doesn't support filtering or sorting. Changing the query will have no effect"_s);
return;
}
diff --git a/src/interfaceframework/qifpendingreply.cpp b/src/interfaceframework/qifpendingreply.cpp
index a1b50432..b4207e19 100644
--- a/src/interfaceframework/qifpendingreply.cpp
+++ b/src/interfaceframework/qifpendingreply.cpp
@@ -15,6 +15,8 @@
#include <QtQml>
#include <QCoreApplication>
+using namespace Qt::StringLiterals;
+
QT_BEGIN_NAMESPACE
#define QTIF_ADD_STATIC_METATYPE2(MetaTypeName, MetaTypeId, AliasingType, RealName) \
@@ -460,7 +462,7 @@ void QIfPendingReplyWatcher::setSuccess(const QVariant &value)
const QMetaObject *mo = metaType.metaObject();
- const QString enumName = QString::fromLocal8Bit(metaType.name()).split(QStringLiteral("::")).last();
+ const QString enumName = QString::fromLocal8Bit(metaType.name()).split(u"::"_s).last();
if (mo) {
QMetaEnum mEnum = mo->enumerator(mo->indexOfEnumerator(enumName.toLocal8Bit().constData()));
if (mEnum.isValid()) {
@@ -474,7 +476,7 @@ void QIfPendingReplyWatcher::setSuccess(const QVariant &value)
//Check that the type names match only if it's not a enum, as it will be converted automatically in this case.
if (!isEnumOrFlag && var.metaType() != metaType) {
- qtif_qmlOrCppWarning(this, QString(QStringLiteral("Expected: %1 but got %2")).arg(QLatin1String(metaType.name()), QLatin1String(var.metaType().name())));
+ qtif_qmlOrCppWarning(this, QString(u"Expected: %1 but got %2"_s).arg(QLatin1String(metaType.name()), QLatin1String(var.metaType().name())));
return;
}
diff --git a/src/interfaceframework/qifpendingreply.h b/src/interfaceframework/qifpendingreply.h
index 7149dd5e..cbc05a95 100644
--- a/src/interfaceframework/qifpendingreply.h
+++ b/src/interfaceframework/qifpendingreply.h
@@ -241,12 +241,12 @@ template <typename T> Q_INLINE_TEMPLATE typename std::enable_if<QtPrivate::IsQEn
} else {
QMetaEnum me = QMetaEnum::fromType<T>();
if (me.isValid() && me.isFlag())
- n = QLatin1String(me.scope()) + QStringLiteral("::") + QLatin1String(me.name());
+ n = QLatin1String(me.scope()) + QLatin1String("::") + QLatin1String(me.name());
else
n = QLatin1String(QMetaType(qMetaTypeId<T>()).name());
}
- const QString t_name = QStringLiteral("QIfPendingReply<") + n + QStringLiteral(">");
+ const QString t_name = QLatin1String("QIfPendingReply<") + n + QLatin1String(">");
qRegisterMetaType<QIfPendingReplyBase>(qPrintable(t_name));
}
@@ -255,7 +255,7 @@ template <typename T> Q_INLINE_TEMPLATE typename std::enable_if<!QtPrivate::IsQE
{
qRegisterMetaType<T>();
const char* n = name ? name : QMetaType(qMetaTypeId<T>()).name();
- const QString t_name = QStringLiteral("QIfPendingReply<") + QLatin1String(n) + QStringLiteral(">");
+ const QString t_name = QLatin1String("QIfPendingReply<") + QLatin1String(n) + QLatin1String(">");
qRegisterMetaType<QIfPendingReplyBase>(qPrintable(t_name));
}
diff --git a/src/interfaceframework/qifqmlconversion_helper.cpp b/src/interfaceframework/qifqmlconversion_helper.cpp
index 6d2a1a59..5d176daa 100644
--- a/src/interfaceframework/qifqmlconversion_helper.cpp
+++ b/src/interfaceframework/qifqmlconversion_helper.cpp
@@ -12,9 +12,11 @@
QT_BEGIN_NAMESPACE
+using namespace Qt::StringLiterals;
+
namespace qtif_helper {
- static const QString valueLiteral = QStringLiteral("value");
- static const QString typeLiteral = QStringLiteral("type");
+ static const QString valueLiteral = u"value"_s;
+ static const QString typeLiteral = u"type"_s;
}
using namespace qtif_helper;
@@ -79,10 +81,10 @@ QVariant qtif_convertFromJSON(const QVariant &value)
const QString type = map.value(typeLiteral).toString();
const QVariant value = map.value(valueLiteral);
- if (type == QStringLiteral("enum")) {
+ if (type == u"enum"_s) {
QString enumValue = value.toString();
- const int lastIndex = enumValue.lastIndexOf(QStringLiteral("::"));
- const QString className = enumValue.left(lastIndex) + QStringLiteral("*");
+ const int lastIndex = enumValue.lastIndexOf(u"::"_s);
+ const QString className = enumValue.left(lastIndex) + u"*"_s;
enumValue = enumValue.right(enumValue.size() - lastIndex - 2);
QMetaType metaType = QMetaType::fromName(className.toLatin1());
const QMetaObject *mo = metaType.metaObject();
@@ -98,7 +100,7 @@ QVariant qtif_convertFromJSON(const QVariant &value)
bool ok = false;
int value = me.keysToValue(enumValue.toLatin1(), &ok);
if (ok) {
- return QVariant(QMetaType::fromName((QLatin1String(me.scope()) + QStringLiteral("::") + QLatin1String(me.enumName())).toLatin1()), &value);
+ return QVariant(QMetaType::fromName((QLatin1String(me.scope()) + u"::"_s + QLatin1String(me.enumName())).toLatin1()), &value);
}
}
qWarning() << "Couldn't parse the enum definition" << map;
diff --git a/src/interfaceframework/qifservicemanager.cpp b/src/interfaceframework/qifservicemanager.cpp
index db713a7b..00bab3df 100644
--- a/src/interfaceframework/qifservicemanager.cpp
+++ b/src/interfaceframework/qifservicemanager.cpp
@@ -18,6 +18,8 @@
#include <QModelIndex>
#include <QStringList>
+using namespace Qt::StringLiterals;
+
#define QIF_PLUGIN_DIRECTORY "interfaceframework"
QT_BEGIN_NAMESPACE
@@ -30,16 +32,16 @@ namespace qtif_helper {
#else
static const bool loadDebug = false;
#endif
- static const QString interfacesLiteral = QStringLiteral("interfaces");
- static const QString fileNameLiteral = QStringLiteral("fileName");
- static const QString metaDataLiteral = QStringLiteral("MetaData");
- static const QString classNameLiteral = QStringLiteral("className");
- static const QString simulationLiteral = QStringLiteral("simulation");
- static const QString debugLiteral = QStringLiteral("debug");
+ static const QString interfacesLiteral = u"interfaces"_s;
+ static const QString fileNameLiteral = u"fileName"_s;
+ static const QString metaDataLiteral = u"MetaData"_s;
+ static const QString classNameLiteral = u"className"_s;
+ static const QString simulationLiteral = u"simulation"_s;
+ static const QString debugLiteral = u"debug"_s;
#ifdef Q_OS_WIN
- static const QString debugSuffixLiteral = QStringLiteral("d");
+ static const QString debugSuffixLiteral = u"d"_s;
#else
- static const QString debugSuffixLiteral = QStringLiteral("_debug");
+ static const QString debugSuffixLiteral = u"_debug"_s;
#endif
QString backendBaseName(const QString &fileName)
@@ -96,7 +98,7 @@ QIfProxyServiceObject *QIfServiceManagerPrivate::createServiceObject(struct Back
if (backend->proxyServiceObject) {
QString fileName = backend->metaData[fileNameLiteral].toString();
if (fileName.isEmpty())
- fileName = QStringLiteral("static plugin");
+ fileName = u"static plugin"_s;
qCDebug(qLcIfServiceManagement) << "Found: " << backend->proxyServiceObject << "from: " << fileName;
diff --git a/src/interfaceframework/qifsimulationengine.cpp b/src/interfaceframework/qifsimulationengine.cpp
index e4c89d5f..9d03429c 100644
--- a/src/interfaceframework/qifsimulationengine.cpp
+++ b/src/interfaceframework/qifsimulationengine.cpp
@@ -15,12 +15,14 @@
#include <QLoggingCategory>
#include <QRegularExpression>
+using namespace Qt::StringLiterals;
+
QT_BEGIN_NAMESPACE
namespace qtif_helper {
- static const QString qrcUrlLiteral = QStringLiteral("qrc:");
- static const QString qrcLiteral = QStringLiteral("qrc");
- static const QString resourceLiteral = QStringLiteral(":/");
+ static const QString qrcUrlLiteral = u"qrc:"_s;
+ static const QString qrcLiteral = u"qrc"_s;
+ static const QString resourceLiteral = u":/"_s;
QUrl toQmlUrl(const QString &path) {
if (path.startsWith(qrcUrlLiteral))
@@ -224,7 +226,7 @@ QIfSimulationEngine::QIfSimulationEngine(const QString &identifier, QObject *par
, m_globalObject(new QIfSimulationGlobalObject)
, m_identifier(identifier)
{
- rootContext()->setContextProperty(QStringLiteral("IfSimulator"), m_globalObject);
+ rootContext()->setContextProperty(u"IfSimulator"_s, m_globalObject);
setOutputWarningsToStandardError(false);
connect(this, &QQmlApplicationEngine::warnings, this, [](const QList<QQmlError> &warnings) {
diff --git a/src/interfaceframework/qifsimulationglobalobject.cpp b/src/interfaceframework/qifsimulationglobalobject.cpp
index d0f02fe0..5175a2c9 100644
--- a/src/interfaceframework/qifsimulationglobalobject.cpp
+++ b/src/interfaceframework/qifsimulationglobalobject.cpp
@@ -7,14 +7,16 @@
#include <QtDebug>
#include <QJsonDocument>
+using namespace Qt::StringLiterals;
+
QT_BEGIN_NAMESPACE
namespace qtif_helper {
- static const QString unsupportedLiteral = QStringLiteral("unsupported");
- static const QString minLiteral = QStringLiteral("minimum");
- static const QString maxLiteral = QStringLiteral("maximum");
- static const QString rangeLiteral = QStringLiteral("range");
- static const QString domainLiteral = QStringLiteral("domain");
+ static const QString unsupportedLiteral = u"unsupported"_s;
+ static const QString minLiteral = u"minimum"_s;
+ static const QString maxLiteral = u"maximum"_s;
+ static const QString rangeLiteral = u"range"_s;
+ static const QString domainLiteral = u"domain"_s;
}
using namespace qtif_helper;
@@ -171,12 +173,12 @@ using namespace qtif_helper;
if (value.type() == QVariant::Map) {
QVariantMap map = value.toMap();
- if (map.contains(QStringLiteral("name")))
- d->m_name = map.value(QStringLiteral("name")).value<QString>();
- if (map.contains(QStringLiteral("age")))
- d->m_age = map.value(QStringLiteral("age")).value<int>();
- if (map.contains(QStringLiteral("isMarried")))
- d->m_isMarried = map.value(QStringLiteral("isMarried")).value<bool>();
+ if (map.contains(u"name"_s))
+ d->m_name = map.value(u"name"_s).value<QString>();
+ if (map.contains(u"age"_s))
+ d->m_age = map.value(u"age"_s).value<int>();
+ if (map.contains(u"isMarried"_s))
+ d->m_isMarried = map.value(u"isMarried"_s).value<bool>();
} else if (value.type() == QVariant::List) {
QVariantList values = value.toList();
d->m_name = values.value(0).value<QString>();
@@ -303,7 +305,7 @@ void QIfSimulationGlobalObject::initializeDefault(const QVariantMap &data, QObje
QQmlPropertyMap *map = currentValue.value<QQmlPropertyMap*>();
if (!map)
continue;
- const QStringList zones = data.value(QStringLiteral("zones")).toStringList();
+ const QStringList zones = data.value(u"zones"_s).toStringList();
for (const QString &zone : zones) {
const QVariant defVal = defaultValue(i.value().toMap(), zone);
if (defVal.isValid()) {
@@ -326,7 +328,7 @@ void QIfSimulationGlobalObject::initializeDefault(const QVariantMap &data, QObje
*/
QVariant QIfSimulationGlobalObject::defaultValue(const QVariantMap &data, const QString &zone)
{
- return parseDomainValue(data, QStringLiteral("default"), zone);
+ return parseDomainValue(data, u"default"_s, zone);
}
/*!
@@ -359,11 +361,11 @@ QString QIfSimulationGlobalObject::constraint(const QVariantMap &data, const QSt
if (unsupportedDomain.isValid())
return unsupportedLiteral;
if (minDomain.isValid() && maxDomain.isValid())
- return QStringLiteral("[") + minDomain.toString() + QStringLiteral("-") + maxDomain.toString() + QStringLiteral("]") ;
+ return u"["_s + minDomain.toString() + u"-"_s + maxDomain.toString() + u"]"_s ;
if (minDomain.isValid())
- return QStringLiteral(">= ") + minDomain.toString();
+ return u">= "_s + minDomain.toString();
if (maxDomain.isValid())
- return QStringLiteral("<= ") + maxDomain.toString();
+ return u"<= "_s + maxDomain.toString();
if (domainDomain.isValid())
return QString::fromUtf8(QJsonDocument::fromVariant(domainDomain).toJson(QJsonDocument::Compact));
@@ -445,7 +447,7 @@ QVariant QIfSimulationGlobalObject::parseDomainValue(const QVariantMap &data, co
const QVariantMap domainMap = domainData.toMap();
QString z = zone;
if (zone.isEmpty())
- z = QStringLiteral("=");
+ z = u"="_s;
if (domainMap.contains(z))
return qtif_convertFromJSON(domainMap.value(z));
diff --git a/src/interfaceframework/qifsimulationproxy.cpp b/src/interfaceframework/qifsimulationproxy.cpp
index 10c0ad0c..0007e7aa 100644
--- a/src/interfaceframework/qifsimulationproxy.cpp
+++ b/src/interfaceframework/qifsimulationproxy.cpp
@@ -11,6 +11,8 @@
#include <private/qmetaobjectbuilder_p.h>
+using namespace Qt::StringLiterals;
+
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(qLcIfSimulationEngine, "qt.if.simulationengine")
@@ -85,7 +87,7 @@ void QIfSimulationProxyBase::componentComplete()
QMetaObject QIfSimulationProxyBase::buildObject(const QMetaObject *metaObject, QHash<int, int> &methodMap, QIfSimulationProxyBase::StaticMetacallFunction metaCallFunction)
{
QMetaObjectBuilder builder;
- const QString name = QString(QStringLiteral("QIfSimulationProxy_%1")).arg(QLatin1String(metaObject->className()));
+ const QString name = QString(u"QIfSimulationProxy_%1"_s).arg(QLatin1String(metaObject->className()));
builder.setClassName(qPrintable(name));
builder.setSuperClass(&QObject::staticMetaObject);
builder.setStaticMetacallFunction(metaCallFunction);
diff --git a/src/interfaceframework/qtinterfaceframeworkmodule.cpp b/src/interfaceframework/qtinterfaceframeworkmodule.cpp
index 85dfc8d8..22ca5929 100644
--- a/src/interfaceframework/qtinterfaceframeworkmodule.cpp
+++ b/src/interfaceframework/qtinterfaceframeworkmodule.cpp
@@ -15,6 +15,8 @@
#include <QQmlEngine>
+using namespace Qt::StringLiterals;
+
/*! \internal */
QObject* qtinterfaceframeworkmodule_singletontype_provider(QQmlEngine*, QJSEngine*)
{
@@ -128,9 +130,9 @@ void QtInterfaceFrameworkModule::registerQmlTypes(const QString &uri, int majorV
qmlRegisterSingletonType<QtInterfaceFrameworkModule>(u, majorVersion, minorVersion,
"QtInterfaceFrameworkModule",
qtinterfaceframeworkmodule_singletontype_provider);
- qmlRegisterUncreatableType<QIfAbstractFeatureListModel>(u, majorVersion, minorVersion, "AbstractFeatureListModel", QStringLiteral("AbstractFeatureListModel is not accessible directly"));
- qmlRegisterUncreatableType<QIfAbstractFeature>(u, majorVersion, minorVersion, "AbstractFeature", QStringLiteral("AbstractFeature is not accessible directly"));
- qmlRegisterUncreatableType<QIfAbstractZonedFeature>(u, majorVersion, minorVersion, "AbstractZonedFeature", QStringLiteral("AbstractZonedFeature is not accessible directly"));
+ qmlRegisterUncreatableType<QIfAbstractFeatureListModel>(u, majorVersion, minorVersion, "AbstractFeatureListModel", u"AbstractFeatureListModel is not accessible directly"_s);
+ qmlRegisterUncreatableType<QIfAbstractFeature>(u, majorVersion, minorVersion, "AbstractFeature", u"AbstractFeature is not accessible directly"_s);
+ qmlRegisterUncreatableType<QIfAbstractZonedFeature>(u, majorVersion, minorVersion, "AbstractZonedFeature", u"AbstractZonedFeature is not accessible directly"_s);
qmlRegisterType<QIfPagingModel>(u, majorVersion, minorVersion, "PagingModel");
qmlRegisterType<QIfFilterAndBrowseModel>(u, majorVersion, minorVersion, "FilterAndBrowseModel");
qmlRegisterType<QIfConfiguration>(u, majorVersion, minorVersion, "InterfaceFrameworkConfiguration");
diff --git a/src/interfaceframework/queryparser/qifqueryterm.cpp b/src/interfaceframework/queryparser/qifqueryterm.cpp
index 542e126c..68bc16be 100644
--- a/src/interfaceframework/queryparser/qifqueryterm.cpp
+++ b/src/interfaceframework/queryparser/qifqueryterm.cpp
@@ -10,6 +10,8 @@
#include <QMetaEnum>
#include <QtDebug>
+using namespace Qt::StringLiterals;
+
QT_BEGIN_NAMESPACE
QIfConjunctionTermPrivate::QIfConjunctionTermPrivate()
@@ -410,19 +412,19 @@ QDataStream &operator<<(QDataStream &out, QIfAbstractQueryTerm *var)
{
if (var->type() == QIfAbstractQueryTerm::FilterTerm) {
auto *term = static_cast<QIfFilterTerm*>(var);
- out << QStringLiteral("filter");
+ out << u"filter"_s;
out << term->operatorType();
out << term->value();
out << term->propertyName();
out << term->isNegated();
} else if (var->type() == QIfAbstractQueryTerm::ScopeTerm) {
auto *term = static_cast<QIfScopeTerm*>(var);
- out << QStringLiteral("scope");
+ out << u"scope"_s;
out << term->isNegated();
out << term->term();
} else {
auto *term = static_cast<QIfConjunctionTerm*>(var);
- out << QStringLiteral("conjunction");
+ out << u"conjunction"_s;
out << term->conjunction();
const auto subTerms = term->terms();
out << subTerms.count();
@@ -437,20 +439,20 @@ QDataStream &operator>>(QDataStream &in, QIfAbstractQueryTerm **var)
QString type;
QIfAbstractQueryTerm *aTerm=nullptr;
in >> type;
- if (type == QStringLiteral("filter")) {
+ if (type == u"filter"_s) {
auto term = new QIfFilterTerm();
aTerm = term;
in >> term->d_ptr->m_operator;
in >> term->d_ptr->m_value;
in >> term->d_ptr->m_property;
in >> term->d_ptr->m_negated;
- } else if (type == QStringLiteral("scope")) {
+ } else if (type == u"scope"_s) {
auto term = new QIfScopeTerm();
aTerm = term;
in >> term->d_ptr->m_negated;
in >> &term->d_ptr->m_term;
} else {
- Q_ASSERT(type == QStringLiteral("conjunction"));
+ Q_ASSERT(type == u"conjunction"_s);
auto term = new QIfConjunctionTerm();
aTerm = term;
qsizetype count = 0;