diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-07-05 13:30:10 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-07-05 13:30:10 -0400 |
| commit | 9c0db82810e95763a34e703a2209fdda7d1ab883 (patch) | |
| tree | 21c3d36c2e2815d447dc4fd840d4d44b5f986366 /src-qt5/core/lumina-desktop-unified/src-events | |
| parent | Add the ability to use a static "instance()" of the DesktopSettings class wit... (diff) | |
| download | lumina-9c0db82810e95763a34e703a2209fdda7d1ab883.tar.gz lumina-9c0db82810e95763a34e703a2209fdda7d1ab883.tar.bz2 lumina-9c0db82810e95763a34e703a2209fdda7d1ab883.zip | |
Move Lumina2 over to using the static instance of the DesktopSettings class rather than a global object (lets us use the DesktopSettings within the standalone classes in libLumina as well).
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/src-events')
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-events/LShortcutEvents.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/src-events/LShortcutEvents.cpp b/src-qt5/core/lumina-desktop-unified/src-events/LShortcutEvents.cpp index eb448f02..f8bb20d3 100644 --- a/src-qt5/core/lumina-desktop-unified/src-events/LShortcutEvents.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-events/LShortcutEvents.cpp @@ -37,11 +37,11 @@ void LShortcutEvents::CheckKeySequence(WId win){ QString shortcut = keylistToString(); //Now see if there is a match for this shortcut // "strict" actions (operate even if a non-desktop window is active/focused) - QString action = Lumina::SETTINGS->value(DesktopSettings::Keys, "strict/"+shortcut, "").toString(); + QString action = DesktopSettings::instance()->value(DesktopSettings::Keys, "strict/"+shortcut, "").toString(); qDebug() << "Strict Action:" << "strict/"+shortcut << action; if(action.isEmpty() && win==0){ //"loose" actions (operating on the desktop or root window itself) - action = Lumina::SETTINGS->value(DesktopSettings::Keys, "desktop/"+shortcut, "").toString(); + action = DesktopSettings::instance()->value(DesktopSettings::Keys, "desktop/"+shortcut, "").toString(); qDebug() << "Desktop Action:" << "desktop/"+shortcut << action; } if(!action.isEmpty()){ @@ -94,10 +94,10 @@ void LShortcutEvents::CheckMouseSequence(WId win, NativeWindowSystem::MouseButto if(shortcut.isEmpty()){ return; } //Now see if there is a match for this shortcut // "strict" actions (operate even if a non-desktop window is active/focused) - QString action = Lumina::SETTINGS->value(DesktopSettings::Keys, "strict/"+shortcut, "").toString(); + QString action = DesktopSettings::instance()->value(DesktopSettings::Keys, "strict/"+shortcut, "").toString(); if(action.isEmpty() && win==0){ //"loose" actions (operating on the desktop or root window itself) - action = Lumina::SETTINGS->value(DesktopSettings::Keys, "desktop/"+shortcut, "").toString(); + action = DesktopSettings::instance()->value(DesktopSettings::Keys, "desktop/"+shortcut, "").toString(); } if(!action.isEmpty()){ //Found a valid action - go ahead and evaluate it |