diff src/multichoicedialog.cpp @ 672:88fa1544b407

Merge from branch qt5. There's much more to be done before we can make another release, but clearly it's going to be done using qt5

--- a/src/multichoicedialog.cpp	Wed Mar 23 14:49:49 2016 +0000
+++ b/src/multichoicedialog.cpp	Wed Dec 05 09:44:10 2018 +0000
@@ -221,14 +221,14 @@
 }
 
 void
-MultiChoiceDialog::urlChanged(const QString &s)
+MultiChoiceDialog::urlChanged(const QString &)
 {
     updateOkButton();
     updateFileComboFromURL();
 }
 
 void
-MultiChoiceDialog::fileChanged(const QString &s)
+MultiChoiceDialog::fileChanged(const QString &)
 {
     updateOkButton();
 }