summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/InputConfig.h
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-02-02 15:11:15 -0800
committerPierre Bourdon <delroth@gmail.com>2014-02-02 15:11:15 -0800
commit3363b396afdc8291d7736705d630efff66b4e95c (patch)
tree6049ebe7c2b8874db5a389af617603883a64270a /Source/Core/InputCommon/InputConfig.h
parent70f66ad32515bce6962e1961e186449e288c497b (diff)
parent3efb0aa5f7d6d1aef90a366754fe69fe573a92ab (diff)
Merge pull request #23 from lioncash/sorta-large-input-cleanup
Larger cleanup to input-related source files (this time using unique_ptr).
Diffstat (limited to 'Source/Core/InputCommon/InputConfig.h')
-rw-r--r--Source/Core/InputCommon/InputConfig.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h
index f6d563fa11..1abed6bb2c 100644
--- a/Source/Core/InputCommon/InputConfig.h
+++ b/Source/Core/InputCommon/InputConfig.h
@@ -30,13 +30,13 @@ public:
bool LoadConfig(bool isGC);
void SaveConfig();
- std::vector< ControllerEmu* > controllers;
+ std::vector<ControllerEmu*> controllers;
- std::recursive_mutex controls_lock; // for changing any control references
+ std::recursive_mutex controls_lock; // for changing any control references
- const char * const ini_name;
- const char * const gui_name;
- const char * const profile_name;
+ const char* const ini_name;
+ const char* const gui_name;
+ const char* const profile_name;
};
#endif