X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fabstractsqlstorage.cpp;h=fbd3489957fdc9ebf4ead1d133b4d0d3c20335e6;hb=24c7de34254b5de4cf28045a6923a527e06f7290;hp=bc56ef27751e5d86c2fd8ed5ad73d55ece49ab7f;hpb=8961f348947fc55cc4bc769563684af3f2ea7ccc;p=quassel.git diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp index bc56ef27..fbd34899 100644 --- a/src/core/abstractsqlstorage.cpp +++ b/src/core/abstractsqlstorage.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2019 by the Quassel Project * + * Copyright (C) 2005-2022 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -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; }