32
32
33
33
namespace ads
34
34
{
35
+ static const char * const FocusedDockWidgetProperty = " FocusedDockWidget" ;
36
+
35
37
/* *
36
38
* Private data class of CDockFocusController class (pimpl)
37
39
*/
@@ -57,8 +59,8 @@ struct DockFocusControllerPrivate
57
59
* the dock area that it belongs to
58
60
*/
59
61
void updateDockWidgetFocus (CDockWidget* DockWidget);
60
- };
61
- // struct DockFocusControllerPrivate
62
+ }; // struct DockFocusControllerPrivate
63
+
62
64
63
65
64
66
// ===========================================================================
@@ -125,7 +127,7 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
125
127
126
128
if (Window)
127
129
{
128
- Window->setProperty (" FocusedDockWidget " , QVariant::fromValue<CDockWidget* >(DockWidget));
130
+ Window->setProperty (FocusedDockWidgetProperty , QVariant::fromValue (QPointer <CDockWidget>(DockWidget) ));
129
131
}
130
132
CDockAreaWidget* NewFocusedDockArea = nullptr ;
131
133
if (FocusedDockWidget)
@@ -161,7 +163,7 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
161
163
162
164
if (NewFloatingWidget)
163
165
{
164
- NewFloatingWidget->setProperty (" FocusedDockWidget " , QVariant::fromValue (DockWidget));
166
+ NewFloatingWidget->setProperty (FocusedDockWidgetProperty , QVariant::fromValue (QPointer<CDockWidget>( DockWidget) ));
165
167
}
166
168
167
169
@@ -243,13 +245,13 @@ void CDockFocusController::onFocusWindowChanged(QWindow *focusWindow)
243
245
return ;
244
246
}
245
247
246
- auto vDockWidget = focusWindow->property (" FocusedDockWidget " );
248
+ auto vDockWidget = focusWindow->property (FocusedDockWidgetProperty );
247
249
if (!vDockWidget.isValid ())
248
250
{
249
251
return ;
250
252
}
251
253
252
- auto DockWidget = vDockWidget.value <CDockWidget* >();
254
+ auto DockWidget = vDockWidget.value <QPointer< CDockWidget> >();
253
255
if (!DockWidget)
254
256
{
255
257
return ;
@@ -376,13 +378,13 @@ void CDockFocusController::notifyFloatingWidgetDrop(CFloatingDockContainer* Floa
376
378
return ;
377
379
}
378
380
379
- auto vDockWidget = FloatingWidget->property (" FocusedDockWidget " );
381
+ auto vDockWidget = FloatingWidget->property (FocusedDockWidgetProperty );
380
382
if (!vDockWidget.isValid ())
381
383
{
382
384
return ;
383
385
}
384
386
385
- auto DockWidget = vDockWidget.value <CDockWidget* >();
387
+ auto DockWidget = vDockWidget.value <QPointer< CDockWidget> >();
386
388
if (DockWidget)
387
389
{
388
390
DockWidget->dockAreaWidget ()->setCurrentDockWidget (DockWidget);
0 commit comments