summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-09 00:27:33 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-09 00:27:33 +0300
commit2fa941b89177cf91cbbc84700c1d7631aa85bcc2 (patch)
treeebc3464db530afd540a67bb86ea735624841ec32 /src/input
parentb4ec726fe28f65b15fd4cc7b0ef6fd72b7d24c02 (diff)
downloadManaVerse-2fa941b89177cf91cbbc84700c1d7631aa85bcc2.tar.gz
ManaVerse-2fa941b89177cf91cbbc84700c1d7631aa85bcc2.tar.bz2
ManaVerse-2fa941b89177cf91cbbc84700c1d7631aa85bcc2.tar.xz
ManaVerse-2fa941b89177cf91cbbc84700c1d7631aa85bcc2.zip
Add some missing checks to other files found by paranucker.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputactionsortfunctor.h2
-rw-r--r--src/input/inputmanager.h9
2 files changed, 6 insertions, 5 deletions
diff --git a/src/input/inputactionsortfunctor.h b/src/input/inputactionsortfunctor.h
index fbd9b79f3..6e4c47582 100644
--- a/src/input/inputactionsortfunctor.h
+++ b/src/input/inputactionsortfunctor.h
@@ -35,7 +35,7 @@ class InputActionSortFunctor final
>= keys[static_cast<size_t>(key2)].priority;
}
- const InputActionData *keys;
+ const InputActionData *keys A_NONNULLPOINTER;
};
#endif // INPUT_INPUTACTIONSORTFUNCTOR_H
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h
index c9d71a091..f8e09e664 100644
--- a/src/input/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -95,7 +95,7 @@ class InputManager final
/**
* Set a reference to the key setup window.
*/
- void setSetupInput(Setup_Input *const setupInput)
+ void setSetupInput(Setup_Input *const setupInput) A_NONNULL(2)
{ mSetupInput = setupInput; }
/**
@@ -145,9 +145,10 @@ class InputManager final
static bool isActionActive0(const InputActionT index) A_WARN_UNUSED;
- Setup_Input *mSetupInput; /**< Reference to setup window */
-
- InputActionT mNewKeyIndex; /**< Index of new key to be assigned */
+ /** Reference to setup window */
+ Setup_Input *mSetupInput A_NONNULLPOINTER;
+ /** Index of new key to be assigned */
+ InputActionT mNewKeyIndex;
int mMask;