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

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

Browse Source 
* Cleaned up compiler warnings in 'rdlogmanager/'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2025-04-26 17:41:36 -04:00
parent 34c07ffc41
commit faadea8f60
7 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -24998,3 +24998,5 @@
* Cleaned up compiler warnings in 'rdlogedit/'.
2025-04-26 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up compiler warnings in 'rdlogin/'.
2025-04-26 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up compiler warnings in 'rdlogmanager/'.

4
rdlogmanager/add_clock.cpp
View File

@ -2,7 +2,7 @@
//
// Add a Rivendell Clock
//
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@ -152,7 +152,7 @@ int AddClock::exec(QString *clk_name,QString *clk_code)
void AddClock::clockNameChangedData(const QString &str)
{
QStringList f0=str.split(" ",QString::SkipEmptyParts);
QStringList f0=str.split(" ",Qt::SkipEmptyParts);
QString code;
while(f0.size()>3) {

4
rdlogmanager/edit_clock.cpp
View File

@ -2,7 +2,7 @@
//
// Edit Rivendell Log Clock
//
// (C) Copyright 2002-2023 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@ -603,7 +603,7 @@ void EditClock::UpdateClock(int line)
// Title
//
p->drawText((CLOCK_EDGE-
edit_title_metrics->width(edit_clocks_model->clockName()))/2,
edit_title_metrics->horizontalAdvance(edit_clocks_model->clockName()))/2,
50,edit_clocks_model->clockName());
//

7
rdlogmanager/edit_grid.cpp
View File

@ -2,7 +2,7 @@
//
// Edit Rivendell Log Grid
//
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@ -31,6 +31,7 @@
EditGrid::EditGrid(QString servicename,QWidget *parent)
: RDDialog(parent)
{
QLocale locale;
QString sql;
edit_servicename=servicename;
@ -48,7 +49,7 @@ EditGrid::EditGrid(QString servicename,QWidget *parent)
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(hourButtonData(int)));
for(int i=0;i<5;i++) {
edit_day_boxes[i]=new QGroupBox(QDate::longDayName(i+1),this);
edit_day_boxes[i]=new QGroupBox(locale.standaloneDayName(i+1),this);
edit_day_boxes[i]->setFont(labelFont());
edit_day_boxes[i]->setGeometry(5,11+75*i,sizeHint().width()-5,65);
for(int j=0;j<24;j++) {
@ -64,7 +65,7 @@ EditGrid::EditGrid(QString servicename,QWidget *parent)
}
}
for(int i=5;i<7;i++) {
edit_day_boxes[i]=new QGroupBox(QDate::longDayName(i+1),this);
edit_day_boxes[i]=new QGroupBox(locale.standaloneDayName(i+1),this);
edit_day_boxes[i]->setFont(labelFont());
edit_day_boxes[i]->setGeometry(5,41+75*i,sizeHint().width()-5,65);
for(int j=0;j<24;j++) {

14
rdlogmanager/eventwidget.cpp
View File

@ -2,7 +2,7 @@
//
// Widget for editing a LogManager event
//
// (C) Copyright 2002-2023 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@ -836,7 +836,7 @@ void EventWidget::resizeEvent(QResizeEvent *e)
// First Cart Transition Type
event_firsttrans_label->
setGeometry(5,140,
labelFontMetrics()->width(event_firsttrans_label->text()+" "),
labelFontMetrics()->horizontalAdvance(event_firsttrans_label->text()+" "),
20);
event_firsttrans_box->setGeometry(event_firsttrans_label->geometry().x()+
event_firsttrans_label->geometry().width(),
@ -844,11 +844,11 @@ void EventWidget::resizeEvent(QResizeEvent *e)
event_firsttrans_unit->
setGeometry(event_firsttrans_box->geometry().x()+
event_firsttrans_box->geometry().width()+5,140,
labelFontMetrics()->width(tr("transition.")),20);
labelFontMetrics()->horizontalAdvance(tr("transition.")),20);
// Default Transition Type
event_defaulttrans_label->
setGeometry(5,161,
labelFontMetrics()->width(event_defaulttrans_label->text()+" "),
labelFontMetrics()->horizontalAdvance(event_defaulttrans_label->text()+" "),
20);
event_defaulttrans_box->
setGeometry(event_defaulttrans_label->geometry().x()+
@ -856,7 +856,7 @@ void EventWidget::resizeEvent(QResizeEvent *e)
event_defaulttrans_unit->
setGeometry(event_defaulttrans_box->geometry().x()+
event_defaulttrans_box->geometry().width()+5,161,
labelFontMetrics()->width(tr("transition.")),20);
labelFontMetrics()->horizontalAdvance(tr("transition.")),20);
//
// Enforcing Length Section
@ -868,12 +868,12 @@ void EventWidget::resizeEvent(QResizeEvent *e)
event_autofill_slop_box->setGeometry(200,210,15,15);
event_autofill_slop_label1->
setGeometry(220,210,
labelFontMetrics()->width(event_autofill_slop_label1->text()),
labelFontMetrics()->horizontalAdvance(event_autofill_slop_label1->text()),
15);
event_autofill_slop_label->
setGeometry(event_autofill_slop_label1->geometry().x()+
event_autofill_slop_label1->geometry().width(),210,
labelFontMetrics()->width(event_autofill_slop_label->text()+" "),15);
labelFontMetrics()->horizontalAdvance(event_autofill_slop_label->text()+" "),15);
event_autofill_slop_edit->
setGeometry(event_autofill_slop_label->geometry().x()+
event_autofill_slop_label->geometry().width(),207,60,22);

30
rdlogmanager/importcartsmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell rdlogmanager(1) pre- and post-import event lists
//
// (C) Copyright 2021-2023 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -371,8 +371,8 @@ void ImportCartsModel::save(RDLogLine::TransType first_trans)
switch(d_event_types.at(i)) {
case RDLogLine::Cart:
case RDLogLine::Macro:
sql+=QString().
sprintf("`CART_NUMBER`=%u,",d_texts.at(i).at(0).toString().toUInt())+
sql+=QString::asprintf("`CART_NUMBER`=%u,",
d_texts.at(i).at(0).toString().toUInt())+
"`MARKER_COMMENT`=null";
break;
@ -449,12 +449,12 @@ bool ImportCartsModel::moveUp(const QModelIndex &row)
if((row.row()==0)||(row.row()>=lineCount())) {
return false;
}
d_marker_comments.swap(row.row(),row.row()-1);
d_texts.swap(row.row(),row.row()-1);
d_icons.swap(row.row(),row.row()-1);
d_event_types.swap(row.row(),row.row()-1);
d_trans_types.swap(row.row(),row.row()-1);
d_lengths.swap(row.row(),row.row()-1);
d_marker_comments.swapItemsAt(row.row(),row.row()-1);
d_texts.swapItemsAt(row.row(),row.row()-1);
d_icons.swapItemsAt(row.row(),row.row()-1);
d_event_types.swapItemsAt(row.row(),row.row()-1);
d_trans_types.swapItemsAt(row.row(),row.row()-1);
d_lengths.swapItemsAt(row.row(),row.row()-1);
// normalizeTransitions();
emit dataChanged(createIndex(row.row()-1,0),
createIndex(row.row(),columnCount()-1));
@ -468,12 +468,12 @@ bool ImportCartsModel::moveDown(const QModelIndex &row)
if(row.row()>=(lineCount()-1)) {
return false;
}
d_marker_comments.swap(row.row(),row.row()+1);
d_texts.swap(row.row(),row.row()+1);
d_event_types.swap(row.row(),row.row()+1);
d_trans_types.swap(row.row(),row.row()+1);
d_lengths.swap(row.row(),row.row()+1);
d_icons.swap(row.row(),row.row()+1);
d_marker_comments.swapItemsAt(row.row(),row.row()+1);
d_texts.swapItemsAt(row.row(),row.row()+1);
d_event_types.swapItemsAt(row.row(),row.row()+1);
d_trans_types.swapItemsAt(row.row(),row.row()+1);
d_lengths.swapItemsAt(row.row(),row.row()+1);
d_icons.swapItemsAt(row.row(),row.row()+1);
// normalizeTransitions();
emit dataChanged(createIndex(row.row(),0),
createIndex(row.row()+1,columnCount()-1));

5
rdlogmanager/svc_rec.cpp
View File

@ -2,7 +2,7 @@
//
// Calendar widget.
//
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@ -30,6 +30,7 @@
SvcRec::SvcRec(const QString &svcname,QWidget *parent)
: RDWidget(parent)
{
QLocale locale;
QString sql;
RDSqlQuery *q;
pick_service_name=svcname;
@ -61,7 +62,7 @@ SvcRec::SvcRec(const QString &svcname,QWidget *parent)
pick_month_box=new QComboBox(this);
pick_month_box->setGeometry(0,0,120,26);
for(int i=1;i<13;i++) {
pick_month_box->insertItem(pick_month_box->count(),QDate::longMonthName(i));
pick_month_box->insertItem(pick_month_box->count(),locale.standaloneMonthName(i));
}
connect(pick_month_box,SIGNAL(activated(int)),
this,SLOT(monthActivatedData(int)));