1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
|
diff --git a/papershell/SNWatcher.cpp b/papershell/SNWatcher.cpp
index 17f640c..f61e473 100644
--- a/papershell/SNWatcher.cpp
+++ b/papershell/SNWatcher.cpp
@@ -13,7 +13,7 @@
#include <QDebug>
#include <QDBusConnectionInterface>
-#include <DFL/DF5/StatusNotifierWatcher.hpp>
+#include <DFStatusNotifierWatcher.hpp>
int main(int argc, char *argv[])
{
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
/* Our actual code starts here */
- DFL::StatusNotifierWatcher *sniw = new DFL::StatusNotifierWatcher();
+ DFL::StatusNotifierWatcher *sniw = DFL::StatusNotifierWatcher::createInstance("kde");
/* Some one else has taken this service!! Grrr... */
if (not sniw->isServiceRunning())
diff --git a/papershell/bg/main.cpp b/papershell/bg/main.cpp
index ea74fc6..9a51fb4 100644
--- a/papershell/bg/main.cpp
+++ b/papershell/bg/main.cpp
@@ -35,7 +35,7 @@
#include <wayqt/Registry.hpp>
#include <wayqt/LayerShell.hpp>
-#include <DFL/DF5/Application.hpp>
+#include <DFApplication.hpp>
Paper::Settings *shellSett;
WQt::Registry *wlRegistry;
diff --git a/papershell/dock/main.cpp b/papershell/dock/main.cpp
index a5d7ec8..ce465d1 100644
--- a/papershell/dock/main.cpp
+++ b/papershell/dock/main.cpp
@@ -30,7 +30,7 @@
#include <cprime/systemxdg.h>
#include <paperde/paperlog.h>
-#include <DFL/DF5/Application.hpp>
+#include <DFApplication.hpp>
#include <wayqt/WayQtUtils.hpp>
#include <wayqt/Registry.hpp>
diff --git a/papershell/dock/manager.cpp b/papershell/dock/manager.cpp
index ee20db9..1111f9e 100644
--- a/papershell/dock/manager.cpp
+++ b/papershell/dock/manager.cpp
@@ -28,7 +28,7 @@
#include <QEasingCurve>
#include <QScreen>
-#include <DFL/DF5/Application.hpp>
+#include <DFApplication.hpp>
Paper::Dock::Manager::Manager()
: menuVisible(false)
diff --git a/papershell/dock/manager.h b/papershell/dock/manager.h
index ccac901..fca72a6 100644
--- a/papershell/dock/manager.h
+++ b/papershell/dock/manager.h
@@ -27,7 +27,7 @@
#include <wayqt/LayerShell.hpp>
#include <wayqt/WayQtUtils.hpp>
-#include <DFL/DF5/IpcClient.hpp>
+#include <DFIpcClient.hpp>
#include "dockbar.h"
diff --git a/papershell/logout/logout.cpp b/papershell/logout/logout.cpp
index 2041356..181815c 100644
--- a/papershell/logout/logout.cpp
+++ b/papershell/logout/logout.cpp
@@ -28,8 +28,8 @@
#include <QDBusReply>
#include <QPainter>
-#include <DFL/DF5/IpcClient.hpp>
-#include <DFL/DF5/Application.hpp>
+#include <DFIpcClient.hpp>
+#include <DFApplication.hpp>
#include "global.h"
diff --git a/papershell/logout/main.cpp b/papershell/logout/main.cpp
index 6eb46c3..4d69722 100644
--- a/papershell/logout/main.cpp
+++ b/papershell/logout/main.cpp
@@ -35,7 +35,7 @@
#include <wayqt/Registry.hpp>
#include <wayqt/LayerShell.hpp>
-#include <DFL/DF5/Application.hpp>
+#include <DFApplication.hpp>
Paper::Settings *shellSett;
WQt::Registry *wlRegistry;
diff --git a/papershell/menu/main.cpp b/papershell/menu/main.cpp
index 56857bb..2b456d6 100644
--- a/papershell/menu/main.cpp
+++ b/papershell/menu/main.cpp
@@ -28,7 +28,7 @@
#include <cprime/systemxdg.h>
#include <paperde/paperlog.h>
-#include <DFL/DF5/Application.hpp>
+#include <DFApplication.hpp>
#include <wayqt/WayQtUtils.hpp>
#include <wayqt/Registry.hpp>
diff --git a/papershell/menu/manager.cpp b/papershell/menu/manager.cpp
index d6ad728..be0b512 100644
--- a/papershell/menu/manager.cpp
+++ b/papershell/menu/manager.cpp
@@ -28,7 +28,7 @@
#include <QEasingCurve>
#include <QScreen>
-#include <DFL/DF5/Application.hpp>
+#include <DFApplication.hpp>
Paper::Menu::Manager::Manager()
{
diff --git a/papershell/menu/manager.h b/papershell/menu/manager.h
index 236fd01..7e5b28a 100644
--- a/papershell/menu/manager.h
+++ b/papershell/menu/manager.h
@@ -27,7 +27,7 @@
#include <wayqt/LayerShell.hpp>
#include <wayqt/WayQtUtils.hpp>
-#include <DFL/DF5/IpcClient.hpp>
+#include <DFIpcClient.hpp>
#include "papermenu.h"
diff --git a/papershell/shell/main.cpp b/papershell/shell/main.cpp
index 10a65ee..d1d4924 100644
--- a/papershell/shell/main.cpp
+++ b/papershell/shell/main.cpp
@@ -30,7 +30,7 @@
#include <QtCore>
-#include <DFL/DF5/Application.hpp>
+#include <DFApplication.hpp>
#include <wayqt/Registry.hpp>
#include <wayqt/WayQtUtils.hpp>
diff --git a/papershell/shell/shellmanager.cpp b/papershell/shell/shellmanager.cpp
index 33310c1..63c0147 100644
--- a/papershell/shell/shellmanager.cpp
+++ b/papershell/shell/shellmanager.cpp
@@ -30,10 +30,10 @@
#include "autostart.hpp"
#include "trackedprocess.hpp"
-#include <DFL/DF5/IpcClient.hpp>
+#include <DFIpcClient.hpp>
#include <paper-config.h>
-#include <DFL/DF5/Application.hpp>
+#include <DFApplication.hpp>
#include <wayqt/WayQtUtils.hpp>
#include <wayqt/Registry.hpp>
diff --git a/papershell/widgets/UI/sni/statusnotifierbutton.cpp b/papershell/widgets/UI/sni/statusnotifierbutton.cpp
index c989230..53b0ed9 100644
--- a/papershell/widgets/UI/sni/statusnotifierbutton.cpp
+++ b/papershell/widgets/UI/sni/statusnotifierbutton.cpp
@@ -34,8 +34,8 @@
#include <paperde/papersettings.h>
-#include <DFL/DF5/StatusNotifierItem.hpp>
-#include <DFL/DF5/SNITypes.hpp>
+#include <DFStatusNotifierItem.hpp>
+#include <DFSNITypes.hpp>
namespace {
class MenuImporter : public DBusMenuImporter {
@@ -57,7 +57,7 @@ StatusNotifierButton::StatusNotifierButton(QString service, QString objectPath,
mFallbackIcon(QIcon::fromTheme("application-x-executable"))
{
setAutoRaise(true);
- interface = new DFL::StatusNotifierItem(service, objectPath, QDBusConnection::sessionBus(), this);
+ interface = new DFL::StatusNotifierItem(service, objectPath, this);
checkCanActivate(service, objectPath);
connect(interface, &DFL::StatusNotifierItem::NewIcon, this, &StatusNotifierButton::newIcon);
diff --git a/papershell/widgets/UI/sni/statusnotifierwidget.cpp b/papershell/widgets/UI/sni/statusnotifierwidget.cpp
index 084bddf..e3951f7 100644
--- a/papershell/widgets/UI/sni/statusnotifierwidget.cpp
+++ b/papershell/widgets/UI/sni/statusnotifierwidget.cpp
@@ -30,7 +30,7 @@
#include <QDebug>
#include <paperde/dynamiclayout.h>
-#include <DFL/DF5/StatusNotifierWatcher.hpp>
+#include <DFStatusNotifierWatcher.hpp>
#include "statusnotifierwidget.h"
#include "statusnotifierbutton.h"
diff --git a/papershell/widgets/main.cpp b/papershell/widgets/main.cpp
index fd2087e..cdcd46e 100644
--- a/papershell/widgets/main.cpp
+++ b/papershell/widgets/main.cpp
@@ -28,7 +28,7 @@
#include <cprime/systemxdg.h>
#include <paperde/paperlog.h>
-#include <DFL/DF5/Application.hpp>
+#include <DFApplication.hpp>
#include <wayqt/WayQtUtils.hpp>
#include <wayqt/Registry.hpp>
diff --git a/papershell/widgets/manager.cpp b/papershell/widgets/manager.cpp
index e176b95..e8797e5 100644
--- a/papershell/widgets/manager.cpp
+++ b/papershell/widgets/manager.cpp
@@ -28,7 +28,7 @@
#include <QEasingCurve>
#include <QScreen>
-#include <DFL/DF5/Application.hpp>
+#include <DFApplication.hpp>
Paper::Widgets::Manager::Manager()
{
diff --git a/sessionmanager/main.cpp b/sessionmanager/main.cpp
index ef704d7..ae9ed56 100644
--- a/sessionmanager/main.cpp
+++ b/sessionmanager/main.cpp
@@ -23,7 +23,7 @@
**/
#include <QDir>
-#include <DFL/DF5/CoreApplication.hpp>
+#include <DFCoreApplication.hpp>
#include <cprime/systemxdg.h>
#include <paperde/paperlog.h>
diff --git a/sessionmanager/sessionmgr.cpp b/sessionmanager/sessionmgr.cpp
index d5cccdc..5874de0 100644
--- a/sessionmanager/sessionmgr.cpp
+++ b/sessionmanager/sessionmgr.cpp
@@ -48,8 +48,8 @@
#include <paperde/paperlog.h>
#include <paper-config.h>
-#include <DFL/DF5/Login1.hpp>
-#include <DFL/DF5/CoreApplication.hpp>
+#include <DFLogin1.hpp>
+#include <DFCoreApplication.hpp>
inline static QString xdgRuntimeDir()
{
|