Skip to content

Commit 58eedde

Browse files
committed
[all] Rename oneos to opuntiaos
1 parent cf4f3db commit 58eedde

File tree

15 files changed

+15
-15
lines changed

15 files changed

+15
-15
lines changed

boot/aarch32/_loader.s

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
.extern _start_secondary_cpu
33
.extern vector_table
44

5-
.section ".oneos_load_section"
6-
oneos_loader:
5+
.section ".opuntiaos_load_section"
6+
opuntiaos_loader:
77
ldr sp, =STACK_PHYZ_TOP
88

99
// The same as reset cpu 0

boot/x86/stage3_entry.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
section .oneos_kernel_boot
1+
section .opuntiaos_kernel_boot
22

33
[bits 32]
44
extern stage3

build/kernel/aarch32/kernel_link.ld

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
. = 0x80010000;
55
.init :
66
{
7-
*(.oneos_load_section)
7+
*(.opuntiaos_load_section)
88
*(.init_code)
99
*(.init_data)
1010
}

build/kernel/x86/kernel_link.ld

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SECTIONS
55

66
.text ALIGN(4K) : AT (ADDR(.text) - 0xc0000000 + 1M)
77
{
8-
*(.oneos_kernel_boot)
8+
*(.opuntiaos_kernel_boot)
99
*(.text)
1010
}
1111

libs/libc/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ opuntiaOS_static_library("libc") {
2222
"stdlib/pts.c",
2323
"stdlib/tools.c",
2424
"string/string.c",
25-
"sysdeps/oneos/generic/shared_buffer.c",
25+
"sysdeps/opuntiaos/generic/shared_buffer.c",
2626
"sysdeps/unix/$target_cpu/crt0.s",
2727
"sysdeps/unix/generic/ioctl.c",
2828
"termios/termios.c",

libs/libcxx/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ opuntiaOS_static_library("libcxx") {
2323
"../libc/stdlib/pts.c",
2424
"../libc/stdlib/tools.c",
2525
"../libc/string/string.c",
26-
"../libc/sysdeps/oneos/generic/shared_buffer.c",
26+
"../libc/sysdeps/opuntiaos/generic/shared_buffer.c",
2727
"../libc/sysdeps/unix/$target_cpu/crt0.s",
2828
"../libc/sysdeps/unix/generic/ioctl.c",
2929
"../libc/termios/termios.c",

libs/libcxx/include/__config

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define _LIBCXX_BEGIN_NAMESPACE_STD namespace std {
77
#define _LIBCXX_END_NAMESPACE_STD }
88

9-
#define _LIBCXX_BEGIN_ONEOS_EXTENSION inline namespace oneos {
9+
#define _LIBCXX_BEGIN_ONEOS_EXTENSION inline namespace opuntiaos {
1010
#define _LIBCXX_END_ONEOS_EXTENSION }
1111

1212
#define _ALIGNAS_TYPE(x) __attribute__((__aligned__(alignof(x))))

libs/libui/src/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extern "C" bool __init_app_delegate(UI::AppDelegate** res);
1313
extern "C" int main(int argc, char** argv)
1414
{
1515
auto process_info = LFoundation::ProcessInfo(argc, argv);
16-
auto& app = std::oneos::construct<UI::App>();
16+
auto& app = std::opuntiaos::construct<UI::App>();
1717
UI::AppDelegate* app_delegate = nullptr;
1818
int res = __init_app_delegate(&app_delegate);
1919
if (res < 0) {

userland/applications/about/AppDelegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class AppDelegate : public UI::AppDelegate {
1212

1313
virtual bool application() override
1414
{
15-
auto& window = std::oneos::construct<UI::Window>(window_size(), icon_path());
15+
auto& window = std::opuntiaos::construct<UI::Window>(window_size(), icon_path());
1616
auto& superview = window.create_superview<UI::View, ViewController>();
1717

1818
window.set_title("About");

userland/applications/activity_monitor/AppDelegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class AppDelegate : public UI::AppDelegate {
1111

1212
virtual bool application() override
1313
{
14-
auto& window = std::oneos::construct<UI::Window>(window_size(), icon_path());
14+
auto& window = std::opuntiaos::construct<UI::Window>(window_size(), icon_path());
1515
auto& superview = window.create_superview<UI::View, ViewController>();
1616

1717
window.set_title("Monitor");

userland/applications/calculator/AppDelegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class AppDelegate : public UI::AppDelegate {
1111

1212
virtual bool application() override
1313
{
14-
auto& window = std::oneos::construct<UI::Window>(window_size(), icon_path());
14+
auto& window = std::opuntiaos::construct<UI::Window>(window_size(), icon_path());
1515
auto& superview = window.create_superview<UI::View, ViewController>();
1616

1717
window.set_title("Calculator");

userland/applications/terminal/AppDelegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class AppDelegate : public UI::AppDelegate {
4242
bool application() override
4343
{
4444
int ptmx = setup_shell();
45-
auto& window = std::oneos::construct<UI::Window>(window_size(), icon_path());
45+
auto& window = std::opuntiaos::construct<UI::Window>(window_size(), icon_path());
4646
auto& superview = window.create_superview<TerminalView, TerminalViewController>(ptmx);
4747
window.set_focused_view(superview);
4848
window.set_frame_style(LG::Color(0x181818));

userland/system/dock/AppDelegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class AppDelegate : public UI::AppDelegate {
1212

1313
bool application() override
1414
{
15-
auto& window = std::oneos::construct<DockWindow>();
15+
auto& window = std::opuntiaos::construct<DockWindow>();
1616
window.set_bitmap_format(LG::PixelBitmapFormat::RGBA); // Turning on Alpha channel
1717
auto& dock_view = window.create_superview<DockView, DockViewController>();
1818

userland/system/homescreen/AppDelegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class AppDelegate : public UI::AppDelegate {
1212

1313
bool application() override
1414
{
15-
auto& window = std::oneos::construct<HomeScreenWindow>(window_size());
15+
auto& window = std::opuntiaos::construct<HomeScreenWindow>(window_size());
1616
window.set_bitmap_format(LG::PixelBitmapFormat::RGBA); // Turning on Alpha channel
1717
auto& dock_view = window.create_superview<HomeScreenView, HomeScreenViewController>();
1818

0 commit comments

Comments
 (0)