Mercurial > hg > octave-nkf

comparison libgui/src/dialog.cc @ 17400: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 510b711f4e31
children 86c6ae5f969e
comparison
equal deleted inserted replaced
17399:a1fa416c7c4a 17400:3feff4d08953
418 InputDialog::reject (void) 418 InputDialog::reject (void)
419 { 419 {
420 buttonCancel_clicked (); 420 buttonCancel_clicked ();
421 } 421 }
422 422
423 FileDialog::FileDialog (const QStringList& filters, const QString& title, 423 FileDialog::FileDialog (const QStringList& name_filters, const QString& title,
424 const QString& filename, const QString& dirname, 424 const QString& filename, const QString& dirname,
425 const QString& multimode) 425 const QString& multimode)
426 : QFileDialog() 426 : QFileDialog()
427 { 427 {
428 // Create a NonModal message. 428 // Create a NonModal message.
454 { 454 {
455 setFileMode (QFileDialog::ExistingFile); 455 setFileMode (QFileDialog::ExistingFile);
456 setAcceptMode (QFileDialog::AcceptOpen); 456 setAcceptMode (QFileDialog::AcceptOpen);
457 } 457 }
458 458
459 setNameFilters (filters); 459 setNameFilters (name_filters);
460 460
461 selectFile (filename); 461 selectFile (filename);
462 462
463 connect (this, 463 connect (this,
464 SIGNAL (finish_input (const QStringList&, const QString&, int)), 464 SIGNAL (finish_input (const QStringList&, const QString&, int)),
491 string_result[i] = QFileInfo (string_result[i]).fileName (); 491 string_result[i] = QFileInfo (string_result[i]).fileName ();
492 492
493 493
494 path = directory ().absolutePath (); 494 path = directory ().absolutePath ();
495 495
496 QStringList filters = nameFilters (); 496 QStringList name_filters = nameFilters ();
497 idx = filters.indexOf (selectedNameFilter ()) + 1; 497 idx = name_filters.indexOf (selectedNameFilter ()) + 1;
498 498
499 // send the selected info 499 // send the selected info
500 emit finish_input (string_result, path, idx); 500 emit finish_input (string_result, path, idx);
501 done (QDialog::Accepted); 501 done (QDialog::Accepted);
502 } 502 }