1313
1414#include < QGuiApplication>
1515#include < QBuffer>
16- #include < QDBusServiceWatcher>
17- #include < QDBusConnectionInterface>
1816
1917DGUI_USE_NAMESPACE
2018
@@ -31,34 +29,17 @@ static DDBusSender clipboardDbus()
3129 .interface (clipboardInterface);
3230}
3331
34- static QDBusServiceWatcher dbusWatcher (clipboardService, QDBusConnection::sessionBus(),
35- QDBusServiceWatcher::WatchForOwnerChange);
36-
3732ClipboardItem::ClipboardItem (QObject *parent)
3833 : DApplet(parent)
3934 , m_visible(true )
4035 , m_clipboardVisible(false )
4136{
4237 QDBusConnection::sessionBus ().connect (clipboardService, clipboardPath, clipboardInterface,
4338 " clipboardVisibleChanged" , this , SLOT (onClipboardVisibleChanged (bool )));
44-
45- auto func = [this ](){
46- QDBusInterface clipboardInter (clipboardService, clipboardPath, clipboardInterface, QDBusConnection::sessionBus ());
47- if (clipboardInter.isValid ()) {
48- m_clipboardVisible = clipboardInter.property (" clipboardVisible" ).toBool ();
49- }
50- };
51- if (QDBusConnection::sessionBus ().interface ()->isServiceRegistered (clipboardService)) {
52- func ();
39+ QDBusInterface clipboardInter (clipboardService, clipboardPath, clipboardInterface, QDBusConnection::sessionBus ());
40+ if (clipboardInter.isValid ()) {
41+ m_clipboardVisible = clipboardInter.property (" clipboardVisible" ).toBool ();
5342 }
54-
55- connect (&dbusWatcher, &QDBusServiceWatcher::serviceRegistered, this , [this , func](){
56- func ();
57- });
58-
59- connect (&dbusWatcher, &QDBusServiceWatcher::serviceUnregistered, this , [this ](){
60- m_clipboardVisible = false ;
61- });
6243}
6344
6445void ClipboardItem::toggleClipboard ()
0 commit comments