Commit 44cf5d29 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG: Fixed whitespace and if braces for TableViewContent::showContextMenu. No... 

PROG: Fixed whitespace and if braces for TableViewContent::showContextMenu. No functionality has been changed. Fixes issue with misleading-indendation warning occuring during Fedora25 (c++14) builds. Referecnes #4809.

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

isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp

+8 −6
Original line number Diff line number Diff line
@@ -1702,8 +1702,9 @@ namespace Isis { 
      // Only show the context menu for cells if the user right-clicked on the

      // active cell.

      if (hasActiveCell() && mouseInCellSelection(mouseLocation)) {

        if (rowsWithActiveColumnSelected->size() > 1)

        if (rowsWithActiveColumnSelected->size() > 1) {

          contextMenu.addAction(m_applyToSelectionAct);

        }



        contextMenu.addAction(m_applyToAllAct);

      }
@@ -1716,8 +1717,9 @@ namespace Isis { 
      // Only show the context menu for cells if the user right-clicked on the

      // active cell.

      if (hasActiveCell() && mouseInCellSelection(mouseLocation)) {

      if (rowsWithActiveColumnSelected->size() > 1)

        if (rowsWithActiveColumnSelected->size() > 1) {

          contextMenu.addAction(m_applyToSelectionAct);

        }



        contextMenu.addAction(m_applyToAllAct);

      }

isis/src/qisis/objs/CnetEditorWidget/TableViewContent.h

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ namespace Isis { 
    *   @history 2017-08-08 Makayla Shepherd - Fixed a seg fault in ipce that occurs when 

    *                           attempting to edit a control point when there is not an active 

    *                           control network. Fixes #5048.

    *   @history 2017-09-20 Ian Humphrey - Modified showContextMenu so single line if statements

    *                           have braces. This prevents a misleading-indentation warning from

    *                           occuring during Fedora25 (c++14) builds. No functionality has been

    *                           changed. References #4809.

    */

  class TableViewContent : public QAbstractScrollArea {

      Q_OBJECT