mirror of
https://github.com/silverqx/TinyORM.git
synced 2026-05-11 20:09:46 -05:00
used auto instead of QString
This commit is contained in:
@@ -984,7 +984,7 @@ namespace Concerns
|
||||
QString
|
||||
HasRelationships<Derived, AllRelations...>::guessBelongsToRelation() const
|
||||
{
|
||||
static const QString relation = guessBelongsToRelationInternal<Related>();
|
||||
static const auto relation = guessBelongsToRelationInternal<Related>();
|
||||
|
||||
/* validateUserRelation() method call can not be cached, has to be called
|
||||
every time, to correctly inform the user about invalid relation name. */
|
||||
@@ -1000,8 +1000,8 @@ namespace Concerns
|
||||
QString
|
||||
HasRelationships<Derived, AllRelations...>::guessBelongsToManyRelation() const
|
||||
{
|
||||
static const QString relation = TMPL_PLURAL
|
||||
.arg(guessBelongsToRelationInternal<Related>());
|
||||
static const auto relation = TMPL_PLURAL
|
||||
.arg(guessBelongsToRelationInternal<Related>());
|
||||
|
||||
/* validateUserRelation() method call can not be cached, has to be called
|
||||
every time, to correctly inform the user about invalid relation name. */
|
||||
|
||||
@@ -23,9 +23,9 @@ namespace Orm
|
||||
|
||||
namespace Constants
|
||||
{
|
||||
inline const QString Attached = QStringLiteral("attached");
|
||||
inline const QString Detached = QStringLiteral("detached");
|
||||
inline const QString Updated_ = QStringLiteral("updated");
|
||||
inline const auto Attached = QStringLiteral("attached");
|
||||
inline const auto Detached = QStringLiteral("detached");
|
||||
inline const auto Updated_ = QStringLiteral("updated");
|
||||
} // namespace Constants
|
||||
|
||||
namespace Tiny
|
||||
|
||||
@@ -350,10 +350,10 @@ void tst_Versions::checkFileVersion_TinyDrivers() const
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4127)
|
||||
#endif
|
||||
const QString versionStr = QString::number(TINYDRIVERS_VERSION_MAJOR) + DOT +
|
||||
QString::number(TINYDRIVERS_VERSION_MINOR) + DOT +
|
||||
QString::number(TINYDRIVERS_VERSION_BUGFIX) + DOT +
|
||||
QString::number(TINYDRIVERS_VERSION_BUILD);
|
||||
const auto versionStr = QString::number(TINYDRIVERS_VERSION_MAJOR) + DOT +
|
||||
QString::number(TINYDRIVERS_VERSION_MINOR) + DOT +
|
||||
QString::number(TINYDRIVERS_VERSION_BUGFIX) + DOT +
|
||||
QString::number(TINYDRIVERS_VERSION_BUILD);
|
||||
#if defined(_MSC_VER) && !defined(__clang__)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
@@ -381,10 +381,10 @@ void tst_Versions::checkFileVersion_TinyMySql() const
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4127)
|
||||
#endif
|
||||
const QString versionStr = QString::number(TINYMYSQL_VERSION_MAJOR) + DOT +
|
||||
QString::number(TINYMYSQL_VERSION_MINOR) + DOT +
|
||||
QString::number(TINYMYSQL_VERSION_BUGFIX) + DOT +
|
||||
QString::number(TINYMYSQL_VERSION_BUILD);
|
||||
const auto versionStr = QString::number(TINYMYSQL_VERSION_MAJOR) + DOT +
|
||||
QString::number(TINYMYSQL_VERSION_MINOR) + DOT +
|
||||
QString::number(TINYMYSQL_VERSION_BUGFIX) + DOT +
|
||||
QString::number(TINYMYSQL_VERSION_BUILD);
|
||||
#if defined(_MSC_VER) && !defined(__clang__)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
@@ -411,10 +411,10 @@ void tst_Versions::checkFileVersion_TinyOrm() const
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4127)
|
||||
#endif
|
||||
const QString versionStr = QString::number(TINYORM_VERSION_MAJOR) + DOT +
|
||||
QString::number(TINYORM_VERSION_MINOR) + DOT +
|
||||
QString::number(TINYORM_VERSION_BUGFIX) + DOT +
|
||||
QString::number(TINYORM_VERSION_BUILD);
|
||||
const auto versionStr = QString::number(TINYORM_VERSION_MAJOR) + DOT +
|
||||
QString::number(TINYORM_VERSION_MINOR) + DOT +
|
||||
QString::number(TINYORM_VERSION_BUGFIX) + DOT +
|
||||
QString::number(TINYORM_VERSION_BUILD);
|
||||
#if defined(_MSC_VER) && !defined(__clang__)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
@@ -436,10 +436,10 @@ void tst_Versions::checkFileVersion_TinyUtils() const
|
||||
Fs::absolutePath(TINYTEST_VERSIONS_TINYUTILS_PATH));
|
||||
|
||||
// Project and File Version strings
|
||||
const QString versionStr = QString::number(TINYUTILS_VERSION_MAJOR) + DOT +
|
||||
QString::number(TINYUTILS_VERSION_MINOR) + DOT +
|
||||
QString::number(TINYUTILS_VERSION_BUGFIX) + DOT +
|
||||
QString::number(TINYUTILS_VERSION_BUILD);
|
||||
const auto versionStr = QString::number(TINYUTILS_VERSION_MAJOR) + DOT +
|
||||
QString::number(TINYUTILS_VERSION_MINOR) + DOT +
|
||||
QString::number(TINYUTILS_VERSION_BUGFIX) + DOT +
|
||||
QString::number(TINYUTILS_VERSION_BUILD);
|
||||
|
||||
QCOMPARE(fileVersions.productVersion, versionStr);
|
||||
QCOMPARE(fileVersions.fileVersion, fileVersions.productVersion);
|
||||
@@ -459,10 +459,10 @@ void tst_Versions::checkFileVersion_TomExample() const
|
||||
Fs::absolutePath(TINYTEST_VERSIONS_TOMEXAMPLE_PATH));
|
||||
|
||||
// Project and File Version strings
|
||||
const QString versionStr = QString::number(TINYTOM_VERSION_MAJOR) + DOT +
|
||||
QString::number(TINYTOM_VERSION_MINOR) + DOT +
|
||||
QString::number(TINYTOM_VERSION_BUGFIX) + DOT +
|
||||
QString::number(TINYTOM_VERSION_BUILD);
|
||||
const auto versionStr = QString::number(TINYTOM_VERSION_MAJOR) + DOT +
|
||||
QString::number(TINYTOM_VERSION_MINOR) + DOT +
|
||||
QString::number(TINYTOM_VERSION_BUGFIX) + DOT +
|
||||
QString::number(TINYTOM_VERSION_BUILD);
|
||||
|
||||
QCOMPARE(fileVersions.productVersion, versionStr);
|
||||
QCOMPARE(fileVersions.fileVersion, fileVersions.productVersion);
|
||||
|
||||
@@ -13,7 +13,7 @@ TINY_SYSTEM_HEADER
|
||||
the filepath part). */
|
||||
#define T_MIGRATION \
|
||||
/*! Filename of the migration file. */ \
|
||||
inline static const QString FileName = [] \
|
||||
inline static const auto FileName = [] \
|
||||
{ \
|
||||
return QString::fromStdString( \
|
||||
std::filesystem::path(__FILE__).stem().string()); \
|
||||
|
||||
Reference in New Issue
Block a user