Unverified Commit 2d76b7da authored by ihumphrey's avatar ihumphrey Committed by GitHub
Browse files

Merge pull request #369 from twilson271828/dev 

A few minor tweaks to documentation tags which were causing PHP warnings in the createReleaseNotesXML script.
parents c13ad95c 3c4a6d3a

isis/src/qisis/objs/SortFilterProxyModel/SortFilterProxyModel.h

+4 −4
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ class QVariant; 


namespace Isis {



class ProjectItem;

class ProjectItemModel;



  /**  

   *

   * @author 2018-06-18 Tyler Wilson
@@ -44,9 +47,6 @@ namespace Isis { 
   *   within the JigsawSetupDialog Bundle Observation Solve Settings (BOSS) tab.

   */

     

   class ProjectItem;

   class ProjectItemModel;

 

    class SortFilterProxyModel : public QSortFilterProxyModel  {

    Q_OBJECT

isis/src/qisis/objs/Template/Template.h

+2 −2
Original line number Diff line number Diff line
@@ -61,10 +61,10 @@ 


   private:

     /**     

      * @author 2012-??-?? Steven Lambright

      * @author ????-??-?? Steven Lambright

      *

      * @internal

      *   @history 2012-??-?? Steven Lambright -  Nested class used to write the Template object

      *   @history ????-??-?? Steven Lambright -  Nested class used to write the Template object

      *                             information to an XML file for the purpose of saving and

      *                             restoring the state of the project.

      */

isis/src/qisis/objs/TemplateList/TemplateList.h

+9 −8
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ 
       QString m_name;

       QString m_type;



       class XmlHandler : public XmlStackedHandler {

       /**

        *

        * @author 2017-11-01 Christopher Combs
@@ -82,6 +81,8 @@ 
        *     can easily be copied from one Project to another, saved to disk, or deleted from disk.

        *     Adapted from ControlList.

        */

       class XmlHandler : public XmlStackedHandler {



         public:

           XmlHandler(TemplateList *templateList, Project *project);