X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fabstractsqlstorage.cpp;h=d43f59ef20c2433cacc7dba5377d21fc582f922a;hp=bc56ef27751e5d86c2fd8ed5ad73d55ece49ab7f;hb=6e3574a163f07c28d44276318f2d9f92e169f491;hpb=8961f348947fc55cc4bc769563684af3f2ea7ccc diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp index bc56ef27..d43f59ef 100644 --- a/src/core/abstractsqlstorage.cpp +++ b/src/core/abstractsqlstorage.cpp @@ -183,13 +183,13 @@ QString AbstractSqlStorage::queryString(const QString& queryName, int version) return query.trimmed(); } -QList AbstractSqlStorage::setupQueries() +std::vector AbstractSqlStorage::setupQueries() { - QList queries; + std::vector queries; // The current schema is stored in the root folder, including setup scripts. QDir dir = QDir(QString(":/SQL/%1/").arg(displayName())); foreach (QFileInfo fileInfo, dir.entryInfoList(QStringList() << "setup*", QDir::NoFilter, QDir::Name)) { - queries << SqlQueryResource(queryString(fileInfo.baseName()), fileInfo.baseName()); + queries.emplace_back(queryString(fileInfo.baseName()), fileInfo.baseName()); } return queries; } @@ -221,13 +221,13 @@ bool AbstractSqlStorage::setup(const QVariantMap& settings, const QProcessEnviro return success; } -QList AbstractSqlStorage::upgradeQueries(int version) +std::vector AbstractSqlStorage::upgradeQueries(int version) { - QList queries; + std::vector queries; // Upgrade queries are stored in the 'version/##' subfolders. QDir dir = QDir(QString(":/SQL/%1/version/%2/").arg(displayName()).arg(version)); foreach (QFileInfo fileInfo, dir.entryInfoList(QStringList() << "upgrade*", QDir::NoFilter, QDir::Name)) { - queries << SqlQueryResource(queryString(fileInfo.baseName(), version), fileInfo.baseName()); + queries.emplace_back(queryString(fileInfo.baseName(), version), fileInfo.baseName()); } return queries; }