From 12b67decae9c89ed5856942d814aa97b7fc2b5bf Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Thu, 5 Jun 2014 19:33:14 -0400 Subject: [PATCH] getTrigger() now takes size_t as the index type and returns a reference to a ReadableString. --- Jupiter/Command.cpp | 4 ++-- Jupiter/Command.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jupiter/Command.cpp b/Jupiter/Command.cpp index 9e51334..ceef5ef 100644 --- a/Jupiter/Command.cpp +++ b/Jupiter/Command.cpp @@ -52,9 +52,9 @@ void Jupiter::Command::addTrigger(const Jupiter::ReadableString &trigger) Jupiter::Command::data_->triggers.add(new Jupiter::StringS(trigger)); } -const char *Jupiter::Command::getTrigger(short index) const +const Jupiter::ReadableString &Jupiter::Command::getTrigger(size_t index) const { - return Jupiter::Command::data_->triggers.get(index)->c_str(); + return *Jupiter::Command::data_->triggers.get(index); } size_t Jupiter::Command::getTriggerCount() const diff --git a/Jupiter/Command.h b/Jupiter/Command.h index 3012ace..6c6c005 100644 --- a/Jupiter/Command.h +++ b/Jupiter/Command.h @@ -49,7 +49,7 @@ namespace Jupiter * @param index Index of the trigger to return. * @return Trigger of the command at the specified index. */ - const char *getTrigger(short index = 0) const; + const Jupiter::ReadableString &getTrigger(size_t index = 0) const; /** * @brief Returns the number of triggers accepted by the command.