Mercurial > octave
comparison libgui/src/m-editor/file-editor.cc @ 32086:3c608abd55f5
Move "same_file" from liboctinterp to liboctave (bug #63803).
* libinterp/corefcn/utils.cc, utils.h (same_file): Deprecate function.
* libinterp/corefcn/sysdep.cc, sysdep.h (same_file_internal): Remove function.
* liboctave/system/lo-sysdep.cc, lo-sysdep.h (same_file): Move function from
liboctinterp to liboctave.
* libgui/src/m-editor/file-editor.cc (file_editor::find_tab_widget),
libinterp/corefcn/fcn-info.cc (file_editor::find_tab_widget),
libinterp/corefcn/interpreter.cc (interpreter::execute_startup_files),
libinterp/corefcn/load-path.cc (load_path::append): Use function in updated
namespace.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sat, 06 May 2023 17:48:27 +0200 |
parents | 77fc9f9653e8 |
children | 6ff63f154144 |
comparison
equal
deleted
inserted
replaced
32085:cf03230c0363 | 32086:3c608abd55f5 |
---|---|
51 #include "gui-preferences-sc.h" | 51 #include "gui-preferences-sc.h" |
52 #include "gui-preferences-global.h" | 52 #include "gui-preferences-global.h" |
53 #include "gui-settings.h" | 53 #include "gui-settings.h" |
54 #include "main-window.h" | 54 #include "main-window.h" |
55 | 55 |
56 #include "lo-sysdep.h" | |
56 #include "oct-env.h" | 57 #include "oct-env.h" |
57 | 58 |
58 #include "event-manager.h" | 59 #include "event-manager.h" |
59 #include "interpreter.h" | 60 #include "interpreter.h" |
60 #include "oct-map.h" | 61 #include "oct-map.h" |
2824 // | 2825 // |
2825 // same_file ("", "") | 2826 // same_file ("", "") |
2826 // | 2827 // |
2827 // is false | 2828 // is false |
2828 | 2829 |
2829 if (same_file (std_file, tab_file.toStdString ()) || file == tab_file) | 2830 if (sys::same_file (std_file, tab_file.toStdString ()) |
2831 || file == tab_file) | |
2830 return fe_tab; | 2832 return fe_tab; |
2831 } | 2833 } |
2832 | 2834 |
2833 return nullptr; | 2835 return nullptr; |
2834 } | 2836 } |