Mercurial > hg > octave-lyh

changeset 17408:3feff4d08953

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dialog.cc: Rename local variables to avoid shadowed variable warning * libgui/src/dialog.cc(FileDialog, accept): Rename 'filters' to 'name_filters'.
author Rik <rik@octave.org>
date Mon, 09 Sep 2013 20:38:00 -0700
parents a1fa416c7c4a
children 6643f21e27f3
files libgui/src/dialog.cc
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/dialog.cc
+++ b/libgui/src/dialog.cc
@@ -420,7 +420,7 @@
   buttonCancel_clicked ();
 }
 
-FileDialog::FileDialog (const QStringList& filters, const QString& title,
+FileDialog::FileDialog (const QStringList& name_filters, const QString& title,
                         const QString& filename, const QString& dirname,
                         const QString& multimode)
   : QFileDialog()
@@ -456,7 +456,7 @@
       setAcceptMode (QFileDialog::AcceptOpen);
     }
 
-  setNameFilters (filters);
+  setNameFilters (name_filters);
 
   selectFile (filename);
   
@@ -493,8 +493,8 @@
 
   path = directory ().absolutePath ();
 
-  QStringList filters = nameFilters ();
-  idx = filters.indexOf (selectedNameFilter ()) + 1;
+  QStringList name_filters = nameFilters ();
+  idx = name_filters.indexOf (selectedNameFilter ()) + 1;
   
   // send the selected info
   emit finish_input (string_result, path, idx);