[Scummvm-git-logs] scummvm master -> 9f168ae4479281945697c9fc4abb439e8e68403a

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d1805a582e BACKENDS: KEYMAPPER: Hid noisy warning
9f168ae447 KEYMAPPER: Fix class/struct declaration mess.


Commit: d1805a582e2c71fb661791859acffed1618459d9
    https://github.com/scummvm/scummvm/commit/d1805a582e2c71fb661791859acffed1618459d9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-29T16:48:46+01:00

Commit Message:
BACKENDS: KEYMAPPER: Hid noisy warning

Changed paths:
    backends/keymapper/keymapper.cpp


diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp
index e7d8761..d2be0d2 100644
--- a/backends/keymapper/keymapper.cpp
+++ b/backends/keymapper/keymapper.cpp
@@ -165,7 +165,7 @@ List<Event> Keymapper::mapEvent(const Event &ev) {
 			continue; // Ignore GUI keymaps while in game and vice versa
 		}
 
-		debug(5, "Keymapper::mapKey keymap: %s", _keymaps[i]->getId().c_str());
+		debug(9, "Keymapper::mapKey keymap: %s", _keymaps[i]->getId().c_str());
 
 		const Keymap::ActionArray &actions = _keymaps[i]->getMappedActions(ev);
 		for (Keymap::ActionArray::const_iterator it = actions.begin(); it != actions.end(); it++) {


Commit: 9f168ae4479281945697c9fc4abb439e8e68403a
    https://github.com/scummvm/scummvm/commit/9f168ae4479281945697c9fc4abb439e8e68403a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-29T16:48:46+01:00

Commit Message:
KEYMAPPER: Fix class/struct declaration mess.

Changed paths:
    backends/keymapper/keymap.h
    backends/keymapper/keymapper.h
    backends/keymapper/remap-widget.h


diff --git a/backends/keymapper/keymap.h b/backends/keymapper/keymap.h
index 4d584a2..a5f7df6 100644
--- a/backends/keymapper/keymap.h
+++ b/backends/keymapper/keymap.h
@@ -38,8 +38,8 @@ namespace Common {
 
 const char *const kStandardActionsKeymapName = "standard-actions";
 
-class Action;
-class Event;
+struct Action;
+struct Event;
 struct HardwareInput;
 class HardwareInputSet;
 class KeymapperDefaultBindings;
diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h
index 4adee53..c5d08cb 100644
--- a/backends/keymapper/keymapper.h
+++ b/backends/keymapper/keymapper.h
@@ -36,7 +36,7 @@ namespace Common {
 const char *const kGuiKeymapName = "gui";
 const char *const kGlobalKeymapName = "global";
 
-class Action;
+struct Action;
 class DelayedEventSource;
 struct HardwareInput;
 class HardwareInputSet;
diff --git a/backends/keymapper/remap-widget.h b/backends/keymapper/remap-widget.h
index 684575a..112f5ad 100644
--- a/backends/keymapper/remap-widget.h
+++ b/backends/keymapper/remap-widget.h
@@ -38,7 +38,7 @@ class StaticTextWidget;
 
 namespace Common {
 
-class Action;
+struct Action;
 class Keymap;
 class Keymapper;
 class InputWatcher;