dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace QLatin1String with operator _L1

Browse Source
This commit is contained in:
Jonas Kvinge
2024-09-07 04:24:14 +02:00
parent e3e6a22172
commit 4270b12cd1
185 changed files with 2429 additions and 2139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/globalshortcuts/globalshortcutgrabber.cpp
View File

@@ -34,6 +34,8 @@
#include "globalshortcutgrabber.h"
#include "ui_globalshortcutgrabber.h"
using namespace Qt::StringLiterals;
GlobalShortcutGrabber::GlobalShortcutGrabber(QWidget *parent)
: QDialog(parent),
ui_(new Ui::GlobalShortcutGrabber),
@@ -110,7 +112,7 @@ bool GlobalShortcutGrabber::event(QEvent *e) {
}
void GlobalShortcutGrabber::UpdateText() {
ui_->label_key->setText(QLatin1String("<b>") + ret_.toString(QKeySequence::NativeText) + QLatin1String("</b>"));
ui_->label_key->setText("<b>"_L1 + ret_.toString(QKeySequence::NativeText) + "</b>"_L1);
}
void GlobalShortcutGrabber::Accepted() {

10
src/globalshortcuts/globalshortcutsbackend-gnome.cpp
View File

@@ -37,6 +37,8 @@
#include "gnomesettingsdaemon.h"
using namespace Qt::StringLiterals;
namespace {
constexpr char kService1[] = "org.gnome.SettingsDaemon.MediaKeys";
constexpr char kService2[] = "org.gnome.SettingsDaemon";
@@ -118,9 +120,9 @@ void GlobalShortcutsBackendGnome::DoUnregister() {
void GlobalShortcutsBackendGnome::GnomeMediaKeyPressed(const QString&, const QString &key) {
auto shortcuts = manager_->shortcuts();
if (key == QLatin1String("Play")) shortcuts[QStringLiteral("play_pause")].action->trigger();
if (key == QLatin1String("Stop")) shortcuts[QStringLiteral("stop")].action->trigger();
if (key == QLatin1String("Next")) shortcuts[QStringLiteral("next_track")].action->trigger();
if (key == QLatin1String("Previous")) shortcuts[QStringLiteral("prev_track")].action->trigger();
if (key == "Play"_L1) shortcuts[QStringLiteral("play_pause")].action->trigger();
if (key == "Stop"_L1) shortcuts[QStringLiteral("stop")].action->trigger();
if (key == "Next"_L1) shortcuts[QStringLiteral("next_track")].action->trigger();
if (key == "Previous"_L1) shortcuts[QStringLiteral("prev_track")].action->trigger();
}

2
src/globalshortcuts/globalshortcutsbackend-kde.cpp
View File

@@ -176,7 +176,7 @@ QStringList GlobalShortcutsBackendKDE::GetActionId(const QString &id, const QAct
ret << QCoreApplication::applicationName();
ret << id;
ret << QCoreApplication::applicationName();
ret << action->text().remove(QLatin1Char('&'));
ret << action->text().remove(u'&');
if (ret.back().isEmpty()) ret.back() = id;
return ret;

10
src/globalshortcuts/globalshortcutsbackend-mate.cpp
View File

@@ -35,6 +35,8 @@
#include "matesettingsdaemon.h"
using namespace Qt::StringLiterals;
namespace {
constexpr char kService1[] = "org.mate.SettingsDaemon.MediaKeys";
constexpr char kService2[] = "org.mate.SettingsDaemon";
@@ -118,9 +120,9 @@ void GlobalShortcutsBackendMate::DoUnregister() {
void GlobalShortcutsBackendMate::MateMediaKeyPressed(const QString&, const QString &key) {
auto shortcuts = manager_->shortcuts();
if (key == QLatin1String("Play")) shortcuts[QStringLiteral("play_pause")].action->trigger();
if (key == QLatin1String("Stop")) shortcuts[QStringLiteral("stop")].action->trigger();
if (key == QLatin1String("Next")) shortcuts[QStringLiteral("next_track")].action->trigger();
if (key == QLatin1String("Previous")) shortcuts[QStringLiteral("prev_track")].action->trigger();
if (key == "Play"_L1) shortcuts[QStringLiteral("play_pause")].action->trigger();
if (key == "Stop"_L1) shortcuts[QStringLiteral("stop")].action->trigger();
if (key == "Next"_L1) shortcuts[QStringLiteral("next_track")].action->trigger();
if (key == "Previous"_L1) shortcuts[QStringLiteral("prev_track")].action->trigger();
}

4
src/globalshortcuts/globalshortcutsbackend-x11.cpp
View File

@@ -33,6 +33,8 @@
#include "globalshortcutsbackend.h"
#include "globalshortcut.h"
using namespace Qt::StringLiterals;
GlobalShortcutsBackendX11::GlobalShortcutsBackendX11(GlobalShortcutsManager *manager, QObject *parent)
: GlobalShortcutsBackend(manager, GlobalShortcutsBackend::Type::X11, parent),
gshortcut_init_(nullptr) {}
@@ -45,7 +47,7 @@ bool GlobalShortcutsBackendX11::IsAvailable() const {
bool GlobalShortcutsBackendX11::IsX11Available() {
return QApplication::platformName() == QLatin1String("xcb");
return QApplication::platformName() == "xcb"_L1;
}