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

LibCore+LibGUI: Move DesktopServices to LibCore

Browse source
This commit is contained in:
Sergey Bugaev 2020-04-19 10:30:33 +03:00 • committed by Andreas Kling
parent 03f2024b6e
commit f8b2a7b4a7
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Applications/FileManager/DirectoryView.cpp
View file

@ -28,7 +28,7 @@
#include <AK/FileSystemPath.h> #include <AK/FileSystemPath.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <AK/URL.h> #include <AK/URL.h>
#include <LibGUI/DesktopServices.h> #include <LibCore/DesktopServices.h>
#include <LibGUI/SortingProxyModel.h> #include <LibGUI/SortingProxyModel.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -70,7 +70,7 @@ void DirectoryView::handle_activation(const GUI::ModelIndex& index)
return; return;
} }
GUI::DesktopServices::open(URL::create_with_file_protocol(path)); Core::DesktopServices::open(URL::create_with_file_protocol(path));
} }
DirectoryView::DirectoryView() DirectoryView::DirectoryView()

4
Applications/FileManager/main.cpp
View file

@ -31,6 +31,7 @@
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <AK/URL.h> #include <AK/URL.h>
#include <LibCore/ConfigFile.h> #include <LibCore/ConfigFile.h>
#include <LibCore/DesktopServices.h>
#include <LibCore/MimeData.h> #include <LibCore/MimeData.h>
#include <LibCore/UserInfo.h> #include <LibCore/UserInfo.h>
#include <LibGUI/AboutDialog.h> #include <LibGUI/AboutDialog.h>
@ -39,7 +40,6 @@
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
#include <LibGUI/Clipboard.h> #include <LibGUI/Clipboard.h>
#include <LibGUI/DesktopServices.h>
#include <LibGUI/FileSystemModel.h> #include <LibGUI/FileSystemModel.h>
#include <LibGUI/InputBox.h> #include <LibGUI/InputBox.h>
#include <LibGUI/Label.h> #include <LibGUI/Label.h>
@ -154,7 +154,7 @@ int run_in_desktop_mode(RefPtr<Core::ConfigFile> config, String initial_location
return; return;
auto& node = model->node(index); auto& node = model->node(index);
auto path = node.full_path(model); auto path = node.full_path(model);
GUI::DesktopServices::open(URL::create_with_file_protocol(path)); Core::DesktopServices::open(URL::create_with_file_protocol(path));
}; };
window->show(); window->show();

4
Libraries/LibGUI/DesktopServices.cpp → Libraries/LibCore/DesktopServices.cpp
View file

@ -25,11 +25,11 @@
*/ */
#include <AK/URL.h> #include <AK/URL.h>
#include <LibGUI/DesktopServices.h> #include <LibCore/DesktopServices.h>
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
namespace GUI { namespace Core {
static bool open_file_url(const URL&); static bool open_file_url(const URL&);
static bool spawn(String executable, String argument); static bool spawn(String executable, String argument);

2
Libraries/LibGUI/DesktopServices.h → Libraries/LibCore/DesktopServices.h
View file

@ -28,7 +28,7 @@
#include <AK/Forward.h> #include <AK/Forward.h>
namespace GUI { namespace Core {
class DesktopServices { class DesktopServices {
public: public:

1
Libraries/LibCore/Makefile
View file

@ -2,6 +2,7 @@ OBJS = \
ArgsParser.o \ ArgsParser.o \
ConfigFile.o \ ConfigFile.o \
DateTime.o \ DateTime.o \
DesktopServices.o \
DirIterator.o \ DirIterator.o \
ElapsedTimer.o \ ElapsedTimer.o \
Event.o \ Event.o \

1
Libraries/LibGUI/Makefile
View file

@ -18,7 +18,6 @@ OBJS = \
CppLexer.o \ CppLexer.o \
CppSyntaxHighlighter.o \ CppSyntaxHighlighter.o \
Desktop.o \ Desktop.o \
DesktopServices.o \
Dialog.o \ Dialog.o \
DisplayLink.o \ DisplayLink.o \
DragOperation.o \ DragOperation.o \