From 093aaa9b26d5ed3d8c29823338229cc4fd1edafb Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Wed, 26 Feb 2020 16:20:46 -0500
Subject: [PATCH] 2020-02-26 Fred Gleason <fredg@paravelsystems.com> 	*
 Removed the 'Q3ProgressBar' dependency from rddiscimport(1).

---
 ChangeLog                           |  2 ++
 utils/rddiscimport/rddiscimport.cpp | 10 +++++-----
 utils/rddiscimport/rddiscimport.h   | 10 +++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e1b7d7ad..5b58c679 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19723,3 +19723,5 @@
 	* Added sanity check code to 'RDRender'.
 2020-02-26 Fred Gleason <fredg@paravelsystems.com>
 	* Removed the 'Q3ProgressBar' dependency from rdlogedit(1).
+2020-02-26 Fred Gleason <fredg@paravelsystems.com>
+	* Removed the 'Q3ProgressBar' dependency from rddiscimport(1).
diff --git a/utils/rddiscimport/rddiscimport.cpp b/utils/rddiscimport/rddiscimport.cpp
index 639e75a7..f3848aff 100644
--- a/utils/rddiscimport/rddiscimport.cpp
+++ b/utils/rddiscimport/rddiscimport.cpp
@@ -157,14 +157,14 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
   dg_disc_label=new QLabel(tr("Disk Progress"),this);
   dg_disc_label->setFont(labelFont());
   dg_disc_label->setDisabled(true);
-  dg_disc_bar=new Q3ProgressBar(this);
+  dg_disc_bar=new QProgressBar(this);
   dg_disc_bar->setDisabled(true);
 
   dg_track_label=new QLabel(tr("Track Progress"),this);
   dg_track_label->setFont(labelFont());
   dg_track_label->setDisabled(true);
-  dg_track_bar=new Q3ProgressBar(this);
-  dg_track_bar->setTotalSteps(dg_ripper->totalSteps()+1);
+  dg_track_bar=new QProgressBar(this);
+  dg_track_bar->setMaximum(dg_ripper->totalSteps()+1);
   dg_track_bar->setDisabled(true);
   connect(dg_ripper,SIGNAL(progressChanged(int)),
 	  dg_track_bar,SLOT(setProgress(int)));
@@ -446,12 +446,12 @@ void MainWidget::ripData()
   //
   // Rip and Import
   //
-  dg_disc_bar->setTotalSteps(dg_player->tracks());
+  dg_disc_bar->setMaximum(dg_player->tracks());
   for(int i=0;i<dg_player->tracks();i++) {
     if(dg_rip_enableds[i]) {
       MetaRecord *r=dg_metalibrary->track(dg_discid_edit->text(),i);
       if(r!=NULL) {
-	dg_disc_bar->setProgress(i);
+	dg_disc_bar->setValue(i);
 	dg_track_label->setText(QString().sprintf("Track %d: ",i+1)+
 				r->title()+" - "+r->artist());
 	dg_ripper->rip(i);
diff --git a/utils/rddiscimport/rddiscimport.h b/utils/rddiscimport/rddiscimport.h
index 8401c477..4827dce6 100644
--- a/utils/rddiscimport/rddiscimport.h
+++ b/utils/rddiscimport/rddiscimport.h
@@ -2,7 +2,7 @@
 //
 // A Qt-based application for importing TM Century GoldDisc CDs
 //
-//   (C) Copyright 2013-2019 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2013-2020 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
@@ -21,12 +21,12 @@
 #ifndef RDDISCIMPORT_H
 #define RDDISCIMPORT_H
 
-#include <q3progressbar.h>
 
 #include <qcheckbox.h>
-#include <qlabel.h>
 #include <qcombobox.h>
+#include <qlabel.h>
 #include <qlineedit.h>
+#include <qprogressbar.h>
 #include <qspinbox.h>
 
 #include <rdaudioimport.h>
@@ -78,9 +78,9 @@ class MainWidget : public RDWidget
   QLineEdit *dg_userdef_edit;
   RDListView *dg_track_list;
   QLabel *dg_disc_label;
-  Q3ProgressBar *dg_disc_bar;
+  QProgressBar *dg_disc_bar;
   QLabel *dg_track_label;
-  Q3ProgressBar *dg_track_bar;
+  QProgressBar *dg_track_bar;
   QLabel *dg_discid_label;
   QLineEdit *dg_discid_edit;
   QPushButton *dg_rip_button;