diff options
47 files changed, 56 insertions, 63 deletions
diff --git a/qtools/qcollection.cpp b/qtools/qcollection.cpp index e70b64b..4f86227 100644 --- a/qtools/qcollection.cpp +++ b/qtools/qcollection.cpp @@ -60,7 +60,7 @@ */ -/*! \enum QCollection::Item +/*! \typedef QCollection::Item This type is the generic "item" in a QCollection. */ diff --git a/qtools/qdatastream.cpp b/qtools/qdatastream.cpp index a2e5c3b..d539daf 100644 --- a/qtools/qdatastream.cpp +++ b/qtools/qdatastream.cpp @@ -815,13 +815,6 @@ QDataStream &QDataStream::operator<<( Q_INT64 i ) } /*! - \fn QDataStream &QDataStream::operator<<( uint i ) - Writes an unsigned integer to the stream as a 32-bit unsigned integer - (Q_UINT32). - Returns a reference to the stream. -*/ - -/*! \fn QDataStream &QDataStream::operator<<( int i ) Writes a signed integer to the stream as a 32-bit signed integer (Q_INT32). Returns a reference to the stream. diff --git a/qtools/qfile.cpp b/qtools/qfile.cpp index 98ed9a3..7939160 100644 --- a/qtools/qfile.cpp +++ b/qtools/qfile.cpp @@ -497,7 +497,7 @@ QCString QFile::encodeName( const QString &fileName ) } /*! - \enum QFile::EncoderFn + \typedef QFile::EncoderFn This is used by QFile::setEncodingFunction(). */ @@ -532,7 +532,7 @@ QString QFile::decodeName( const QCString &localFileName ) } /*! - \enum QFile::DecoderFn + \typedef QFile::DecoderFn This is used by QFile::setDecodingFunction(). */ diff --git a/src/doxygen.cpp b/src/doxygen.cpp index a0e9623..cc6b898 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -7722,9 +7722,9 @@ static void addSourceReferences() for (cli.toFirst();(cd=cli.current());++cli) { FileDef *fd=cd->getBodyDef(); - if (fd && cd->isLinkableInProject() && cd->getStartBodyLine()!=-1) + if (fd && cd->isLinkableInProject() && cd->getDefLine()!=-1) { - fd->addSourceRef(cd->getStartBodyLine(),cd,0); + fd->addSourceRef(cd->getDefLine(),cd,0); } } // add source references for namespace definitions @@ -7733,9 +7733,9 @@ static void addSourceReferences() for (nli.toFirst();(nd=nli.current());++nli) { FileDef *fd=nd->getBodyDef(); - if (fd && nd->isLinkableInProject() && nd->getStartBodyLine()!=-1) + if (fd && nd->isLinkableInProject() && nd->getDefLine()!=-1) { - fd->addSourceRef(nd->getStartBodyLine(),nd,0); + fd->addSourceRef(nd->getDefLine(),nd,0); } } @@ -7754,14 +7754,14 @@ static void addSourceReferences() // md->getStartBodyLine(),md->isLinkableInProject()); FileDef *fd=md->getBodyDef(); if (fd && - md->getStartBodyLine()!=-1 && + md->getDefLine()!=-1 && md->isLinkableInProject() && (fd->generateSourceFile() || Doxygen::parseSourcesNeeded) ) { //printf("Found member '%s' in file '%s' at line '%d' def=%s\n", // md->name().data(),fd->name().data(),md->getStartBodyLine(),md->getOuterScope()->name().data()); - fd->addSourceRef(md->getStartBodyLine(),md->getOuterScope(),md); + fd->addSourceRef(md->getDefLine(),md->getOuterScope(),md); } } } @@ -7779,14 +7779,14 @@ static void addSourceReferences() // md->isLinkableInProject(), // Doxygen::parseSourcesNeeded); if (fd && - md->getStartBodyLine()!=-1 && + md->getDefLine()!=-1 && md->isLinkableInProject() && (fd->generateSourceFile() || Doxygen::parseSourcesNeeded) ) { //printf("Found member '%s' in file '%s' at line '%d' def=%s\n", // md->name().data(),fd->name().data(),md->getStartBodyLine(),md->getOuterScope()->name().data()); - fd->addSourceRef(md->getStartBodyLine(),md->getOuterScope(),md); + fd->addSourceRef(md->getDefLine(),md->getOuterScope(),md); } } } diff --git a/testing/009/bug.xml b/testing/009/bug.xml index ca3a22a..dc7abaf 100644 --- a/testing/009/bug.xml +++ b/testing/009/bug.xml @@ -12,7 +12,7 @@ <term>Class <ref refid="class_bug" kindref="compound">Bug</ref> </term> </varlistentry> <listitem> - <para><anchor id="bug_1_bug000001"/>Class bug. </para> + <para><anchor id="bug_1_bug000001"/>Class bug. </para> </listitem> <varlistentry> <term>Member <ref refid="class_bug_1a1f720954dd97cd1203e80501a6eae74c" kindref="member">Bug::foo</ref> ()</term> diff --git a/testing/009/class_bug.xml b/testing/009/class_bug.xml index f972b4a..056b405 100644 --- a/testing/009/class_bug.xml +++ b/testing/009/class_bug.xml @@ -32,7 +32,7 @@ </xrefsect> </para> </detaileddescription> - <location file="009_bug.cpp" line="16" column="1" bodyfile="009_bug.cpp" bodystart="15" bodyend="26"/> + <location file="009_bug.cpp" line="15" column="1" bodyfile="009_bug.cpp" bodystart="16" bodyend="26"/> <listofallmembers> <member refid="class_bug_1a1f720954dd97cd1203e80501a6eae74c" prot="public" virt="non-virtual"> <scope>Bug</scope> diff --git a/testing/009/class_deprecated.xml b/testing/009/class_deprecated.xml index 061bb34..32c9ea6 100644 --- a/testing/009/class_deprecated.xml +++ b/testing/009/class_deprecated.xml @@ -30,7 +30,7 @@ </xrefsect> </para> </detaileddescription> - <location file="009_bug.cpp" line="30" column="1" bodyfile="009_bug.cpp" bodystart="29" bodyend="36"/> + <location file="009_bug.cpp" line="29" column="1" bodyfile="009_bug.cpp" bodystart="30" bodyend="36"/> <listofallmembers> <member refid="class_deprecated_1a1d5f6803e72c625727e7083d1722dbf9" prot="public" virt="non-virtual"> <scope>Deprecated</scope> diff --git a/testing/009/class_reminder.xml b/testing/009/class_reminder.xml index bdf2ee0..9bfb4fc 100644 --- a/testing/009/class_reminder.xml +++ b/testing/009/class_reminder.xml @@ -37,7 +37,7 @@ </xrefsect> </para> </detaileddescription> - <location file="009_bug.cpp" line="56" column="1" bodyfile="009_bug.cpp" bodystart="55" bodyend="60"/> + <location file="009_bug.cpp" line="55" column="1" bodyfile="009_bug.cpp" bodystart="56" bodyend="60"/> <listofallmembers> <member refid="class_reminder_1a173b5218bb11287b0e86a550d9f0728d" prot="public" virt="non-virtual"> <scope>Reminder</scope> diff --git a/testing/009/class_test.xml b/testing/009/class_test.xml index 64f287f..a3792a4 100644 --- a/testing/009/class_test.xml +++ b/testing/009/class_test.xml @@ -37,7 +37,7 @@ </xrefsect> </para> </detaileddescription> - <location file="009_bug.cpp" line="48" column="1" bodyfile="009_bug.cpp" bodystart="47" bodyend="52"/> + <location file="009_bug.cpp" line="47" column="1" bodyfile="009_bug.cpp" bodystart="48" bodyend="52"/> <listofallmembers> <member refid="class_test_1a9fc54b716f326514a4c5f434137f4fc0" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/009/class_todo.xml b/testing/009/class_todo.xml index a4fed63..adb8b91 100644 --- a/testing/009/class_todo.xml +++ b/testing/009/class_todo.xml @@ -37,7 +37,7 @@ </xrefsect> </para> </detaileddescription> - <location file="009_bug.cpp" line="40" column="1" bodyfile="009_bug.cpp" bodystart="39" bodyend="44"/> + <location file="009_bug.cpp" line="39" column="1" bodyfile="009_bug.cpp" bodystart="40" bodyend="44"/> <listofallmembers> <member refid="class_todo_1a9e70ec9176ac4c1b20e011b4daddc9d8" prot="public" virt="non-virtual"> <scope>Todo</scope> diff --git a/testing/009/deprecated.xml b/testing/009/deprecated.xml index c3fc2a2..e4c5877 100644 --- a/testing/009/deprecated.xml +++ b/testing/009/deprecated.xml @@ -12,7 +12,7 @@ <term>Class <ref refid="class_deprecated" kindref="compound">Deprecated</ref> </term> </varlistentry> <listitem> - <para><anchor id="deprecated_1_deprecated000001"/>This class is deprecated </para> + <para><anchor id="deprecated_1_deprecated000001"/>This class is deprecated </para> </listitem> <varlistentry> <term>Member <ref refid="class_deprecated_1a1d5f6803e72c625727e7083d1722dbf9" kindref="member">Deprecated::deprecated</ref> ()</term> diff --git a/testing/009/reminders.xml b/testing/009/reminders.xml index 4818541..6bbe18b 100644 --- a/testing/009/reminders.xml +++ b/testing/009/reminders.xml @@ -12,7 +12,7 @@ <term>Class <ref refid="class_reminder" kindref="compound">Reminder</ref> </term> </varlistentry> <listitem> - <para><anchor id="reminders_1_reminders000001"/> A reminder </para> + <para><anchor id="reminders_1_reminders000001"/> A reminder </para> </listitem> <varlistentry> <term>Member <ref refid="class_reminder_1a173b5218bb11287b0e86a550d9f0728d" kindref="member">Reminder::reminder</ref> ()</term> diff --git a/testing/009/test.xml b/testing/009/test.xml index 665dc0e..c8f104d 100644 --- a/testing/009/test.xml +++ b/testing/009/test.xml @@ -12,7 +12,7 @@ <term>Class <ref refid="class_test" kindref="compound">Test</ref> </term> </varlistentry> <listitem> - <para><anchor id="test_1_test000001"/>This is part of testing </para> + <para><anchor id="test_1_test000001"/>This is part of testing </para> </listitem> <varlistentry> <term>Member <ref refid="class_test_1a9fc54b716f326514a4c5f434137f4fc0" kindref="member">Test::test</ref> ()</term> diff --git a/testing/009/todo.xml b/testing/009/todo.xml index c3b160f..b31ecae 100644 --- a/testing/009/todo.xml +++ b/testing/009/todo.xml @@ -12,7 +12,7 @@ <term>Class <ref refid="class_todo" kindref="compound">Todo</ref> </term> </varlistentry> <listitem> - <para><anchor id="todo_1_todo000001"/>This still needs to be done. </para> + <para><anchor id="todo_1_todo000001"/>This still needs to be done. </para> </listitem> <varlistentry> <term>Member <ref refid="class_todo_1a9e70ec9176ac4c1b20e011b4daddc9d8" kindref="member">Todo::todo</ref> ()</term> diff --git a/testing/011/category_integer_07_arithmetic_08.xml b/testing/011/category_integer_07_arithmetic_08.xml index 0705628..0d13751 100644 --- a/testing/011/category_integer_07_arithmetic_08.xml +++ b/testing/011/category_integer_07_arithmetic_08.xml @@ -45,7 +45,7 @@ <detaileddescription> <para>A category </para> </detaileddescription> - <location file="011_category.m" line="17" column="19" bodyfile="011_category.m" bodystart="17" bodyend="-1"/> + <location file="011_category.m" line="17" column="12" bodyfile="011_category.m" bodystart="17" bodyend="-1"/> <listofallmembers> <member refid="category_integer_07_arithmetic_08_1a12f411c5872ba3bafb8ea7dd1826cf2a" prot="public" virt="virtual"> <scope>Integer(Arithmetic)</scope> diff --git a/testing/011/interface_integer.xml b/testing/011/interface_integer.xml index 21d71fd..7c56077 100644 --- a/testing/011/interface_integer.xml +++ b/testing/011/interface_integer.xml @@ -80,7 +80,7 @@ </childnode> </node> </collaborationgraph> - <location file="011_category.m" line="6" column="26" bodyfile="011_category.m" bodystart="6" bodyend="-1"/> + <location file="011_category.m" line="6" column="12" bodyfile="011_category.m" bodystart="6" bodyend="-1"/> <listofallmembers> <member refid="interface_integer_1a35e89216966d8179a1b77f14b8211fda" prot="protected" virt="non-virtual"> <scope>Integer</scope> diff --git a/testing/013/class_t1.xml b/testing/013/class_t1.xml index ba91621..72fe36a 100644 --- a/testing/013/class_t1.xml +++ b/testing/013/class_t1.xml @@ -8,7 +8,7 @@ <detaileddescription> <para>A class </para> </detaileddescription> - <location file="013_class.h" line="11" column="1" bodyfile="013_class.h" bodystart="10" bodyend="12"/> + <location file="013_class.h" line="10" column="1" bodyfile="013_class.h" bodystart="11" bodyend="12"/> <listofallmembers> </listofallmembers> </compounddef> diff --git a/testing/013/class_t2.xml b/testing/013/class_t2.xml index 9df47e2..3679110 100644 --- a/testing/013/class_t2.xml +++ b/testing/013/class_t2.xml @@ -8,7 +8,7 @@ <detaileddescription> <para>class <ref refid="class_t2" kindref="compound">T2</ref> </para> </detaileddescription> - <location file="013_class.h" line="15" column="1" bodyfile="013_class.h" bodystart="14" bodyend="16"/> + <location file="013_class.h" line="14" column="1" bodyfile="013_class.h" bodystart="15" bodyend="16"/> <listofallmembers> </listofallmembers> </compounddef> diff --git a/testing/013/class_t3.xml b/testing/013/class_t3.xml index dc0cd3f..21f3b86 100644 --- a/testing/013/class_t3.xml +++ b/testing/013/class_t3.xml @@ -8,7 +8,7 @@ <detaileddescription> <para>class <ref refid="class_t3" kindref="compound">T3</ref> </para> </detaileddescription> - <location file="013_class.h" line="19" column="1" bodyfile="013_class.h" bodystart="18" bodyend="20"/> + <location file="013_class.h" line="18" column="1" bodyfile="013_class.h" bodystart="19" bodyend="20"/> <listofallmembers> </listofallmembers> </compounddef> diff --git a/testing/013/class_t4.xml b/testing/013/class_t4.xml index 52955d2..3a1013e 100644 --- a/testing/013/class_t4.xml +++ b/testing/013/class_t4.xml @@ -8,7 +8,7 @@ <detaileddescription> <para>class <ref refid="class_t4" kindref="compound">T4</ref> </para> </detaileddescription> - <location file="013_class.h" line="23" column="1" bodyfile="013_class.h" bodystart="22" bodyend="24"/> + <location file="013_class.h" line="22" column="1" bodyfile="013_class.h" bodystart="23" bodyend="24"/> <listofallmembers> </listofallmembers> </compounddef> diff --git a/testing/018/018__def_8c.xml b/testing/018/018__def_8c.xml index 837a85a..1bd3d79 100644 --- a/testing/018/018__def_8c.xml +++ b/testing/018/018__def_8c.xml @@ -41,7 +41,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="018_def.c" line="13" column="7" bodyfile="018_def.c" bodystart="13" bodyend="13"/> + <location file="018_def.c" line="13" column="1" bodyfile="018_def.c" bodystart="13" bodyend="13"/> </memberdef> </sectiondef> <sectiondef kind="typedef"> diff --git a/testing/021/indexpage.xml b/testing/021/indexpage.xml index 3ecbd0a..0647eeb 100644 --- a/testing/021/indexpage.xml +++ b/testing/021/indexpage.xml @@ -6,7 +6,7 @@ <briefdescription> </briefdescription> <detaileddescription> - <para> Our main function starts like this: <programlisting filename="example_test.cpp"><codeline><highlight class="keywordtype">void</highlight><highlight class="normal"><sp/>main()</highlight></codeline><codeline><highlight class="normal">{</highlight></codeline></programlisting> First we create a object <computeroutput>t</computeroutput> of the <ref refid="class_test" kindref="compound">Test</ref> class. <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/><ref refid="class_test" kindref="compound">Test</ref><sp/>t;</highlight></codeline></programlisting> Then we call the example member function <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/>t.<ref refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" kindref="member">example</ref>();</highlight></codeline></programlisting> After that our little test routine ends. <programlisting filename="example_test.cpp"><codeline><highlight class="normal">}</highlight></codeline></programlisting> </para> + <para> Our main function starts like this: <programlisting filename="example_test.cpp"><codeline><highlight class="keywordtype">void</highlight><highlight class="normal"><sp/>main()</highlight></codeline><codeline><highlight class="normal">{</highlight></codeline></programlisting> First we create a object <computeroutput>t</computeroutput> of the <ref refid="class_test" kindref="compound">Test</ref> class. <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/><ref refid="class_test" kindref="compound">Test</ref><sp/>t;</highlight></codeline></programlisting> Then we call the example member function <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/>t.<ref refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" kindref="member">example</ref>();</highlight></codeline></programlisting> After that our little test routine ends. <programlisting filename="example_test.cpp"><codeline><highlight class="normal">}</highlight></codeline></programlisting> </para> </detaileddescription> </compounddef> </doxygen> diff --git a/testing/025/class_test.xml b/testing/025/class_test.xml index 7438488..f7ab931 100644 --- a/testing/025/class_test.xml +++ b/testing/025/class_test.xml @@ -25,7 +25,7 @@ <detaileddescription> <para>More details about this class. </para> </detaileddescription> - <location file="025_example.cpp" line="11" column="1" bodyfile="025_example.cpp" bodystart="10" bodyend="18"/> + <location file="025_example.cpp" line="10" column="1" bodyfile="025_example.cpp" bodystart="11" bodyend="18"/> <listofallmembers> <member refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/026/class_test.xml b/testing/026/class_test.xml index 469ba7c..d9a0aba 100644 --- a/testing/026/class_test.xml +++ b/testing/026/class_test.xml @@ -41,7 +41,7 @@ <para>A <ref refid="class_test" kindref="compound">Test</ref> class. More details about this class. <parameterlist kind="templateparam"><parameteritem><parameternamelist><parametername>T</parametername></parameternamelist><parameterdescription><para>A template parameter. </para></parameterdescription></parameteritem></parameterlist> </para> </detaileddescription> - <location file="026_exception.cpp" line="9" column="1" bodyfile="026_exception.cpp" bodystart="8" bodyend="20"/> + <location file="026_exception.cpp" line="8" column="11" bodyfile="026_exception.cpp" bodystart="9" bodyend="20"/> <listofallmembers> <member refid="class_test_1abf9d5fbdaa4c23d0a513ee9746060779" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/027/struct_car.xml b/testing/027/struct_car.xml index b3d9894..c90017a 100644 --- a/testing/027/struct_car.xml +++ b/testing/027/struct_car.xml @@ -68,7 +68,7 @@ </childnode> </node> </collaborationgraph> - <location file="027_extends.c" line="68" column="1" bodyfile="027_extends.c" bodystart="67" bodyend="70"/> + <location file="027_extends.c" line="67" column="1" bodyfile="027_extends.c" bodystart="68" bodyend="70"/> <listofallmembers> <member refid="struct_car_1ab8ff28306286da5a8b14fa9bdccaafaa" prot="protected" virt="non-virtual"> <scope>Car</scope> diff --git a/testing/027/struct_object.xml b/testing/027/struct_object.xml index 754906e..807b0c1 100644 --- a/testing/027/struct_object.xml +++ b/testing/027/struct_object.xml @@ -86,7 +86,7 @@ </childnode> </node> </inheritancegraph> - <location file="027_extends.c" line="20" column="1" bodyfile="027_extends.c" bodystart="19" bodyend="22"/> + <location file="027_extends.c" line="19" column="1" bodyfile="027_extends.c" bodystart="20" bodyend="22"/> <listofallmembers> <member refid="struct_object_1a71225073d06a793b9a6ea9263ed37b12" prot="public" virt="non-virtual"> <scope>Object</scope> diff --git a/testing/027/struct_truck.xml b/testing/027/struct_truck.xml index 0da26dc..b25c20b 100644 --- a/testing/027/struct_truck.xml +++ b/testing/027/struct_truck.xml @@ -68,7 +68,7 @@ <link refid="struct_object"/> </node> </collaborationgraph> - <location file="027_extends.c" line="78" column="1" bodyfile="027_extends.c" bodystart="77" bodyend="80"/> + <location file="027_extends.c" line="77" column="1" bodyfile="027_extends.c" bodystart="78" bodyend="80"/> <listofallmembers> <member refid="struct_truck_1ad0ac321609dda1a6c552488b05ec7ac8" prot="protected" virt="non-virtual"> <scope>Truck</scope> diff --git a/testing/027/struct_vehicle.xml b/testing/027/struct_vehicle.xml index 40c2be2..bab901d 100644 --- a/testing/027/struct_vehicle.xml +++ b/testing/027/struct_vehicle.xml @@ -105,7 +105,7 @@ <link refid="struct_object"/> </node> </collaborationgraph> - <location file="027_extends.c" line="44" column="1" bodyfile="027_extends.c" bodystart="43" bodyend="46"/> + <location file="027_extends.c" line="43" column="1" bodyfile="027_extends.c" bodystart="44" bodyend="46"/> <listofallmembers> <member refid="struct_vehicle_1ad7970f528d429f6fc1725173e93a77c2" prot="protected" virt="non-virtual"> <scope>Vehicle</scope> diff --git a/testing/037/class_receiver.xml b/testing/037/class_receiver.xml index 21156d7..24e82fd 100644 --- a/testing/037/class_receiver.xml +++ b/testing/037/class_receiver.xml @@ -32,7 +32,7 @@ </msc> </para> </detaileddescription> - <location file="037_msc.cpp" line="29" column="1" bodyfile="037_msc.cpp" bodystart="28" bodyend="33"/> + <location file="037_msc.cpp" line="28" column="1" bodyfile="037_msc.cpp" bodystart="29" bodyend="33"/> <listofallmembers> <member refid="class_receiver_1a162099741e0324e6254c9bc570566e40" prot="public" virt="non-virtual"> <scope>Receiver</scope> diff --git a/testing/037/class_sender.xml b/testing/037/class_sender.xml index 53ba04e..525ab0a 100644 --- a/testing/037/class_sender.xml +++ b/testing/037/class_sender.xml @@ -32,7 +32,7 @@ </msc> </para> </detaileddescription> - <location file="037_msc.cpp" line="14" column="1" bodyfile="037_msc.cpp" bodystart="13" bodyend="18"/> + <location file="037_msc.cpp" line="13" column="1" bodyfile="037_msc.cpp" bodystart="14" bodyend="18"/> <listofallmembers> <member refid="class_sender_1a8ad2c6f9baa4e798868fe4a4d45f8fda" prot="public" virt="non-virtual"> <scope>Sender</scope> diff --git a/testing/039/class_test.xml b/testing/039/class_test.xml index ca7ff62..aa409f5 100644 --- a/testing/039/class_test.xml +++ b/testing/039/class_test.xml @@ -55,7 +55,7 @@ <detaileddescription> <para>More details about this class. </para> </detaileddescription> - <location file="039_name.cpp" line="9" column="1" bodyfile="039_name.cpp" bodystart="8" bodyend="24"/> + <location file="039_name.cpp" line="8" column="1" bodyfile="039_name.cpp" bodystart="9" bodyend="24"/> <listofallmembers> <member refid="class_test_1a78e37a450a276b60a5a2fa4a46c86f2e" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/040/namespace_n_s.xml b/testing/040/namespace_n_s.xml index 64beb23..7e93ed0 100644 --- a/testing/040/namespace_n_s.xml +++ b/testing/040/namespace_n_s.xml @@ -7,6 +7,6 @@ <detaileddescription> <para>A namespace </para> </detaileddescription> - <location file="040_namespace.cpp" line="5" column="1"/> + <location file="040_namespace.cpp" line="4" column="1"/> </compounddef> </doxygen> diff --git a/testing/041/class_test.xml b/testing/041/class_test.xml index c4c1d9c..568f4c3 100644 --- a/testing/041/class_test.xml +++ b/testing/041/class_test.xml @@ -81,7 +81,7 @@ <detaileddescription> <para>More text. </para> </detaileddescription> - <location file="041_overload.cpp" line="5" column="1" bodyfile="041_overload.cpp" bodystart="4" bodyend="10"/> + <location file="041_overload.cpp" line="4" column="1" bodyfile="041_overload.cpp" bodystart="5" bodyend="10"/> <listofallmembers> <member refid="class_test_1a8e7b46ceaf7bd2ab94114b390b3288ca" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/044/struct_s.xml b/testing/044/struct_s.xml index 7214f29..b661a85 100644 --- a/testing/044/struct_s.xml +++ b/testing/044/struct_s.xml @@ -98,7 +98,7 @@ <detaileddescription> <para>A struct </para> </detaileddescription> - <location file="044_section.h" line="6" column="1" bodyfile="044_section.h" bodystart="5" bodyend="27"/> + <location file="044_section.h" line="5" column="1" bodyfile="044_section.h" bodystart="6" bodyend="27"/> <listofallmembers> <member refid="struct_s_1ab754fee7e3500035f644d0ac528cbfc3" prot="private" virt="non-virtual"> <scope>S</scope> diff --git a/testing/046/class_test.xml b/testing/046/class_test.xml index 0a9f22c..4885fb1 100644 --- a/testing/046/class_test.xml +++ b/testing/046/class_test.xml @@ -61,7 +61,7 @@ <para>A test class <simplesect kind="see"><para><ref refid="class_test_1a1683da699dc049d74101488d143c8e98" kindref="member">Test::method()</ref></para></simplesect> </para> </detaileddescription> - <location file="046_related.cpp" line="11" column="1" bodyfile="046_related.cpp" bodystart="10" bodyend="15"/> + <location file="046_related.cpp" line="10" column="1" bodyfile="046_related.cpp" bodystart="11" bodyend="15"/> <listofallmembers> <member refid="class_test_1a1283d836e0611ff772c1b06a31ecbbfe" prot="public" virt="non-virtual"> <scope>Test</scope> diff --git a/testing/064/struct_foo.xml b/testing/064/struct_foo.xml index d9e2486..a1a5ba0 100644 --- a/testing/064/struct_foo.xml +++ b/testing/064/struct_foo.xml @@ -97,7 +97,7 @@ </itemizedlist> </para> </detaileddescription> - <location file="064_castoperator.cpp" line="20" column="10" bodyfile="064_castoperator.cpp" bodystart="20" bodyend="25"/> + <location file="064_castoperator.cpp" line="20" column="1" bodyfile="064_castoperator.cpp" bodystart="20" bodyend="25"/> <listofallmembers> <member refid="struct_foo_1aab9774d892b6cd4a0fbebd034b4c1fad" prot="public" virt="non-virtual"> <scope>Foo</scope> diff --git a/testing/066/class_class1.xml b/testing/066/class_class1.xml index ccc412e..9f01b20 100644 --- a/testing/066/class_class1.xml +++ b/testing/066/class_class1.xml @@ -38,7 +38,7 @@ </briefdescription> <detaileddescription> </detaileddescription> - <location file="066_property_initializer.cs" line="6" column="1" bodyfile="066_property_initializer.cs" bodystart="5" bodyend="9"/> + <location file="066_property_initializer.cs" line="5" column="1" bodyfile="066_property_initializer.cs" bodystart="6" bodyend="9"/> <listofallmembers> <member refid="class_class1_1a6b0b2ab73516e37adb38b8ff33f97c40" prot="public" virt="non-virtual"> <scope>Class1</scope> diff --git a/testing/071/namespace_a_namespace_1_1_0d0.xml b/testing/071/namespace_a_namespace_1_1_0d0.xml index d439723..1eca472 100644 --- a/testing/071/namespace_a_namespace_1_1_0d0.xml +++ b/testing/071/namespace_a_namespace_1_1_0d0.xml @@ -33,13 +33,13 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="071_enum_in_anon_ns.cpp" line="6" column="19" bodyfile="071_enum_in_anon_ns.cpp" bodystart="6" bodyend="10"/> + <location file="071_enum_in_anon_ns.cpp" line="6" column="1" bodyfile="071_enum_in_anon_ns.cpp" bodystart="6" bodyend="10"/> </memberdef> </sectiondef> <briefdescription> </briefdescription> <detaileddescription> </detaileddescription> - <location file="071_enum_in_anon_ns.cpp" line="4" column="30"/> + <location file="071_enum_in_anon_ns.cpp" line="4" column="20"/> </compounddef> </doxygen> diff --git a/testing/073/073__typed__enum_8cpp.xml b/testing/073/073__typed__enum_8cpp.xml index b0b2014..9dda417 100644 --- a/testing/073/073__typed__enum_8cpp.xml +++ b/testing/073/073__typed__enum_8cpp.xml @@ -13,7 +13,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="073_typed_enum.cpp" line="7" column="13" bodyfile="073_typed_enum.cpp" bodystart="7" bodyend="7"/> + <location file="073_typed_enum.cpp" line="7" column="1" bodyfile="073_typed_enum.cpp" bodystart="7" bodyend="7"/> </memberdef> </sectiondef> <briefdescription> diff --git a/testing/074/namespacens.xml b/testing/074/namespacens.xml index 0ee93fc..7b5d861 100644 --- a/testing/074/namespacens.xml +++ b/testing/074/namespacens.xml @@ -76,6 +76,6 @@ </itemizedlist> </para> </detaileddescription> - <location file="074_ref.cpp" line="64" column="12"/> + <location file="074_ref.cpp" line="64" column="1"/> </compounddef> </doxygen> diff --git a/testing/074/struct_foo.xml b/testing/074/struct_foo.xml index bf9c426..81499d9 100644 --- a/testing/074/struct_foo.xml +++ b/testing/074/struct_foo.xml @@ -243,7 +243,7 @@ </simplesect> </para> </detaileddescription> - <location file="074_ref.cpp" line="19" column="10" bodyfile="074_ref.cpp" bodystart="19" bodyend="54"/> + <location file="074_ref.cpp" line="19" column="1" bodyfile="074_ref.cpp" bodystart="19" bodyend="54"/> <listofallmembers> <member refid="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" prot="public" virt="non-virtual"> <scope>Foo</scope> diff --git a/testing/075/struct_foo.xml b/testing/075/struct_foo.xml index 53ed0a8..9b859b5 100644 --- a/testing/075/struct_foo.xml +++ b/testing/075/struct_foo.xml @@ -117,7 +117,7 @@ </briefdescription> <detaileddescription> </detaileddescription> - <location file="075_argmatch.cpp" line="4" column="10" bodyfile="075_argmatch.cpp" bodystart="4" bodyend="11"/> + <location file="075_argmatch.cpp" line="4" column="1" bodyfile="075_argmatch.cpp" bodystart="4" bodyend="11"/> <listofallmembers> <member refid="struct_foo_1a4f9767677227174b2a9684b92e36cba7" prot="public" virt="non-virtual"> <scope>Foo</scope> diff --git a/testing/078/078__xml__namespace__members__in__file__scope_8h.xml b/testing/078/078__xml__namespace__members__in__file__scope_8h.xml index 1198549..263df18 100644 --- a/testing/078/078__xml__namespace__members__in__file__scope_8h.xml +++ b/testing/078/078__xml__namespace__members__in__file__scope_8h.xml @@ -14,7 +14,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="078_xml_namespace_members_in_file_scope.h" line="15" column="16" bodyfile="078_xml_namespace_members_in_file_scope.h" bodystart="15" bodyend="15"/> + <location file="078_xml_namespace_members_in_file_scope.h" line="15" column="1" bodyfile="078_xml_namespace_members_in_file_scope.h" bodystart="15" bodyend="15"/> </memberdef> </sectiondef> <sectiondef kind="func"> diff --git a/testing/080/class_interface.xml b/testing/080/class_interface.xml index 2ee4379..5fdb043 100644 --- a/testing/080/class_interface.xml +++ b/testing/080/class_interface.xml @@ -83,7 +83,7 @@ </briefdescription> <detaileddescription> </detaileddescription> - <location file="080_extract_private_virtual.cpp" line="6" column="16" bodyfile="080_extract_private_virtual.cpp" bodystart="6" bodyend="35"/> + <location file="080_extract_private_virtual.cpp" line="6" column="1" bodyfile="080_extract_private_virtual.cpp" bodystart="6" bodyend="35"/> <listofallmembers> <member refid="class_interface_1a328e0a16ccee5d796ca93801a055d27d" prot="private" virt="pure-virtual"> <scope>Interface</scope> diff --git a/testing/082/namespace_n.xml b/testing/082/namespace_n.xml index 9f39bd1..9ceaeb9 100644 --- a/testing/082/namespace_n.xml +++ b/testing/082/namespace_n.xml @@ -45,6 +45,6 @@ <detaileddescription> <para>Namespace </para> </detaileddescription> - <location file="decl_def.h" line="2" column="1"/> + <location file="decl_def.h" line="1" column="1"/> </compounddef> </doxygen> diff --git a/testing/083/namespace_n.xml b/testing/083/namespace_n.xml index 2b41072..a44864d 100644 --- a/testing/083/namespace_n.xml +++ b/testing/083/namespace_n.xml @@ -45,6 +45,6 @@ <detaileddescription> <para>Namespace </para> </detaileddescription> - <location file="083_decl_def.cpp" line="8" column="1"/> + <location file="083_decl_def.cpp" line="7" column="1"/> </compounddef> </doxygen> diff --git a/testing/085/085__tooltip_8cpp.xml b/testing/085/085__tooltip_8cpp.xml index f9859d9..84f781d 100644 --- a/testing/085/085__tooltip_8cpp.xml +++ b/testing/085/085__tooltip_8cpp.xml @@ -11,7 +11,7 @@ <param> <defname>mod</defname> </param> - <initializer>if ((<ref refid="085__tooltip_8cpp_1a5cccf7694b5d688466063895f39ee5d1" kindref="member">unit</ref> = fopen(fn, mod)) == NULL) \ + <initializer> if ((<ref refid="085__tooltip_8cpp_1a5cccf7694b5d688466063895f39ee5d1" kindref="member">unit</ref> = fopen(fn, mod)) == NULL) \ { \ msg(OPEN_ERR,strerror(errno)); \ }</initializer> @@ -26,7 +26,7 @@ </memberdef> <memberdef kind="define" id="085__tooltip_8cpp_1a11a2c0486e2bbd915f975a3517817de6" prot="public" static="no"> <name>FCLOSE_MACRO</name> - <initializer>if (fclose(<ref refid="085__tooltip_8cpp_1a5cccf7694b5d688466063895f39ee5d1" kindref="member">unit</ref>) != 0) \ + <initializer> if (fclose(<ref refid="085__tooltip_8cpp_1a5cccf7694b5d688466063895f39ee5d1" kindref="member">unit</ref>) != 0) \ { \ msg(CLOSE_ERR,strerror(errno)); \ }</initializer> |