Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-27 22:22:36 +02:00
Code Issues Projects Releases Wiki Activity

2025-04-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Cleaned up compiler warnings in 'utils/rddbmgr/'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2025-04-26 18:14:59 -04:00
parent 3afa5914a4
commit 11591fd175
5 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -25014,3 +25014,5 @@
* Cleaned up compiler warnings in 'utils/alsaconfig/'.
2025-04-26 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up compiler warnings in 'utils/rdclilogedit/'.
2025-04-26 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up compiler warnings in 'utils/rddbmgr/'.

5
utils/rddbmgr/check.cpp
View File

@ -2,7 +2,7 @@
//
// Routines for --check for rddbmgr(8)
//
// (C) Copyright 2018-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2018-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -776,8 +776,7 @@ void MainObject::CheckOrphanedCuts() const
//
// FIXME: Regen Cart Data
//
sql=QString().
sprintf("update `CUTS` set `CART_NUMBER`=%u where `CUT_NAME`='%s'",
sql=QString::asprintf("update `CUTS` set `CART_NUMBER`=%u where `CUT_NAME`='%s'",
q1->value(0).toUInt(),
q->value(0).toString().toUtf8().constData());
q2=new QSqlQuery(sql);

4
utils/rddbmgr/rddbmgr.cpp
View File

@ -2,7 +2,7 @@
//
// Rivendell database management utility
//
// (C) Copyright 2018-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2018-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -175,7 +175,7 @@ MainObject::MainObject(QObject *parent)
if(cmd->key(i)=="--set-version") {
bool ok2=false;
set_version=cmd->value(i);
QStringList f0=set_version.split(".",QString::KeepEmptyParts);
QStringList f0=set_version.split(".",Qt::KeepEmptyParts);
if(f0.size()==3) {
ok2=true;
for(int i=0;i<3;i++) {

6
utils/rddbmgr/schemamap.cpp
View File

@ -2,7 +2,7 @@
//
// DB schema version <==> Rivendell version map
//
// (C) Copyright 2018-2024 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2018-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -50,7 +50,7 @@ VersionString::VersionString()
VersionString::VersionString(const char *str)
: QString(str)
{
QStringList f0=QString(str).split(".",QString::KeepEmptyParts);
QStringList f0=QString(str).split(".",Qt::KeepEmptyParts);
ver_major=f0[0].toInt();
if(f0.size()>=2) {
ver_minor=f0[1].toInt();
@ -179,7 +179,7 @@ int MainObject::GetVersionSchema(const QString &ver) const
if(version.left(1).toLower()=="v") {
version=version.right(version.length()-1);
}
QStringList f0=version.split(".",QString::KeepEmptyParts);
QStringList f0=version.split(".",Qt::KeepEmptyParts);
if(f0.size()!=3) {
return 0;
}

31
utils/rddbmgr/updateschema.cpp
View File

@ -2,7 +2,7 @@
//
// Update Rivendell DB schema.
//
// (C) Copyright 2018-2024 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2018-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -2199,10 +2199,10 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
"`END_TYPE`=1";
q=new RDSqlQuery(sql,false);
while(q->next()) {
sql=QString().
sprintf("update `RECORDINGS` set `MAX_GPI_REC_LENGTH`=%u where `ID`=%u",
QTime(0,0,0).msecsTo(q->value(2).toTime())+q->value(3).toUInt()-
QTime(0,0,0).msecsTo(q->value(1).toTime()),q->value(0).toUInt());
sql=QString::
asprintf("update `RECORDINGS` set `MAX_GPI_REC_LENGTH`=%u where `ID`=%u",
QTime(0,0,0).msecsTo(q->value(2).toTime())+q->value(3).toUInt()-
QTime(0,0,0).msecsTo(q->value(1).toTime()),q->value(0).toUInt());
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
@ -4854,9 +4854,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
while(q->next()) {
tablename=q->value(0).toString();
tablename.replace(" ","_");
sql=QString().
sprintf("alter table `%s_LOG` modify column `ORIGIN_USER` char(255)",
tablename.toUtf8().constData());
sql=QString::asprintf("alter table `%s_LOG` modify column `ORIGIN_USER` char(255)",
tablename.toUtf8().constData());
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
@ -4868,14 +4867,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
while(q->next()) {
tablename=q->value(0).toString();
tablename.replace(" ","_");
sql=QString().
sprintf("alter table `%s_PRE` modify column `ORIGIN_USER` char(255)",
tablename.toUtf8().constData());
sql=QString::asprintf("alter table `%s_PRE` modify column `ORIGIN_USER` char(255)",
tablename.toUtf8().constData());
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
sql=QString().
sprintf("alter table `%s_POST` modify column `ORIGIN_USER` char(255)",
sql=QString::asprintf("alter table `%s_POST` modify column `ORIGIN_USER` char(255)",
tablename.toUtf8().constData());
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
@ -5812,8 +5809,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
}
for(unsigned i=0;i<10;i++) {
sql=QString().
sprintf("select `STATION`,`CARD%u`,`PORT%u`,`START_RML%u`,`STOP_RML%u` ",
sql=QString::asprintf("select `STATION`,`CARD%u`,`PORT%u`,`START_RML%u`,`STOP_RML%u` ",
i,i,i,i)+
"from `RDAIRPLAY`";
q=new RDSqlQuery(sql,false);
@ -5860,8 +5856,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
for(unsigned i=0;i<10;i++) {
if((i==2)||(i==3)||(i==6)||(i==7)||(i==8)||(i==9)) {
sql=QString().
sprintf("select `STATION`,`CARD%u`,`PORT%u`,`START_RML%u`,`STOP_RML%u` ",
sql=QString::asprintf("select `STATION`,`CARD%u`,`PORT%u`,`START_RML%u`,`STOP_RML%u` ",
i,i,i,i)+
"from `RDPANEL`";
q=new RDSqlQuery(sql,false);
@ -10426,7 +10421,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
"from `STACK_LINES`";
q=new RDSqlQuery(sql,false);
while(q->next()) {
QStringList f0=q->value(1).toString().split(" ",QString::SkipEmptyParts);
QStringList f0=q->value(1).toString().split(" ",Qt::SkipEmptyParts);
for(int i=0;i<f0.size();i++) {
if((!f0.at(i).trimmed().isEmpty())&&(f0.at(i).trimmed()!=".")) {
sql=QString("insert into `STACK_SCHED_CODES` set ")+