Commit 78e9df6a authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Removed unused methods.

parent 97b6606b

isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp

+2 −49
Original line number Diff line number Diff line
@@ -46,14 +46,10 @@ 
#include "Directory.h"

#include "FileName.h"

#include "Project.h"

#include "ToolPad.h"

#include "ToolList.h"

#include "XmlStackedHandlerReader.h"



#include "HelpTool.h"

#include "TrackTool.h"





// #include "HelpTool.h"

// #include "TrackTool.h"



namespace Isis {

  /**
@@ -99,12 +95,8 @@ namespace Isis { 


    delete m_cnetEditorWidget;

    delete m_permToolBar;

    delete m_activeToolBar;

    delete m_toolPad;



    m_permToolBar = 0;

    m_activeToolBar = 0;

    m_toolPad = 0;

  }



  /**
@@ -168,10 +160,6 @@ namespace Isis { 
    m_permToolBar->setObjectName("permToolBar");

    m_permToolBar->setIconSize(QSize(22, 22));



    // m_toolPad = new ToolPad("Tool Pad", 0);

    // m_toolPad->setObjectName("toolPad");

    // addToolBar(m_toolPad);



    QMap< QString, QList< QAction * > > actionMap;

    actionMap = m_cnetEditorWidget->toolBarActions();

    QMapIterator< QString, QList< QAction * > > actionIter(actionMap);
@@ -216,41 +204,6 @@ namespace Isis { 
    return QSize(800, 600);

  }





  /**

   * Returns a list of actions for the permanent tool bar.

   *

   * @return (QList<QAction *>) The actions

   */

  QList<QAction *> CnetEditorView::permToolBarActions() {

    return m_permToolBar->actions();

  }





  /**

   * Returns a list of actions for the active tool bar.

   *

   * @return (QList<QAction *>) The actions

   */

  QList<QAction *> CnetEditorView::activeToolBarActions() {

    QList<QAction *> actions;

    actions.append(m_activeToolBarAction);

    return actions;

  }





  /**

   * Returns a list of actions for the tool pad.

   *

   * @return (QList<QAction *>) The actions

   */

  QList<QAction *> CnetEditorView::toolPadActions() {

    return m_toolPad->actions();

  }









  /**

   * This method pushes a new XmlHandler into the parser stack.

   *

isis/src/qisis/objs/CnetEditorView/CnetEditorView.h

+4 −10
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ namespace Isis { 
   *    @history 2018-06-05 Kaitlyn Lee - Added createMenus() and createToolBars(). The body of createMenus()

   *                              was moved from the constructor. createToolBars() was copied and edited

   *                              from CnetEditorWindow. Fixes #5416

   *    @history 2018-06-13 Kaitlyn Lee - Since views now inherit from QMainWindow, each individual

   *                              view has its own toolbar, so having getters that return toolbar

   *                              actions to fill the toolbar of the IpceMainWindow are unnecessary.

   *                              Removed methods that returned menu and toolbar actions.

   */



class CnetEditorView : public AbstractProjectItemView {
@@ -69,10 +73,6 @@ class CnetEditorView : public AbstractProjectItemView { 
                   QWidget *parent = 0);

    ~CnetEditorView();



    virtual QList<QAction *> permToolBarActions();

    virtual QList<QAction *> activeToolBarActions();

    virtual QList<QAction *> toolPadActions();



    CnetEditorWidget *cnetEditorWidget();

    Control *control();
@@ -113,12 +113,6 @@ class CnetEditorView : public AbstractProjectItemView { 
    QPointer<Control> m_control;



    QToolBar *m_permToolBar; //!< The permanent tool bar

    QToolBar *m_activeToolBar; //!< The active tool bar

    ToolPad *m_toolPad; //!< The tool pad



    QList<QAction *> m_permToolBarActions; //!< The permanent tool bar actions

    QWidgetAction *m_activeToolBarAction; //!< Stores the active tool bar

    QList<QAction *> m_toolPadActions; //!< The tool pad actions

  };

}