Mercurial > hg > octave-lyh

comparison 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
comparison
equal deleted inserted replaced
16579:7f8db1942dc0 16580:adc150db1809
177 return enabled () 177 return enabled ()
178 ? instance->do_input_dialog (prompt, title, nr, nc, defaults) 178 ? instance->do_input_dialog (prompt, title, nr, nc, defaults)
179 : std::list<std::string> (); 179 : std::list<std::string> ();
180 } 180 }
181 181
182 typedef std::list<std::pair<std::string, std::string> > filter_list;
183
182 static std::list<std::string> 184 static std::list<std::string>
183 file_dialog ( const std::list< std::pair< std::string, std::string > > filter, 185 file_dialog (const filter_list& filter, const std::string& title,
184 const std::string& title, 186 const std::string& filename, const std::string& dirname,
185 const std::string& filename, 187 bool multiselect)
186 const std::string& dirname,
187 bool multiselect)
188 { 188 {
189 return enabled () 189 return enabled ()
190 ? instance->do_file_dialog (filter, title, filename, dirname, multiselect) 190 ? instance->do_file_dialog (filter, title, filename, dirname, multiselect)
191 : std::list<std::string> (); 191 : std::list<std::string> ();
192 } 192 }
382 const std::list<float>& nr, 382 const std::list<float>& nr,
383 const std::list<float>& nc, 383 const std::list<float>& nc,
384 const std::list<std::string>& defaults) = 0; 384 const std::list<std::string>& defaults) = 0;
385 385
386 virtual std::list<std::string> 386 virtual std::list<std::string>
387 do_file_dialog (const std::list< std::pair< std::string, std::string > > filter, 387 do_file_dialog (const filter_list& filter, const std::string& title,
388 const std::string& title, 388 const std::string& filename, const std::string& dirname,
389 const std::string& filename,
390 const std::string& dirname,
391 bool multiselect) = 0; 389 bool multiselect) = 0;
392 390
393 virtual int 391 virtual int
394 do_debug_cd_or_addpath_error (const std::string& file, 392 do_debug_cd_or_addpath_error (const std::string& file,
395 const std::string& dir, 393 const std::string& dir,