From f8b2a7b4a71243fc749d5c466920a1769e5e2982 Mon Sep 17 00:00:00 2001 From: Sergey Bugaev Date: Sun, 19 Apr 2020 10:30:33 +0300 Subject: [PATCH] LibCore+LibGUI: Move DesktopServices to LibCore --- Applications/FileManager/DirectoryView.cpp | 4 ++-- Applications/FileManager/main.cpp | 4 ++-- Libraries/{LibGUI => LibCore}/DesktopServices.cpp | 4 ++-- Libraries/{LibGUI => LibCore}/DesktopServices.h | 2 +- Libraries/LibCore/Makefile | 1 + Libraries/LibGUI/Makefile | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) rename Libraries/{LibGUI => LibCore}/DesktopServices.cpp (98%) rename Libraries/{LibGUI => LibCore}/DesktopServices.h (98%) diff --git a/Applications/FileManager/DirectoryView.cpp b/Applications/FileManager/DirectoryView.cpp index f9800406bd..e52f6ce0bf 100644 --- a/Applications/FileManager/DirectoryView.cpp +++ b/Applications/FileManager/DirectoryView.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -70,7 +70,7 @@ void DirectoryView::handle_activation(const GUI::ModelIndex& index) return; } - GUI::DesktopServices::open(URL::create_with_file_protocol(path)); + Core::DesktopServices::open(URL::create_with_file_protocol(path)); } DirectoryView::DirectoryView() diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp index e11823b117..90b0d10caa 100644 --- a/Applications/FileManager/main.cpp +++ b/Applications/FileManager/main.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -39,7 +40,6 @@ #include #include #include -#include #include #include #include @@ -154,7 +154,7 @@ int run_in_desktop_mode(RefPtr config, String initial_location return; auto& node = model->node(index); 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(); diff --git a/Libraries/LibGUI/DesktopServices.cpp b/Libraries/LibCore/DesktopServices.cpp similarity index 98% rename from Libraries/LibGUI/DesktopServices.cpp rename to Libraries/LibCore/DesktopServices.cpp index e994655cbf..393fee2ee2 100644 --- a/Libraries/LibGUI/DesktopServices.cpp +++ b/Libraries/LibCore/DesktopServices.cpp @@ -25,11 +25,11 @@ */ #include -#include +#include #include #include -namespace GUI { +namespace Core { static bool open_file_url(const URL&); static bool spawn(String executable, String argument); diff --git a/Libraries/LibGUI/DesktopServices.h b/Libraries/LibCore/DesktopServices.h similarity index 98% rename from Libraries/LibGUI/DesktopServices.h rename to Libraries/LibCore/DesktopServices.h index da91c70d18..f25884f754 100644 --- a/Libraries/LibGUI/DesktopServices.h +++ b/Libraries/LibCore/DesktopServices.h @@ -28,7 +28,7 @@ #include -namespace GUI { +namespace Core { class DesktopServices { public: diff --git a/Libraries/LibCore/Makefile b/Libraries/LibCore/Makefile index 10c243b503..9948956218 100644 --- a/Libraries/LibCore/Makefile +++ b/Libraries/LibCore/Makefile @@ -2,6 +2,7 @@ OBJS = \ ArgsParser.o \ ConfigFile.o \ DateTime.o \ + DesktopServices.o \ DirIterator.o \ ElapsedTimer.o \ Event.o \ diff --git a/Libraries/LibGUI/Makefile b/Libraries/LibGUI/Makefile index cc90ba5c34..5156a15a4a 100644 --- a/Libraries/LibGUI/Makefile +++ b/Libraries/LibGUI/Makefile @@ -18,7 +18,6 @@ OBJS = \ CppLexer.o \ CppSyntaxHighlighter.o \ Desktop.o \ - DesktopServices.o \ Dialog.o \ DisplayLink.o \ DragOperation.o \