Skip to content

Commit

Permalink
fix: [CI] DDesktopService has been moved into GUI
Browse files Browse the repository at this point in the history
use both Widget and Gui namespace.

Log: fix CI issue.
  • Loading branch information
itsXuSt authored and Johnson-zs committed Jan 4, 2024
1 parent e4b6222 commit 09eee4e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/external/dde-dock-plugins/disk-mount/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -58,6 +59,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
${Qt5Core_LIBRARIES}
${Qt5DBus_LIBRARIES}
${DtkWidget_LIBRARIES}
${DtkGui_LIBRARIES}
${Gesttings_LIBRARIES}
${DdeDockInterface_LIBRARIES}
Qt5::Concurrent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@
#include "dockitemdatamanager.h"
#include "utils/dockutils.h"

#include <dtkgui_global.h>
#include <dtkwidget_global.h>
#include <DDesktopServices>

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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 09eee4e

Please sign in to comment.