RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:47:34 +00:00
Code Issues Activity Actions

LibCore: Add StandardPaths thing to retrieve various standard locations

Browse source 
Fixes #1853.
This commit is contained in:
Andreas Kling 2020-04-19 19:57:05 +02:00
parent 3b434068eb
commit c45e16f605
10 changed files with 51 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Applications/FileManager/main.cpp
View file

@ -33,7 +33,7 @@
#include <LibCore/ConfigFile.h>
#include <LibCore/DesktopServices.h>
#include <LibCore/MimeData.h>
#include <LibCore/UserInfo.h>
#include <LibCore/StandardPaths.h>
#include <LibGUI/AboutDialog.h>
#include <LibGUI/Action.h>
#include <LibGUI/ActionGroup.h>
@ -91,7 +91,7 @@ int main(int argc, char** argv)
}
if (app.args().contains_slow("--desktop") || app.args().contains_slow("-d"))
return run_in_desktop_mode(move(config), String::format("%s/Desktop", get_current_user_home_path().characters()));
return run_in_desktop_mode(move(config), Core::StandardPaths::desktop_directory());
// our initial location is defined as, in order of precedence:
// 1. the first command-line argument (e.g. FileManager /bin)
@ -103,7 +103,7 @@ int main(int argc, char** argv)
initial_location = argv[1];
if (initial_location.is_empty())
initial_location = get_current_user_home_path();
initial_location = Core::StandardPaths::home_directory();
if (initial_location.is_empty())
initial_location = "/";
@ -530,7 +530,7 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
auto go_home_action = GUI::CommonActions::make_go_home_action(
[&](auto&) {
directory_view.open(get_current_user_home_path());
directory_view.open(Core::StandardPaths::home_directory());
},
window);

4
Applications/SystemMenu/main.cpp
View file

@ -28,7 +28,7 @@
#include <AK/QuickSort.h>
#include <LibCore/ConfigFile.h>
#include <LibCore/DirIterator.h>
#include <LibCore/UserInfo.h>
#include <LibCore/StandardPaths.h>
#include <LibGUI/Action.h>
#include <LibGUI/Application.h>
#include <LibGUI/Desktop.h>
@ -81,7 +81,7 @@ int main(int argc, char** argv)
return 1;
}
if (chdir(get_current_user_home_path().characters()) < 0) {
if (chdir(Core::StandardPaths::home_directory().characters()) < 0) {
perror("chdir");
return 1;
}

4
Applications/Taskbar/TaskbarWindow.cpp
View file

@ -28,7 +28,7 @@
#include "TaskbarButton.h"
#include <AK/SharedBuffer.h>
#include <LibCore/ConfigFile.h>
#include <LibCore/UserInfo.h>
#include <LibCore/StandardPaths.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h>
#include <LibGUI/Desktop.h>
@ -105,7 +105,7 @@ void TaskbarWindow::create_quick_launch_bar()
if (pid < 0) {
perror("fork");
} else if (pid == 0) {
if (chdir(get_current_user_home_path().characters()) < 0) {
if (chdir(Core::StandardPaths::home_directory().characters()) < 0) {
perror("chdir");
exit(1);
}

1
Applications/Terminal/main.cpp
View file

@ -26,7 +26,6 @@
#include <Kernel/KeyCode.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/UserInfo.h>
#include <LibGUI/AboutDialog.h>
#include <LibGUI/Action.h>
#include <LibGUI/ActionGroup.h>