diff --git a/ChangeLog b/ChangeLog index a6130436..f0b7b615 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14417,3 +14417,6 @@ the 'Switcher Matrix' and 'Switcher Output' dropdowns to fail to be populated for a LiveWire LWRP Audio switcher device in 'rdadmin/edit_decks.cpp' and 'rdadmin/edit_decks.h'. +2014-09-04 Fred Gleason + * Removed object names in 'rdairplay/log_play.cpp' and + 'rdairplay/log_play.h'. diff --git a/rdairplay/log_play.cpp b/rdairplay/log_play.cpp index 532ee18f..2db58761 100644 --- a/rdairplay/log_play.cpp +++ b/rdairplay/log_play.cpp @@ -32,9 +32,8 @@ #include LogPlay::LogPlay(RDCae *cae,int id,QSocketDevice *nn_sock,QString logname, - std::vector *rlm_hosts, - QObject *parent,const char *name) - : QObject(parent,name),RDLogEvent(logname) + std::vector *rlm_hosts,QObject *parent) + : QObject(parent),RDLogEvent(logname) { // // Initialize Data Structures @@ -89,8 +88,7 @@ LogPlay::LogPlay(RDCae *cae,int id,QSocketDevice *nn_sock,QString logname, // // Macro Cart Decks // - play_macro_deck=new RDMacroEvent(rdstation_conf->address(),rdripc, - this,"play_macro_deck"); + play_macro_deck=new RDMacroEvent(rdstation_conf->address(),rdripc,this); connect(play_macro_deck,SIGNAL(started()),this,SLOT(macroStartedData())); connect(play_macro_deck,SIGNAL(finished()),this,SLOT(macroFinishedData())); connect(play_macro_deck,SIGNAL(stopped()),this,SLOT(macroStoppedData())); @@ -131,19 +129,18 @@ LogPlay::LogPlay(RDCae *cae,int id,QSocketDevice *nn_sock,QString logname, // // Transition Timers // - play_trans_timer=new QTimer(this,"play_trans_timer"); + play_trans_timer=new QTimer(this); connect(play_trans_timer,SIGNAL(timeout()), this,SLOT(transTimerData())); - play_grace_timer=new QTimer(this,"play_grace_timer"); + play_grace_timer=new QTimer(this); connect(play_grace_timer,SIGNAL(timeout()), this,SLOT(graceTimerData())); // // Rescan Timer // - play_rescan_timer=new QTimer(this,"play_rescan_timer"); - connect(play_rescan_timer,SIGNAL(timeout()), - this,SLOT(rescanEventsData())); + play_rescan_timer=new QTimer(this); + connect(play_rescan_timer,SIGNAL(timeout()),this,SLOT(rescanEventsData())); play_rescan_timer->start(LOGPLAY_RESCAN_INTERVAL); } diff --git a/rdairplay/log_play.h b/rdairplay/log_play.h index 5b933215..75a492c6 100644 --- a/rdairplay/log_play.h +++ b/rdairplay/log_play.h @@ -63,8 +63,7 @@ class LogPlay : public QObject,public RDLogEvent Q_OBJECT public: LogPlay(RDCae *cae,int id,QSocketDevice *nn_sock,QString logname, - std::vector *rlm_hosts, - QObject *parent=0,const char *name=0); + std::vector *rlm_hosts,QObject *parent=0); QString serviceName() const; void setServiceName(const QString &svcname); QString defaultServiceName() const;