Build system changed to Cmake, ORM changed to QxORM, Qt6 compatibility.

This commit is contained in:
2023-04-28 22:25:29 +02:00
parent 30e6180c82
commit d699ce79f7
481 changed files with 2310 additions and 130206 deletions
+12 -19
View File
@@ -1,25 +1,20 @@
#include "numberseriesservice.h"
#include "seasonservice.h"
#include "core-odb.hxx"
NumberSeriesService::NumberSeriesService()
{
}
QSharedPointer<NumberSeries> NumberSeriesService::forPluginAndSeason(QString pluginId, QSharedPointer<Season> season)
QSharedPointer<NumberSeries> NumberSeriesService::forPluginAndSeason(const QString& pluginId, const QSharedPointer<Season>& season)
{
QList<QSharedPointer<NumberSeries> > series = all(QString("pluginId = '%1' AND season = %2").arg(pluginId, QString::number(season->id())));
if (!series.isEmpty())
{
load(series[0]);
return series[0];
}
return QSharedPointer<NumberSeries>();
return {};
}
QSharedPointer<NumberSeries> NumberSeriesService::forPlugin(QString pluginId)
QSharedPointer<NumberSeries> NumberSeriesService::forPlugin(const QString& pluginId)
{
SeasonService sesSrv;
QSharedPointer<Season> currentSeason = sesSrv.active();
@@ -29,34 +24,32 @@ QSharedPointer<NumberSeries> NumberSeriesService::forPlugin(QString pluginId)
return forPluginAndSeason(pluginId, currentSeason);
}
return QSharedPointer<NumberSeries>();
return {};
}
QSharedPointer<NumberSeries> NumberSeriesService::nextForPlugin(QString pluginId)
QSharedPointer<NumberSeries> NumberSeriesService::nextForPlugin(const QString& pluginId, qx::QxSession* pSession/* = nullptr*/)
{
QSharedPointer<NumberSeries> numSer = forPlugin(pluginId);
if (numSer.isNull())
{
return QSharedPointer<NumberSeries>();
return {};
}
numSer->setLastNumber(numSer->lastNumber() + 1);
update(numSer);
update(numSer, pSession);
return numSer;
}
QList<QSharedPointer<NumberSeries> > NumberSeriesService::allForSeason(QSharedPointer<Season> season)
QList<QSharedPointer<NumberSeries> > NumberSeriesService::allForSeason(const QSharedPointer<Season>& season)
{
return all(QString("season = %1").arg(QString::number(season->id())));
}
QString NumberSeriesService::nextStrForPlugin(QString pluginId)
QString NumberSeriesService::nextStrForPlugin(const QString& pluginId, qx::QxSession* pSession)
{
NumberSeriesPtr numSer = nextForPlugin(pluginId);
QString numSerStr;
numSerStr.sprintf("%s%05d", numSer->prefix().toStdString().c_str(), numSer->lastNumber());
NumberSeriesPtr numSer = nextForPlugin(pluginId, pSession);
return numSerStr;
return QString("%1%2").arg(numSer->prefix()).arg(numSer->lastNumber(), 5, 10, QLatin1Char('0'));
}