From 2e6081c8543b63cc0aab30decbafc67adbf94ca2 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Tue, 25 Feb 2020 17:05:32 -0500
Subject: [PATCH] 2020-02-25 Fred Gleason <fredg@paravelsystems.com> 	*
 Removed the 'Q3FileDialog' dependency from rddiscimport(1).

---
 ChangeLog                                |  2 ++
 utils/rddiscimport/rddiscimport.cpp      | 12 ++++++------
 utils/rddiscimport/rddiscimport_de.ts    |  8 ++++----
 utils/rddiscimport/rddiscimport_es.ts    |  8 ++++----
 utils/rddiscimport/rddiscimport_fr.ts    |  8 ++++----
 utils/rddiscimport/rddiscimport_nb.ts    |  8 ++++----
 utils/rddiscimport/rddiscimport_nn.ts    |  8 ++++----
 utils/rddiscimport/rddiscimport_pt_BR.ts |  8 ++++----
 8 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf0acb6a..cb25e3d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19705,3 +19705,5 @@
 	* Removed the 'Q3FileDialog' dependency from rdadmin(1).
 2020-02-25 Fred Gleason <fredg@paravelsystems.com>
 	* Removed the 'Q3FileDialog' dependency from rddbconfig(8).
+2020-02-25 Fred Gleason <fredg@paravelsystems.com>
+	* Removed the 'Q3FileDialog' dependency from rddiscimport(1).
diff --git a/utils/rddiscimport/rddiscimport.cpp b/utils/rddiscimport/rddiscimport.cpp
index 65fd6da4..639e75a7 100644
--- a/utils/rddiscimport/rddiscimport.cpp
+++ b/utils/rddiscimport/rddiscimport.cpp
@@ -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
@@ -18,9 +18,8 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include <q3filedialog.h>
-
 #include <qapplication.h>
+#include <qfiledialog.h>
 #include <qmessagebox.h>
 #include <qtranslator.h>
 
@@ -287,9 +286,10 @@ void MainWidget::indexFileSelectedData()
   QString filename;
   int lines;
 
-  filename=Q3FileDialog::getOpenFileName(dg_indexfile_edit->text(),
-					"CSV Files *.csv",this,"",
-					tr("RDDiscImport - Open Index File"));
+  filename=QFileDialog::getOpenFileName(this,"RDDiscImport - "+
+					tr("Open Index File"),
+					dg_indexfile_edit->text(),
+					"CSV files (*.csv);;All files (*.*)");
   dg_metalibrary->clear();
   if((lines=dg_metalibrary->load(filename))<0) {
     QMessageBox::warning(this,"RDDiscImport - "+tr("Read Error"),
diff --git a/utils/rddiscimport/rddiscimport_de.ts b/utils/rddiscimport/rddiscimport_de.ts
index 99147cee..bbbadb5b 100644
--- a/utils/rddiscimport/rddiscimport_de.ts
+++ b/utils/rddiscimport/rddiscimport_de.ts
@@ -95,10 +95,6 @@
         <source>Rip Complete!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>RDDiscImport - Open Index File</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>File Read</source>
         <translation type="unfinished"></translation>
@@ -155,5 +151,9 @@
         <source>Unknown command option</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Open Index File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/utils/rddiscimport/rddiscimport_es.ts b/utils/rddiscimport/rddiscimport_es.ts
index 99147cee..bbbadb5b 100644
--- a/utils/rddiscimport/rddiscimport_es.ts
+++ b/utils/rddiscimport/rddiscimport_es.ts
@@ -95,10 +95,6 @@
         <source>Rip Complete!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>RDDiscImport - Open Index File</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>File Read</source>
         <translation type="unfinished"></translation>
@@ -155,5 +151,9 @@
         <source>Unknown command option</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Open Index File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/utils/rddiscimport/rddiscimport_fr.ts b/utils/rddiscimport/rddiscimport_fr.ts
index 99147cee..bbbadb5b 100644
--- a/utils/rddiscimport/rddiscimport_fr.ts
+++ b/utils/rddiscimport/rddiscimport_fr.ts
@@ -95,10 +95,6 @@
         <source>Rip Complete!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>RDDiscImport - Open Index File</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>File Read</source>
         <translation type="unfinished"></translation>
@@ -155,5 +151,9 @@
         <source>Unknown command option</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Open Index File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/utils/rddiscimport/rddiscimport_nb.ts b/utils/rddiscimport/rddiscimport_nb.ts
index 99147cee..bbbadb5b 100644
--- a/utils/rddiscimport/rddiscimport_nb.ts
+++ b/utils/rddiscimport/rddiscimport_nb.ts
@@ -95,10 +95,6 @@
         <source>Rip Complete!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>RDDiscImport - Open Index File</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>File Read</source>
         <translation type="unfinished"></translation>
@@ -155,5 +151,9 @@
         <source>Unknown command option</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Open Index File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/utils/rddiscimport/rddiscimport_nn.ts b/utils/rddiscimport/rddiscimport_nn.ts
index 99147cee..bbbadb5b 100644
--- a/utils/rddiscimport/rddiscimport_nn.ts
+++ b/utils/rddiscimport/rddiscimport_nn.ts
@@ -95,10 +95,6 @@
         <source>Rip Complete!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>RDDiscImport - Open Index File</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>File Read</source>
         <translation type="unfinished"></translation>
@@ -155,5 +151,9 @@
         <source>Unknown command option</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Open Index File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/utils/rddiscimport/rddiscimport_pt_BR.ts b/utils/rddiscimport/rddiscimport_pt_BR.ts
index 99147cee..bbbadb5b 100644
--- a/utils/rddiscimport/rddiscimport_pt_BR.ts
+++ b/utils/rddiscimport/rddiscimport_pt_BR.ts
@@ -95,10 +95,6 @@
         <source>Rip Complete!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>RDDiscImport - Open Index File</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>File Read</source>
         <translation type="unfinished"></translation>
@@ -155,5 +151,9 @@
         <source>Unknown command option</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Open Index File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>