From dbf515a46e9bce05eb8c4bb87a0ef01af6676a3b Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 5 Feb 2021 20:34:47 -0500 Subject: [PATCH] 2021-02-05 Fred Gleason * Removed dead method from 'RDCartDialog'. * Fixed a bug in rdlogedit(1) that made it impossible to select a cart in the 'Select Cart' dialog. Signed-off-by: Fred Gleason --- ChangeLog | 4 ++++ lib/rdcart_dialog.cpp | 17 ----------------- lib/rdcart_dialog.h | 1 - rdlogedit/edit_logline.cpp | 2 +- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11b3a3a1..f02a3503 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21020,3 +21020,7 @@ 2021-02-05 Fred Gleason * Added 'RDGpioLogModel'. * Refactored rdgpimon(1) to use the model-based API. +2021-02-05 Fred Gleason + * Removed dead method from 'RDCartDialog'. + * Fixed a bug in rdlogedit(1) that made it impossible to select + a cart in the 'Select Cart' dialog. diff --git a/lib/rdcart_dialog.cpp b/lib/rdcart_dialog.cpp index c6b25df9..93317638 100644 --- a/lib/rdcart_dialog.cpp +++ b/lib/rdcart_dialog.cpp @@ -245,23 +245,6 @@ QSizePolicy RDCartDialog::sizePolicy() const } -void RDCartDialog::clickedData(Q3ListViewItem *item) -{ - RDListViewItem *i=(RDListViewItem *)item; - if (i==NULL) { - return; - } - cart_ok_button->setEnabled(true); - bool audio=((RDCart::Type)i->id())==RDCart::Audio; - if(cart_player!=NULL) { - cart_player->playButton()->setEnabled(audio); - cart_player->stopButton()->setEnabled(audio); - cart_player->setCart(i->text(1).toUInt()); - } - cart_editor_button->setEnabled(audio); -} - - void RDCartDialog::cartDoubleClickedData(const QModelIndex &index) { okData(); diff --git a/lib/rdcart_dialog.h b/lib/rdcart_dialog.h index 7e353fac..2093f9d3 100644 --- a/lib/rdcart_dialog.h +++ b/lib/rdcart_dialog.h @@ -54,7 +54,6 @@ class RDCartDialog : public RDDialog private slots: void modelResetData(); - void clickedData(Q3ListViewItem *item); void cartDoubleClickedData(const QModelIndex &index); void selectionChangedData(const QItemSelection &before, const QItemSelection &after); diff --git a/rdlogedit/edit_logline.cpp b/rdlogedit/edit_logline.cpp index f766ab34..638af750 100644 --- a/rdlogedit/edit_logline.cpp +++ b/rdlogedit/edit_logline.cpp @@ -147,7 +147,7 @@ void EditLogLine::selectCartData() if(!ok) { cartnum=-1; } - if(edit_cart_dialog->exec(&cartnum,RDCart::All,edit_service,NULL)==0) { + if(edit_cart_dialog->exec(&cartnum,RDCart::All,edit_service,NULL)) { FillCart(cartnum); } }