From 4e58265b35a8e97448a612e3bf53ae9f2af52ebc Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 28 Apr 2025 11:24:18 -0400 Subject: [PATCH] 2025-04-28 Fred Gleason * Cleaned up numerous 'no such signal' runtime errors. Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ cae/cae_server.cpp | 8 ++++---- cae/driver_alsa.cpp | 8 ++++---- cae/driver_jack.cpp | 6 +++--- lib/rd.h | 2 +- lib/rdadd_cart.cpp | 4 ++-- lib/rdbutton_panel.cpp | 2 +- lib/rdcartfilter.cpp | 8 ++++---- lib/rdcddblookup.cpp | 2 +- lib/rdevent_player.cpp | 4 ++-- lib/rdexport_settings_dialog.cpp | 8 ++++---- lib/rdgpio.cpp | 4 ++-- lib/rdlivewire.cpp | 6 +++--- lib/rdmarkerplayer.cpp | 2 +- lib/rdoneshot.cpp | 4 ++-- lib/rdplay_deck.cpp | 4 ++-- lib/rdripc.cpp | 2 +- lib/rdrsscategorybox.cpp | 6 +++--- lib/rdsocket.cpp | 2 +- lib/rdtimeengine.cpp | 4 ++-- rdadmin/edit_audios.cpp | 4 ++-- rdadmin/edit_decks.cpp | 8 ++++---- rdadmin/edit_rdairplay.cpp | 4 ++-- rdadmin/edit_station.cpp | 4 ++-- rdadmin/edit_svc.cpp | 6 +++--- rdairplay/button_log.cpp | 2 +- rdairplay/hourselector.cpp | 2 +- rdairplay/rdairplay.cpp | 6 +++--- rdcatch/edit_switchevent.cpp | 8 ++++---- rdcatch/eventwidget.cpp | 2 +- rdcatchd/rdcatchd.cpp | 8 ++++---- rdlogedit/edit_log.cpp | 4 ++-- rdlogmanager/edit_event.cpp | 4 ++-- rdlogmanager/edit_grid.cpp | 2 +- rdpadd/repeater.cpp | 6 +++--- rdvairplayd/rdvairplayd.cpp | 4 ++-- ripcd/btsentinel4web.cpp | 4 ++-- ripcd/btu41mlrweb.cpp | 4 ++-- ripcd/gvc7000.cpp | 2 +- ripcd/harlond.cpp | 7 ++++--- ripcd/kernelgpio.cpp | 5 +++-- ripcd/livewire_mcastgpio.cpp | 8 ++++---- ripcd/modbus.cpp | 6 +++--- ripcd/modemlines.cpp | 4 ++-- ripcd/quartz1.cpp | 14 ++++++++------ ripcd/ripcd.cpp | 8 ++++---- ripcd/sasusi.cpp | 2 +- ripcd/swauthority.cpp | 2 +- ripcd/vguest.cpp | 8 ++++---- ripcd/wheatnet_lio.cpp | 6 +++--- ripcd/wheatnet_slio.cpp | 6 +++--- utils/rdgpimon/rdgpimon.cpp | 2 +- utils/rdsoftkeys/rdsoftkeys.cpp | 2 +- 53 files changed, 129 insertions(+), 123 deletions(-) diff --git a/ChangeLog b/ChangeLog index c07fdf12..00cf7b90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 + * Cleaned up numerous 'no such signal' runtime errors. diff --git a/cae/cae_server.cpp b/cae/cae_server.cpp index aca17e75..2e4f6fa7 100644 --- a/cae/cae_server.cpp +++ b/cae/cae_server.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include @@ -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))); } diff --git a/cae/driver_alsa.cpp b/cae/driver_alsa.cpp index b828eb55..0f493a98 100644 --- a/cae/driver_alsa.cpp +++ b/cae/driver_alsa.cpp @@ -2,7 +2,7 @@ // // caed(8) driver for Advanced Linux Audio Architecture devices // -// (C) Copyright 2021 Fred Gleason +// (C) Copyright 2021-2025 Fred Gleason // // 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;isetSingleShot(true); diff --git a/lib/rd.h b/lib/rd.h index 22c4d838..cb7f8e34 100644 --- a/lib/rd.h +++ b/lib/rd.h @@ -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" diff --git a/lib/rdadd_cart.cpp b/lib/rdadd_cart.cpp index 87721ea1..e7377d84 100644 --- a/lib/rdadd_cart.cpp +++ b/lib/rdadd_cart.cpp @@ -2,7 +2,7 @@ // // Add a Rivendell Cart // -// (C) Copyright 2002-2021 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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 &))); // diff --git a/lib/rdbutton_panel.cpp b/lib/rdbutton_panel.cpp index a8e14ea1..8e801dc8 100644 --- a/lib/rdbutton_panel.cpp +++ b/lib/rdbutton_panel.cpp @@ -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 +// (C) Copyright 2021-2025 Fred Gleason // // 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 &))); // diff --git a/lib/rdcddblookup.cpp b/lib/rdcddblookup.cpp index 8bf32f85..40b89566 100644 --- a/lib/rdcddblookup.cpp +++ b/lib/rdcddblookup.cpp @@ -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))); } diff --git a/lib/rdevent_player.cpp b/lib/rdevent_player.cpp index 52422ed0..a1c1d594 100644 --- a/lib/rdevent_player.cpp +++ b/lib/rdevent_player.cpp @@ -2,7 +2,7 @@ // // Execute a list of RML commands asynchronously. // -// (C) Copyright 2002-2021 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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); diff --git a/lib/rdexport_settings_dialog.cpp b/lib/rdexport_settings_dialog.cpp index a146ef86..2b25a9a4 100644 --- a/lib/rdexport_settings_dialog.cpp +++ b/lib/rdexport_settings_dialog.cpp @@ -2,7 +2,7 @@ // // Edit Audio Export Settings // -// (C) Copyright 2002-2022 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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); diff --git a/lib/rdgpio.cpp b/lib/rdgpio.cpp index ab5a4ffb..0c9a77c8 100644 --- a/lib/rdgpio.cpp +++ b/lib/rdgpio.cpp @@ -2,7 +2,7 @@ // // A driver for General-Purpose I/O devices. // -// (C) Copyright 2002-2003,2016 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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;isetSingleShot(true); diff --git a/lib/rdlivewire.cpp b/lib/rdlivewire.cpp index 7f807a2a..9644f91c 100644 --- a/lib/rdlivewire.cpp +++ b/lib/rdlivewire.cpp @@ -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;isetText(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); diff --git a/lib/rdoneshot.cpp b/lib/rdoneshot.cpp index 70d906ff..be7cc177 100644 --- a/lib/rdoneshot.cpp +++ b/lib/rdoneshot.cpp @@ -2,7 +2,7 @@ // // A class for providing one-shot single use timers. // -// (C) Copyright 2008,2016 Fred Gleason +// (C) Copyright 2008-2025 Fred Gleason // // 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 diff --git a/lib/rdplay_deck.cpp b/lib/rdplay_deck.cpp index a3c89cec..4f33333d 100644 --- a/lib/rdplay_deck.cpp +++ b/lib/rdplay_deck.cpp @@ -2,7 +2,7 @@ // // Abstract a Rivendell Playback Deck // -// (C) Copyright 2003-2024 Fred Gleason +// (C) Copyright 2003-2025 Fred Gleason // // 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); diff --git a/lib/rdripc.cpp b/lib/rdripc.cpp index 2025b647..2ca08afe 100644 --- a/lib/rdripc.cpp +++ b/lib/rdripc.cpp @@ -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())); diff --git a/lib/rdrsscategorybox.cpp b/lib/rdrsscategorybox.cpp index 77b2bea1..1201fe8f 100644 --- a/lib/rdrsscategorybox.cpp +++ b/lib/rdrsscategorybox.cpp @@ -2,7 +2,7 @@ // // A Combo Box widget for RSS categories. // -// (C) Copyright 2020 Fred Gleason +// (C) Copyright 2020-2025 Fred Gleason // // 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 &))); } diff --git a/lib/rdsocket.cpp b/lib/rdsocket.cpp index 37a4372c..4f3f08b1 100644 --- a/lib/rdsocket.cpp +++ b/lib/rdsocket.cpp @@ -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))); } diff --git a/lib/rdtimeengine.cpp b/lib/rdtimeengine.cpp index 2f8b5fd1..7deb6acf 100644 --- a/lib/rdtimeengine.cpp +++ b/lib/rdtimeengine.cpp @@ -2,7 +2,7 @@ // // An event timer engine. // -// (C) Copyright 2002-2022 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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))); } diff --git a/rdadmin/edit_audios.cpp b/rdadmin/edit_audios.cpp index ef79eeaa..7c1da64d 100644 --- a/rdadmin/edit_audios.cpp +++ b/rdadmin/edit_audios.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Audio Port Configuration // -// (C) Copyright 2002-2023 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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")); diff --git a/rdadmin/edit_decks.cpp b/rdadmin/edit_decks.cpp index 6fe885d0..aff27f90 100644 --- a/rdadmin/edit_decks.cpp +++ b/rdadmin/edit_decks.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell RDCatch Deck Configuration // -// (C) Copyright 2002-2022 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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 +// (C) Copyright 2002-2025 Fred Gleason // // 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 diff --git a/rdadmin/edit_station.cpp b/rdadmin/edit_station.cpp index 66aeb98e..9bfcca45 100644 --- a/rdadmin/edit_station.cpp +++ b/rdadmin/edit_station.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Workstation Configuration // -// (C) Copyright 2002-2022 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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()); diff --git a/rdadmin/edit_svc.cpp b/rdadmin/edit_svc.cpp index 8a1de992..4df0759e 100644 --- a/rdadmin/edit_svc.cpp +++ b/rdadmin/edit_svc.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Service // -// (C) Copyright 2002-2022 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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); diff --git a/rdairplay/button_log.cpp b/rdairplay/button_log.cpp index 46468732..3faaf1a3 100644 --- a/rdairplay/button_log.cpp +++ b/rdairplay/button_log.cpp @@ -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;isetFont(bigButtonFont()); diff --git a/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp index 213e5c4b..f1f034a7 100644 --- a/rdairplay/rdairplay.cpp +++ b/rdairplay/rdairplay.cpp @@ -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;isetFont(bigButtonFont()); diff --git a/rdcatch/edit_switchevent.cpp b/rdcatch/edit_switchevent.cpp index 00ff57c6..0b2062ea 100644 --- a/rdcatch/edit_switchevent.cpp +++ b/rdcatch/edit_switchevent.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Netcatch Cart Event // -// (C) Copyright 2002-2022 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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 &))); // diff --git a/rdcatch/eventwidget.cpp b/rdcatch/eventwidget.cpp index d404a8a4..5f29bbdd 100644 --- a/rdcatch/eventwidget.cpp +++ b/rdcatch/eventwidget.cpp @@ -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 &))); // diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index 3708ca0b..3c65f3c0 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -2,7 +2,7 @@ // // The Rivendell Netcatcher Daemon // -// (C) Copyright 2002-2023 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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))); // diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index 4b05a920..c0c78a0c 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Log // -// (C) Copyright 2002-2022 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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 &))); // diff --git a/rdlogmanager/edit_event.cpp b/rdlogmanager/edit_event.cpp index 7a860f2e..49cf14b0 100644 --- a/rdlogmanager/edit_event.cpp +++ b/rdlogmanager/edit_event.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Log Event // -// (C) Copyright 2002-2023 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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()); diff --git a/rdlogmanager/edit_grid.cpp b/rdlogmanager/edit_grid.cpp index 349d41d6..5c86c948 100644 --- a/rdlogmanager/edit_grid.cpp +++ b/rdlogmanager/edit_grid.cpp @@ -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()); diff --git a/rdpadd/repeater.cpp b/rdpadd/repeater.cpp index a5bbacca..250cc949 100644 --- a/rdpadd/repeater.cpp +++ b/rdpadd/repeater.cpp @@ -2,7 +2,7 @@ // // Rivendell PAD Data Repeater // -// (C) Copyright 2018-2024 Fred Gleason +// (C) Copyright 2018-2025 Fred Gleason // // 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); diff --git a/rdvairplayd/rdvairplayd.cpp b/rdvairplayd/rdvairplayd.cpp index 3e5edd13..1a9a4a9e 100644 --- a/rdvairplayd/rdvairplayd.cpp +++ b/rdvairplayd/rdvairplayd.cpp @@ -2,7 +2,7 @@ // // Headless log player // -// (C) Copyright 2018-2023 Fred Gleason +// (C) Copyright 2018-2025 Fred Gleason // // 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>Web // -// (C) Copyright 2017-2021 Fred Gleason +// (C) Copyright 2017-2025 Fred Gleason // // 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); diff --git a/ripcd/gvc7000.cpp b/ripcd/gvc7000.cpp index 6b823345..ead92725 100644 --- a/ripcd/gvc7000.cpp +++ b/ripcd/gvc7000.cpp @@ -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(); } diff --git a/ripcd/harlond.cpp b/ripcd/harlond.cpp index f82abec6..8bfd457b 100644 --- a/ripcd/harlond.cpp +++ b/ripcd/harlond.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the Harlond Virtual Mixer // -// (C) Copyright 2002-2021 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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;isetSingleShot(true); diff --git a/ripcd/kernelgpio.cpp b/ripcd/kernelgpio.cpp index 00e565c0..44e61ee6 100644 --- a/ripcd/kernelgpio.cpp +++ b/ripcd/kernelgpio.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the Kernel GPIO interface. // -// (C) Copyright 2017-2021 Fred Gleason +// (C) Copyright 2017-2025 Fred Gleason // // 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))); diff --git a/ripcd/livewire_mcastgpio.cpp b/ripcd/livewire_mcastgpio.cpp index 02fb7bc3..c5d85a90 100644 --- a/ripcd/livewire_mcastgpio.cpp +++ b/ripcd/livewire_mcastgpio.cpp @@ -2,7 +2,7 @@ // // A Rivendell multicast GPIO driver for LiveWire networks. // -// (C) Copyright 2013-2021 Fred Gleason +// (C) Copyright 2013-2025 Fred Gleason // // 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 +// (C) Copyright 2017-2025 Fred Gleason // // 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 +// (C) Copyright 2015-2025 Fred Gleason // // 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;isetSingleShot(true); diff --git a/ripcd/quartz1.cpp b/ripcd/quartz1.cpp index 91d2ad87..483410b9 100644 --- a/ripcd/quartz1.cpp +++ b/ripcd/quartz1.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the Quartz Type 1 Switcher Protocol // -// (C) Copyright 2002-2021 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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; } diff --git a/ripcd/ripcd.cpp b/ripcd/ripcd.cpp index 2c626a54..430c6b4e 100644 --- a/ripcd/ripcd.cpp +++ b/ripcd/ripcd.cpp @@ -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;istation()->address(); diff --git a/ripcd/sasusi.cpp b/ripcd/sasusi.cpp index afdc4f00..54898ebc 100644 --- a/ripcd/sasusi.cpp +++ b/ripcd/sasusi.cpp @@ -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; diff --git a/ripcd/swauthority.cpp b/ripcd/swauthority.cpp index 5a33a1ea..8e613b16 100644 --- a/ripcd/swauthority.cpp +++ b/ripcd/swauthority.cpp @@ -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(); } diff --git a/ripcd/vguest.cpp b/ripcd/vguest.cpp index b55a90e7..1e0e3d5c 100644 --- a/ripcd/vguest.cpp +++ b/ripcd/vguest.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the Logitek vGuest Protocol // -// (C) Copyright 2002-2021 Fred Gleason +// (C) Copyright 2002-2025 Fred Gleason // // 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); diff --git a/ripcd/wheatnet_lio.cpp b/ripcd/wheatnet_lio.cpp index c702202f..e4f4ed2b 100644 --- a/ripcd/wheatnet_lio.cpp +++ b/ripcd/wheatnet_lio.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for WheatNet LIO // -// (C) Copyright 2017-2021 Fred Gleason +// (C) Copyright 2017-2025 Fred Gleason // // 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 +// (C) Copyright 2017-2025 Fred Gleason // // 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;isetSource(map_filename); key_columns=