From 7caf93246945ebcd55a245ed7622b9660b8e9df5 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 25 Feb 2020 14:22:03 -0500 Subject: [PATCH] 2020-02-25 Fred Gleason * Removed the 'Q3FileDialog' dependency from the 'Import Audio' dialog. --- ChangeLog | 3 +++ lib/rdimport_audio.cpp | 23 +++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 694ee05e..637f17f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19685,3 +19685,6 @@ 2020-02-25 Fred Gleason * Removed the 'Q3ButtonGroup' dependency from the 'Import Audio' dialog. +2020-02-25 Fred Gleason + * Removed the 'Q3FileDialog' dependency from the 'Import Audio' + dialog. diff --git a/lib/rdimport_audio.cpp b/lib/rdimport_audio.cpp index 1ef616e0..1c0901f8 100644 --- a/lib/rdimport_audio.cpp +++ b/lib/rdimport_audio.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include @@ -347,7 +347,6 @@ int RDImportAudio::exec(bool enable_import,bool enable_export) void RDImportAudio::modeClickedData(int id) { - printf("modeClickedData(%d)\n",id); import_in_filename_label->setDisabled(id); import_in_filename_edit->setDisabled(id); import_in_metadata_box->setDisabled(id||(import_wavedata==NULL)); @@ -401,14 +400,13 @@ void RDImportAudio::selectInputFileData() QString filename; if(import_in_filename_edit->text().isEmpty()) { - filename= - Q3FileDialog::getOpenFileName(*import_path, - import_file_filter,this); + filename=QFileDialog::getOpenFileName(this,"Audio Dialog",*import_path, + import_file_filter); } else { - filename= - Q3FileDialog::getOpenFileName(import_in_filename_edit->text(), - import_file_filter,this); + filename=QFileDialog::getOpenFileName(this,"Audio Dialog", + import_in_filename_edit->text(), + import_file_filter); } if(!filename.isEmpty()) { import_in_filename_edit->setText(filename); @@ -425,12 +423,13 @@ void RDImportAudio::selectOutputFileData() import_settings->format())+")"; if(import_out_filename_edit->text().isEmpty()) { - filename= - Q3FileDialog::getSaveFileName(*import_path,filter,this); + filename=QFileDialog::getSaveFileName(this,"Audio Export",*import_path, + filter); } else { - filename=Q3FileDialog::getSaveFileName(import_out_filename_edit->text(), - filter,this); + filename=QFileDialog::getSaveFileName(this,"Audio Export", + import_out_filename_edit->text(), + filter); } if(!filename.isEmpty()) { import_out_filename_edit->