Mercurial > octave

diff libinterp/interpfcn/octave-link.h @ 16580:adc150db1809

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes for uigetfile changes * dialog.cc, dialog.h, main-window.cc, octave-qt-link.cc, octave-qt-link.h, octave-link.cc, octave-link.h, uigetfile.m: Style fixes.
author John W. Eaton <jwe@octave.org>
date Sun, 28 Apr 2013 13:41:37 -0400
parents 7f8db1942dc0
children fa4a035e0cf4
line wrap: on
line diff
--- a/libinterp/interpfcn/octave-link.h	Sun Apr 28 09:45:19 2013 -0400
+++ b/libinterp/interpfcn/octave-link.h	Sun Apr 28 13:41:37 2013 -0400
@@ -179,12 +179,12 @@
       : std::list<std::string> ();
   }
 
+  typedef std::list<std::pair<std::string, std::string> > filter_list;
+
   static std::list<std::string>
-  file_dialog ( const std::list< std::pair< std::string, std::string > > filter,
-                const std::string& title,
-                const std::string& filename,
-                const std::string& dirname,
-                bool multiselect)
+  file_dialog (const filter_list& filter, const std::string& title,
+               const std::string& filename, const std::string& dirname,
+               bool multiselect)
   {
     return enabled ()
       ? instance->do_file_dialog (filter, title, filename, dirname, multiselect)
@@ -384,10 +384,8 @@
                    const std::list<std::string>& defaults) = 0;
 
   virtual std::list<std::string>
-  do_file_dialog (const std::list< std::pair< std::string, std::string > > filter,
-                  const std::string& title,
-                  const std::string& filename,
-                  const std::string& dirname,
+  do_file_dialog (const filter_list& filter, const std::string& title,
+                  const std::string& filename, const std::string& dirname,
                   bool multiselect) = 0;
 
   virtual int