Commit c1b47339 authored by Hiroshi Sumita's avatar Hiroshi Sumita
Browse files

Change return value of some accessors to "const &". 

BUG=None
TEST=Build library.

Review URL: http://codereview.appspot.com/5376088
parent 6e6dd86f

src/PyZyInputContext.h

+9 −8
Original line number Diff line number Diff line
@@ -100,14 +100,15 @@ public: 
                                 InputContext::Observer * observer);



    /* accessors */

    virtual std::string inputText () const = 0;

    virtual std::string selectedText (void) const = 0;

    virtual std::string conversionText (void) const = 0;

    virtual std::string restText (void) const = 0;

    virtual std::string auxiliaryText (void) const = 0;

    virtual std::vector<Candidate> candidates () const = 0;

    virtual size_t cursor () const = 0;

    virtual size_t focusedCandidate () const = 0;

    virtual const std::string & inputText () const = 0;

    virtual const std::string & selectedText (void) const = 0;

    virtual const std::string & conversionText (void) const = 0;

    virtual const std::string & restText (void) const = 0;

    virtual const std::string & auxiliaryText (void) const = 0;

    // TODO(hsumita): Change return value to "class Candidates".

    virtual const std::vector<Candidate> & candidates () const = 0;

    virtual unsigned int cursor () const = 0;

    virtual unsigned int focusedCandidate () const = 0;

};



}; // namespace PyZy

src/PyZyPhoneticContext.h

+8 −8
Original line number Diff line number Diff line
@@ -64,14 +64,14 @@ public: 
    virtual void bopomofoSelectMode () { }



    /* Accessors of InputContext. */

    virtual std::string inputText () const { return m_text; }

    virtual std::string selectedText (void) const { return m_preedit_text.selected_text; }

    virtual std::string conversionText (void) const { return m_preedit_text.candidate_text; }

    virtual std::string restText (void) const { return m_preedit_text.rest_text; }

    virtual std::string auxiliaryText (void) const { return m_auxiliary_text; }

    virtual std::vector<Candidate> candidates () const { return m_candidates; }

    virtual size_t cursor () const { return m_cursor; }

    virtual size_t focusedCandidate () const { return m_focused_candidate; }

    virtual const std::string & inputText () const { return m_text; }

    virtual const std::string & selectedText (void) const { return m_preedit_text.selected_text; }

    virtual const std::string & conversionText (void) const { return m_preedit_text.candidate_text; }

    virtual const std::string & restText (void) const { return m_preedit_text.rest_text; }

    virtual const std::string & auxiliaryText (void) const { return m_auxiliary_text; }

    virtual const std::vector<Candidate> & candidates () const { return m_candidates; }

    virtual unsigned int cursor () const { return m_cursor; }

    virtual unsigned int focusedCandidate () const { return m_focused_candidate; }



protected:

    virtual void resetContext (void);