forked from quickshell/quickshell
all: fix formatting
This commit is contained in:
parent
bb33c9a0c4
commit
49b309247d
4 changed files with 9 additions and 9 deletions
|
@ -344,12 +344,11 @@ void DesktopEntryManager::scanPath(const QDir& dir, const QString& prefix) {
|
||||||
|
|
||||||
this->desktopEntries.insert(id, dentry);
|
this->desktopEntries.insert(id, dentry);
|
||||||
|
|
||||||
|
|
||||||
if (this->lowercaseDesktopEntries.contains(lowerId)) {
|
if (this->lowercaseDesktopEntries.contains(lowerId)) {
|
||||||
qCInfo(logDesktopEntry).nospace()
|
qCInfo(logDesktopEntry).nospace()
|
||||||
<< "Multiple desktop entries have the same lowercased id " << lowerId
|
<< "Multiple desktop entries have the same lowercased id " << lowerId
|
||||||
<< ". This can cause ambiguity when byId requests are not made with the correct case "
|
<< ". This can cause ambiguity when byId requests are not made with the correct case "
|
||||||
"already.";
|
"already.";
|
||||||
|
|
||||||
this->lowercaseDesktopEntries.remove(lowerId);
|
this->lowercaseDesktopEntries.remove(lowerId);
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,6 @@ public:
|
||||||
static QVector<QString> parseExecString(const QString& execString);
|
static QVector<QString> parseExecString(const QString& execString);
|
||||||
static void doExec(const QString& execString, const QString& workingDirectory);
|
static void doExec(const QString& execString, const QString& workingDirectory);
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
QString mId;
|
QString mId;
|
||||||
QString mName;
|
QString mName;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include "proxywindow.hpp"
|
#include "proxywindow.hpp"
|
||||||
|
|
||||||
|
#include <private/qquickwindow_p.h>
|
||||||
#include <qnamespace.h>
|
#include <qnamespace.h>
|
||||||
#include <qobject.h>
|
#include <qobject.h>
|
||||||
#include <qqmlcontext.h>
|
#include <qqmlcontext.h>
|
||||||
|
@ -11,7 +12,6 @@
|
||||||
#include <qtmetamacros.h>
|
#include <qtmetamacros.h>
|
||||||
#include <qtypes.h>
|
#include <qtypes.h>
|
||||||
#include <qwindow.h>
|
#include <qwindow.h>
|
||||||
#include <private/qquickwindow_p.h>
|
|
||||||
|
|
||||||
#include "generation.hpp"
|
#include "generation.hpp"
|
||||||
#include "qmlglobal.hpp"
|
#include "qmlglobal.hpp"
|
||||||
|
|
|
@ -236,7 +236,8 @@ DBusMenu* StatusNotifierItem::menu() const { return this->mMenu; }
|
||||||
|
|
||||||
void StatusNotifierItem::refMenu() {
|
void StatusNotifierItem::refMenu() {
|
||||||
this->menuRefcount++;
|
this->menuRefcount++;
|
||||||
qCDebug(logSniMenu) << "Menu of" << this << "gained a reference. Refcount is now" << this->menuRefcount;
|
qCDebug(logSniMenu) << "Menu of" << this << "gained a reference. Refcount is now"
|
||||||
|
<< this->menuRefcount;
|
||||||
|
|
||||||
if (this->menuRefcount == 1) {
|
if (this->menuRefcount == 1) {
|
||||||
this->onMenuPathChanged();
|
this->onMenuPathChanged();
|
||||||
|
@ -249,7 +250,8 @@ void StatusNotifierItem::refMenu() {
|
||||||
|
|
||||||
void StatusNotifierItem::unrefMenu() {
|
void StatusNotifierItem::unrefMenu() {
|
||||||
this->menuRefcount--;
|
this->menuRefcount--;
|
||||||
qCDebug(logSniMenu) << "Menu of" << this << "lost a reference. Refcount is now" << this->menuRefcount;
|
qCDebug(logSniMenu) << "Menu of" << this << "lost a reference. Refcount is now"
|
||||||
|
<< this->menuRefcount;
|
||||||
|
|
||||||
if (this->menuRefcount == 0) {
|
if (this->menuRefcount == 0) {
|
||||||
this->onMenuPathChanged();
|
this->onMenuPathChanged();
|
||||||
|
@ -258,7 +260,7 @@ void StatusNotifierItem::unrefMenu() {
|
||||||
|
|
||||||
void StatusNotifierItem::onMenuPathChanged() {
|
void StatusNotifierItem::onMenuPathChanged() {
|
||||||
qCDebug(logSniMenu) << "Updating menu of" << this << "with refcount" << this->menuRefcount
|
qCDebug(logSniMenu) << "Updating menu of" << this << "with refcount" << this->menuRefcount
|
||||||
<< "path" << this->menuPath.get().path();
|
<< "path" << this->menuPath.get().path();
|
||||||
|
|
||||||
if (this->mMenu) {
|
if (this->mMenu) {
|
||||||
this->mMenu->deleteLater();
|
this->mMenu->deleteLater();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue