diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-26 14:40:50 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-26 14:40:50 (GMT) |
commit | d1e058b9c1f93aa0a986dbc8a754c5eabd747e27 (patch) | |
tree | 5dadd9d3fae88b0d9e37182ea073e60ebe3197a5 /addon/doxmlparser/src | |
parent | c42c0ae66542e4e154c2646fc725890554208d89 (diff) | |
parent | a5c98ade388f4f18ec30476ca706760a8129c73f (diff) | |
download | Doxygen-d1e058b9c1f93aa0a986dbc8a754c5eabd747e27.zip Doxygen-d1e058b9c1f93aa0a986dbc8a754c5eabd747e27.tar.gz Doxygen-d1e058b9c1f93aa0a986dbc8a754c5eabd747e27.tar.bz2 |
Merge branch 'master' into feature/bug_fenced_code
Diffstat (limited to 'addon/doxmlparser/src')
-rw-r--r-- | addon/doxmlparser/src/basehandler.h | 10 | ||||
-rw-r--r-- | addon/doxmlparser/src/compoundhandler.cpp | 2 | ||||
-rw-r--r-- | addon/doxmlparser/src/compoundhandler.h | 40 | ||||
-rw-r--r-- | addon/doxmlparser/src/linkedtexthandler.cpp | 2 | ||||
-rw-r--r-- | addon/doxmlparser/src/memberhandler.cpp | 2 |
5 files changed, 28 insertions, 28 deletions
diff --git a/addon/doxmlparser/src/basehandler.h b/addon/doxmlparser/src/basehandler.h index a82114d..1772d8a 100644 --- a/addon/doxmlparser/src/basehandler.h +++ b/addon/doxmlparser/src/basehandler.h @@ -57,7 +57,7 @@ template<class T> class ElementMapper void operator()(const QXmlAttributes &attrib) { if (m_parent) (m_parent->*m_handler)(attrib); } private: - T *m_parent; + T *m_parent = 0; Handler m_handler; }; @@ -71,7 +71,7 @@ template<class T> class ElementMapper void operator()() { if (m_parent) (m_parent->*m_handler)(); } private: - T *m_parent; + T *m_parent = 0; Handler m_handler; }; @@ -277,9 +277,9 @@ template<class T> class BaseHandler : public QXmlDefaultHandler, protected: QString m_curString; QString m_skipUntil; - int m_skipCount; - QXmlDefaultHandler *m_delegateHandler; - IFallBackHandler *m_fallBackHandler; + int m_skipCount = 0; + QXmlDefaultHandler *m_delegateHandler = 0; + IFallBackHandler *m_fallBackHandler = 0; }; //----------------------------------------------------------------------------- diff --git a/addon/doxmlparser/src/compoundhandler.cpp b/addon/doxmlparser/src/compoundhandler.cpp index 077c8fb..69fb70c 100644 --- a/addon/doxmlparser/src/compoundhandler.cpp +++ b/addon/doxmlparser/src/compoundhandler.cpp @@ -86,7 +86,7 @@ class CompoundIdIterator : public ICompoundIterator, { delete this; } private: - const MainHandler *m_mainHandler; + const MainHandler *m_mainHandler = 0; }; //---------------------------------------------------------------------------- diff --git a/addon/doxmlparser/src/compoundhandler.h b/addon/doxmlparser/src/compoundhandler.h index b05ba3d..6f191dc 100644 --- a/addon/doxmlparser/src/compoundhandler.h +++ b/addon/doxmlparser/src/compoundhandler.h @@ -54,10 +54,10 @@ class IncludeHandler : public IInclude, public BaseHandler<IncludeHandler> { return m_isLocal; } private: - IBaseHandler *m_parent; + IBaseHandler *m_parent = 0; StringImpl m_name; // element's content StringImpl m_refId; // refid - bool m_isLocal; // local + bool m_isLocal = false; // local }; class IncludeIterator : public BaseIterator<IIncludeIterator,IInclude,IncludeHandler> @@ -86,10 +86,10 @@ class RelatedCompound : public IRelatedCompound virtual const IString *name() const { return &m_name; } private: - CompoundHandler *m_parent; + CompoundHandler *m_parent = 0; QString m_id; // refid - Protection m_protection; // prot - Kind m_kind; // virt + Protection m_protection = Public; // prot + Kind m_kind = Normal; // virt StringImpl m_name; // element's content }; @@ -193,42 +193,42 @@ class CompoundHandler : public IClass, // XML elements: // ------------- StringImpl m_name; // compoundname - TitleHandler* m_titleHandler; // title + TitleHandler* m_titleHandler = 0; // title QList<RelatedCompound> m_subClasses; // basecompoundref QList<RelatedCompound> m_superClasses; // derivedcompoundref QList<IncludeHandler> m_includes; // includes QList<IncludeHandler> m_includedBy; // includedBy - GraphHandler* m_includeDependencyGraph; // incdepgraph - GraphHandler* m_includedByDependencyGraph; // invincdepgraph + GraphHandler* m_includeDependencyGraph = 0;// incdepgraph + GraphHandler* m_includedByDependencyGraph = 0; // invincdepgraph QList<QString> m_innerCompounds; // innerdir/innerfile/innerclass/innernamespace/innergroup TemplateParamListHandler* m_templateParamList; // templateparamlist QList<SectionHandler> m_sections; // sectiondef - DocHandler* m_brief; // briefdescription - DocHandler* m_detailed; // detaileddescription - GraphHandler* m_inheritanceGraph; // inheritancegraph - GraphHandler* m_collaborationGraph; // collaborationgraph - ProgramListingHandler* m_programListing; // programlisting + DocHandler* m_brief = 0; // briefdescription + DocHandler* m_detailed = 0; // detaileddescription + GraphHandler* m_inheritanceGraph = 0; // inheritancegraph + GraphHandler* m_collaborationGraph = 0; // collaborationgraph + ProgramListingHandler* m_programListing = 0; // programlisting // location StringImpl m_defFile; // - file - int m_defLine; // - line + int m_defLine = 0; // - line StringImpl m_defBodyFile; // - bodyfile - int m_defBodyStart; // - bodystart - int m_defBodyEnd; // - bodyend - ListOfAllMembersHandler* m_members; // listofallmember + int m_defBodyStart = 0; // - bodystart + int m_defBodyEnd = 0; // - bodyend + ListOfAllMembersHandler* m_members = 0; // listofallmember // XML attributes: // --------------- StringImpl m_id; // id - CompoundKind m_kind; // kind + CompoundKind m_kind = Invalid; // kind StringImpl m_kindString; // kind as a string StringImpl m_protection; // prot // local variables QString m_xmlDir; // directory where the info is found - int m_refCount; // object reference counter + int m_refCount = 0; // object reference counter QDict<MemberHandler> m_memberDict; // id->member lookup QDict<QList<MemberHandler> > m_memberNameDict; // name->memberlist lookup - MainHandler* m_mainHandler; // parent object + MainHandler* m_mainHandler = 0; // parent object }; void compoundhandler_init(); diff --git a/addon/doxmlparser/src/linkedtexthandler.cpp b/addon/doxmlparser/src/linkedtexthandler.cpp index b774f0f..140a48b 100644 --- a/addon/doxmlparser/src/linkedtexthandler.cpp +++ b/addon/doxmlparser/src/linkedtexthandler.cpp @@ -51,7 +51,7 @@ class LT_Ref : public LinkedTextImpl, public ILT_Ref StringImpl m_refId; StringImpl m_extId; StringImpl m_text; - TargetKind m_targetKind; + TargetKind m_targetKind = TargetKind::Member; }; LinkedTextHandler::LinkedTextHandler(IBaseHandler *parent, diff --git a/addon/doxmlparser/src/memberhandler.cpp b/addon/doxmlparser/src/memberhandler.cpp index 6042f91..df8c04f 100644 --- a/addon/doxmlparser/src/memberhandler.cpp +++ b/addon/doxmlparser/src/memberhandler.cpp @@ -453,7 +453,7 @@ void MemberHandler::startArgsString(const QXmlAttributes&) void MemberHandler::endArgsString() { m_argsstring = m_curString.stripWhiteSpace(); - debug(2,"arggstring=%s\n",m_argsstring.data()); + debug(2,"argstring=%s\n",m_argsstring.data()); } void MemberHandler::startParam(const QXmlAttributes& attrib) |