From 95892001f6ee26ad2123baed7b52c0135c74f460 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 17 Mar 2021 12:07:38 +0100 Subject: [PATCH] Fix for auto qstringbuilder deduction --- src/librssguard/database/databasedriver.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/librssguard/database/databasedriver.cpp b/src/librssguard/database/databasedriver.cpp index 0574c3e76..a543f7a4c 100755 --- a/src/librssguard/database/databasedriver.cpp +++ b/src/librssguard/database/databasedriver.cpp @@ -16,13 +16,13 @@ QStringList DatabaseDriver::prepareScript(const QString& base_sql_folder, const QString& sql_file, const QString& database_name) { QStringList statements; - auto next_file = base_sql_folder + QDir::separator() + sql_file; + QString next_file = base_sql_folder + QDir::separator() + sql_file; QString sql_script = QString::fromUtf8(IOFactory::readFile(next_file)); - auto new_statements = sql_script.split(APP_DB_COMMENT_SPLIT, + QStringList new_statements = sql_script.split(APP_DB_COMMENT_SPLIT, #if QT_VERSION >= 0x050F00 // Qt >= 5.15.0 - Qt::SplitBehaviorFlags::SkipEmptyParts); + Qt::SplitBehaviorFlags::SkipEmptyParts); #else - QString::SplitBehavior::SkipEmptyParts); + QString::SplitBehavior::SkipEmptyParts); #endif for (int i = 0; i < new_statements.size(); i++) { @@ -30,13 +30,13 @@ QStringList DatabaseDriver::prepareScript(const QString& base_sql_folder, // We include another file. QString included_file_name = new_statements.at(i).mid(QSL(APP_DB_INCLUDE_PLACEHOLDER).size() + 1); - auto included_file = base_sql_folder + QDir::separator() + included_file_name; + QString included_file = base_sql_folder + QDir::separator() + included_file_name; QString included_sql_script = QString::fromUtf8(IOFactory::readFile(included_file)); - auto included_statements = included_sql_script.split(APP_DB_COMMENT_SPLIT, + QStringList included_statements = included_sql_script.split(APP_DB_COMMENT_SPLIT, #if QT_VERSION >= 0x050F00 // Qt >= 5.15.0 - Qt::SplitBehaviorFlags::SkipEmptyParts); + Qt::SplitBehaviorFlags::SkipEmptyParts); #else - QString::SplitBehavior::SkipEmptyParts); + QString::SplitBehavior::SkipEmptyParts); #endif statements << included_statements;