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

Fix narrowing conversions

Browse Source
This commit is contained in:
Jonas Kvinge
2021-10-30 02:21:29 +02:00
parent a704412dee
commit 79ac53b2d9
111 changed files with 376 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/globalshortcuts/globalshortcut-win.cpp
View File

@@ -25,9 +25,9 @@
#include "globalshortcut.h"
#include "keymapper_win.h"
quint32 GlobalShortcut::nativeModifiers(Qt::KeyboardModifiers qt_mods) {
int GlobalShortcut::nativeModifiers(Qt::KeyboardModifiers qt_mods) {
quint32 native_mods = 0;
int native_mods = 0;
if (qt_mods & Qt::ShiftModifier) native_mods |= MOD_SHIFT;
if (qt_mods & Qt::ControlModifier) native_mods |= MOD_CONTROL;
if (qt_mods & Qt::AltModifier) native_mods |= MOD_ALT;
@@ -36,9 +36,9 @@ quint32 GlobalShortcut::nativeModifiers(Qt::KeyboardModifiers qt_mods) {
}
quint32 GlobalShortcut::nativeKeycode(Qt::Key qt_key) {
int GlobalShortcut::nativeKeycode(Qt::Key qt_key) {
quint32 key_code = 0;
int key_code = 0;
if (KeyMapperWin::keymapper_win_.contains(qt_key)) {
key_code = KeyMapperWin::keymapper_win_.value(qt_key);
}
@@ -46,11 +46,11 @@ quint32 GlobalShortcut::nativeKeycode(Qt::Key qt_key) {
}
bool GlobalShortcut::registerShortcut(quint32 native_key, quint32 native_mods) {
bool GlobalShortcut::registerShortcut(int native_key, int native_mods) {
return RegisterHotKey(0, native_mods ^ native_key, native_mods, native_key);
}
bool GlobalShortcut::unregisterShortcut(quint32 native_key, quint32 native_mods) {
bool GlobalShortcut::unregisterShortcut(int native_key, int native_mods) {
return UnregisterHotKey(0, native_mods ^ native_key);
}

10
src/globalshortcuts/globalshortcut-x11.cpp
View File

@@ -123,9 +123,9 @@ quint32 AppRootWindow() {
} // namespace
quint32 GlobalShortcut::nativeModifiers(Qt::KeyboardModifiers qt_mods) {
int GlobalShortcut::nativeModifiers(Qt::KeyboardModifiers qt_mods) {
quint32 native_mods = 0;
int native_mods = 0;
if (qt_mods & Qt::ShiftModifier) native_mods |= ShiftMask;
if (qt_mods & Qt::ControlModifier) native_mods |= ControlMask;
if (qt_mods & Qt::AltModifier) native_mods |= Mod1Mask;
@@ -134,7 +134,7 @@ quint32 GlobalShortcut::nativeModifiers(Qt::KeyboardModifiers qt_mods) {
}
quint32 GlobalShortcut::nativeKeycode(Qt::Key qt_key) {
int GlobalShortcut::nativeKeycode(Qt::Key qt_key) {
Display *disp = X11Display();
if (!disp) return false;
@@ -151,7 +151,7 @@ quint32 GlobalShortcut::nativeKeycode(Qt::Key qt_key) {
}
bool GlobalShortcut::registerShortcut(quint32 native_key, quint32 native_mods) {
bool GlobalShortcut::registerShortcut(int native_key, int native_mods) {
Display *disp = X11Display();
if (!disp) return false;
@@ -163,7 +163,7 @@ bool GlobalShortcut::registerShortcut(quint32 native_key, quint32 native_mods) {
}
bool GlobalShortcut::unregisterShortcut(quint32 native_key, quint32 native_mods) {
bool GlobalShortcut::unregisterShortcut(int native_key, int native_mods) {
Display *disp = X11Display();
if (!disp) return false;

12
src/globalshortcuts/globalshortcut.h
View File

@@ -55,11 +55,11 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter {
static void activateShortcut(quint32 native_key, quint32 native_mods);
static quint32 nativeModifiers(Qt::KeyboardModifiers qt_mods);
static quint32 nativeKeycode(Qt::Key qt_keycode);
static int nativeModifiers(Qt::KeyboardModifiers qt_mods);
static int nativeKeycode(Qt::Key qt_keycode);
static bool registerShortcut(quint32 native_key, quint32 native_mods);
static bool unregisterShortcut(quint32 native_key, quint32 native_mods);
static bool registerShortcut(int native_key, int native_mods);
static bool unregisterShortcut(int native_key, int native_mods);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool nativeEventFilter(const QByteArray &eventtype, void *message, qintptr *result) override;
@@ -75,8 +75,8 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter {
QKeySequence shortcut_;
Qt::Key qt_key_;
Qt::KeyboardModifiers qt_mods_;
quint32 native_key_;
quint32 native_mods_;
int native_key_;
int native_mods_;
};

4
src/globalshortcuts/globalshortcutgrabber.cpp
View File

@@ -94,10 +94,10 @@ bool GlobalShortcutGrabber::event(QEvent *e) {
QKeyEvent *ke = static_cast<QKeyEvent*>(e);
if (modifier_keys_.contains(ke->key())) {
ret_ = QKeySequence(ke->modifiers());
ret_ = QKeySequence(static_cast<int>(ke->modifiers()));
}
else {
ret_ = QKeySequence(ke->modifiers() | ke->key());
ret_ = QKeySequence(static_cast<int>(ke->modifiers() | ke->key()));
}
UpdateText();