From 0e47266a4dffd634492195d059a0516e46ff6d81 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 31 Jan 2018 17:17:31 -0500 Subject: [PATCH] 2018-02-01 Fred Gleason * Added an 'RDApplication::userChanged() signal. --- ChangeLog | 2 ++ lib/rdapplication.cpp | 8 ++++++++ lib/rdapplication.h | 6 ++++++ rdairplay/rdairplay.cpp | 9 +-------- rdcartslots/rdcartslots.cpp | 3 +-- rdcastmanager/rdcastmanager.cpp | 3 +-- rdcatch/rdcatch.cpp | 9 +-------- rdlibrary/rdlibrary.cpp | 3 +-- rdlogedit/rdlogedit.cpp | 4 +--- rdlogmanager/rdlogmanager.cpp | 3 +-- rdpanel/rdpanel.cpp | 3 +-- utils/rdclilogedit/rdclilogedit.cpp | 3 +-- utils/rddelete/rddelete.cpp | 3 +-- 13 files changed, 26 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ec838ac..d510f747 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16625,3 +16625,5 @@ * Converted rdclilogedit(1) to use RDApplication. 2018-02-01 Fred Gleason * Converted rddelete(1) to use RDApplication. +2018-02-01 Fred Gleason + * Added an 'RDApplication::userChanged() signal. diff --git a/lib/rdapplication.cpp b/lib/rdapplication.cpp index 125b98c9..110ac649 100644 --- a/lib/rdapplication.cpp +++ b/lib/rdapplication.cpp @@ -147,6 +147,7 @@ bool RDApplication::open(QString *err_msg) app_user=new RDUser(); app_cae=new RDCae(app_station,app_config,this); app_ripc=new RDRipc(app_station,app_config,this); + connect(app_ripc,SIGNAL(userChanged()),this,SLOT(userChangedData())); return true; } @@ -216,3 +217,10 @@ RDUser *RDApplication::user() { return app_user; } + + +void RDApplication::userChangedData() +{ + app_user->setName(app_ripc->user()); + emit userChanged(); +} diff --git a/lib/rdapplication.h b/lib/rdapplication.h index 214b7ee8..8651a59e 100644 --- a/lib/rdapplication.h +++ b/lib/rdapplication.h @@ -56,6 +56,12 @@ class RDApplication : public QObject RDSystem *system(); RDUser *user(); + private slots: + void userChangedData(); + + signals: + void userChanged(); + private: RDAirPlayConf *app_airplay_conf; RDAirPlayConf *app_panel_conf; diff --git a/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp index e5526867..c6c9a8a3 100644 --- a/rdairplay/rdairplay.cpp +++ b/rdairplay/rdairplay.cpp @@ -316,7 +316,7 @@ MainWidget::MainWidget(QWidget *parent) // RIPC Connection // connect(rda->ripc(),SIGNAL(connected(bool)),this,SLOT(ripcConnected(bool))); - connect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userData())); + connect(rda,SIGNAL(userChanged()),this,SLOT(userData())); connect(rda->ripc(),SIGNAL(rmlReceived(RDMacro *)), this,SLOT(rmlReceivedData(RDMacro *))); connect(rda->ripc(),SIGNAL(gpiStateChanged(int,int,bool)), @@ -1434,13 +1434,6 @@ void MainWidget::logReloadedData(int log) void MainWidget::userData() { - /* - if(rduser!=NULL) { - delete rduser; - } - rduser=new RDUser(rda->ripc()->user()); - */ - rda->user()->setName(rda->ripc()->user()); LogLine(RDConfig::LogInfo,QString(). sprintf("user changed to '%s'",(const char *)rda->ripc()->user())); SetCaption(); diff --git a/rdcartslots/rdcartslots.cpp b/rdcartslots/rdcartslots.cpp index 854f277d..7dcbbee5 100644 --- a/rdcartslots/rdcartslots.cpp +++ b/rdcartslots/rdcartslots.cpp @@ -97,7 +97,7 @@ MainWidget::MainWidget(QWidget *parent) // // RIPC Connection // - connect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userData())); + connect(rda,SIGNAL(userChanged()),this,SLOT(userData())); connect(rda->ripc(),SIGNAL(rmlReceived(RDMacro *)), this,SLOT(rmlReceivedData(RDMacro *))); @@ -182,7 +182,6 @@ QSizePolicy MainWidget::sizePolicy() const void MainWidget::userData() { - rda->user()->setName(rda->ripc()->user()); for(unsigned i=0;isetUser(rda->user()); } diff --git a/rdcastmanager/rdcastmanager.cpp b/rdcastmanager/rdcastmanager.cpp index f1cd93b7..899c7660 100644 --- a/rdcastmanager/rdcastmanager.cpp +++ b/rdcastmanager/rdcastmanager.cpp @@ -106,7 +106,7 @@ MainWidget::MainWidget(QWidget *parent) // RIPC Connection // #ifndef WIN32 - connect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userChangedData())); + connect(rda,SIGNAL(userChanged()),this,SLOT(userChangedData())); rda->ripc()->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password()); #endif // WIN32 @@ -193,7 +193,6 @@ void MainWidget::userChangedData() QString str1; QString str2; - rda->user()->setName(rda->ripc()->user()); str1=QString("RDCastManager")+" v"+VERSION+" - "+tr("Host"); str2=QString(tr("User")); setCaption(str1+": "+rda->config()->stationName()+" "+str2+" "+rda->ripc()->user()); diff --git a/rdcatch/rdcatch.cpp b/rdcatch/rdcatch.cpp index becc9b9a..a0d4d774 100644 --- a/rdcatch/rdcatch.cpp +++ b/rdcatch/rdcatch.cpp @@ -227,7 +227,7 @@ MainWidget::MainWidget(QWidget *parent) // connect(rda->ripc(),SIGNAL(connected(bool)), this,SLOT(ripcConnectedData(bool))); - connect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(ripcUserData())); + connect(rda,SIGNAL(userChanged()),this,SLOT(ripcUserData())); rda->ripc()->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password()); // @@ -922,13 +922,6 @@ void MainWidget::ripcUserData() str=QString("RDCatch")+" v"+VERSION+" - "+tr("Host")+":"; setCaption(str+" "+rda->config()->stationName()+", "+tr("User")+": "+ rda->ripc()->user()); - /* - if(catch_user!=NULL) { - delete catch_user; - } - catch_user=new RDUser(rda->ripc()->user()); - */ - rda->user()->setName(rda->ripc()->user()); // // Set Control Perms diff --git a/rdlibrary/rdlibrary.cpp b/rdlibrary/rdlibrary.cpp index 70759a19..e911df65 100644 --- a/rdlibrary/rdlibrary.cpp +++ b/rdlibrary/rdlibrary.cpp @@ -179,7 +179,7 @@ MainWidget::MainWidget(QWidget *parent) rdaudioport_conf=new RDAudioPort(rda->config()->stationName(), rda->libraryConf()->inputCard()); connect(rda->ripc(),SIGNAL(connected(bool)),this,SLOT(connectedData(bool))); - connect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userData())); + connect(rda,SIGNAL(userChanged()),this,SLOT(userData())); rda->ripc()-> connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password()); cut_clipboard=NULL; @@ -498,7 +498,6 @@ void MainWidget::userData() } SetCaption(rda->ripc()->user()); - rda->user()->setName(rda->ripc()->user()); lib_group_box->clear(); lib_group_box->insertItem(tr("ALL")); diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index 1dd0ff93..c5c34f1b 100644 --- a/rdlogedit/rdlogedit.cpp +++ b/rdlogedit/rdlogedit.cpp @@ -153,7 +153,7 @@ MainWidget::MainWidget(QWidget *parent) // #ifndef WIN32 connect(rda->ripc(),SIGNAL(connected(bool)),this,SLOT(connectedData(bool))); - connect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userData())); + connect(rda,SIGNAL(userChanged()),this,SLOT(userData())); rda->ripc()->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password()); #else rdripc=NULL; @@ -336,8 +336,6 @@ void MainWidget::userData() str2=QString(tr("User")); setCaption(str1+": "+rda->config()->stationName()+", "+str2+": "+ rda->ripc()->user()); - rda->user()->setName(rda->ripc()->user()); - log_filter_widget->setUser(rda->user()); RefreshList(); diff --git a/rdlogmanager/rdlogmanager.cpp b/rdlogmanager/rdlogmanager.cpp index 2a651b0f..bebde9fa 100644 --- a/rdlogmanager/rdlogmanager.cpp +++ b/rdlogmanager/rdlogmanager.cpp @@ -130,7 +130,7 @@ MainWidget::MainWidget(QWidget *parent) // // RIPC Connection // - connect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userData())); + connect(rda,SIGNAL(userChanged()),this,SLOT(userData())); rda->ripc()->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password()); // @@ -249,7 +249,6 @@ void MainWidget::userData() QString str1=tr("RDLogManager - User: "); setCaption(QString().sprintf("%s%s",(const char *)str1, (const char *)rda->ripc()->user())); - rda->user()->setName(rda->ripc()->user()); // // Set Control Perms diff --git a/rdpanel/rdpanel.cpp b/rdpanel/rdpanel.cpp index 762e9f61..b3276472 100644 --- a/rdpanel/rdpanel.cpp +++ b/rdpanel/rdpanel.cpp @@ -150,7 +150,7 @@ MainWidget::MainWidget(QWidget *parent) // // RIPC Connection // - connect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userData())); + connect(rda,SIGNAL(userChanged()),this,SLOT(userData())); connect(rda->ripc(),SIGNAL(rmlReceived(RDMacro *)), this,SLOT(rmlReceivedData(RDMacro *))); @@ -345,7 +345,6 @@ QSizePolicy MainWidget::sizePolicy() const void MainWidget::userData() { - rda->user()->setName(rda->ripc()->user()); SetCaption(); rda->ripc()->sendOnairFlag(); } diff --git a/utils/rdclilogedit/rdclilogedit.cpp b/utils/rdclilogedit/rdclilogedit.cpp index a2b3d08b..a5430d05 100644 --- a/utils/rdclilogedit/rdclilogedit.cpp +++ b/utils/rdclilogedit/rdclilogedit.cpp @@ -75,7 +75,7 @@ MainObject::MainObject(QObject *parent) // // RIPC Connection // - connect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userData())); + connect(rda,SIGNAL(userChanged()),this,SLOT(userData())); rda->ripc()-> connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password()); } @@ -90,7 +90,6 @@ void MainObject::userData() // Get User Context // disconnect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userData())); - rda->user()->setName(rda->ripc()->user()); // // Start up command processor diff --git a/utils/rddelete/rddelete.cpp b/utils/rddelete/rddelete.cpp index d3553ba7..fdf5bdb7 100644 --- a/utils/rddelete/rddelete.cpp +++ b/utils/rddelete/rddelete.cpp @@ -110,7 +110,7 @@ MainObject::MainObject(QObject *parent) // // RIPC Connection // - connect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userData())); + connect(rda,SIGNAL(userChanged()),this,SLOT(userData())); rda->ripc()->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password()); // @@ -149,7 +149,6 @@ void MainObject::userData() // Get User Context // disconnect(rda->ripc(),SIGNAL(userChanged()),this,SLOT(userData())); - rda->user()->setName(rda->ripc()->user()); // // Process Objects