diff --git a/src/external/dde-dock-plugins/disk-mount/CMakeLists.txt b/src/external/dde-dock-plugins/disk-mount/CMakeLists.txt index 314e61da65..410564d3e9 100644 --- a/src/external/dde-dock-plugins/disk-mount/CMakeLists.txt +++ b/src/external/dde-dock-plugins/disk-mount/CMakeLists.txt @@ -20,7 +20,7 @@ FILE (GLOB_RECURSE MOUNT_PLUGIN_FILES find_package(Qt5Widgets REQUIRED) find_package(Qt5DBus REQUIRED) find_package(Qt5 COMPONENTS Concurrent Core REQUIRED) -find_package(DtkWidget REQUIRED) +find_package(Dtk COMPONENTS Widget Gui REQUIRED) find_package(PkgConfig REQUIRED) pkg_check_modules(DdeDockInterface REQUIRED dde-dock) @@ -48,6 +48,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${Qt5Widgets_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${DtkWidget_INCLUDE_DIRS} + ${DtkGui_INCLUDE_DIRS} ${Gesttings_INCLUDE_DIRS} ${DdeDockInterface_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src/dfm-base/dbusservice @@ -58,6 +59,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} ${DtkWidget_LIBRARIES} + ${DtkGui_LIBRARIES} ${Gesttings_LIBRARIES} ${DdeDockInterface_LIBRARIES} Qt5::Concurrent diff --git a/src/external/dde-dock-plugins/disk-mount/device/dockitemdatamanager.cpp b/src/external/dde-dock-plugins/disk-mount/device/dockitemdatamanager.cpp index 1b43834287..2a2650dcd6 100644 --- a/src/external/dde-dock-plugins/disk-mount/device/dockitemdatamanager.cpp +++ b/src/external/dde-dock-plugins/disk-mount/device/dockitemdatamanager.cpp @@ -6,10 +6,15 @@ #include "dockitemdatamanager.h" #include "utils/dockutils.h" +#include +#include #include Q_DECLARE_LOGGING_CATEGORY(logAppDock) +DGUI_BEGIN_NAMESPACE +DGUI_END_NAMESPACE + static constexpr char kDeviceService[] { "org.deepin.filemanager.server" }; static constexpr char kDevMngPath[] { "/org/deepin/filemanager/server/DeviceManager" }; static const bool kDisplay = true; @@ -109,7 +114,8 @@ bool DockItemDataManager::protoDeviceFilter(const QVariantMap &data) void DockItemDataManager::playSoundOnDevPlugInOut(bool in) { - using namespace Dtk::Widget; + DGUI_USE_NAMESPACE + DWIDGET_USE_NAMESPACE DDesktopServices::playSystemSoundEffect(in ? DDesktopServices::SSE_DeviceAdded : DDesktopServices::SSE_DeviceRemoved); if (!in)