Commit d5e678da authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG reverse commit r6784 since auto-merge of OpenProjectWorkOrder was... 

PROG reverse commit r6784 since auto-merge of OpenProjectWorkOrder was incorrect from IPCE to trunk. References #4012.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6794 41f8697f-d340-4b68-9986-7bafba869bb8
parent 1eab8eef

isis/src/qisis/objs/Directory/OpenProjectWorkOrder.cpp

+0 −23
Original line number Diff line number Diff line
@@ -35,11 +35,6 @@ 


namespace Isis {



  /**

   * Constructs an OpenProjectWorkOrder

   *

   * @param project The project 

   */

  OpenProjectWorkOrder::OpenProjectWorkOrder(Project *project) :

      WorkOrder(project) {

    QAction::setText(tr("&Open Project"));
@@ -56,39 +51,21 @@ namespace Isis { 
  }





  /**

   * Copy constructor

   *

   * @param other The other OpenProjectWorkOrder to initialize from

   */

  OpenProjectWorkOrder::OpenProjectWorkOrder(const OpenProjectWorkOrder &other) :

      WorkOrder(other) {

  }





  /**

   * Destructor

   */

  OpenProjectWorkOrder::~OpenProjectWorkOrder() {



  }





  /**

   * Clones the current OpenProjectWorkOrder

   *

   * @return @b OpenProjectWorkOrder * The OpenProjectWorkOrder clone

   */

  OpenProjectWorkOrder *OpenProjectWorkOrder::clone() const {

    return new OpenProjectWorkOrder(*this);

  }





  /**

   * Executes the OpenProjectWorkOrder

   *

   * @return @b bool true if the successfully executed

   */

  bool OpenProjectWorkOrder::execute() {

    bool success = WorkOrder::execute();

isis/src/qisis/objs/Directory/OpenProjectWorkOrder.h

+3 −4
Original line number Diff line number Diff line
@@ -24,9 +24,12 @@ 
 */

#include "WorkOrder.h"



#include "FileName.h"



class QString;



namespace Isis {

  class FileName;



  /**

   * This opens a project that's saved on disk.
@@ -34,10 +37,6 @@ namespace Isis { 
   * @author 2012-??-?? ???

   *

   * @internal

   *   @history 2014-09-05 Kim Oyama - Removed the connection for opening a project from the

   *                           command line.

   *   @history 2016-06-10 Ian Humphrey - Minor updates to documentation and coding standards.

   *                           Fixes #3952.

   */

  class OpenProjectWorkOrder : public WorkOrder {

      Q_OBJECT