no keywords

src/.qmake.stash

@@ -0,0 +1,22 @@
+QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
+QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 10
+QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 2
+QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1
+QMAKE_CXX.COMPILER_MACROS = \
+    QT_COMPILER_STDCXX \
+    QMAKE_GCC_MAJOR_VERSION \
+    QMAKE_GCC_MINOR_VERSION \
+    QMAKE_GCC_PATCH_VERSION
+QMAKE_CXX.INCDIRS = \
+    /usr/include/c++/10 \
+    /usr/include/c++/10/x86_64-redhat-linux \
+    /usr/include/c++/10/backward \
+    /usr/lib/gcc/x86_64-redhat-linux/10/include \
+    /usr/local/include \
+    /usr/include
+QMAKE_CXX.LIBDIRS = \
+    /usr/lib/gcc/x86_64-redhat-linux/10 \
+    /usr/lib64 \
+    /lib64 \
+    /usr/lib \
+    /lib

src/nut/config/nut_macros.h

@@ -63,7 +63,7 @@ public:                                                                        \
     NUT_DECLARE_FIELD(keytype, name##Id, read##Id, write##Id)                  \
     NUT_INFO(__nut_FOREIGN_KEY, name, type)                                    \
     Nut::Row<type> m_##name;                                                   \
-public slots:                                                                  \
+public Q_SLOTS:                                                                  \
     Nut::Row<type> read() const { return m_##name ; }                          \
     Q_INVOKABLE void write(Nut::Row<type> name){                               \
         m_##name = name;                                                       \
@@ -85,7 +85,7 @@ public:                                                                        \
                         (staticMetaObject.className(), #name "Id");            \
         return f;                                                              \
     }                                                                          \
-public slots: \
+public Q_SLOTS: \
     void write(Nut::Row<type> name); \
     void write##Id(keytype name##Id);
 

src/nut/core/abstracttableset.cpp

@@ -40,7 +40,7 @@ AbstractTableSet::AbstractTableSet(Table *parent) : QObject(parent),
 
 AbstractTableSet::~AbstractTableSet()
 {
-    foreach (Row<Table> t, data->childs)
+    Q_FOREACH (Row<Table> t, data->childs)
         if (t)
             t->setParentTableSet(nullptr);
 }
@@ -52,7 +52,7 @@ int AbstractTableSet::save(Database *db, bool cleanUp)
     if (data->table)
         masterModel = db->model().tableByClassName(QString::fromUtf8(data->table->metaObject()->className()));
 
-    foreach (Row<Table> t, data->childs) {
+    Q_FOREACH (Row<Table> t, data->childs) {
         if (data->table)
             t->setParentTable(data->table,
                               masterModel,
@@ -80,7 +80,7 @@ int AbstractTableSet::save(Database *db, bool cleanUp)
 void AbstractTableSet::clearChilds()
 {
 #ifdef NUT_RAW_POINTER
-    foreach (Table *t, data->childs)
+    Q_FOREACH (Table *t, data->childs)
         t->deleteLater();
 #endif
     data->childs.clear();

src/nut/core/bulkinserter.cpp

@@ -21,7 +21,7 @@ BulkInserter::BulkInserter(Database *db, QString &className)
 {
     Q_D(BulkInserter);
 
-    foreach (TableModel *m, db->model())
+    Q_FOREACH (TableModel *m, db->model())
         if (m->className() == className)
             d->className = m->name();
 }

src/nut/core/database.cpp

@@ -144,8 +144,8 @@ bool DatabasePrivate::updateDatabase()
         return true;
     }
 
-    foreach (TableModel *tm, current) {
+    Q_FOREACH (TableModel *tm, current) {
-        foreach (FieldModel *fm, tm->fields()) {
+        Q_FOREACH (FieldModel *fm, tm->fields()) {
             if (sqlGenerator->fieldType(fm).isEmpty()) {
                 qWarning("The type (%s) is not supported for field %s::%s",
                          QMetaType::typeName(fm->type),
@@ -163,7 +163,7 @@ bool DatabasePrivate::updateDatabase()
     QStringList sql = sqlGenerator->diff(last, current);
 
     db.transaction();
-    foreach (QString s, sql) {
+    Q_FOREACH (QString s, sql) {
         db.exec(s);
 
         if (db.lastError().type() != QSqlError::NoError) {
@@ -259,8 +259,8 @@ bool DatabasePrivate::getCurrectSchema()
         }
     }
 
-    foreach (TableModel *table, currentModel) {
+    Q_FOREACH (TableModel *table, currentModel) {
-        foreach (FieldModel *f, table->fields()) {
+        Q_FOREACH (FieldModel *f, table->fields()) {
             if (f->isPrimaryKey && ! sqlGenerator->supportPrimaryKey(f->type))
                 qFatal("The field of type %s does not support as primary key",
                        qPrintable(f->typeName));
@@ -270,7 +270,7 @@ bool DatabasePrivate::getCurrectSchema()
                        qPrintable(f->typeName));
         }
 
-        foreach (RelationModel *fk, table->foreignKeys())
+        Q_FOREACH (RelationModel *fk, table->foreignKeys())
             fk->masterTable = currentModel.tableByClassName(fk->masterClassName);
     }
 
@@ -296,7 +296,7 @@ DatabaseModel DatabasePrivate::getLastSchema()
         DatabaseModel ret = json;
         return ret;
         /*
-        foreach (QString key, json.keys()) {
+        Q_FOREACH (QString key, json.keys()) {
             TableModel *sch = new TableModel(json.value(key).toObject(), key);
             ret.append(sch);
         }*/
@@ -310,7 +310,7 @@ DatabaseModel DatabasePrivate::getLastSchema()
     //        QJsonObject json =
     //        QJsonDocument::fromJson(query.value("data").toByteArray()).object();
 
-    //        foreach (QString key, json.keys()) {
+    //        Q_FOREACH (QString key, json.keys()) {
     //            TableModel *sch = new TableModel(json.value(key).toObject(),
     //            key);
     //            ret.append(sch);
@@ -352,7 +352,7 @@ void DatabasePrivate::createChangeLogs()
                                           currentModel.tableByName(
                                               QStringLiteral("__change_log")));
 
-    foreach (QString s, diff)
+    Q_FOREACH (QString s, diff)
         db.exec(s);
 }
 
@@ -564,7 +564,7 @@ bool Database::open(bool updateDatabase)
     else if (d->driver == QStringLiteral("QODBC") || d->driver == QStringLiteral("QODBC3")) {
         QString driverName = QString();
         QStringList parts = d->databaseName.toLower().split(';');
-        foreach (QString p, parts)
+        Q_FOREACH (QString p, parts)
             if (p.trimmed().startsWith(QStringLiteral("driver=")))
                 driverName = p.split('=').at(1).toLower().trimmed();
 
@@ -615,7 +615,7 @@ int Database::saveChanges(bool cleanUp)
     }
 
     int rowsAffected = 0;
-    foreach (AbstractTableSet *ts, d->tableSets)
+    Q_FOREACH (AbstractTableSet *ts, d->tableSets)
         rowsAffected += ts->save(this, cleanUp);
 
     return rowsAffected;
@@ -624,7 +624,7 @@ int Database::saveChanges(bool cleanUp)
 void Database::cleanUp()
 {
     Q_D(Database);
-    foreach (AbstractTableSet *ts, d->tableSets)
+    Q_FOREACH (AbstractTableSet *ts, d->tableSets)
         ts->clearChilds();
 }
 

src/nut/core/database.h

@@ -79,7 +79,7 @@ protected:
     virtual void databaseCreated();
     virtual void databaseUpdated(int oldVersion, int newVersion);
 
-public slots:
+public Q_SLOTS:
     void setDatabaseName(QString databaseName);
     void setHostName(QString hostName);
     void setPort(int port);

src/nut/core/query.h

@@ -244,7 +244,7 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
 
     QSet<TableModel*> relatedTables;
     relatedTables << d->database->model().tableByName(d->tableName);
-    foreach (RelationModel *rel, d->relations)
+    Q_FOREACH (RelationModel *rel, d->relations)
         relatedTables << rel->slaveTable << rel->masterTable;
 
     struct LevelData{
@@ -271,7 +271,7 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
         data.lastKeyValue = QVariant();
 
         QHash<QString, QString> masters;
-        foreach (RelationModel *rel, d->relations)
+        Q_FOREACH (RelationModel *rel, d->relations)
             if (rel->slaveTable->name() == table->name())
                 masters.insert(rel->masterTable->name(), rel->localProperty);
 
@@ -337,7 +337,7 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
             }
 
             // check if master if current table has processed
-            foreach (int m, data.masters)
+            Q_FOREACH (int m, data.masters)
                 if (!checked[m]) {
 //                    qDebug() << "row is checked";
                     continue;
@@ -371,7 +371,7 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
             }
 
             QList<FieldModel*> childFields = data.table->fields();
-            foreach (FieldModel *field, childFields)
+            Q_FOREACH (FieldModel *field, childFields)
                 row->setProperty(field->name.toLatin1().data(),
                                    d->database->sqlGenerator()->unescapeValue(
                                    field->type,
@@ -678,7 +678,7 @@ Q_OUTOFLINE_TEMPLATE void Query<T>::toModel(QSqlQueryModel *model)
     int fieldIndex = 0;
 
     if (d->fieldPhrase.data.count()) {
-        foreach (const PhraseData *pd, d->fieldPhrase.data) {
+        Q_FOREACH (const PhraseData *pd, d->fieldPhrase.data) {
             QString displayName = dbModel
                                       .tableByClassName(QString::fromUtf8(pd->className))
                                       ->field(QString::fromUtf8(pd->fieldName))
@@ -690,7 +690,7 @@ Q_OUTOFLINE_TEMPLATE void Query<T>::toModel(QSqlQueryModel *model)
         }
     } else {
         TableModel *tbl = d->database->model().tableByName(d->tableName);
-        foreach (FieldModel *f, tbl->fields()) {
+        Q_FOREACH (FieldModel *f, tbl->fields()) {
             model->setHeaderData(fieldIndex++,
                                  Qt::Horizontal,
                                  f->displayName);
@@ -717,7 +717,7 @@ Q_OUTOFLINE_TEMPLATE void Query<T>::toModel(SqlModel *model)
     int fieldIndex = 0;
 
     if (d->fieldPhrase.data.count()) {
-        foreach (const PhraseData *pd, d->fieldPhrase.data) {
+        Q_FOREACH (const PhraseData *pd, d->fieldPhrase.data) {
             QString displayName = dbModel.tableByClassName(pd->className)
                     ->field(pd->fieldName)->displayName;
 
@@ -727,7 +727,7 @@ Q_OUTOFLINE_TEMPLATE void Query<T>::toModel(SqlModel *model)
         }
     } else {
         TableModel *tbl = d->database->model().tableByName(d->tableName);
-        foreach (FieldModel *f, tbl->fields()) {
+        Q_FOREACH (FieldModel *f, tbl->fields()) {
             model->setHeaderData(fieldIndex++,
                                  Qt::Horizontal,
                                  f->displayName);

src/nut/core/table.cpp

@@ -96,7 +96,7 @@ void Table::propertyChanged(const QString &propName)
 //    if (!d->model)
 //        qFatal ("model for class '%s' not found", qPrintable(metaObject()->className()));
 
-//    foreach (FieldModel *f, d->model->fields())
+//    Q_FOREACH (FieldModel *f, d->model->fields())
 //        if(f->isPrimaryKey && propName == f->name && f->isAutoIncrement)
 //            return;
 
@@ -138,7 +138,7 @@ bool Table::setParentTable(Table *master, TableModel *masterModel, TableModel *m
 //    if (!d->model)
 //        d->model = TableModel::findByClassName(metaObject()->className());
 
-    foreach (RelationModel *r, model->foreignKeys())
+    Q_FOREACH (RelationModel *r, model->foreignKeys())
         if(r->masterClassName == masterClassName)
         {
             setProperty(QString(r->localColumn).toLatin1().data(),
@@ -179,7 +179,7 @@ void Table::setParentTableSet(AbstractTableSet *parent)
 AbstractTableSet *Table::childTableSet(const QString &name) const
 {
     //Q_D(const Table);
-    foreach (AbstractTableSet *t, d->childTableSets)
+    Q_FOREACH (AbstractTableSet *t, d->childTableSets)
         if (t->childClassName() == name)
             return t;
     return Q_NULLPTR;

src/nut/core/table.h

@@ -69,9 +69,9 @@ public:
     QSet<QString> changedProperties() const;
 
     bool setParentTable(Table *master, TableModel *masterModel, TableModel *model);
-signals:
+Q_SIGNALS:
 
-public slots:
+public Q_SLOTS:
     void propertyChanged();
 
 protected:

src/nut/core/tableset.h

@@ -151,7 +151,7 @@ Q_OUTOFLINE_TEMPLATE void TableSet<T>::append(Row<T> t)
 template<class T>
 Q_OUTOFLINE_TEMPLATE void TableSet<T>::append(RowList<T> t)
 {
-    foreach (Row<T> i, t)
+    Q_FOREACH (Row<T> i, t)
         append(i);
 }
 
@@ -168,7 +168,7 @@ Q_OUTOFLINE_TEMPLATE void TableSet<T>::remove(Row<T> t)
 template<class T>
 Q_OUTOFLINE_TEMPLATE void TableSet<T>::remove(RowList<T> t)
 {
-    foreach (Row<T> i, t)
+    Q_FOREACH (Row<T> i, t)
         remove(i);
 }
 

src/nut/generators/abstractsqlgenerator.cpp

@@ -114,7 +114,7 @@ QString AbstractSqlGenerator::recordsPhrase(TableModel *table)
         return QString();
 
     QString ret = QString();
-    foreach (FieldModel *f, table->fields()) {
+    Q_FOREACH (FieldModel *f, table->fields()) {
         if (!ret.isEmpty())
             ret.append(QLatin1String(", "));
         ret.append(QStringLiteral("%1.%2 AS \"%1.%2\"").arg(table->name(), f->name));
@@ -125,9 +125,9 @@ QString AbstractSqlGenerator::recordsPhrase(TableModel *table)
 QString AbstractSqlGenerator::insertBulk(const QString &tableName, const PhraseList &ph, const QList<QVariantList> &vars)
 {
     QString sql;
-    foreach (QVariantList list, vars) {
+    Q_FOREACH (QVariantList list, vars) {
         QStringList values;
-        foreach (QVariant v, list)
+        Q_FOREACH (QVariant v, list)
             values.append(escapeValue(v));
 
         if (!sql.isEmpty())
@@ -227,23 +227,23 @@ QStringList AbstractSqlGenerator::diff(TableModel *oldTable, TableModel *newTabl
     QList<QString> relations;
 
     if (oldTable) {
-        foreach (FieldModel *f, oldTable->fields())
+        Q_FOREACH (FieldModel *f, oldTable->fields())
             if (!fieldNames.contains(f->name))
                 fieldNames.append(f->name);
-        foreach (RelationModel *r, oldTable->foreignKeys())
+        Q_FOREACH (RelationModel *r, oldTable->foreignKeys())
             if (!relations.contains(r->localColumn))
                 relations.append(r->localColumn);
     }
 
-    foreach (FieldModel *f, newTable->fields())
+    Q_FOREACH (FieldModel *f, newTable->fields())
         if (!fieldNames.contains(f->name))
             fieldNames.append(f->name);
-    foreach (RelationModel *r, newTable->foreignKeys())
+    Q_FOREACH (RelationModel *r, newTable->foreignKeys())
         if (!relations.contains(r->localColumn))
             relations.append(r->localColumn);
 
     QStringList columnSql;
-    foreach (QString fieldName, fieldNames) {
+    Q_FOREACH (QString fieldName, fieldNames) {
         FieldModel *newField = newTable->field(fieldName);
         if (oldTable) {
             FieldModel *oldField = oldTable->field(fieldName);
@@ -258,7 +258,7 @@ QStringList AbstractSqlGenerator::diff(TableModel *oldTable, TableModel *newTabl
             columnSql << declare;
         }
     }
-//    foreach (QString fieldName, relations) {
+//    Q_FOREACH (QString fieldName, relations) {
 //        RelationModel *newRelation = newTable->foregionKeyByField(fieldName);
 //        if (oldTable) {
 //            RelationModel *oldRelation = oldTable->foregionKeyByField(fieldName);
@@ -298,17 +298,17 @@ QStringList AbstractSqlGenerator::diffRelation(TableModel *oldTable, TableModel
     QList<QString> relations;
 
     if (oldTable) {
-        foreach (RelationModel *r, oldTable->foreignKeys())
+        Q_FOREACH (RelationModel *r, oldTable->foreignKeys())
             if (!relations.contains(r->localColumn))
                 relations.append(r->localColumn);
     }
 
-    foreach (RelationModel *r, newTable->foreignKeys())
+    Q_FOREACH (RelationModel *r, newTable->foreignKeys())
         if (!relations.contains(r->localColumn))
             relations.append(r->localColumn);
 
     QStringList columnSql;
-    foreach (QString fieldName, relations) {
+    Q_FOREACH (QString fieldName, relations) {
         RelationModel *newRelation = newTable->foreignKeyByField(fieldName);
         RelationModel *oldRelation = nullptr;
         if (oldTable)
@@ -465,7 +465,7 @@ QString AbstractSqlGenerator::insertRecord(Table *t, QString tableName)
 
     QSet<QString> props = t->changedProperties();
     QString changedPropertiesText = QString();
-    foreach (QString f, props) {
+    Q_FOREACH (QString f, props) {
         if (f == key)
             continue;
 
@@ -490,7 +490,7 @@ QString AbstractSqlGenerator::updateRecord(Table *t, QString tableName)
     QString key = model->primaryKey();
     QStringList values;
 
-    foreach (QString f, t->changedProperties())
+    Q_FOREACH (QString f, t->changedProperties())
         if (f != key)
             values.append(f + QStringLiteral("='")
                           + t->property(f.toLatin1().data()).toString()
@@ -595,11 +595,11 @@ QString AbstractSqlGenerator::selectCommand(const QString &tableName,
     if (fields.data.count() == 0) {
         QSet<TableModel*> tables;
         tables.insert(_database->model().tableByName(tableName));
-        foreach (RelationModel *rel, joins)
+        Q_FOREACH (RelationModel *rel, joins)
             tables << rel->masterTable << rel->slaveTable;
 
         selectText = QString();
-        foreach (TableModel *t, tables) {
+        Q_FOREACH (TableModel *t, tables) {
             if (!selectText.isEmpty())
                 selectText.append(QStringLiteral(", "));
             selectText.append(recordsPhrase(t));
@@ -684,7 +684,7 @@ QString AbstractSqlGenerator::updateCommand(const QString &tableName,
                                         const ConditionalPhrase &where)
 {
     QString assigmentTexts = QString();
-    foreach (PhraseData *d, assigments.data) {
+    Q_FOREACH (PhraseData *d, assigments.data) {
         if (assigmentTexts != QStringLiteral(""))
             assigmentTexts.append(QStringLiteral(", "));
 
@@ -712,7 +712,7 @@ QString AbstractSqlGenerator::insertCommand(const QString &tableName, const Assi
 
     QString fieldNames;
     QString values;
-    foreach (PhraseData *d, assigments.data) {
+    Q_FOREACH (PhraseData *d, assigments.data) {
         if (!fieldNames.isEmpty())
             fieldNames.append(QStringLiteral(", "));
 
@@ -744,11 +744,11 @@ QString AbstractSqlGenerator::insertCommand(const QString &tableName, const Assi
 //    if (t == SelectAll) {
 //        QSet<TableModel*> tables;
 //        tables.insert(_database->model().tableByName(tableName));
-//        foreach (RelationModel *rel, joins)
+//        Q_FOREACH (RelationModel *rel, joins)
 //            tables << rel->masterTable << rel->slaveTable;
 
 //        select = "";
-//        foreach (TableModel *t, tables) {
+//        Q_FOREACH (TableModel *t, tables) {
 //            if (!select.isEmpty())
 //                select.append(", ");
 //            select.append(recordsPhrase(t));
@@ -758,7 +758,7 @@ QString AbstractSqlGenerator::insertCommand(const QString &tableName, const Assi
 //    QString where = createWhere(wheres);
 //    QString orderText = joinedOrders.join(", ");
 
-//    foreach (WherePhrase p, orders) {
+//    Q_FOREACH (WherePhrase p, orders) {
 //        if (orderText != "")
 //            orderText.append(", ");
 //        orderText.append(phraseOrder(p.data()));
@@ -785,7 +785,7 @@ QString AbstractSqlGenerator::insertCommand(const QString &tableName, const Assi
 //{
 //    QString whereText = "";
 
-//    foreach (WherePhrase w, wheres) {
+//    Q_FOREACH (WherePhrase w, wheres) {
 //        if (whereText != "")
 //            whereText.append(" AND ");
 
@@ -797,7 +797,7 @@ QString AbstractSqlGenerator::insertCommand(const QString &tableName, const Assi
 
 void AbstractSqlGenerator::replaceTableNames(QString &command)
 {
-    foreach (TableModel *m, _database->model())
+    Q_FOREACH (TableModel *m, _database->model())
         command = command
                       .replace(QStringLiteral("[") + m->className()
                                    + QStringLiteral("]"), m->name());
@@ -805,7 +805,7 @@ void AbstractSqlGenerator::replaceTableNames(QString &command)
 
 void AbstractSqlGenerator::removeTableNames(QString &command)
 {
-    foreach (TableModel *m, _database->model())
+    Q_FOREACH (TableModel *m, _database->model())
         command = command.replace(QStringLiteral("[")
                                       + m->className()
                                       + QStringLiteral("]."), QStringLiteral(""));
@@ -892,7 +892,7 @@ QString AbstractSqlGenerator::escapeValue(const QVariant &v) const
     if (v.type() == QVariant::List) {
         auto list = v.toList();
         QStringList ret;
-        foreach (QVariant vi, list) {
+        Q_FOREACH (QVariant vi, list) {
             ret.append(QStringLiteral("'")
                        + _serializer->serialize(vi)
                        + QStringLiteral("'"));
@@ -1116,7 +1116,7 @@ QString AbstractSqlGenerator::createConditionalPhrase(const PhraseData *d) const
 QString AbstractSqlGenerator::createOrderPhrase(const PhraseList &ph)
 {
     QString ret = QString();
-    foreach (const PhraseData *d, ph.data) {
+    Q_FOREACH (const PhraseData *d, ph.data) {
         if (!ret.isEmpty())
             ret.append(QStringLiteral(", "));
         ret.append(d->toString());
@@ -1130,7 +1130,7 @@ QString AbstractSqlGenerator::createOrderPhrase(const PhraseList &ph)
 QString AbstractSqlGenerator::createFieldPhrase(const PhraseList &ph)
 {
     QString ret = QString();
-    foreach (const PhraseData *d, ph.data) {
+    Q_FOREACH (const PhraseData *d, ph.data) {
         if (!ret.isEmpty())
             ret.append(QStringLiteral(", "));
         ret.append(d->toString());
@@ -1142,7 +1142,7 @@ QString AbstractSqlGenerator::createFieldPhrase(const PhraseList &ph)
 
 void AbstractSqlGenerator::createInsertPhrase(const AssignmentPhraseList &ph, QString &fields, QString &values)
 {
-    foreach (PhraseData *d, ph.data) {
+    Q_FOREACH (PhraseData *d, ph.data) {
         if (!fields.isEmpty())
             fields.append(QStringLiteral(", "));
 

src/nut/generators/mysqlgenerator.cpp

@@ -194,7 +194,7 @@ QVariant MySqlGenerator::unescapeValue(const QMetaType::Type &type, const QVaria
 //        if (!readInsideParentese(ref, p))
 //            return pol;
 //        QStringList parts = p.split(",");
-//        foreach (QString v, parts) {
+//        Q_FOREACH (QString v, parts) {
 //            QList<int> l = _serializer->toListInt(p.trimmed(), " ");
 //            if (l.count() != 2)
 //                return QPolygon();
@@ -210,7 +210,7 @@ QVariant MySqlGenerator::unescapeValue(const QMetaType::Type &type, const QVaria
 //            return pol;
 
 //        QStringList parts = p.split(",");
-//        foreach (QString v, parts) {
+//        Q_FOREACH (QString v, parts) {
 //            QList<qreal> l = _serializer->toListReal(p.trimmed(), " ");
 //            if (l.count() != 2)
 //                return QPolygonF();

src/nut/generators/sqlitegenerator.cpp

@@ -135,22 +135,22 @@ QStringList SqliteGenerator::diff(TableModel *oldTable, TableModel *newTable)
     QList<QString> fieldNames;
     QList<QString> relations;
 
-    foreach (FieldModel *f, oldTable->fields())
+    Q_FOREACH (FieldModel *f, oldTable->fields())
         if (!fieldNames.contains(f->name))
             fieldNames.append(f->name);
-    foreach (RelationModel *r, oldTable->foreignKeys())
+    Q_FOREACH (RelationModel *r, oldTable->foreignKeys())
         if (!relations.contains(r->localColumn))
             relations.append(r->localColumn);
 
-    foreach (FieldModel *f, newTable->fields())
+    Q_FOREACH (FieldModel *f, newTable->fields())
         if (!fieldNames.contains(f->name))
             fieldNames.append(f->name);
-    foreach (RelationModel *r, newTable->foreignKeys())
+    Q_FOREACH (RelationModel *r, newTable->foreignKeys())
         if (!relations.contains(r->localColumn))
             relations.append(r->localColumn);
 
     QString columns;
-    foreach (FieldModel *f, oldTable->fields()) {
+    Q_FOREACH (FieldModel *f, oldTable->fields()) {
         if (!newTable->field(f->name))
             continue;
 

src/nut/models/databasemodel.cpp

@@ -48,7 +48,7 @@ DatabaseModel::DatabaseModel(const QJsonObject &json) :
     setVersion(json.value(NODE_VERSION).toInt());
 
     QJsonObject tables = json.value(NODE_TABLES).toObject();
-    foreach (QString key, tables.keys()) {
+    Q_FOREACH (QString key, tables.keys()) {
         if(!tables.value(key).isObject())
             continue;
 
@@ -146,7 +146,7 @@ RelationModel *DatabaseModel::relationByClassNames(const QString &masterClassNam
     if(!childTable)
         return nullptr;
 
-    foreach (RelationModel *rel, childTable->foreignKeys())
+    Q_FOREACH (RelationModel *rel, childTable->foreignKeys())
         if(rel->masterClassName == masterClassName)
             return rel;
 
@@ -160,7 +160,7 @@ RelationModel *DatabaseModel::relationByTableNames(const QString &masterTableNam
     if(!childTable)
         return nullptr;
 
-    foreach (RelationModel *rel, childTable->foreignKeys())
+    Q_FOREACH (RelationModel *rel, childTable->foreignKeys())
         if(rel->masterTable->name() == masterTableName)
             return rel;
 
@@ -174,7 +174,7 @@ DatabaseModel DatabaseModel::fromJson(QJsonObject &json)
     model.setVersion(json.value(NODE_VERSION).toInt());
 
     QJsonObject tables = json.value(NODE_TABLES).toObject();
-    foreach (QString key, tables.keys()) {
+    Q_FOREACH (QString key, tables.keys()) {
         if(!json.value(key).isObject())
             continue;
 
@@ -209,8 +209,8 @@ bool DatabaseModel::remove(const QString &tableName)
 void DatabaseModel::fixRelations()
 {
     /*TODO: fixme
-    foreach (TableModel *table, currentModel)
+    Q_FOREACH (TableModel *table, currentModel)
-        foreach (RelationModel *fk, table->foreignKeys())
+        Q_FOREACH (RelationModel *fk, table->foreignKeys())
             fk->masterTable = currentModel.tableByClassName(fk->masterClassName);
             */
 }

src/nut/models/sqlmodel.h

@@ -59,7 +59,7 @@ public:
 
     void setRenderer(const std::function<QVariant (int, QVariant)> &renderer);
 
-signals:
+Q_SIGNALS:
     void beforeShowText(int col, QVariant &value);
 };
 
@@ -67,7 +67,7 @@ template<class T>
 Q_OUTOFLINE_TEMPLATE void SqlModel::setTable(RowList<T> rows)
 {
     RowList<Table> tab;
-    foreach (auto t, rows)
+    Q_FOREACH (auto t, rows)
         tab.append(t);
     setRows(tab);
 }

src/nut/models/tablemodel.cpp

@@ -74,7 +74,7 @@ FieldModel *TableModel::field(int n) const
 
 FieldModel *TableModel::field(const QString &name) const
 {
-    foreach (FieldModel *f, _fields)
+    Q_FOREACH (FieldModel *f, _fields)
         if(f->name == name)
             return f;
 
@@ -94,7 +94,7 @@ QList<RelationModel *> TableModel::foreignKeys() const
 QStringList TableModel::fieldsNames() const
 {
     QStringList ret;
-    foreach (FieldModel *f, _fields)
+    Q_FOREACH (FieldModel *f, _fields)
         ret.append(f->name);
     return ret;
 }
@@ -106,7 +106,7 @@ bool TableModel::operator ==(const TableModel &t) const{
     if(fields().count() != t.fields().count())
         return false;
 
-    foreach (FieldModel *f, _fields) {
+    Q_FOREACH (FieldModel *f, _fields) {
         FieldModel *tf = t.field(f->name);
         if(!tf)
             return false;
@@ -162,7 +162,7 @@ TableModel::TableModel(int typeId, const QString &tableName)
         QMetaProperty fieldProperty = tableMetaObject->property(j);
         auto name = QString::fromUtf8(fieldProperty.name());
         FieldModel *fieldObj = field(name);
-        foreach (FieldModel *f, _fields)
+        Q_FOREACH (FieldModel *f, _fields)
             if(f->name == name)
                 f = fieldObj;
         if(!fieldObj)
@@ -244,7 +244,7 @@ TableModel::TableModel(const QJsonObject &json, const QString &tableName) : _typ
 
     QJsonObject fields = json.value(QStringLiteral(__FIELDS)).toObject();
     QJsonObject relations = json.value(QStringLiteral(__FOREIGN_KEYS)).toObject();
-    foreach (QString key, fields.keys()) {
+    Q_FOREACH (QString key, fields.keys()) {
         QJsonObject fieldObject = fields.value(key).toObject();
         //TODO: use FieldModel(QJsonObject) ctor
         auto *f = new FieldModel;
@@ -266,7 +266,7 @@ TableModel::TableModel(const QJsonObject &json, const QString &tableName) : _typ
         _fields.append(f);
     }
 
-    foreach (QString key, relations.keys()) {
+    Q_FOREACH (QString key, relations.keys()) {
         QJsonObject relObject = fields.value(key).toObject();
         _foreignKeys.append(new RelationModel(relObject));
     }
@@ -284,7 +284,7 @@ QJsonObject TableModel::toJson() const
     QJsonObject fieldsObj;
     QJsonObject foreignKeysObj;
 
-    foreach (FieldModel *f, _fields) {
+    Q_FOREACH (FieldModel *f, _fields) {
         QJsonObject fieldObj;
         fieldObj.insert(QStringLiteral(__NAME), f->name);
         fieldObj.insert(QStringLiteral(__TYPE), QString::fromUtf8(QVariant::typeToName(f->type)));
@@ -309,7 +309,7 @@ QJsonObject TableModel::toJson() const
 
         fieldsObj.insert(f->name, fieldObj);
     }
-    foreach (RelationModel *rel, _foreignKeys)
+    Q_FOREACH (RelationModel *rel, _foreignKeys)
         foreignKeysObj.insert(rel->localColumn, rel->toJson());
 
     obj.insert(QStringLiteral(__FIELDS), fieldsObj);
@@ -320,7 +320,7 @@ QJsonObject TableModel::toJson() const
 
 RelationModel *TableModel::foreignKey(const QString &otherTable) const
 {
-    foreach (RelationModel *fk, _foreignKeys)
+    Q_FOREACH (RelationModel *fk, _foreignKeys)
         if(fk->masterClassName == otherTable)
             return fk;
 
@@ -329,7 +329,7 @@ RelationModel *TableModel::foreignKey(const QString &otherTable) const
 
 RelationModel *TableModel::foreignKeyByField(const QString &fieldName) const
 {
-    foreach (RelationModel *fk, _foreignKeys)
+    Q_FOREACH (RelationModel *fk, _foreignKeys)
         if(fk->localColumn == fieldName)
             return fk;
 
@@ -339,7 +339,7 @@ RelationModel *TableModel::foreignKeyByField(const QString &fieldName) const
 QString TableModel::toString() const
 {
     QStringList sl;
-    foreach (FieldModel *f, _fields)
+    Q_FOREACH (FieldModel *f, _fields)
         sl.append(f->name + QStringLiteral(" ")
                   + QString::fromUtf8(QVariant::typeToName(f->type)));
 
@@ -350,7 +350,7 @@ QString TableModel::toString() const
 
 QString TableModel::primaryKey() const
 {
-    foreach (FieldModel *f, _fields)
+    Q_FOREACH (FieldModel *f, _fields)
         if(f->isPrimaryKey)
             return f->name;
     return QString();

src/nut/phrases/abstractfieldphrase.h

@@ -46,7 +46,7 @@ public:
     ConditionalPhrase in(QList<T> list)
     {
         QVariantList vlist;
-        foreach (T t, list)
+        Q_FOREACH (T t, list)
             vlist.append(QVariant::fromValue(t));
 
         return ConditionalPhrase(this, PhraseData::In, vlist);

src/nut/phrases/assignmentphraselist.cpp

@@ -68,7 +68,7 @@ AssignmentPhraseList AssignmentPhraseList::operator &(const AssignmentPhrase
 
 AssignmentPhraseList::~AssignmentPhraseList()
 {
-//    foreach (PhraseData *d, data)
+//    Q_FOREACH (PhraseData *d, data)
 //        if (!d->ref.deref())
 //            delete d;
 //    qDeleteAll(data);
@@ -77,7 +77,7 @@ AssignmentPhraseList::~AssignmentPhraseList()
 
 void AssignmentPhraseList::incAllDataParents()
 {
-    foreach (PhraseData *d, data)
+    Q_FOREACH (PhraseData *d, data)
         d->ref.ref();
 }
 

src/nut/phrases/phrasedatalist.cpp

@@ -43,7 +43,7 @@ void PhraseDataList::append(PhraseData *d)
 
 void PhraseDataList::append(QList<PhraseData *> &dl)
 {
-    foreach (PhraseData *d, dl)
+    Q_FOREACH (PhraseData *d, dl)
         d->ref.ref();
     QList<PhraseData*>::append(dl);
 }

src/nut/phrases/phraselist.cpp

@@ -83,7 +83,7 @@ PhraseList PhraseList::operator |(const AbstractFieldPhrase &other) {
 
 void PhraseList::incAllDataParents()
 {
-//    foreach (PhraseData *d, data)
+//    Q_FOREACH (PhraseData *d, data)
 //        d->parents++;
 }
 

tests/auto/common/comment.cpp

@@ -33,7 +33,7 @@ void Comment::setId(int id)
         return;
 
     m_id = id;
-    emit idChanged(m_id);
+    Q_EMIT idChanged(m_id);
 }
 
 void Comment::setMessage(QString message)
@@ -42,7 +42,7 @@ void Comment::setMessage(QString message)
         return;
 
     m_message = message;
-    emit messageChanged(m_message);
+    Q_EMIT messageChanged(m_message);
 }
 
 void Comment::setSaveDate(QDateTime saveDate)
@@ -51,7 +51,7 @@ void Comment::setSaveDate(QDateTime saveDate)
         return;
 
     m_saveDate = saveDate;
-    emit saveDateChanged(m_saveDate);
+    Q_EMIT saveDateChanged(m_saveDate);
 }
 
 void Comment::setPoint(qreal point)
@@ -61,7 +61,7 @@ void Comment::setPoint(qreal point)
         return;
 
     m_point = point;
-    emit pointChanged(m_point);
+    Q_EMIT pointChanged(m_point);
 }
 
 NUT_FOREIGN_KEY_IMPLEMENT(Comment, Post, int, post, post, setPost)

tests/auto/common/comment.h

@@ -42,13 +42,13 @@ public:
     QDateTime saveDate() const;
     qreal point() const;
 
-public slots:
+public Q_SLOTS:
     void setId(int id);
     void setMessage(QString message);
     void setSaveDate(QDateTime saveDate);
     void setPoint(qreal point);
 
-signals:
+Q_SIGNALS:
     void idChanged(int id);
     void messageChanged(QString message);
     void saveDateChanged(QDateTime saveDate);

tests/auto/common/post.cpp

@@ -42,7 +42,7 @@ void Post::setId(int id)
         return;
 
     m_id = id;
-    emit idChanged(m_id);
+    Q_EMIT idChanged(m_id);
 }
 
 void Post::setTitle(QString title)
@@ -51,7 +51,7 @@ void Post::setTitle(QString title)
         return;
 
     m_title = title;
-    emit titleChanged(m_title);
+    Q_EMIT titleChanged(m_title);
 }
 
 void Post::setSaveDate(QDateTime saveDate)
@@ -60,7 +60,7 @@ void Post::setSaveDate(QDateTime saveDate)
         return;
 
     m_saveDate = saveDate;
-    emit saveDateChanged(m_saveDate);
+    Q_EMIT saveDateChanged(m_saveDate);
 }
 
 void Post::setBody(QString body)
@@ -69,7 +69,7 @@ void Post::setBody(QString body)
         return;
 
     m_body = body;
-    emit bodyChanged(m_body);
+    Q_EMIT bodyChanged(m_body);
 }
 
 void Post::setPublic(bool isPublic)
@@ -78,7 +78,7 @@ void Post::setPublic(bool isPublic)
         return;
 
     m_isPublic = isPublic;
-    emit isPublicChanged(m_isPublic);
+    Q_EMIT isPublicChanged(m_isPublic);
 }
 
 NUT_IMPLEMENT_CHILD_TABLE(Post, Comment, comments)

tests/auto/common/post.h

@@ -53,14 +53,14 @@ public:
     QString body() const;
     bool isPublic() const;
 
-signals:
+Q_SIGNALS:
     void idChanged(int id);
     void titleChanged(QString title);
     void saveDateChanged(QDateTime saveDate);
     void bodyChanged(QString body);
     void isPublicChanged(bool isPublic);
 
-public slots:
+public Q_SLOTS:
     void setId(int id);
     void setTitle(QString title);
     void setSaveDate(QDateTime saveDate);

tests/auto/common/user.cpp

@@ -31,7 +31,7 @@ void User::setId(int id)
         return;
 
     m_id = id;
-    emit idChanged(m_id);
+    Q_EMIT idChanged(m_id);
 }
 
 void User::setUsername(QString username)
@@ -40,7 +40,7 @@ void User::setUsername(QString username)
         return;
 
     m_username = username;
-    emit usernameChanged(m_username);
+    Q_EMIT usernameChanged(m_username);
 }
 
 void User::setPassword(QString password)
@@ -49,7 +49,7 @@ void User::setPassword(QString password)
         return;
 
     m_password = password;
-    emit passwordChanged(m_password);
+    Q_EMIT passwordChanged(m_password);
 }
 
 NUT_IMPLEMENT_CHILD_TABLE(User, Comment, comments)

tests/auto/common/user.h

@@ -46,12 +46,12 @@ public:
     QString username() const;
     QString password() const;
 
-public slots:
+public Q_SLOTS:
     void setId(int id);
     void setUsername(QString username);
     void setPassword(QString password);
 
-signals:
+Q_SIGNALS:
     void idChanged(int id);
     void usernameChanged(QString username);
     void passwordChanged(QString password);

tests/auto/tst_basic/tst_basic.h

@@ -19,9 +19,9 @@ class BasicTest : public QObject
 public:
     explicit BasicTest(QObject *parent = nullptr);
 
-signals:
+Q_SIGNALS:
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
 
     void dataSchema();

tests/auto/tst_benckmark/tst_benchmark.h

@@ -16,9 +16,9 @@ class BenchmarkTest : public QObject
 public:
     explicit BenchmarkTest(QObject *parent = nullptr);
 
-signals:
+Q_SIGNALS:
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
 
     void insert1kPost();

tests/auto/tst_commands/tst_commands.h

@@ -16,9 +16,9 @@ class CommandsTest : public QObject
 public:
     explicit CommandsTest(QObject *parent = nullptr);
 
-signals:
+Q_SIGNALS:
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
 
     void cmd1();

tests/auto/tst_datatypes/tst_datatypes.h

@@ -58,9 +58,9 @@ class DataTypesTest : public QObject
 public:
     explicit DataTypesTest(QObject *parent = nullptr);
 
-signals:
+Q_SIGNALS:
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
 
     void insert();

tests/auto/tst_datetime/tst_datetime.h

@@ -26,9 +26,9 @@ class DateTimeTest : public QObject
 public:
     explicit DateTimeTest(QObject *parent = nullptr);
 
-signals:
+Q_SIGNALS:
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void dateAdd();
     void timeAdd();

tests/auto/tst_generators/tst_generators.cpp

@@ -85,7 +85,7 @@ void GeneratorsTest::types(Nut::AbstractSqlGenerator *g, QString name)
                ;
 
     Nut::FieldModel m;
-    foreach (QMetaType::Type t, types) {
+    Q_FOREACH (QMetaType::Type t, types) {
         m.type = t;
         QString fn = g->fieldType(&m);
 

tests/auto/tst_generators/tst_generators.h

@@ -35,7 +35,7 @@ public:
 
     void types(Nut::AbstractSqlGenerator *g, QString name);
 
-private slots:
+private Q_SLOTS:
     void test_sqlite();
     void test_psql();
     void test_sqlserver();

tests/auto/tst_join/jointest.h

@@ -14,9 +14,9 @@ class JoinTest : public QObject
 public:
     explicit JoinTest(QObject *parent = 0);
 
-signals:
+Q_SIGNALS:
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
 
     void join();

tests/auto/tst_json/tst_json.h

@@ -21,7 +21,7 @@ public:
     TestJson();
     ~TestJson();
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
 
     void store();

tests/auto/tst_phrases/tst_phrases.h

@@ -19,9 +19,9 @@ class PhrasesTest : public QObject
 public:
     explicit PhrasesTest(QObject *parent = nullptr);
 
-signals:
+Q_SIGNALS:
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
 
     void condition_numeric_sqlite();

tests/auto/tst_properties/sampletable.cpp

@@ -26,7 +26,7 @@ void SampleTable::setId(int id)
         return;
 
     m_id = id;
-    emit idChanged(m_id);
+    Q_EMIT idChanged(m_id);
 }
 
 void SampleTable::setName(QString name)
@@ -35,7 +35,7 @@ void SampleTable::setName(QString name)
         return;
 
     m_name = name;
-    emit nameChanged(m_name);
+    Q_EMIT nameChanged(m_name);
 }
 
 void SampleTable::setLastName(QString lastName)
@@ -44,5 +44,5 @@ void SampleTable::setLastName(QString lastName)
         return;
 
     m_lastName = lastName;
-    emit lastNameChanged(m_lastName);
+    Q_EMIT lastNameChanged(m_lastName);
 }

tests/auto/tst_properties/sampletable.h

@@ -26,12 +26,12 @@ public:
     QString name() const;
     QString lastName() const;
 
-public slots:
+public Q_SLOTS:
     void setId(int id);
     void setName(QString name);
     void setLastName(QString lastName);
 
-signals:
+Q_SIGNALS:
     void idChanged(int id);
     void nameChanged(QString name);
     void lastNameChanged(QString lastName);

tests/auto/tst_properties/tst_properties.h

@@ -14,9 +14,9 @@ class PropertiesTest : public QObject
 public:
     explicit PropertiesTest(QObject *parent = nullptr);
 
-signals:
+Q_SIGNALS:
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void insert();
     void select();

tests/auto/tst_quuid/tst_uuid.h

@@ -17,9 +17,9 @@ class UuidTest : public QObject
 public:
     explicit UuidTest(QObject *parent = nullptr);
 
-signals:
+Q_SIGNALS:
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void save();
     void restore();

tests/auto/tst_upgrades/tst_upgrades.h

@@ -17,7 +17,7 @@ public:
     Upgrades();
     ~Upgrades();
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
 
     void version1();