dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Pass std::string_view from drivers instead of char *.

Browse Source
This commit is contained in:
Peter Nelson
2024-04-09 02:47:14 +01:00
committed by Peter Nelson
parent a42aa1a086
commit 332cbca36e
52 changed files with 161 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/driver.h
View File

@@ -23,9 +23,9 @@ public:
/**
* Start this driver.
* @param parm Parameters passed to the driver.
* @return nullptr if everything went okay, otherwise an error message.
* @return std::nullopt if everything went okay, otherwise an error message.
*/
virtual const char *Start(const StringList &parm) = 0;
virtual std::optional<std::string_view> Start(const StringList &parm) = 0;
/**
* Stop this driver.
@@ -47,7 +47,7 @@ public:
* Get the name of this driver.
* @return The name of the driver.
*/
virtual const char *GetName() const = 0;
virtual std::string_view GetName() const = 0;
};
DECLARE_POSTFIX_INCREMENT(Driver::Type)
@@ -62,8 +62,8 @@ private:
Driver::Type type; ///< The type of driver.
int priority; ///< The priority of this factory.
const char *name; ///< The name of the drivers of this factory.
const char *description; ///< The description of this driver.
std::string_view name; ///< The name of the drivers of this factory.
std::string_view description; ///< The description of this driver.
typedef std::map<std::string, DriverFactoryBase *> Drivers; ///< Type for a map of drivers.
@@ -92,9 +92,9 @@ private:
* @param type The type of driver to get the name of.
* @return The name of the type.
*/
static const char *GetDriverTypeName(Driver::Type type)
static std::string_view GetDriverTypeName(Driver::Type type)
{
static const char * const driver_type_name[] = { "music", "sound", "video" };
static const std::string_view driver_type_name[] = { "music", "sound", "video" };
return driver_type_name[type];
}
@@ -135,7 +135,7 @@ public:
* Get a nice description of the driver-class.
* @return The description.
*/
const char *GetDescription() const
std::string_view GetDescription() const
{
return this->description;
}