From 819af91cbe10984cdd604d0e5d95efb75b01ecb9 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Thu, 25 Feb 2021 08:32:39 -0500
Subject: [PATCH] 2021-02-25 Fred Gleason <fredg@paravelsystems.com> 	*
 Fixed a regression in rdlogedit(1) that broke searching for 'ALL' 
 services. 	* Fixed a regression in rdlibrary(1) that broke searching for
 'ALL' 	groups.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog                        | 5 +++++
 lib/rdcartfilter.cpp             | 2 +-
 lib/rdcombobox.cpp               | 4 ++--
 lib/rdexport_settings_dialog.cpp | 2 +-
 lib/rdlogfilter.cpp              | 2 +-
 rdlogedit/edit_log.cpp           | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4865f8b9..7bfa5764 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21193,3 +21193,8 @@
 	groups.
 2021-02-25 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a regression in rdlogin(1) that broke account logout.
+2021-02-25 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a regression in rdlogedit(1) that broke searching for 'ALL'
+	services.
+	* Fixed a regression in rdlibrary(1) that broke searching for 'ALL'
+	groups.
diff --git a/lib/rdcartfilter.cpp b/lib/rdcartfilter.cpp
index 2013a98f..6d901530 100644
--- a/lib/rdcartfilter.cpp
+++ b/lib/rdcartfilter.cpp
@@ -432,7 +432,7 @@ void RDCartFilter::setFilterText(const QString &str)
 void RDCartFilter::setSelectedGroup(const QString &grpname)
 {
   for(int i=0;i<d_group_box->count();i++) {
-    if(d_group_box->itemData(i).toString()==grpname) {
+    if(d_group_box->itemText(i)==grpname) {
       d_group_box->setCurrentIndex(i);
       groupChangedData(d_group_box->currentText());
     }
diff --git a/lib/rdcombobox.cpp b/lib/rdcombobox.cpp
index bb3bd24a..29440659 100644
--- a/lib/rdcombobox.cpp
+++ b/lib/rdcombobox.cpp
@@ -57,7 +57,7 @@ void RDComboBox::addIgnoredKey(int key)
 bool RDComboBox::setCurrentText(const QString &str)
 {
   for(int i=0;i<count();i++) {
-    if(itemData(i).toString()==str) {
+    if(itemText(i)==str) {
       setCurrentIndex(i);
       return true;
     }
@@ -92,7 +92,7 @@ void RDComboBox::keyPressEvent(QKeyEvent *e)
 bool RDComboBox::IsItemUnique(const QString &str)
 {
   for(int i=0;i<count();i++) {
-    if(str==itemData(i).toString()) {
+    if(str==itemText(i)) {
       return false;
     }
   }
diff --git a/lib/rdexport_settings_dialog.cpp b/lib/rdexport_settings_dialog.cpp
index 6c4b5e4c..f462575f 100644
--- a/lib/rdexport_settings_dialog.cpp
+++ b/lib/rdexport_settings_dialog.cpp
@@ -2,7 +2,7 @@
 //
 // Edit Audio Export Settings
 //
-//   (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2021 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
diff --git a/lib/rdlogfilter.cpp b/lib/rdlogfilter.cpp
index 99c9ea3f..2af7fa09 100644
--- a/lib/rdlogfilter.cpp
+++ b/lib/rdlogfilter.cpp
@@ -134,7 +134,7 @@ QString RDLogFilter::whereSql() const
   else {
     sql+="&&(";
     for(int i=1;i<filter_service_box->count();i++) {
-      sql+="(SERVICE=\""+RDEscapeString(filter_service_box->itemData(i).toString())+"\")||";
+      sql+="(SERVICE=\""+RDEscapeString(filter_service_box->itemText(i))+"\")||";
     }
     sql=sql.left(sql.length()-2);
     sql+=")";
diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp
index 64bff21c..f2411e43 100644
--- a/rdlogedit/edit_log.cpp
+++ b/rdlogedit/edit_log.cpp
@@ -1045,7 +1045,7 @@ void EditLog::saveasData()
     edit_log=new RDLog(logname);
     edit_log_model->setLogName(logname);
     for(int i=0;i<edit_service_box->count();i++) {
-      if(edit_service_box->itemData(i).toString()==svcname) {
+      if(edit_service_box->itemText(i)==svcname) {
 	edit_service_box->setCurrentIndex(i);
       }
     }