mirrors/aports
3
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-04-12 18:26:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
aports/testing/paperde/DFL-v0.2.0.patch

264 lines
7.7 KiB
Diff
Raw Permalink Blame History

Patch-Source: https://aur.archlinux.org/cgit/aur.git/plain/DFL-v0.2.0.patch?h=paperde
--
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()
{
Reference in a new issue View git blame Copy permalink