benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some issues detected by Clazy (#384)

Browse Source 
* Fix old style connect

* Fix unneeded QString memory allocations
This commit is contained in:
Alfredo Ramos
2018-10-23 18:04:42 -05:00
committed by Dharkael
parent 7d91b00072
commit ee2f583acd
48 changed files with 231 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/utils/desktopinfo.cpp
View File

@@ -20,26 +20,26 @@
DesktopInfo::DesktopInfo() {
auto e = QProcessEnvironment::systemEnvironment();
XDG_CURRENT_DESKTOP = e.value("XDG_CURRENT_DESKTOP");
XDG_SESSION_TYPE = e.value("XDG_SESSION_TYPE");
WAYLAND_DISPLAY = e.value("WAYLAND_DISPLAY");
KDE_FULL_SESSION = e.value("KDE_FULL_SESSION");
GNOME_DESKTOP_SESSION_ID = e.value("GNOME_DESKTOP_SESSION_ID");
DESKTOP_SESSION = e.value("DESKTOP_SESSION");
XDG_CURRENT_DESKTOP = e.value(QStringLiteral("XDG_CURRENT_DESKTOP"));
XDG_SESSION_TYPE = e.value(QStringLiteral("XDG_SESSION_TYPE"));
WAYLAND_DISPLAY = e.value(QStringLiteral("WAYLAND_DISPLAY"));
KDE_FULL_SESSION = e.value(QStringLiteral("KDE_FULL_SESSION"));
GNOME_DESKTOP_SESSION_ID = e.value(QStringLiteral("GNOME_DESKTOP_SESSION_ID"));
DESKTOP_SESSION = e.value(QStringLiteral("DESKTOP_SESSION"));
}
bool DesktopInfo::waylandDectected() {
return XDG_SESSION_TYPE == "wayland" ||
WAYLAND_DISPLAY.contains("wayland", Qt::CaseInsensitive);
return XDG_SESSION_TYPE == QLatin1String("wayland") ||
WAYLAND_DISPLAY.contains(QLatin1String("wayland"), Qt::CaseInsensitive);
}
DesktopInfo::WM DesktopInfo::windowManager() {
DesktopInfo::WM res = DesktopInfo::OTHER;
if (XDG_CURRENT_DESKTOP.contains("GNOME", Qt::CaseInsensitive) ||
if (XDG_CURRENT_DESKTOP.contains(QLatin1String("GNOME"), Qt::CaseInsensitive) ||
!GNOME_DESKTOP_SESSION_ID.isEmpty())
{
res = DesktopInfo::GNOME;
} else if (!KDE_FULL_SESSION.isEmpty() || DESKTOP_SESSION == "kde-plasma") {
} else if (!KDE_FULL_SESSION.isEmpty() || DESKTOP_SESSION == QLatin1String("kde-plasma")) {
res = DesktopInfo::KDE;
}
return res;