Mercurial > octave

comparison libinterp/octave.cc @ 30160:9c4e8c3bf41d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: use "s_" prefix for static member variables in class application. * octave.cc, octave.h: Use "s_" prefix for static member variables in class application.
author Rik <rik@octave.org>
date Sun, 12 Sep 2021 20:31:03 -0700
parents 7d6709900da7
children 6b17822663f8 796f54d4ddbf
comparison
equal deleted inserted replaced
30159:fb174e59db0a 30160:9c4e8c3bf41d
271 m.assign ("remaining_args", remaining_args ()); 271 m.assign ("remaining_args", remaining_args ());
272 272
273 return m; 273 return m;
274 } 274 }
275 275
276 application *application::instance = nullptr; 276 application *application::s_instance = nullptr;
277 277
278 application::application (int argc, char **argv) 278 application::application (int argc, char **argv)
279 : m_options (argc, argv) 279 : m_options (argc, argv)
280 { 280 {
281 init (); 281 init ();
322 } 322 }
323 } 323 }
324 324
325 bool application::forced_interactive (void) 325 bool application::forced_interactive (void)
326 { 326 {
327 return instance ? instance->m_options.forced_interactive () : false; 327 return s_instance ? s_instance->m_options.forced_interactive () : false;
328 } 328 }
329 329
330 // Provided for convenience. Will be removed once we eliminate the 330 // Provided for convenience. Will be removed once we eliminate the
331 // old terminal widget. 331 // old terminal widget.
332 bool application::experimental_terminal_widget (void) const 332 bool application::experimental_terminal_widget (void) const
333 { 333 {
334 return (instance 334 return (s_instance
335 ? instance->m_options.experimental_terminal_widget () : false); 335 ? s_instance->m_options.experimental_terminal_widget () : false);
336 } 336 }
337 337
338 bool application::interpreter_initialized (void) 338 bool application::interpreter_initialized (void)
339 { 339 {
340 return m_interpreter ? m_interpreter->initialized () : false; 340 return m_interpreter ? m_interpreter->initialized () : false;
364 m_interpreter.reset (); 364 m_interpreter.reset ();
365 } 365 }
366 366
367 void application::init (void) 367 void application::init (void)
368 { 368 {
369 if (instance) 369 if (s_instance)
370 throw std::runtime_error 370 throw std::runtime_error
371 ("only one Octave application object may be active"); 371 ("only one Octave application object may be active");
372 372
373 instance = this; 373 s_instance = this;
374 374
375 string_vector all_args = m_options.all_args (); 375 string_vector all_args = m_options.all_args ();
376 376
377 set_program_names (all_args[0]); 377 set_program_names (all_args[0]);
378 378