summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-01-17 18:21:49 +0300
committerAndrei Karas <akaras@inbox.ru>2017-01-17 18:21:49 +0300
commitfdab79795551b8383751682bf26362ed7b82da7a (patch)
tree6adc34025ef3fc9add34d73c01a60d2a8662736b /src
parentfe4eff7bbf665cf356271c19feccb80b99cf877b (diff)
downloadmv-fdab79795551b8383751682bf26362ed7b82da7a.tar.gz
mv-fdab79795551b8383751682bf26362ed7b82da7a.tar.bz2
mv-fdab79795551b8383751682bf26362ed7b82da7a.tar.xz
mv-fdab79795551b8383751682bf26362ed7b82da7a.zip
Add missing A_DEFAULT_COPY / A_DELETE_COPY into input.
Diffstat (limited to 'src')
-rw-r--r--src/input/inputactiondata.h2
-rw-r--r--src/input/inputactionsortfunctor.h2
-rw-r--r--src/input/inputfunction.h2
-rw-r--r--src/input/inputitem.h2
-rw-r--r--src/input/key.h2
-rw-r--r--src/input/keyinput.h2
-rw-r--r--src/input/mouseinput.h2
-rw-r--r--src/input/touch/multitouchmanager.h2
8 files changed, 16 insertions, 0 deletions
diff --git a/src/input/inputactiondata.h b/src/input/inputactiondata.h
index d627d77f3..507b30b49 100644
--- a/src/input/inputactiondata.h
+++ b/src/input/inputactiondata.h
@@ -32,6 +32,8 @@
struct InputActionData final
{
+ A_DEFAULT_COPY(InputActionData)
+
const char *const configField;
const InputTypeT defaultType1;
const int defaultValue1;
diff --git a/src/input/inputactionsortfunctor.h b/src/input/inputactionsortfunctor.h
index 0a9b7f312..1d2583aa9 100644
--- a/src/input/inputactionsortfunctor.h
+++ b/src/input/inputactionsortfunctor.h
@@ -28,6 +28,8 @@
class InputActionSortFunctor final
{
public:
+ A_DEFAULT_COPY(InputActionSortFunctor)
+
bool operator() (const InputActionT key1,
const InputActionT key2) const
{
diff --git a/src/input/inputfunction.h b/src/input/inputfunction.h
index a676c365e..7b43203d6 100644
--- a/src/input/inputfunction.h
+++ b/src/input/inputfunction.h
@@ -29,6 +29,8 @@ const size_t inputFunctionSize = 3U;
struct InputFunction final
{
+ A_DEFAULT_COPY(InputFunction)
+
InputItem values[inputFunctionSize];
};
diff --git a/src/input/inputitem.h b/src/input/inputitem.h
index 54677b849..e7c7b4488 100644
--- a/src/input/inputitem.h
+++ b/src/input/inputitem.h
@@ -38,6 +38,8 @@ struct InputItem final
value(value0)
{ }
+ A_DEFAULT_COPY(InputItem)
+
InputTypeT type;
int value;
};
diff --git a/src/input/key.h b/src/input/key.h
index 53ed4d985..58c594f36 100644
--- a/src/input/key.h
+++ b/src/input/key.h
@@ -86,6 +86,8 @@ class Key final
*/
explicit Key(const int value = 0);
+ A_DEFAULT_COPY(Key)
+
/**
* Checks if a key is a character.
*
diff --git a/src/input/keyinput.h b/src/input/keyinput.h
index 7c2bb4040..28262b861 100644
--- a/src/input/keyinput.h
+++ b/src/input/keyinput.h
@@ -98,6 +98,8 @@ class KeyInput final
{
}
+ A_DEFAULT_COPY(KeyInput)
+
KeyInput &operator=(const KeyInput &k) noexcept2
{
mKey = k.mKey;
diff --git a/src/input/mouseinput.h b/src/input/mouseinput.h
index cd6799132..2e3a5f58e 100644
--- a/src/input/mouseinput.h
+++ b/src/input/mouseinput.h
@@ -93,6 +93,8 @@ class MouseInput final
{
}
+ A_DEFAULT_COPY(MouseInput)
+
MouseInput &operator=(const MouseInput &m)
{
mType = m.mType;
diff --git a/src/input/touch/multitouchmanager.h b/src/input/touch/multitouchmanager.h
index 1eff2d7aa..5d3003f48 100644
--- a/src/input/touch/multitouchmanager.h
+++ b/src/input/touch/multitouchmanager.h
@@ -31,6 +31,8 @@ union SDL_Event;
struct MultiTouchEvent final
{
+ A_DELETE_COPY(MultiTouchEvent)
+
bool active;
float x;
float y;