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

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

Browse Source 
* Cleaned up numerous 'no such signal' runtime errors.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2025-04-28 11:24:18 -04:00
parent 7da766d635
commit 4e58265b35
53 changed files with 129 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -25046,3 +25046,5 @@
'DISTRO SPECIFIC NOTES' section of 'INSTALL'.
* Updated the 'Ubuntu 22.04 LTS' entry in the
'DISTRO SPECIFIC NOTES' section of 'INSTALL'.
2025-04-28 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up numerous 'no such signal' runtime errors.

8
cae/cae_server.cpp
View File

@ -21,8 +21,8 @@
#include <ctype.h>
#include <stdio.h>
#include <qbytearray.h>
#include <qstringlist.h>
#include <QByteArray>
#include <QStringList>
#include <rdapplication.h>
@ -63,11 +63,11 @@ CaeServer::CaeServer(RDConfig *config,QObject *parent)
connect(cae_server,SIGNAL(newConnection()),this,SLOT(newConnectionData()));
cae_ready_read_mapper=new QSignalMapper(this);
connect(cae_ready_read_mapper,SIGNAL(mapped(int)),
connect(cae_ready_read_mapper,SIGNAL(mappedInt(int)),
this,SLOT(readyReadData(int)));
cae_connection_closed_mapper=new QSignalMapper(this);
connect(cae_connection_closed_mapper,SIGNAL(mapped(int)),
connect(cae_connection_closed_mapper,SIGNAL(mappedInt(int)),
this,SLOT(connectionClosedData(int)));
}

8
cae/driver_alsa.cpp
View File

@ -2,7 +2,7 @@
//
// caed(8) driver for Advanced Linux Audio Architecture devices
//
// (C) Copyright 2021 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
@ -592,11 +592,11 @@ DriverAlsa::DriverAlsa(QObject *parent)
// Stop & Fade Timers
//
QSignalMapper *stop_mapper=new QSignalMapper(this);
connect(stop_mapper,SIGNAL(mapped(int)),this,SLOT(stopTimerData(int)));
connect(stop_mapper,SIGNAL(mappedInt(int)),this,SLOT(stopTimerData(int)));
QSignalMapper *fade_mapper=new QSignalMapper(this);
connect(fade_mapper,SIGNAL(mapped(int)),this,SLOT(fadeTimerData(int)));
connect(fade_mapper,SIGNAL(mappedInt(int)),this,SLOT(fadeTimerData(int)));
QSignalMapper *record_mapper=new QSignalMapper(this);
connect(record_mapper,SIGNAL(mapped(int)),this,SLOT(recordTimerData(int)));
connect(record_mapper,SIGNAL(mappedInt(int)),this,SLOT(recordTimerData(int)));
for(int i=0;i<RD_MAX_CARDS;i++) {
for(int j=0;j<RD_MAX_STREAMS;j++) {
alsa_stop_timer[i][j]=new QTimer(this);

6
cae/driver_jack.cpp
View File

@ -628,11 +628,11 @@ bool DriverJack::initialize(unsigned *next_cardnum)
// Stop & Fade Timers
//
QSignalMapper *stop_mapper=new QSignalMapper(this);
connect(stop_mapper,SIGNAL(mapped(int)),this,SLOT(stopTimerData(int)));
connect(stop_mapper,SIGNAL(mappedInt(int)),this,SLOT(stopTimerData(int)));
QSignalMapper *fade_mapper=new QSignalMapper(this);
connect(fade_mapper,SIGNAL(mapped(int)),this,SLOT(fadeTimerData(int)));
connect(fade_mapper,SIGNAL(mappedInt(int)),this,SLOT(fadeTimerData(int)));
QSignalMapper *record_mapper=new QSignalMapper(this);
connect(record_mapper,SIGNAL(mapped(int)),this,SLOT(recordTimerData(int)));
connect(record_mapper,SIGNAL(mappedInt(int)),this,SLOT(recordTimerData(int)));
for(int i=0;i<RD_MAX_STREAMS;i++) {
jack_stop_timer[i]=new QTimer(this);
jack_stop_timer[i]->setSingleShot(true);

2
lib/rd.h
View File

@ -71,7 +71,7 @@
#define DEFAULT_MYSQL_DATABASE "Rivendell"
#define DEFAULT_MYSQL_USERNAME "rduser"
#define DEFAULT_MYSQL_PASSWORD "letmein"
#define DEFAULT_MYSQL_DRIVER "QMYSQL3"
#define DEFAULT_MYSQL_DRIVER "QMARIADB"
#define DEFAULT_MYSQL_HEARTBEAT_INTERVAL 360
#define DEFAULT_MYSQL_ENGINE "MyISAM"
#define DEFAULT_MYSQL_CHARSET "utf8mb4"

4
lib/rdadd_cart.cpp
View File

@ -2,7 +2,7 @@
//
// Add a Rivendell Cart
//
// (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
@ -66,7 +66,7 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title,
}
}
delete q;
connect(cart_group_box,SIGNAL(activated(const QString &)),
connect(cart_group_box,SIGNAL(textActivated(const QString &)),
this,SLOT(groupActivatedData(const QString &)));
//

2
lib/rdbutton_panel.cpp
View File

@ -34,7 +34,7 @@ RDButtonPanel::RDButtonPanel(RDAirPlayConf::PanelType type,int number,
panel_title=title;
panel_button_mapper=new QSignalMapper(this);
connect(panel_button_mapper,SIGNAL(mapped(int)),
connect(panel_button_mapper,SIGNAL(mappedInt(int)),
this,SLOT(buttonClickedData(int)));
for(int i=0;i<PANEL_MAX_BUTTON_ROWS;i++) {

8
lib/rdcartfilter.cpp
View File

@ -2,7 +2,7 @@
//
// Filter widget for picking Rivendell carts.
//
// (C) Copyright 2021-2022 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
@ -82,7 +82,7 @@ RDCartFilter::RDCartFilter(bool show_drag_box,bool user_is_admin,
d_group_label=new QLabel(tr("Group:"),this);
d_group_label->setFont(labelFont());
d_group_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
connect(d_group_box,SIGNAL(activated(const QString &)),
connect(d_group_box,SIGNAL(textActivated(const QString &)),
this,SLOT(groupChangedData(const QString &)));
//
@ -92,7 +92,7 @@ RDCartFilter::RDCartFilter(bool show_drag_box,bool user_is_admin,
d_codes_label=new QLabel(tr("Scheduler Codes:"),this);
d_codes_label->setFont(labelFont());
d_codes_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
connect(d_codes_box,SIGNAL(activated(const QString &)),
connect(d_codes_box,SIGNAL(textActivated(const QString &)),
this,SLOT(schedulerCodeChangedData(const QString &)));
d_and_codes_box=new QComboBox(this);
d_and_codes_box->setDisabled(true);
@ -101,7 +101,7 @@ RDCartFilter::RDCartFilter(bool show_drag_box,bool user_is_admin,
d_and_codes_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
d_and_codes_box->insertItem(0,tr("[none]"));
d_and_codes_label->setDisabled(true);
connect(d_and_codes_box,SIGNAL(activated(const QString &)),
connect(d_and_codes_box,SIGNAL(textActivated(const QString &)),
this,SLOT(andSchedulerCodeChangedData(const QString &)));
//

2
lib/rdcddblookup.cpp
View File

@ -42,7 +42,7 @@ RDCddbLookup::RDCddbLookup(const QString &caption,FILE *profile_msgs,
//
lookup_socket=new QTcpSocket(this);
connect(lookup_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(lookup_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(lookup_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
}

4
lib/rdevent_player.cpp
View File

@ -2,7 +2,7 @@
//
// Execute a list of RML commands asynchronously.
//
// (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,7 +30,7 @@ RDEventPlayer::RDEventPlayer(RDRipc *ripc,QObject *parent)
player_state[i]=false;
}
player_mapper=new QSignalMapper(this);
connect(player_mapper,SIGNAL(mapped(int)),
connect(player_mapper,SIGNAL(mappedInt(int)),
this,SLOT(macroFinishedData(int)));
player_timer=new QTimer(this);
player_timer->setSingleShot(true);

8
lib/rdexport_settings_dialog.cpp
View File

@ -2,7 +2,7 @@
//
// Edit Audio Export Settings
//
// (C) Copyright 2002-2022 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
@ -51,7 +51,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(const QString &caption,
// Format
//
lib_format_box=new QComboBox(this);
connect(lib_format_box,SIGNAL(activated(const QString &)),
connect(lib_format_box,SIGNAL(textActivated(const QString &)),
this,SLOT(formatData(const QString &)));
lib_format_label=new QLabel(tr("Format")+":",this);
lib_format_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@ -69,7 +69,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(const QString &caption,
// Sample Rate
//
lib_samprate_box=new QComboBox(this);
connect(lib_samprate_box,SIGNAL(activated(const QString &)),
connect(lib_samprate_box,SIGNAL(textActivated(const QString &)),
this,SLOT(samprateData(const QString &)));
lib_samprate_label=new QLabel(tr("Sample Rate")+":",this);
lib_samprate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@ -82,7 +82,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(const QString &caption,
lib_bitrate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
lib_bitrate_label->setFont(labelFont());
lib_bitrate_box=new QComboBox(this);
connect(lib_bitrate_box,SIGNAL(activated(const QString &)),
connect(lib_bitrate_box,SIGNAL(textActivated(const QString &)),
this,SLOT(bitrateData(const QString &)));
lib_bitrate_unit=new QLabel("kbps",this);
lib_bitrate_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);

4
lib/rdgpio.cpp
View File

@ -2,7 +2,7 @@
//
// A driver for General-Purpose I/O devices.
//
// (C) Copyright 2002-2003,2016 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 Library General Public License
@ -344,7 +344,7 @@ void RDGpio::RemapTimers()
//
ioctl(gpio_fd,GPIO_GETINFO,&info);
gpio_revert_mapper=new QSignalMapper(this);
connect(gpio_revert_mapper,SIGNAL(mapped(int)),this,SLOT(revertData(int)));
connect(gpio_revert_mapper,SIGNAL(mappedInt(int)),this,SLOT(revertData(int)));
for(int i=0;i<info.outputs;i++) {
gpio_revert_timer[i]=new QTimer(this);
gpio_revert_timer[i]->setSingleShot(true);

6
lib/rdlivewire.cpp
View File

@ -122,7 +122,7 @@ RDLiveWire::RDLiveWire(unsigned id,QObject *parent)
connect(live_socket,SIGNAL(disconnected()),
this,SLOT(connectionClosedData()));
connect(live_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(live_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(live_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
//
@ -645,7 +645,7 @@ void RDLiveWire::ReadVersion(const QString &cmd)
if(f1[0]=="NGPI") {
live_gpis=f1[1].toInt();
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(gpiTimeoutData(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(gpiTimeoutData(int)));
for(int i=0;i<live_gpis;i++) {
live_gpi_states.push_back(new bool[RD_LIVEWIRE_GPIO_BUNDLE_SIZE]);
live_gpi_channels.
@ -670,7 +670,7 @@ void RDLiveWire::ReadVersion(const QString &cmd)
if(f1[0]=="NGPO") {
live_gpos=f1[1].toInt();
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(gpoTimeoutData(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(gpoTimeoutData(int)));
for(int i=0;i<live_gpos;i++) {
live_gpo_states.push_back(new bool[RD_LIVEWIRE_GPIO_BUNDLE_SIZE]);
live_gpo_channels.

2
lib/rdmarkerplayer.cpp
View File

@ -59,7 +59,7 @@ RDMarkerPlayer::RDMarkerPlayer(int card,int port,QWidget *parent)
d_readout_labels[6]->setText(tr("Length")+":");
d_readout_mapper=new QSignalMapper(this);
connect(d_readout_mapper,SIGNAL(mapped(int)),
connect(d_readout_mapper,SIGNAL(mappedInt(int)),
this,SLOT(readoutClickedData(int)));
d_cut_readout=new RDMarkerReadout(RDMarkerHandle::CutStart,this);

4
lib/rdoneshot.cpp
View File

@ -2,7 +2,7 @@
//
// A class for providing one-shot single use timers.
//
// (C) Copyright 2008,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2008-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
@ -28,7 +28,7 @@ RDOneShot::RDOneShot(QObject *parent)
//
shot_count=0;
shot_mapper=new QSignalMapper(this);
connect(shot_mapper,SIGNAL(mapped(int)),this,SLOT(timeoutData(int)));
connect(shot_mapper,SIGNAL(mappedInt(int)),this,SLOT(timeoutData(int)));
//
// Zombie Timer

4
lib/rdplay_deck.cpp
View File

@ -2,7 +2,7 @@
//
// Abstract a Rivendell Playback Deck
//
// (C) Copyright 2003-2024 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2003-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
@ -62,7 +62,7 @@ RDPlayDeck::RDPlayDeck(RDCae *cae,int id,QObject *parent)
// Timers
//
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(pointTimerData(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(pointTimerData(int)));
for(int i=0;i<3;i++) {
play_point_timer[i]=new QTimer(this);
play_point_timer[i]->setSingleShot(true);

2
lib/rdripc.cpp
View File

@ -103,7 +103,7 @@ void RDRipc::connectHost(QString hostname,uint16_t hostport,QString password)
}
ripc_socket=new QTcpSocket(this);
connect(ripc_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(ripc_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(ripc_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
connect(ripc_socket,SIGNAL(readyRead()),this,SLOT(readyData()));

6
lib/rdrsscategorybox.cpp
View File

@ -2,7 +2,7 @@
//
// A Combo Box widget for RSS categories.
//
// (C) Copyright 2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2020-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,7 +30,7 @@ RDRssCategoryBox::RDRssCategoryBox(QWidget *parent)
// Category
//
c_box=new QComboBox(this);
connect(c_box,SIGNAL(activated(const QString &)),
connect(c_box,SIGNAL(textActivated(const QString &)),
this,SLOT(boxActivatedData(const QString &)));
c_edit=new QLineEdit(this);
c_edit->setMaxLength(64);
@ -48,7 +48,7 @@ RDRssCategoryBox::RDRssCategoryBox(QWidget *parent)
c_sub_box=new QComboBox(this);
c_sub_edit=new QLineEdit(this);
c_sub_edit->setMaxLength(64);
connect(c_sub_box,SIGNAL(activated(const QString &)),
connect(c_sub_box,SIGNAL(textActivated(const QString &)),
c_sub_edit,SLOT(setText(const QString &)));
}

2
lib/rdsocket.cpp
View File

@ -32,7 +32,7 @@ RDSocket::RDSocket(int id,QObject *parent)
connect(this,SIGNAL(connected()),this,SLOT(connectedData()));
connect(this,SIGNAL(disconnected()),this,SLOT(connectionClosedData()));
connect(this,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(this,SIGNAL(error(QAbstractSocket::SocketError)),
connect(this,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
}

4
lib/rdtimeengine.cpp
View File

@ -2,7 +2,7 @@
//
// An event timer engine.
//
// (C) Copyright 2002-2022 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 Library General Public License
@ -24,7 +24,7 @@ RDTimeEngine::RDTimeEngine(QObject *parent)
: QObject(parent)
{
d_mapper=new QSignalMapper(this);
connect(d_mapper,SIGNAL(mapped(int)),this,SLOT(timerData(int)));
connect(d_mapper,SIGNAL(mappedInt(int)),this,SLOT(timerData(int)));
}

4
rdadmin/edit_audios.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Audio Port Configuration
//
// (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
@ -91,7 +91,7 @@ EditAudioPorts::EditAudioPorts(RDStation *station,QWidget *parent)
edit_input_label_edit[i]->setMaxLength(4);
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(inputMapData(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(inputMapData(int)));
edit_type_box[i]=new QComboBox(this);
edit_type_box[i]->
insertItem(edit_type_box[i]->count(),tr("Analog"));

8
rdadmin/edit_decks.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell RDCatch Deck Configuration
//
// (C) Copyright 2002-2022 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
@ -137,7 +137,7 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent)
edit_swstation_label->setFont(labelFont());
edit_swstation_label->setGeometry(10,190,110,24);
edit_swstation_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(edit_swstation_box,SIGNAL(activated(const QString &)),
connect(edit_swstation_box,SIGNAL(textActivated(const QString &)),
this,SLOT(stationActivatedData(const QString &)));
//
@ -151,7 +151,7 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent)
edit_swmatrix_label->setGeometry(10,214,110,24);
edit_swmatrix_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_swmatrix_label->setDisabled(true);
connect(edit_swmatrix_box,SIGNAL(activated(const QString &)),
connect(edit_swmatrix_box,SIGNAL(textActivated(const QString &)),
this,SLOT(matrixActivatedData(const QString &)));
//
@ -260,7 +260,7 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent)
edit_event_section_label->setFont(sectionLabelFont());
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(eventCartSelectedData(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(eventCartSelectedData(int)));
for(unsigned i=0;i<RD_CUT_EVENT_ID_QUAN;i+=2) {
for(unsigned j=0;j<2;j++) {
edit_event_labels[i+j]=new QLabel(QString::asprintf("%u:",i+j+1),this);

4
rdadmin/edit_rdairplay.cpp
View File

@ -2,7 +2,7 @@
//
// Edit an RDAirPlay Configuration
//
// (C) Copyright 2002-2024 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
@ -73,7 +73,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setGeometry(10,10,200,16);
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(editGpiosData(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(editGpiosData(int)));
//
// Main Log Output 1

4
rdadmin/edit_station.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Workstation Configuration
//
// (C) Copyright 2002-2022 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
@ -302,7 +302,7 @@ EditStation::EditStation(QString sname,QWidget *parent)
station_cae_station_box->setEditable(false);
station_cae_station_model=new RDStationListModel(false,sname,this);
station_cae_station_box->setModel(station_cae_station_model);
connect(station_cae_station_box,SIGNAL(activated(const QString &)),
connect(station_cae_station_box,SIGNAL(textActivated(const QString &)),
this,SLOT(caeStationActivatedData(const QString &)));
station_cae_station_label=new QLabel(tr("Core Audio Engine:"),this);
station_cae_station_label->setFont(labelFont());

6
rdadmin/edit_svc.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Service
//
// (C) Copyright 2002-2022 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
@ -132,7 +132,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
svc_bypass_box->setGeometry(185,136,60,19);
svc_bypass_box->insertItem(0,tr("No"));
svc_bypass_box->insertItem(1,tr("Yes"));
connect(svc_bypass_box,SIGNAL(activated(const QString &)),
connect(svc_bypass_box,SIGNAL(textActivated(const QString &)),
this,SLOT(textChangedData(const QString &)));
connect(svc_bypass_box,SIGNAL(activated(int)),
this,SLOT(bypassModeChangedData(int)));
@ -149,7 +149,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
insertItem((int)RDSvc::ParentEvent,tr("From Relative Position"));
svc_sub_event_inheritance_box->
insertItem((int)RDSvc::SchedFile,tr("From Scheduler File"));
connect(svc_sub_event_inheritance_box,SIGNAL(activated(const QString &)),
connect(svc_sub_event_inheritance_box,SIGNAL(textActivated(const QString &)),
this,SLOT(textChangedData(const QString &)));
svc_sub_event_inheritance_label=
new QLabel(tr("Inline Event Start/Length")+":",this);

2
rdairplay/button_log.cpp
View File

@ -70,7 +70,7 @@ ButtonLog::ButtonLog(RDLogPlay *log,int id,RDAirPlayConf *conf,bool allow_pause,
// Line Boxes / Start Buttons
//
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),
connect(mapper,SIGNAL(mappedInt(int)),
this,SLOT(startButton(int)));
for(int i=0;i<BUTTON_TOTAL_BUTTONS;i++) {
log_line_box[i]=new LogLineBox(conf,this);

2
rdairplay/hourselector.cpp
View File

@ -33,7 +33,7 @@ HourSelector::HourSelector(QWidget *parent)
// Buttons
//
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(hourClicked(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(hourClicked(int)));
for(unsigned i=0;i<24;i++) {
hour_button[i]=new QPushButton(this);
hour_button[i]->setFont(bigButtonFont());

6
rdairplay/rdairplay.cpp
View File

@ -266,9 +266,9 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent)
// Log Machines
//
QSignalMapper *reload_mapper=new QSignalMapper(this);
connect(reload_mapper,SIGNAL(mapped(int)),this,SLOT(logReloadedData(int)));
connect(reload_mapper,SIGNAL(mappedInt(int)),this,SLOT(logReloadedData(int)));
QSignalMapper *rename_mapper=new QSignalMapper(this);
connect(rename_mapper,SIGNAL(mapped(int)),this,SLOT(logRenamedData(int)));
connect(rename_mapper,SIGNAL(mappedInt(int)),this,SLOT(logRenamedData(int)));
QString default_svcname=rda->airplayConf()->defaultSvc();
for(int i=0;i<RDAIRPLAY_LOG_QUANTITY;i++) {
air_log[i]=new RDLogPlay(i,air_event_player,true,this);
@ -569,7 +569,7 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent)
// Full Log Buttons
//
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(fullLogButtonData(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(fullLogButtonData(int)));
for(int i=0;i<RDAIRPLAY_LOG_QUANTITY;i++) {
air_log_button[i]=new QPushButton(this);
air_log_button[i]->setFont(bigButtonFont());

8
rdcatch/edit_switchevent.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Netcatch Cart Event
//
// (C) Copyright 2002-2022 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
@ -77,7 +77,7 @@ EditSwitchEvent::EditSwitchEvent(QWidget *parent)
edit_matrix_label=new QLabel(tr("Switch Matrix:"),this);
edit_matrix_label->setFont(labelFont());
edit_matrix_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(edit_matrix_box,SIGNAL(activated(const QString &)),
connect(edit_matrix_box,SIGNAL(textActivated(const QString &)),
this,SLOT(activateMatrixData(const QString &)));
//
@ -88,7 +88,7 @@ EditSwitchEvent::EditSwitchEvent(QWidget *parent)
edit_input_label->setFont(labelFont());
edit_input_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_input_spin=new QSpinBox(this);
connect(edit_input_box,SIGNAL(activated(const QString &)),
connect(edit_input_box,SIGNAL(textActivated(const QString &)),
this,SLOT(activateInputData(const QString &)));
//
@ -99,7 +99,7 @@ EditSwitchEvent::EditSwitchEvent(QWidget *parent)
edit_output_label->setFont(labelFont());
edit_output_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_output_spin=new QSpinBox(this);
connect(edit_output_box,SIGNAL(activated(const QString &)),
connect(edit_output_box,SIGNAL(textActivated(const QString &)),
this,SLOT(activateOutputData(const QString &)));
//

2
rdcatch/eventwidget.cpp
View File

@ -50,7 +50,7 @@ EventWidget::EventWidget(EventWidget::EventType type,QWidget *parent)
d_location_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
d_location_label->setFont(labelFont());
d_location_box=new QComboBox(this);
connect(d_location_box,SIGNAL(activated(const QString &)),
connect(d_location_box,SIGNAL(textActivated(const QString &)),
this,SLOT(locationActivatedData(const QString &)));
//

8
rdcatchd/rdcatchd.cpp
View File

@ -2,7 +2,7 @@
//
// The Rivendell Netcatcher Daemon
//
// (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
@ -164,7 +164,7 @@ MainObject::MainObject(QObject *parent)
catch_macro_event_id[i]=-1;
}
catch_event_mapper=new QSignalMapper(this);
connect(catch_event_mapper,SIGNAL(mapped(int)),
connect(catch_event_mapper,SIGNAL(mappedInt(int)),
this,SLOT(eventFinishedData(int)));
QTimer *timer=new QTimer(this);
connect(timer,SIGNAL(timeout()),this,SLOT(freeEventsData()));
@ -179,10 +179,10 @@ MainObject::MainObject(QObject *parent)
// GPI Mappers
//
catch_gpi_start_mapper=new QSignalMapper(this);
connect(catch_gpi_start_mapper,SIGNAL(mapped(int)),
connect(catch_gpi_start_mapper,SIGNAL(mappedInt(int)),
this,SLOT(startTimerData(int)));
catch_gpi_offset_mapper=new QSignalMapper(this);
connect(catch_gpi_offset_mapper,SIGNAL(mapped(int)),
connect(catch_gpi_offset_mapper,SIGNAL(mappedInt(int)),
this,SLOT(offsetTimerData(int)));
//

4
rdlogedit/edit_log.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Log
//
// (C) Copyright 2002-2022 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
@ -147,7 +147,7 @@ EditLog::EditLog(QString *filter,QString *group,QString *schedcode,
edit_service_label=new QLabel(tr("Service:"),this);
edit_service_label->setFont(labelFont());
edit_service_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(edit_service_box,SIGNAL(activated(const QString &)),
connect(edit_service_box,SIGNAL(textActivated(const QString &)),
this,SLOT(serviceActivatedData(const QString &)));
//

4
rdlogmanager/edit_event.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Log 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
@ -80,7 +80,7 @@ EditEvent::EditEvent(QString eventname,bool new_event,QStringList *new_events,
event_group_model=new RDGroupListModel(true,false,false,this);
event_group_model->changeUser();
event_group_box->setModel(event_group_model);
connect(event_group_box,SIGNAL(activated(const QString &)),
connect(event_group_box,SIGNAL(textActivated(const QString &)),
this,SLOT(filterActivatedData(const QString &)));
event_group_label=new QLabel(tr("Group:"),this);
event_group_label->setFont(labelFont());

2
rdlogmanager/edit_grid.cpp
View File

@ -47,7 +47,7 @@ EditGrid::EditGrid(QString servicename,QWidget *parent)
// Hour Buttons
//
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(hourButtonData(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(hourButtonData(int)));
for(int i=0;i<5;i++) {
edit_day_boxes[i]=new QGroupBox(locale.standaloneDayName(i+1),this);
edit_day_boxes[i]->setFont(labelFont());

6
rdpadd/repeater.cpp
View File

@ -2,7 +2,7 @@
//
// Rivendell PAD Data Repeater
//
// (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
@ -38,7 +38,7 @@ Repeater::Repeater(const QString &src_unix_addr,uint16_t serv_port,
// Client Server
//
pad_client_disconnect_mapper=new QSignalMapper(this);
connect(pad_client_disconnect_mapper,SIGNAL(mapped(int)),
connect(pad_client_disconnect_mapper,SIGNAL(mappedInt(int)),
this,SLOT(clientDisconnected(int)));
pad_client_server=new QTcpServer(this);
@ -53,7 +53,7 @@ Repeater::Repeater(const QString &src_unix_addr,uint16_t serv_port,
// Source Server
//
pad_source_disconnect_mapper=new QSignalMapper(this);
connect(pad_source_disconnect_mapper,SIGNAL(mapped(int)),
connect(pad_source_disconnect_mapper,SIGNAL(mappedInt(int)),
this,SLOT(sourceDisconnected(int)));
pad_source_server=new RDUnixServer(this);

4
rdvairplayd/rdvairplayd.cpp
View File

@ -2,7 +2,7 @@
//
// Headless log player
//
// (C) Copyright 2018-2023 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
@ -118,7 +118,7 @@ MainObject::MainObject(QObject *parent)
// Log Machines
//
QSignalMapper *reload_mapper=new QSignalMapper(this);
connect(reload_mapper,SIGNAL(mapped(int)),this,SLOT(logReloadedData(int)));
connect(reload_mapper,SIGNAL(mappedInt(int)),this,SLOT(logReloadedData(int)));
QSignalMapper *rename_mapper=new QSignalMapper(this);
QString default_svcname=rda->airplayConf()->defaultSvc();
for(int i=0;i<RD_RDVAIRPLAY_LOG_QUAN;i++) {

4
ripcd/btsentinel4web.cpp
View File

@ -35,7 +35,7 @@ BtSentinel4Web::BtSentinel4Web(RDMatrix *matrix,QObject *parent)
//
bt_socket=new QTcpSocket(this);
connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(bt_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(bt_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
@ -168,7 +168,7 @@ void BtSentinel4Web::watchdogResetData()
delete bt_socket;
bt_socket=new QTcpSocket(this);
connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(bt_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(bt_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));

4
ripcd/btu41mlrweb.cpp
View File

@ -2,7 +2,7 @@
//
// Rivendell switcher driver for the BroadcastTools Universal 4.1 MLR>>Web
//
// (C) Copyright 2017-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2017-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
@ -37,7 +37,7 @@ BtU41MlrWeb::BtU41MlrWeb(RDMatrix *matrix,QObject *parent)
bt_socket=new QTcpSocket(this);
connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(bt_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(bt_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
bt_socket->connectToHost(bt_ip_address.toString(),bt_ip_port);

2
ripcd/gvc7000.cpp
View File

@ -63,7 +63,7 @@ Gvc7000::Gvc7000(RDMatrix *matrix,QObject *parent)
gvc_socket=new QTcpSocket(this);
connect(gvc_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(gvc_socket,SIGNAL(disconnected()),this,SLOT(disconnectedData()));
connect(gvc_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(gvc_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
ipConnect();
}

7
ripcd/harlond.cpp
View File

@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for the Harlond Virtual Mixer
//
// (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
@ -44,7 +44,8 @@ Harlond::Harlond(RDMatrix *matrix,QObject *parent)
// Reset Timers
//
bt_reset_mapper=new QSignalMapper(this);
connect(bt_reset_mapper,SIGNAL(mapped(int)),this,SLOT(resetTimeoutData(int)));
connect(bt_reset_mapper,SIGNAL(mappedInt(int)),
this,SLOT(resetTimeoutData(int)));
for(int i=0;i<bt_inputs;i++) {
bt_reset_states.push_back(false);
bt_reset_timers.push_back(new QTimer(this));
@ -61,7 +62,7 @@ Harlond::Harlond(RDMatrix *matrix,QObject *parent)
connect(bt_socket,SIGNAL(connected()),this,SLOT(socketConnectedData()));
connect(bt_socket,SIGNAL(disconnected()),this,SLOT(socketDisconnectedData()));
connect(bt_socket,SIGNAL(readyRead()),this,SLOT(socketReadyReadData()));
connect(bt_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(bt_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(socketErrorData(QAbstractSocket::SocketError)));
bt_watchdog_timer=new QTimer(this);
bt_watchdog_timer->setSingleShot(true);

5
ripcd/kernelgpio.cpp
View File

@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for the Kernel GPIO interface.
//
// (C) Copyright 2017-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2017-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
@ -35,7 +35,8 @@ KernelGpio::KernelGpio(RDMatrix *matrix,QObject *parent)
// Initialize the interface
//
gpio_reset_mapper=new QSignalMapper(this);
connect(gpio_reset_mapper,SIGNAL(mapped(int)),this,SLOT(gpoResetData(int)));
connect(gpio_reset_mapper,SIGNAL(mappedInt(int)),
this,SLOT(gpoResetData(int)));
gpio_gpio=new RDKernelGpio(this);
connect(gpio_gpio,SIGNAL(valueChanged(int,bool)),
this,SLOT(gpiChangedData(int,bool)));

8
ripcd/livewire_mcastgpio.cpp
View File

@ -2,7 +2,7 @@
//
// A Rivendell multicast GPIO driver for LiveWire networks.
//
// (C) Copyright 2013-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-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
@ -63,7 +63,7 @@ LiveWireMcastGpio::LiveWireMcastGpio(RDMatrix *matrix,QObject *parent)
// Timers
//
livewire_gpi_timer_mapper=new QSignalMapper(this);
connect(livewire_gpi_timer_mapper,SIGNAL(mapped(int)),
connect(livewire_gpi_timer_mapper,SIGNAL(mappedInt(int)),
this,SLOT(gpiTimeoutData(int)));
for(unsigned i=0;i<livewire_gpios;i++) {
livewire_gpi_timers.push_back(new QTimer(this));
@ -73,7 +73,7 @@ LiveWireMcastGpio::LiveWireMcastGpio(RDMatrix *matrix,QObject *parent)
livewire_gpi_timer_mapper,SLOT(map()));
}
livewire_gpo_out_timer_mapper=new QSignalMapper(this);
connect(livewire_gpo_out_timer_mapper,SIGNAL(mapped(int)),
connect(livewire_gpo_out_timer_mapper,SIGNAL(mappedInt(int)),
this,SLOT(gpoOutTimeoutData(int)));
for(unsigned i=0;i<livewire_gpios;i++) {
livewire_gpo_out_timers.push_back(new QTimer(this));
@ -85,7 +85,7 @@ LiveWireMcastGpio::LiveWireMcastGpio(RDMatrix *matrix,QObject *parent)
}
livewire_gpo_in_timer_mapper=new QSignalMapper(this);
connect(livewire_gpo_in_timer_mapper,SIGNAL(mapped(int)),
connect(livewire_gpo_in_timer_mapper,SIGNAL(mappedInt(int)),
this,SLOT(gpoInTimeoutData(int)));
for(unsigned i=0;i<livewire_gpios;i++) {
livewire_gpo_in_timers.push_back(new QTimer(this));

6
ripcd/modbus.cpp
View File

@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for Modbus TCP
//
// (C) Copyright 2017-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2017-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
@ -44,7 +44,7 @@ Modbus::Modbus(RDMatrix *matrix,QObject *parent)
modbus_socket=new QTcpSocket(this);
connect(modbus_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(modbus_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(modbus_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(modbus_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
modbus_socket->connectToHost(modbus_ip_address.toString(),modbus_ip_port);
@ -53,7 +53,7 @@ Modbus::Modbus(RDMatrix *matrix,QObject *parent)
connect(modbus_poll_timer,SIGNAL(timeout()),this,SLOT(pollInputs()));
modbus_reset_mapper=new QSignalMapper(this);
connect(modbus_reset_mapper,SIGNAL(mapped(int)),
connect(modbus_reset_mapper,SIGNAL(mappedInt(int)),
this,SLOT(resetStateData(int)));
for(int i=0;i<modbus_gpos;i++) {
modbus_reset_timers.push_back(new QTimer(this));

4
ripcd/modemlines.cpp
View File

@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for using TTY modem lines for GPIO
//
// (C) Copyright 2015-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2015-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
@ -80,7 +80,7 @@ ModemLines::ModemLines(RDMatrix *matrix,QObject *parent)
// GPO Timers
//
gpio_gpo_mapper=new QSignalMapper(this);
connect(gpio_gpo_mapper,SIGNAL(mapped(int)),this,SLOT(gpoResetData(int)));
connect(gpio_gpo_mapper,SIGNAL(mappedInt(int)),this,SLOT(gpoResetData(int)));
for(int i=0;i<gpio_gpos;i++) {
gpio_gpo_timers[i]=new QTimer(this);
gpio_gpo_timers[i]->setSingleShot(true);

14
ripcd/quartz1.cpp
View File

@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for the Quartz Type 1 Switcher Protocol
//
// (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
@ -53,7 +53,7 @@ Quartz1::Quartz1(RDMatrix *matrix,QObject *parent)
// Reconnection Timers
//
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(ipConnect(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(ipConnect(int)));
for(int i=0;i<2;i++) {
sas_reconnect_timer[i]=new QTimer(this);
sas_reconnect_timer[i]->setSingleShot(true);
@ -65,9 +65,9 @@ Quartz1::Quartz1(RDMatrix *matrix,QObject *parent)
// Initialize the connections
//
QSignalMapper *connected_mapper=new QSignalMapper(this);
connect(connected_mapper,SIGNAL(mapped(int)),this,SLOT(connectedData(int)));
connect(connected_mapper,SIGNAL(mappedInt(int)),this,SLOT(connectedData(int)));
QSignalMapper *closed_mapper=new QSignalMapper(this);
connect(closed_mapper,SIGNAL(mapped(int)),
connect(closed_mapper,SIGNAL(mappedInt(int)),
this,SLOT(connectionClosedData(int)));
for(int i=0;i<2;i++) {
switch(sas_porttype[i]) {
@ -94,12 +94,14 @@ Quartz1::Quartz1(RDMatrix *matrix,QObject *parent)
closed_mapper,SLOT(map()));
switch(i) {
case 0:
connect(sas_socket[i],SIGNAL(error(QAbstractSocket::SocketError)),
connect(sas_socket[i],
SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(error0Data(QAbstractSocket::SocketError)));
break;
case 1:
connect(sas_socket[i],SIGNAL(error(QAbstractSocket::SocketError)),
connect(sas_socket[i],
SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(error1Data(QAbstractSocket::SocketError)));
break;
}

8
ripcd/ripcd.cpp
View File

@ -95,10 +95,10 @@ MainObject::MainObject(QObject *parent)
// Client Connections
//
ripcd_ready_mapper=new QSignalMapper(this);
connect(ripcd_ready_mapper,SIGNAL(mapped(int)),this,SLOT(readyReadData(int)));
connect(ripcd_ready_mapper,SIGNAL(mappedInt(int)),this,SLOT(readyReadData(int)));
ripcd_kill_mapper=new QSignalMapper(this);
connect(ripcd_kill_mapper,SIGNAL(mapped(int)),this,SLOT(killData(int)));
connect(ripcd_kill_mapper,SIGNAL(mappedInt(int)),this,SLOT(killData(int)));
server=new QTcpServer(this);
if(!server->listen(QHostAddress::Any,RIPCD_TCP_PORT)) {
rda->syslog(LOG_ERR,"unable to bind ripc port");
@ -110,7 +110,7 @@ MainObject::MainObject(QObject *parent)
// Macro Timers
//
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(macroTimerData(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(macroTimerData(int)));
for(int i=0;i<RD_MAX_MACRO_TIMERS;i++) {
ripc_macro_cart[i]=0;
ripc_macro_timer[i]=new QTimer(this);
@ -123,7 +123,7 @@ MainObject::MainObject(QObject *parent)
// TTY Ready Read Mapper
//
ripcd_tty_ready_read_mapper=new QSignalMapper(this);
connect(ripcd_tty_ready_read_mapper,SIGNAL(mapped(int)),
connect(ripcd_tty_ready_read_mapper,SIGNAL(mappedInt(int)),
this,SLOT(ttyReadyReadData(int)));
ripcd_host_addr=rda->station()->address();

2
ripcd/sasusi.cpp
View File

@ -95,7 +95,7 @@ SasUsi::SasUsi(RDMatrix *matrix,QObject *parent)
this,SLOT(connectionClosedData()));
connect(sas_socket,SIGNAL(readyRead()),
this,SLOT(readyReadData()));
connect(sas_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(sas_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
ipConnect();
break;

2
ripcd/swauthority.cpp
View File

@ -63,7 +63,7 @@ SoftwareAuthority::SoftwareAuthority(RDMatrix *matrix,QObject *parent)
connect(swa_socket,SIGNAL(disconnected()),this,SLOT(connectionClosedData()));
connect(swa_socket,SIGNAL(readyRead()),
this,SLOT(readyReadData()));
connect(swa_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(swa_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
ipConnect();
}

8
ripcd/vguest.cpp
View File

@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for the Logitek vGuest Protocol
//
// (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
@ -182,9 +182,9 @@ VGuest::VGuest(RDMatrix *matrix,QObject *parent)
// Ping Timers
//
vguest_ping_mapper=new QSignalMapper(this);
connect(vguest_ping_mapper,SIGNAL(mapped(int)),this,SLOT(pingData(int)));
connect(vguest_ping_mapper,SIGNAL(mappedInt(int)),this,SLOT(pingData(int)));
vguest_ping_response_mapper=new QSignalMapper(this);
connect(vguest_ping_response_mapper,SIGNAL(mapped(int)),
connect(vguest_ping_response_mapper,SIGNAL(mappedInt(int)),
this,SLOT(pingResponseData(int)));
for(int i=0;i<2;i++) {
vguest_ping_timer[i]=new QTimer(this);
@ -203,7 +203,7 @@ VGuest::VGuest(RDMatrix *matrix,QObject *parent)
// Reconnection Timer
//
QSignalMapper *reconnect_mapper=new QSignalMapper(this);
connect(reconnect_mapper,SIGNAL(mapped(int)),
connect(reconnect_mapper,SIGNAL(mappedInt(int)),
this,SLOT(ipConnect(int)));
for(int i=0;i<2;i++) {
vguest_reconnect_timer[i]=new QTimer(this);

6
ripcd/wheatnet_lio.cpp
View File

@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for WheatNet LIO
//
// (C) Copyright 2017-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2017-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
@ -37,7 +37,7 @@ WheatnetLio::WheatnetLio(RDMatrix *matrix,QObject *parent)
lio_socket=new QTcpSocket(this);
connect(lio_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(lio_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(lio_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(lio_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
lio_socket->connectToHost(lio_ip_address.toString(),lio_ip_port);
@ -46,7 +46,7 @@ WheatnetLio::WheatnetLio(RDMatrix *matrix,QObject *parent)
connect(lio_poll_timer,SIGNAL(timeout()),this,SLOT(pollData()));
lio_reset_mapper=new QSignalMapper(this);
connect(lio_reset_mapper,SIGNAL(mapped(int)),
connect(lio_reset_mapper,SIGNAL(mappedInt(int)),
this,SLOT(resetStateData(int)));
for(int i=0;i<lio_gpios;i++) {
lio_reset_timers.push_back(new QTimer(this));

6
ripcd/wheatnet_slio.cpp
View File

@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for WheatNet SLIO
//
// (C) Copyright 2017-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2017-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
@ -36,7 +36,7 @@ WheatnetSlio::WheatnetSlio(RDMatrix *matrix,QObject *parent)
slio_socket=new QTcpSocket(this);
connect(slio_socket,SIGNAL(connected()),this,SLOT(connectedData()));
connect(slio_socket,SIGNAL(readyRead()),this,SLOT(readyReadData()));
connect(slio_socket,SIGNAL(error(QAbstractSocket::SocketError)),
connect(slio_socket,SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
this,SLOT(errorData(QAbstractSocket::SocketError)));
slio_socket->connectToHost(slio_ip_address.toString(),slio_ip_port);
@ -45,7 +45,7 @@ WheatnetSlio::WheatnetSlio(RDMatrix *matrix,QObject *parent)
connect(slio_poll_timer,SIGNAL(timeout()),this,SLOT(pollData()));
slio_reset_mapper=new QSignalMapper(this);
connect(slio_reset_mapper,SIGNAL(mapped(int)),
connect(slio_reset_mapper,SIGNAL(mappedInt(int)),
this,SLOT(resetStateData(int)));
for(int i=0;i<slio_gpios;i++) {
slio_reset_timers.push_back(new QTimer(this));

2
utils/rdgpimon/rdgpimon.cpp
View File

@ -206,7 +206,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
gpi_events_view,SLOT(resizeColumnsToContents()));
connect(gpi_events_date_edit,SIGNAL(dateChanged(const QDate &)),
gpi_events_model,SLOT(setDateFilter(const QDate &)));
connect(gpi_events_state_box,SIGNAL(activated(const QString &)),
connect(gpi_events_state_box,SIGNAL(textActivated(const QString &)),
gpi_events_model,SLOT(setStateFilter(const QString &)));
connect(gpi_events_model,SIGNAL(rowsInserted(const QModelIndex &,int,int)),
this,SLOT(rowsInsertedData(const QModelIndex &,int,int)));

2
utils/rdsoftkeys/rdsoftkeys.cpp
View File

@ -81,7 +81,7 @@ MainWidget::MainWidget(RDConfig *config,Qt::WindowFlags f)
int v=0;
QSignalMapper *mapper=new QSignalMapper(this);
connect(mapper,SIGNAL(mapped(int)),this,SLOT(buttonData(int)));
connect(mapper,SIGNAL(mappedInt(int)),this,SLOT(buttonData(int)));
RDProfile *profile=new RDProfile();
profile->setSource(map_filename);
key_columns=