Skip to content

Revert "refactor: move dockiteminfo to shared frame library" #1557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Apr 16, 2026
Merged

Revert "refactor: move dockiteminfo to shared frame library" #1557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions frame/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ set(PUBLIC_HEADERS
layershell/dlayershellwindow.h
models/listtotableproxymodel.h
dsutility.h
dockiteminfo.h
)

set(PRIVATE_HEADERS
Expand Down Expand Up @@ -64,7 +63,6 @@ add_library(dde-shell-frame SHARED
qmlengine.cpp
appletitemmodel.h
appletitemmodel.cpp
dockiteminfo.cpp
dsqmlglobal.cpp
layershell/dlayershellwindow.cpp
layershell/qwaylandlayershellsurface.cpp
Expand Down
4 changes: 3 additions & 1 deletion panels/dock/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
#
# SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -18,6 +18,8 @@ file(
dockabstractsettingsconfig.h
dockdbusproxy.cpp
dockdbusproxy.h
dockiteminfo.cpp
dockiteminfo.h
dockpanel.cpp
dockpanel.h
docksettings.cpp
Expand Down
4 changes: 3 additions & 1 deletion panels/dock/appruntimeitem/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
# SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
#
# SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -13,6 +13,8 @@ add_library(dock-appruntimeitem SHARED
xcbgetinfo.h
xcbgetinfo.cpp
qmlappruntime.qrc
${CMAKE_SOURCE_DIR}/panels/dock/dockiteminfo.cpp
${CMAKE_SOURCE_DIR}/panels/dock/dockiteminfo.h
${CMAKE_SOURCE_DIR}/panels/dock/constants.h
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/x11utils.h
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/x11utils.cpp
Expand Down
2 changes: 1 addition & 1 deletion frame/dockiteminfo.cpp → panels/dock/dockiteminfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down
2 changes: 1 addition & 1 deletion frame/dockiteminfo.h → panels/dock/dockiteminfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
Expand Down
4 changes: 3 additions & 1 deletion panels/dock/multitaskview/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
#
# SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -12,6 +12,8 @@ add_library(dock-multitaskview SHARED
multitaskview.h
treelandmultitaskview.cpp
treelandmultitaskview.h
../dockiteminfo.cpp
../dockiteminfo.h
)

target_include_directories(dock-multitaskview PRIVATE
Expand Down
4 changes: 2 additions & 2 deletions panels/dock/multitaskview/multitaskview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

#pragma once

#include "dockiteminfo.h"
#include "../dockiteminfo.h"
#include "applet.h"

Check warning on line 8 in panels/dock/multitaskview/multitaskview.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "applet.h" not found.
#include "dsglobal.h"

Check warning on line 9 in panels/dock/multitaskview/multitaskview.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "dsglobal.h" not found.
#include "treelandmultitaskview.h"

#include <DConfig>
Expand Down
4 changes: 3 additions & 1 deletion panels/dock/tray/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
#
# SPDX-License-Identifier: CC0-1.0

Expand Down Expand Up @@ -42,6 +42,8 @@ add_library(trayitem SHARED
trayitem.h
traysettings.cpp
traysettings.h
../dockiteminfo.cpp
../dockiteminfo.h
../constants.h
)

Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/trayitem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down
Loading