forked from pool/deepin-launcher
Hillwood Yang
58bbc0cacd
* Fix bugs - Add fix-include-dir.patch, Make sure the compiler can find DtkGui headers - fix-ambiguous-error.patch, Skip the ambiguous error - Update version to 5.5.37 * Fix bugs * Update translations * Update documents - Update version to 5.5.33 * Fix bugs OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-launcher?expand=0&rev=21
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From a314975957367c8101e66f6b38074c40463fac37 Mon Sep 17 00:00:00 2001
|
|
From: wangyixue <wangyixue@uniontech.com>
|
|
Date: Sun, 29 Jan 2023 11:35:59 +0800
|
|
Subject: [PATCH] fix: ambigious reference to DRegionMonitor
|
|
|
|
Explicitly using DTK_GUI_NAMESPACE to avoid ambigious reference to
|
|
DRegionMonitor.
|
|
|
|
Log: fix ambigious reference to DRegionMonitor compiling error
|
|
---
|
|
src/launchersys.cpp | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/launchersys.cpp b/src/launchersys.cpp
|
|
index 41f87097..694e71c5 100644
|
|
--- a/src/launchersys.cpp
|
|
+++ b/src/launchersys.cpp
|
|
@@ -26,14 +26,14 @@ LauncherSys::LauncherSys(QObject *parent)
|
|
, m_sessionManagerInter(new com::deepin::SessionManager(SessionManagerService, SessionManagerPath, QDBusConnection::sessionBus(), this))
|
|
, m_windowLauncher(nullptr)
|
|
, m_fullLauncher(nullptr)
|
|
- , m_regionMonitor(new DRegionMonitor(this))
|
|
+ , m_regionMonitor(new DTK_GUI_NAMESPACE::DRegionMonitor(this))
|
|
, m_autoExitTimer(new QTimer(this))
|
|
, m_ignoreRepeatVisibleChangeTimer(new QTimer(this))
|
|
, m_calcUtil(CalculateUtil::instance())
|
|
, m_dockInter(new DBusDock(this))
|
|
, m_clicked(false)
|
|
{
|
|
- m_regionMonitor->setCoordinateType(DRegionMonitor::Original);
|
|
+ m_regionMonitor->setCoordinateType(DTK_GUI_NAMESPACE::DRegionMonitor::Original);
|
|
displayModeChanged();
|
|
|
|
m_autoExitTimer->setInterval(60 * 1000);
|
|
@@ -200,7 +200,7 @@ bool LauncherSys::eventFilter(QObject *watched, QEvent *event)
|
|
|
|
void LauncherSys::registerRegion()
|
|
{
|
|
- m_regionMonitorConnect = connect(m_regionMonitor, &DRegionMonitor::buttonPress, this, &LauncherSys::onButtonPress);
|
|
+ m_regionMonitorConnect = connect(m_regionMonitor, &DTK_GUI_NAMESPACE::DRegionMonitor::buttonPress, this, &LauncherSys::onButtonPress);
|
|
|
|
if (!m_regionMonitor->registered())
|
|
m_regionMonitor->registerRegion();
|
|
--
|
|
2.20.1
|
|
|