Commit 941eea99 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Some restructuring and some compiler warning fixes

parent c1e25238

doc/docblocks.doc

+3 −3
Original line number Diff line number Diff line
@@ -460,10 +460,10 @@ settings where overruled. 
When using doxygen for Fortran code you should

set \ref cfg_optimize_for_fortran "OPTIMIZE_FOR_FORTRAN" to \c YES.



The parser tries to guess wheter the source code is fixed format Fortran or

free format Fortran code. This is not always correct, in the later case 

The parser tries to guess if the source code is fixed format Fortran or

free format Fortran code. This may not always be correct. If not

one should use \ref cfg_extension_mapping "EXTENSION_MAPPING" to correct this.

By setteing `EXTENSION_MAPPING =  f=FortranFixed f90=FortranFree` files with

By setting `EXTENSION_MAPPING =  f=FortranFixed f90=FortranFree` files with

extension \c f90 are interpreted as fixed format Fortran code and files with

extension \c f are interpreted as free format Fortran code.

src/commentcnv.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 */



#ifndef _COMMENTCNV_H

#define _COMMNETCNV_H

#define _COMMENTCNV_H



class BufStr;

src/context.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4045,7 +4045,7 @@ class ClassInheritanceContext::Private : public GenericNodeListContext 
        bool b;

        if (cd->getLanguage()==SrcLangExt_VHDL)

        {

          if (!(VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::ENTITYCLASS)

          if ((VhdlDocGen::VhdlClasses)cd->protection()!=VhdlDocGen::ENTITYCLASS)

          {

            continue;

          }

src/dot.cpp

+6 −2
Original line number Diff line number Diff line
@@ -2462,8 +2462,12 @@ void DotGfxHierarchyTable::addClassList(ClassSDict *cl) 
  for (cli.toLast();(cd=cli.current());--cli)

  {

    //printf("Trying %s subClasses=%d\n",cd->name().data(),cd->subClasses()->count());

    if (cd->getLanguage()==SrcLangExt_VHDL  && !(VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::ENTITYCLASS)

    if (cd->getLanguage()==SrcLangExt_VHDL &&

        (VhdlDocGen::VhdlClasses)cd->protection()!=VhdlDocGen::ENTITYCLASS

       )

    {

      continue;

    }

    if (!hasVisibleRoot(cd->baseClasses()) &&

        cd->isVisibleInHierarchy()

       ) // root node in the forest

src/fortrancode.h

+5 −3
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ 
 *

 */



#ifndef CODE_H

#define CODE_H

#ifndef FORTRANCODE_H

#define FORTRANCODE_H



#include "types.h"



class CodeOutputInterface;

class FileDef;
@@ -28,7 +30,7 @@ void parseFortranCode(CodeOutputInterface &,const char *,const QCString &, 
            bool ,const char *,FileDef *fd,

            int startLine,int endLine,bool inlineFragment,

            MemberDef *memberDef,bool showLineNumbers,Definition *searchCtx,

            bool collectRefs, FortranKind codeType);

            bool collectRefs, FortranFormat format);

void resetFortranCodeParserState();

void codeFreeScanner();