mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-23 01:21:42 +00:00
Changed const char* -> string in most of wpilibc.
The HAL will remain untouched in order to maintain C-style compatibility. A few places in wpilibc were left as C-style strings, especially if special formatting (eg, elaborate uses of snprintf or sscanf) was being used. In general, const char* was changed to std::string. character buffers used for formatting were either untouched, changed to std::stringstream, or changed to std::string, depending on what was done with the buffer. Change-Id: I5e431ddf1cc4d9a6d534e1f21b16ea23be26e7f1
This commit is contained in:
@@ -10,9 +10,9 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
static const char *kDefault = "default";
|
||||
static const char *kOptions = "options";
|
||||
static const char *kSelected = "selected";
|
||||
static const std::string kDefault = "default";
|
||||
static const std::string kOptions = "options";
|
||||
static const std::string kSelected = "selected";
|
||||
|
||||
/**
|
||||
* Adds the given object to the list of options. On the {@link SmartDashboard}
|
||||
@@ -21,7 +21,7 @@ static const char *kSelected = "selected";
|
||||
* @param name the name of the option
|
||||
* @param object the option
|
||||
*/
|
||||
void SendableChooser::AddObject(const char *name, void *object) {
|
||||
void SendableChooser::AddObject(const std::string &name, void *object) {
|
||||
m_choices[name] = object;
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ void SendableChooser::AddObject(const char *name, void *object) {
|
||||
* @param name the name of the option
|
||||
* @param object the option
|
||||
*/
|
||||
void SendableChooser::AddDefault(const char *name, void *object) {
|
||||
void SendableChooser::AddDefault(const std::string &name, void *object) {
|
||||
m_defaultChoice = name;
|
||||
AddObject(name, object);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user