Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Itinerary
Commits
aa75afb1
Commit
aa75afb1
authored
Dec 30, 2021
by
Nicolas Fella
Browse files
[solidextras] Rename SolidLockBackend to FreedesktopLockBackend
It actually has nothing to do with Solid
parent
f72d460e
Pipeline
#116073
passed with stage
in 1 minute and 14 seconds
Changes
4
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
src/solidextras/CMakeLists.txt
View file @
aa75afb1
...
...
@@ -19,7 +19,7 @@ if (ANDROID)
else
()
list
(
APPEND solidextras_srcs
solidbrightnessbackend.cpp
solid
lockbackend.cpp
freedesktop
lockbackend.cpp
networkstatus_dbus.cpp
)
qt_add_dbus_interface
(
solidextras_srcs org.kde.Solid.PowerManagement.Actions.BrightnessControl.xml brightnesscontroldbusinterface
)
...
...
src/solidextras/
solid
lockbackend.cpp
→
src/solidextras/
freedesktop
lockbackend.cpp
View file @
aa75afb1
...
...
@@ -4,25 +4,25 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include
"
solid
lockbackend.h"
#include
"
freedesktop
lockbackend.h"
#include
"screensaverdbusinterface.h"
#include
<QDBusConnection>
Solid
LockBackend
::
Solid
LockBackend
(
QObject
*
parent
)
Freedesktop
LockBackend
::
Freedesktop
LockBackend
(
QObject
*
parent
)
:
LockBackend
(
parent
)
,
m_cookie
(
0
)
{
m_iface
=
new
OrgFreedesktopScreenSaverInterface
(
QStringLiteral
(
"org.freedesktop.ScreenSaver"
),
QStringLiteral
(
"/org/freedesktop/ScreenSaver"
),
QDBusConnection
::
sessionBus
(),
this
);
}
void
Solid
LockBackend
::
setInhibitionOff
()
void
Freedesktop
LockBackend
::
setInhibitionOff
()
{
m_iface
->
UnInhibit
(
m_cookie
);
}
void
Solid
LockBackend
::
setInhibitionOn
(
const
QString
&
explanation
)
void
Freedesktop
LockBackend
::
setInhibitionOn
(
const
QString
&
explanation
)
{
m_cookie
=
m_iface
->
Inhibit
(
QStringLiteral
(
"org.kde.itinerary"
),
explanation
);
}
...
...
src/solidextras/
solid
lockbackend.h
→
src/solidextras/
freedesktop
lockbackend.h
View file @
aa75afb1
...
...
@@ -12,11 +12,11 @@
class
OrgFreedesktopScreenSaverInterface
;
class
Solid
LockBackend
:
public
LockBackend
class
Freedesktop
LockBackend
:
public
LockBackend
{
public:
explicit
Solid
LockBackend
(
QObject
*
parent
=
nullptr
);
explicit
Freedesktop
LockBackend
(
QObject
*
parent
=
nullptr
);
void
setInhibitionOff
()
override
;
void
setInhibitionOn
(
const
QString
&
explanation
)
override
;
...
...
src/solidextras/lockmanager.cpp
View file @
aa75afb1
...
...
@@ -11,7 +11,7 @@
#if defined(Q_OS_ANDROID)
#include
"androidlockbackend.h"
#elif defined(Q_OS_LINUX)
#include
"
solid
lockbackend.h"
#include
"
freedesktop
lockbackend.h"
#endif
LockManager
::
LockManager
(
QObject
*
parent
)
...
...
@@ -21,7 +21,7 @@ LockManager::LockManager(QObject *parent)
#if defined(Q_OS_ANDROID)
m_backend
=
new
AndroidLockBackend
(
this
);
#elif defined(Q_OS_LINUX)
m_backend
=
new
Solid
LockBackend
(
this
);
m_backend
=
new
Freedesktop
LockBackend
(
this
);
#endif
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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