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

Fixed versioning in ControlPointV0003

parent ebf91443

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

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


#include <QString>



#include "ControlPointV0004.h"

#include "ControlPointV0002.h"

#include "Pvl.h"



using namespace std;

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

+10 −10
Original line number Diff line number Diff line 
#ifndef ControlPointV0005_h

#define ControlPointV0005_h

#ifndef ControlPointV0003_h

#define ControlPointV0003_h

/**

 * @file

 * $Revision: 1.9 $
@@ -28,22 +28,22 @@ 
 #include "QSharedPointer<ControlPointFileEntryV0002>.pb.h"



namespace Isis {

  class ControlPointV0004;

  class ControlPointV0002;

  class Pvl;



  class ControlPointV0005 {

  class ControlPointV0003 {

    public:

      ControlPointV0005(const Pvl &pointObject);

      ControlPointV0005(QSharedPointer<QSharedPointer<ControlPointFileEntryV0002>> pointData);

      ControlPointV0005(const ControlPointV0004 &oldPoint);

      ControlPointV0003(const Pvl &pointObject);

      ControlPointV0003(QSharedPointer<QSharedPointer<ControlPointFileEntryV0002>> pointData);

      ControlPointV0003(const ControlPointV0002 &oldPoint);



      Pvl toPvl();



    private:

      // These are intentionally not implemented

      ControlPointV0005();

      ControlPointV0005(const &ControlPointV0005 other);

      ControlPointV0005 &operator=(const &ControlPointV0005 other);

      ControlPointV0003();

      ControlPointV0003(const &ControlPointV0003 other);

      ControlPointV0003 &operator=(const &ControlPointV0003 other);



      // methods for converting from Pvl to protobuf

      void copy(PvlContainer &container,