napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[keyboard] Make keyboard preview more robust

Browse Source 
- Replace #define with static const char
 - Handle FreeBSD as well (for testing purposes)
This commit is contained in:
Adriaan de Groot 2019-04-18 13:06:50 +02:00
parent b704933b58
commit 3c014a868c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/keyboard/keyboardwidget/keyboardglobal.cpp
View File

@ -24,18 +24,24 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#ifdef Q_OS_FREEBSD
static const char XKB_FILE[] = "/usr/local/share/X11/xkb/rules/base.lst";
#else
static const char XKB_FILE[] = "/usr/share/X11/xkb/rules/base.lst";
#endif
//### //###
//### Public methods //### Public methods
//### //###
QMap<QString, KeyboardGlobal::KeyboardInfo> KeyboardGlobal::getKeyboardLayouts() { QMap<QString, KeyboardGlobal::KeyboardInfo> KeyboardGlobal::getKeyboardLayouts() {
return parseKeyboardLayouts(XKB_FILE); return parseKeyboardLayouts( XKB_FILE );
} }
QMap<QString, QString> KeyboardGlobal::getKeyboardModels() { QMap<QString, QString> KeyboardGlobal::getKeyboardModels() {
return parseKeyboardModels(XKB_FILE); return parseKeyboardModels( XKB_FILE );
} }

2
src/modules/keyboard/keyboardwidget/keyboardglobal.h
View File

@ -35,8 +35,6 @@
#include <QRegExp> #include <QRegExp>
#include <QDebug> #include <QDebug>
#define XKB_FILE "/usr/share/X11/xkb/rules/base.lst"
class KeyboardGlobal class KeyboardGlobal
{ {
public: public: