Browse Source

LibCore+LibGUI: Move DesktopServices to LibCore

Sergey Bugaev 5 năm trước cách đây
mục cha
commit
f8b2a7b4a7

+ 2 - 2
Applications/FileManager/DirectoryView.cpp

@@ -28,7 +28,7 @@
 #include <AK/FileSystemPath.h>
 #include <AK/StringBuilder.h>
 #include <AK/URL.h>
-#include <LibGUI/DesktopServices.h>
+#include <LibCore/DesktopServices.h>
 #include <LibGUI/SortingProxyModel.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -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()

+ 2 - 2
Applications/FileManager/main.cpp

@@ -31,6 +31,7 @@
 #include <AK/StringBuilder.h>
 #include <AK/URL.h>
 #include <LibCore/ConfigFile.h>
+#include <LibCore/DesktopServices.h>
 #include <LibCore/MimeData.h>
 #include <LibCore/UserInfo.h>
 #include <LibGUI/AboutDialog.h>
@@ -39,7 +40,6 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Clipboard.h>
-#include <LibGUI/DesktopServices.h>
 #include <LibGUI/FileSystemModel.h>
 #include <LibGUI/InputBox.h>
 #include <LibGUI/Label.h>
@@ -154,7 +154,7 @@ int run_in_desktop_mode(RefPtr<Core::ConfigFile> 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();

+ 2 - 2
Libraries/LibGUI/DesktopServices.cpp → Libraries/LibCore/DesktopServices.cpp

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

+ 1 - 1
Libraries/LibGUI/DesktopServices.h → Libraries/LibCore/DesktopServices.h

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

+ 1 - 0
Libraries/LibCore/Makefile

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

+ 0 - 1
Libraries/LibGUI/Makefile

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