Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KWayland Server
Commits
b27d7f9e
Commit
b27d7f9e
authored
May 13, 2021
by
Laurent Montel
😁
Browse files
Use Q_EMIT to make it compile against kf5.82
parent
a8237541
Pipeline
#61744
passed with stage
in 5 minutes and 24 seconds
Changes
44
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
autotests/server/test_datacontrol_interface.cpp
View file @
b27d7f9e
...
...
@@ -96,7 +96,7 @@ public:
AbstractDataSource
(
nullptr
)
{}
~
TestDataSource
()
{
emit
aboutToBeDestroyed
();
Q_EMIT
aboutToBeDestroyed
();
}
void
requestData
(
const
QString
&
mimeType
,
qint32
fd
)
override
{
Q_UNUSED
(
mimeType
);
...
...
autotests/server/test_keyboard_shortcuts_inhibitor_interface.cpp
View file @
b27d7f9e
...
...
@@ -47,12 +47,12 @@ public:
void
zwp_keyboard_shortcuts_inhibitor_v1_active
()
override
{
emit
inhibitorActive
();
Q_EMIT
inhibitorActive
();
}
void
zwp_keyboard_shortcuts_inhibitor_v1_inactive
()
override
{
emit
inhibitorInactive
();
Q_EMIT
inhibitorInactive
();
}
Q_SIGNALS:
...
...
autotests/server/test_textinputv3_interface.cpp
View file @
b27d7f9e
...
...
@@ -41,10 +41,10 @@ Q_SIGNALS:
public:
~
TextInputV3
()
override
{
destroy
();
}
void
zwp_text_input_v3_enter
(
struct
::
wl_surface
*
surface
)
override
{
emit
surface_enter
(
surface
);
Q_EMIT
surface_enter
(
surface
);
}
void
zwp_text_input_v3_leave
(
struct
::
wl_surface
*
surface
)
override
{
emit
surface_leave
(
surface
);
Q_EMIT
surface_leave
(
surface
);
}
void
zwp_text_input_v3_commit_string
(
const
QString
&
text
)
override
{
commitText
=
text
;
...
...
@@ -54,10 +54,10 @@ public:
after
=
after_length
;
}
void
zwp_text_input_v3_done
(
uint32_t
serial
)
override
{
emit
commit_string
(
commitText
);
emit
preedit_string
(
preeditText
,
cursorBegin
,
cursorEnd
);
emit
delete_surrounding_text
(
before
,
after
);
emit
done
(
serial
);
Q_EMIT
commit_string
(
commitText
);
Q_EMIT
preedit_string
(
preeditText
,
cursorBegin
,
cursorEnd
);
Q_EMIT
delete_surrounding_text
(
before
,
after
);
Q_EMIT
done
(
serial
);
}
void
zwp_text_input_v3_preedit_string
(
const
QString
&
text
,
int32_t
cursor_begin
,
int32_t
cursor_end
)
override
{
preeditText
=
text
;
...
...
src/server/appmenu_interface.cpp
View file @
b27d7f9e
...
...
@@ -46,7 +46,7 @@ void AppMenuManagerInterfacePrivate::org_kde_kwin_appmenu_manager_create(Resourc
QObject
::
connect
(
appmenu
,
&
QObject
::
destroyed
,
q
,
[
=
]()
{
appmenus
.
removeOne
(
appmenu
);
});
emit
q
->
appMenuCreated
(
appmenu
);
Q_EMIT
q
->
appMenuCreated
(
appmenu
);
}
AppMenuManagerInterfacePrivate
::
AppMenuManagerInterfacePrivate
(
AppMenuManagerInterface
*
_q
,
Display
*
d
)
...
...
@@ -92,7 +92,7 @@ void AppMenuInterfacePrivate::org_kde_kwin_appmenu_set_address(Resource *resourc
address
.
serviceName
=
service_name
;
address
.
objectPath
=
object_path
;
emit
q
->
addressChanged
(
address
);
Q_EMIT
q
->
addressChanged
(
address
);
}
void
AppMenuInterfacePrivate
::
org_kde_kwin_appmenu_release
(
QtWaylandServer
::
org_kde_kwin_appmenu
::
Resource
*
resource
)
...
...
src/server/buffer_interface.cpp
View file @
b27d7f9e
...
...
@@ -222,7 +222,7 @@ void BufferInterface::Private::destroyListenerCallback(wl_listener *listener, vo
Q_UNUSED
(
listener
);
auto
b
=
cast
(
reinterpret_cast
<
wl_resource
*>
(
data
));
b
->
buffer
=
nullptr
;
emit
b
->
q
->
aboutToBeDestroyed
(
b
->
q
);
Q_EMIT
b
->
q
->
aboutToBeDestroyed
(
b
->
q
);
delete
b
->
q
;
}
...
...
@@ -327,7 +327,7 @@ void BufferInterface::setSize(const QSize &size)
return
;
}
d
->
size
=
size
;
emit
sizeChanged
();
Q_EMIT
sizeChanged
();
}
bool
BufferInterface
::
hasAlphaChannel
()
const
...
...
src/server/clientconnection.cpp
View file @
b27d7f9e
...
...
@@ -68,10 +68,10 @@ void ClientConnectionPrivate::destroyListenerCallback(wl_listener *listener, voi
Q_ASSERT
(
it
!=
s_allClients
.
constEnd
());
auto
p
=
(
*
it
);
auto
q
=
p
->
q
;
emit
q
->
aboutToBeDestroyed
();
Q_EMIT
q
->
aboutToBeDestroyed
();
p
->
client
=
nullptr
;
wl_list_remove
(
&
p
->
listener
.
link
);
emit
q
->
disconnected
(
q
);
Q_EMIT
q
->
disconnected
(
q
);
q
->
deleteLater
();
}
...
...
src/server/compositor_interface.cpp
View file @
b27d7f9e
...
...
@@ -44,7 +44,7 @@ void CompositorInterfacePrivate::compositor_create_surface(Resource *resource, u
wl_resource_post_no_memory
(
resource
->
handle
);
return
;
}
emit
q
->
surfaceCreated
(
new
SurfaceInterface
(
q
,
surfaceResource
));
Q_EMIT
q
->
surfaceCreated
(
new
SurfaceInterface
(
q
,
surfaceResource
));
}
void
CompositorInterfacePrivate
::
compositor_create_region
(
Resource
*
resource
,
uint32_t
id
)
...
...
src/server/datacontroldevice_v1_interface.cpp
View file @
b27d7f9e
...
...
@@ -60,7 +60,7 @@ void DataControlDeviceV1InterfacePrivate::zwlr_data_control_device_v1_set_select
selection
->
cancel
();
}
selection
=
dataSource
;
emit
q
->
selectionChanged
(
selection
);
Q_EMIT
q
->
selectionChanged
(
selection
);
}
void
DataControlDeviceV1InterfacePrivate
::
zwlr_data_control_device_v1_destroy
(
QtWaylandServer
::
zwlr_data_control_device_v1
::
Resource
*
resource
)
...
...
src/server/datacontroldevicemanager_v1_interface.cpp
View file @
b27d7f9e
...
...
@@ -44,7 +44,7 @@ void DataControlDeviceManagerV1InterfacePrivate::zwlr_data_control_manager_v1_cr
return
;
}
DataControlSourceV1Interface
*
dataSource
=
new
DataControlSourceV1Interface
(
q
,
data_source_resource
);
emit
q
->
dataSourceCreated
(
dataSource
);
Q_EMIT
q
->
dataSourceCreated
(
dataSource
);
}
void
DataControlDeviceManagerV1InterfacePrivate
::
zwlr_data_control_manager_v1_get_data_device
(
Resource
*
resource
,
uint32_t
id
,
wl_resource
*
seat
)
...
...
@@ -61,7 +61,7 @@ void DataControlDeviceManagerV1InterfacePrivate::zwlr_data_control_manager_v1_ge
return
;
}
DataControlDeviceV1Interface
*
dataDevice
=
new
DataControlDeviceV1Interface
(
s
,
data_device_resource
);
emit
q
->
dataDeviceCreated
(
dataDevice
);
Q_EMIT
q
->
dataDeviceCreated
(
dataDevice
);
}
void
DataControlDeviceManagerV1InterfacePrivate
::
zwlr_data_control_manager_v1_destroy
(
QtWaylandServer
::
zwlr_data_control_manager_v1
::
Resource
*
resource
)
...
...
src/server/datacontrolsource_v1_interface.cpp
View file @
b27d7f9e
...
...
@@ -40,14 +40,14 @@ DataControlSourceV1InterfacePrivate::DataControlSourceV1InterfacePrivate(DataCon
void
DataControlSourceV1InterfacePrivate
::
zwlr_data_control_source_v1_destroy_resource
(
QtWaylandServer
::
zwlr_data_control_source_v1
::
Resource
*
resource
)
{
Q_UNUSED
(
resource
)
emit
q
->
aboutToBeDestroyed
();
Q_EMIT
q
->
aboutToBeDestroyed
();
delete
q
;
}
void
DataControlSourceV1InterfacePrivate
::
zwlr_data_control_source_v1_offer
(
Resource
*
,
const
QString
&
mimeType
)
{
mimeTypes
<<
mimeType
;
emit
q
->
mimeTypeOffered
(
mimeType
);
Q_EMIT
q
->
mimeTypeOffered
(
mimeType
);
}
void
DataControlSourceV1InterfacePrivate
::
zwlr_data_control_source_v1_destroy
(
QtWaylandServer
::
zwlr_data_control_source_v1
::
Resource
*
resource
)
...
...
src/server/datadevice_interface.cpp
View file @
b27d7f9e
...
...
@@ -119,7 +119,7 @@ void DataDeviceInterfacePrivate::data_device_start_drag(Resource *resource, wl_r
}
surface
=
focusSurface
;
drag
.
serial
=
serial
;
emit
q
->
dragStarted
();
Q_EMIT
q
->
dragStarted
();
}
void
DataDeviceInterfacePrivate
::
data_device_set_selection
(
Resource
*
resource
,
wl_resource
*
source
,
uint32_t
serial
)
...
...
@@ -141,9 +141,9 @@ void DataDeviceInterfacePrivate::data_device_set_selection(Resource *resource, w
}
selection
=
dataSource
;
if
(
selection
)
{
emit
q
->
selectionChanged
(
selection
);
Q_EMIT
q
->
selectionChanged
(
selection
);
}
else
{
emit
q
->
selectionCleared
();
Q_EMIT
q
->
selectionCleared
();
}
}
...
...
@@ -175,7 +175,7 @@ DataOfferInterface *DataDeviceInterfacePrivate::createDataOffer(AbstractDataSour
void
DataDeviceInterfacePrivate
::
data_device_destroy_resource
(
QtWaylandServer
::
wl_data_device
::
Resource
*
resource
)
{
Q_UNUSED
(
resource
)
emit
q
->
aboutToBeDestroyed
();
Q_EMIT
q
->
aboutToBeDestroyed
();
delete
q
;
}
...
...
src/server/datadevicemanager_interface.cpp
View file @
b27d7f9e
...
...
@@ -47,7 +47,7 @@ void DataDeviceManagerInterfacePrivate::data_device_manager_create_data_source(R
return
;
}
DataSourceInterface
*
dataSource
=
new
DataSourceInterface
(
q
,
data_source_resource
);
emit
q
->
dataSourceCreated
(
dataSource
);
Q_EMIT
q
->
dataSourceCreated
(
dataSource
);
}
void
DataDeviceManagerInterfacePrivate
::
data_device_manager_get_data_device
(
Resource
*
resource
,
uint32_t
id
,
wl_resource
*
seat
)
...
...
@@ -64,7 +64,7 @@ void DataDeviceManagerInterfacePrivate::data_device_manager_get_data_device(Reso
return
;
}
DataDeviceInterface
*
dataDevice
=
new
DataDeviceInterface
(
s
,
data_device_resource
);
emit
q
->
dataDeviceCreated
(
dataDevice
);
Q_EMIT
q
->
dataDeviceCreated
(
dataDevice
);
}
DataDeviceManagerInterface
::
DataDeviceManagerInterface
(
Display
*
display
,
QObject
*
parent
)
...
...
src/server/dataoffer_interface.cpp
View file @
b27d7f9e
...
...
@@ -123,7 +123,7 @@ void DataOfferInterfacePrivate::data_offer_set_actions(Resource *resource, uint3
supportedDnDActions
=
supportedActions
;
preferredDnDAction
=
preferredAction
;
emit
q
->
dragAndDropActionsChanged
();
Q_EMIT
q
->
dragAndDropActionsChanged
();
}
void
DataOfferInterface
::
sendSourceActions
()
...
...
src/server/datasource_interface.cpp
View file @
b27d7f9e
...
...
@@ -47,7 +47,7 @@ DataSourceInterfacePrivate::DataSourceInterfacePrivate(DataSourceInterface *_q,
void
DataSourceInterfacePrivate
::
data_source_destroy_resource
(
Resource
*
resource
)
{
Q_UNUSED
(
resource
)
emit
q
->
aboutToBeDestroyed
();
Q_EMIT
q
->
aboutToBeDestroyed
();
delete
q
;
}
...
...
@@ -55,7 +55,7 @@ void DataSourceInterfacePrivate::data_source_offer(QtWaylandServer::wl_data_sour
{
Q_UNUSED
(
resource
)
mimeTypes
<<
mime_type
;
emit
q
->
mimeTypeOffered
(
mime_type
);
Q_EMIT
q
->
mimeTypeOffered
(
mime_type
);
}
void
DataSourceInterfacePrivate
::
data_source_destroy
(
QtWaylandServer
::
wl_data_source
::
Resource
*
resource
)
...
...
@@ -66,7 +66,7 @@ void DataSourceInterfacePrivate::data_source_destroy(QtWaylandServer::wl_data_so
void
DataSourceInterfacePrivate
::
offer
(
const
QString
&
mimeType
)
{
mimeTypes
<<
mimeType
;
emit
q
->
mimeTypeOffered
(
mimeType
);
Q_EMIT
q
->
mimeTypeOffered
(
mimeType
);
}
void
DataSourceInterfacePrivate
::
data_source_set_actions
(
Resource
*
resource
,
uint32_t
dnd_actions
)
...
...
@@ -90,7 +90,7 @@ void DataSourceInterfacePrivate::data_source_set_actions(Resource *resource, uin
}
if
(
supportedDnDActions
!=
supportedActions
)
{
supportedDnDActions
=
supportedActions
;
emit
q
->
supportedDragAndDropActionsChanged
();
Q_EMIT
q
->
supportedDragAndDropActionsChanged
();
}
}
...
...
src/server/display.cpp
View file @
b27d7f9e
...
...
@@ -28,7 +28,7 @@ DisplayPrivate::DisplayPrivate(Display *q)
void
DisplayPrivate
::
registerSocketName
(
const
QString
&
socketName
)
{
socketNames
.
append
(
socketName
);
emit
q
->
socketNamesChanged
();
Q_EMIT
q
->
socketNamesChanged
();
}
Display
::
Display
(
QObject
*
parent
)
...
...
@@ -97,7 +97,7 @@ bool Display::start()
connect
(
dispatcher
,
&
QAbstractEventDispatcher
::
aboutToBlock
,
this
,
&
Display
::
flush
);
d
->
running
=
true
;
emit
runningChanged
(
true
);
Q_EMIT
runningChanged
(
true
);
return
true
;
}
...
...
@@ -180,10 +180,10 @@ ClientConnection *Display::getConnection(wl_client *client)
Q_ASSERT
(
index
!=
-
1
);
d
->
clients
.
remove
(
index
);
Q_ASSERT
(
d
->
clients
.
indexOf
(
c
)
==
-
1
);
emit
clientDisconnected
(
c
);
Q_EMIT
clientDisconnected
(
c
);
}
);
emit
clientConnected
(
c
);
Q_EMIT
clientConnected
(
c
);
return
c
;
}
...
...
src/server/dpms_interface.cpp
View file @
b27d7f9e
...
...
@@ -94,7 +94,7 @@ void DpmsInterface::org_kde_kwin_dpms_set(Resource *resource, uint32_t mode)
default:
return
;
}
emit
output
->
dpmsModeRequested
(
dpmsMode
);
Q_EMIT
output
->
dpmsModeRequested
(
dpmsMode
);
}
void
DpmsInterface
::
sendSupported
()
...
...
src/server/eglstream_controller_interface.cpp
View file @
b27d7f9e
...
...
@@ -42,7 +42,7 @@ void EglStreamControllerInterfacePrivate::eglstream_controller_attach_eglstream_
wl_resource_post_error
(
resource
->
handle
,
0
,
"Invalid surface"
);
return
;
}
emit
q
->
streamConsumerAttached
(
surface
,
eglStream
,
attribs
);
Q_EMIT
q
->
streamConsumerAttached
(
surface
,
eglStream
,
attribs
);
}
EglStreamControllerInterfacePrivate
::
EglStreamControllerInterfacePrivate
(
EglStreamControllerInterface
*
_q
,
Display
*
display
)
...
...
src/server/fakeinput_interface.cpp
View file @
b27d7f9e
...
...
@@ -67,7 +67,7 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_bind_resource(Resource *
FakeInputDevice
*
device
=
new
FakeInputDevice
(
q
,
resource
->
handle
);
devices
<<
device
;
QObject
::
connect
(
device
,
&
FakeInputDevice
::
destroyed
,
q
,
[
device
,
this
]
{
devices
.
removeAll
(
device
);
});
emit
q
->
deviceCreated
(
device
);
Q_EMIT
q
->
deviceCreated
(
device
);
}
void
FakeInputInterfacePrivate
::
org_kde_kwin_fake_input_destroy_resource
(
Resource
*
resource
)
...
...
@@ -92,7 +92,7 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_authenticate(Resource *r
if
(
!
d
)
{
return
;
}
emit
d
->
authenticationRequested
(
application
,
reason
);
Q_EMIT
d
->
authenticationRequested
(
application
,
reason
);
}
void
FakeInputInterfacePrivate
::
org_kde_kwin_fake_input_pointer_motion
(
Resource
*
resource
,
wl_fixed_t
delta_x
,
wl_fixed_t
delta_y
)
...
...
@@ -101,7 +101,7 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_pointer_motion(Resource
if
(
!
d
||
!
d
->
isAuthenticated
())
{
return
;
}
emit
d
->
pointerMotionRequested
(
QSizeF
(
wl_fixed_to_double
(
delta_x
),
wl_fixed_to_double
(
delta_y
)));
Q_EMIT
d
->
pointerMotionRequested
(
QSizeF
(
wl_fixed_to_double
(
delta_x
),
wl_fixed_to_double
(
delta_y
)));
}
void
FakeInputInterfacePrivate
::
org_kde_kwin_fake_input_button
(
Resource
*
resource
,
uint32_t
button
,
uint32_t
state
)
...
...
@@ -112,10 +112,10 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_button(Resource *resourc
}
switch
(
state
)
{
case
WL_POINTER_BUTTON_STATE_PRESSED
:
emit
d
->
pointerButtonPressRequested
(
button
);
Q_EMIT
d
->
pointerButtonPressRequested
(
button
);
break
;
case
WL_POINTER_BUTTON_STATE_RELEASED
:
emit
d
->
pointerButtonReleaseRequested
(
button
);
Q_EMIT
d
->
pointerButtonReleaseRequested
(
button
);
break
;
default:
// nothing
...
...
@@ -140,7 +140,7 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_axis(Resource *resource,
// invalid
return
;
}
emit
d
->
pointerAxisRequested
(
orientation
,
wl_fixed_to_double
(
value
));
Q_EMIT
d
->
pointerAxisRequested
(
orientation
,
wl_fixed_to_double
(
value
));
}
void
FakeInputInterfacePrivate
::
org_kde_kwin_fake_input_touch_down
(
Resource
*
resource
,
uint32_t
id
,
wl_fixed_t
x
,
wl_fixed_t
y
)
...
...
@@ -153,7 +153,7 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_touch_down(Resource *res
return
;
}
touchIds
<<
id
;
emit
d
->
touchDownRequested
(
id
,
QPointF
(
wl_fixed_to_double
(
x
),
wl_fixed_to_double
(
y
)));
Q_EMIT
d
->
touchDownRequested
(
id
,
QPointF
(
wl_fixed_to_double
(
x
),
wl_fixed_to_double
(
y
)));
}
void
FakeInputInterfacePrivate
::
org_kde_kwin_fake_input_touch_motion
(
Resource
*
resource
,
uint32_t
id
,
wl_fixed_t
x
,
wl_fixed_t
y
)
...
...
@@ -165,7 +165,7 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_touch_motion(Resource *r
if
(
!
touchIds
.
contains
(
id
))
{
return
;
}
emit
d
->
touchMotionRequested
(
id
,
QPointF
(
wl_fixed_to_double
(
x
),
wl_fixed_to_double
(
y
)));
Q_EMIT
d
->
touchMotionRequested
(
id
,
QPointF
(
wl_fixed_to_double
(
x
),
wl_fixed_to_double
(
y
)));
}
void
FakeInputInterfacePrivate
::
org_kde_kwin_fake_input_touch_up
(
Resource
*
resource
,
uint32_t
id
)
...
...
@@ -178,7 +178,7 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_touch_up(Resource *resou
return
;
}
touchIds
.
removeOne
(
id
);
emit
d
->
touchUpRequested
(
id
);
Q_EMIT
d
->
touchUpRequested
(
id
);
}
void
FakeInputInterfacePrivate
::
org_kde_kwin_fake_input_touch_cancel
(
Resource
*
resource
)
...
...
@@ -188,7 +188,7 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_touch_cancel(Resource *r
return
;
}
touchIds
.
clear
();
emit
d
->
touchCancelRequested
();
Q_EMIT
d
->
touchCancelRequested
();
}
void
FakeInputInterfacePrivate
::
org_kde_kwin_fake_input_touch_frame
(
Resource
*
resource
)
...
...
@@ -197,7 +197,7 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_touch_frame(Resource *re
if
(
!
d
||
!
d
->
isAuthenticated
())
{
return
;
}
emit
d
->
touchFrameRequested
();
Q_EMIT
d
->
touchFrameRequested
();
}
void
FakeInputInterfacePrivate
::
org_kde_kwin_fake_input_pointer_motion_absolute
(
Resource
*
resource
,
wl_fixed_t
x
,
wl_fixed_t
y
)
...
...
@@ -206,7 +206,7 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_pointer_motion_absolute(
if
(
!
d
||
!
d
->
isAuthenticated
())
{
return
;
}
emit
d
->
pointerMotionAbsoluteRequested
(
QPointF
(
wl_fixed_to_double
(
x
),
wl_fixed_to_double
(
y
)));
Q_EMIT
d
->
pointerMotionAbsoluteRequested
(
QPointF
(
wl_fixed_to_double
(
x
),
wl_fixed_to_double
(
y
)));
}
void
FakeInputInterfacePrivate
::
org_kde_kwin_fake_input_keyboard_key
(
Resource
*
resource
,
uint32_t
button
,
uint32_t
state
)
...
...
@@ -217,10 +217,10 @@ void FakeInputInterfacePrivate::org_kde_kwin_fake_input_keyboard_key(Resource *r
}
switch
(
state
)
{
case
WL_KEYBOARD_KEY_STATE_PRESSED
:
emit
d
->
keyboardKeyPressRequested
(
button
);
Q_EMIT
d
->
keyboardKeyPressRequested
(
button
);
break
;
case
WL_KEYBOARD_KEY_STATE_RELEASED
:
emit
d
->
keyboardKeyReleaseRequested
(
button
);
Q_EMIT
d
->
keyboardKeyReleaseRequested
(
button
);
break
;
default:
// nothing
...
...
src/server/global.cpp
View file @
b27d7f9e
...
...
@@ -67,7 +67,7 @@ void Global::destroy()
if
(
!
d
->
global
)
{
return
;
}
emit
aboutToDestroyGlobal
();
Q_EMIT
aboutToDestroyGlobal
();
wl_global_destroy
(
d
->
global
);
d
->
global
=
nullptr
;
}
...
...
src/server/idle_interface.cpp
View file @
b27d7f9e
...
...
@@ -50,7 +50,7 @@ void IdleInterface::inhibit()
{
d
->
inhibitCount
++
;
if
(
d
->
inhibitCount
==
1
)
{
emit
inhibitedChanged
();
Q_EMIT
inhibitedChanged
();
}
}
...
...
@@ -58,7 +58,7 @@ void IdleInterface::uninhibit()
{
d
->
inhibitCount
--
;
if
(
d
->
inhibitCount
==
0
)
{
emit
inhibitedChanged
();
Q_EMIT
inhibitedChanged
();
}
}
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment