diff --git a/include/orm/ormconcepts.hpp b/include/orm/ormconcepts.hpp index 5e5d0b383..7b832ed80 100644 --- a/include/orm/ormconcepts.hpp +++ b/include/orm/ormconcepts.hpp @@ -78,17 +78,17 @@ namespace Query /*! QString/Column container concept (QStringList or QList). */ template - concept ColumnContainer = std::convertible_to || + concept ColumnContainer = std::convertible_to || std::convertible_to> || std::convertible_to>; /*! QString container concept (used by ContainerUtils::join()). */ template - concept JoinContainer = ColumnContainer || - std::convertible_to> || - std::convertible_to> || + concept JoinContainer = ColumnContainer || + std::convertible_to> || + std::convertible_to> || std::convertible_to> || - std::convertible_to> || + std::convertible_to> || std::convertible_to>; /*! Concept for delimiter for joining containers. */ diff --git a/src/orm/utils/string.cpp b/src/orm/utils/string.cpp index 8bab8e3dc..b10e499b4 100644 --- a/src/orm/utils/string.cpp +++ b/src/orm/utils/string.cpp @@ -485,9 +485,9 @@ bool String::allTagCharsAllowed(const QString &string, const QString::size_type // All allowed chars // A-Z a-z 0-9 - if ((ch >= QLatin1Char('A') && ch <= QLatin1Char('Z')) || - (ch >= QLatin1Char('a') && ch <= QLatin1Char('z')) || - (ch >= QLatin1Char('0') && ch <= QLatin1Char('9')) || + if ((ch >= QLatin1Char('A') && ch <= QLatin1Char('Z')) || + (ch >= QLatin1Char('a') && ch <= QLatin1Char('z')) || + (ch >= QLatin1Char('0') && ch <= QLatin1Char('9')) || // space ! " # $ % & ' (ch >= SPACE && ch <= SQUOTE) || // - = ? _ @