Commit 519d2dc6 authored by Jesse Mapel's avatar Jesse Mapel Committed by Makayla Shepherd
Browse files

Changed versioned control point point data accessors to return constant references

parent 63946f96

isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp

+13 −6
Original line number Diff line number Diff line
@@ -264,14 +264,21 @@ namespace Isis { 




  /**

   * Access the protobuf control point data.

   * Access the protobuf control point data. If there is not internal point data then

   * default point data is returned. Note that default point data may be missing required

   * fields.

   *

   * @return @b QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> A shared pointer to the

   *                                                                    internal protobuf control

   *                                                                    point data.

   * @return @b const ControlNetFileProtoV0001_PBControlPoint& A constant reference to the internal

   *                                                           control point data. There is no

   *                                                           guarantee that the point data is

   *                                                           fully initialized.

   */

  QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> ControlPointV0002::pointData() {

    return m_pointData;

  const ControlNetFileProtoV0001_PBControlPoint &ControlPointV0002::pointData() {

      if (!m_pointData) {

        m_pointData.reset(new ControlNetFileProtoV0001_PBControlPoint);

      }



      return *m_pointData;

  }

isis/src/control/objs/ControlNetVersioner/ControlPointV0002.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ namespace Isis { 
      ControlPointV0002(QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> pointData);

      ControlPointV0002(const ControlPointV0001 &oldPoint);



      QSharedPointer<ControlNetFileProtoV0001_PBControlPoint> pointData();

      const ControlNetFileProtoV0001_PBControlPoint &pointData();



    private:

      // These are intentionally not implemented

isis/src/control/objs/ControlNetVersioner/ControlPointV0003.cpp

+12 −5
Original line number Diff line number Diff line
@@ -506,13 +506,20 @@ namespace Isis { 




  /**

   * Access the protobuf control point data.

   * Access the protobuf control point data. If there is not internal point data then

   * default point data is returned. Note that default point data may be missing required

   * fields.

   *

   * @return @b QSharedPointer<ControlPointFileEntryV0002> A shared pointer to the internal

   *                                                       protobuf control point data.

   * @return @b const ControlPointFileEntryV0002& A constant reference to the internal control

   *                                              point data. There is no guarantee that the point

   *                                              data is fully initialized.

   */

  QSharedPointer<ControlPointFileEntryV0002> ControlPointV0003::pointData() {

    return m_pointData;

  const ControlPointFileEntryV0002 &ControlPointV0003::pointData() const {

    if (!m_pointData) {

      m_pointData.reset(new ControlPointFileEntryV0002);

    }



    return *m_pointData;

  }

isis/src/control/objs/ControlNetVersioner/ControlPointV0003.h

+2 −2
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ namespace Isis { 
  class ControlPointV0003 {

    public:

      ControlPointV0003(const PvlObject &pointObject);

      ControlPointV0003(QSharedPointer<ControlPointFileEntryV0002> pointData);

      ControlPointV0003(const ControlPointFileEntryV0002 &pointData);

      ControlPointV0003(ControlPointV0002 &oldPoint);



      QSharedPointer<ControlPointFileEntryV0002> pointData();

      const ControlPointFileEntryV0002 &pointData() const;



    private:

      // These are intentionally not implemented