summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2017-08-20 11:56:46 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2017-08-20 11:56:46 (GMT)
commit47f130eab1bcb0795fd2998d72867706b63f3859 (patch)
tree5e02a3d9f3d341b324f11c2c184d4b19abef4fa3
parent104acb4bac5da39814a7e30310f66e1e26d099ff (diff)
parent0072ba56aa994208b61515c60b6cbfaee2244d4d (diff)
downloadDoxygen-47f130eab1bcb0795fd2998d72867706b63f3859.zip
Doxygen-47f130eab1bcb0795fd2998d72867706b63f3859.tar.gz
Doxygen-47f130eab1bcb0795fd2998d72867706b63f3859.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
-rw-r--r--src/docparser.cpp2
-rw-r--r--src/memberlist.cpp2
-rw-r--r--src/parserintf.h2
-rw-r--r--src/translator_am.h8
-rw-r--r--src/translator_ru.h8
-rw-r--r--src/translator_ua.h8
6 files changed, 15 insertions, 15 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 2602f78..5bb28ea 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -543,7 +543,7 @@ static void detectNoDocumentedParams()
}
else if (!g_memberDef->hasDocumentedParams())
{
- bool allDoc=TRUE; // no paramater => all parameters are documented
+ bool allDoc=TRUE; // no parameter => all parameters are documented
if ( // member has parameters
al!=0 && // but the member has a parameter list
al->count()>0 // with at least one parameter (that is not void)
diff --git a/src/memberlist.cpp b/src/memberlist.cpp
index 5349030..e19cead 100644
--- a/src/memberlist.cpp
+++ b/src/memberlist.cpp
@@ -426,6 +426,7 @@ void MemberList::writePlainDeclarations(OutputList &ol,
{
ol.endDoxyAnchor(md->getOutputFileBase(),md->anchor());
}
+ ol.endMemberItem();
if (!md->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC))
{
DocRoot *rootNode = validatingParseDoc(
@@ -452,7 +453,6 @@ void MemberList::writePlainDeclarations(OutputList &ol,
}
delete rootNode;
}
- ol.endMemberItem();
ol.endMemberDeclaration(md->anchor(),inheritId);
}
md->warnIfUndocumented();
diff --git a/src/parserintf.h b/src/parserintf.h
index cc95ea4..0942106 100644
--- a/src/parserintf.h
+++ b/src/parserintf.h
@@ -96,7 +96,7 @@ class ParserInterface
* is associated (non null in case of an inline fragment
* for a member).
* @param[in] showLineNumbers if set to TRUE and also fileDef is not 0,
- * line numbers will be added to the source fragement
+ * line numbers will be added to the source fragment
* @param[in] searchCtx context under which search data has to be stored.
* @param[in] collectXRefs collect cross-reference relations.
*/
diff --git a/src/translator_am.h b/src/translator_am.h
index 9e72529..6f5e671 100644
--- a/src/translator_am.h
+++ b/src/translator_am.h
@@ -80,26 +80,26 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0
{ return "Մանրամասն..."; }
/*! put in the class documentation */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trListOfAllMembers()
{
return "Բոլոր անդամների ցուցակը";
}
/*! used as the title of the "list of all members" page of a class */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trMemberList()
{
return "Անդամների ցուցակ";
}
/*! this is the first part of a sentence that is followed by a class name */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trThisIsTheListOfAllMembers()
{ return "Սա դասի անդամների ամբողջական ցուցակն է "; }
/*! this is the remainder of the sentence after the class name */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trIncludingInheritedMembers()
{ return ", ներառյալ բոլոր ժառանգված անդամները"; }
diff --git a/src/translator_ru.h b/src/translator_ru.h
index dbc734c..54c0202 100644
--- a/src/translator_ru.h
+++ b/src/translator_ru.h
@@ -83,26 +83,26 @@ class TranslatorRussian : public Translator
{ return "Подробнее..."; }
/*! put in the class documentation */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trListOfAllMembers()
{
return "Полный список членов класса";
}
/*! used as the title of the "list of all members" page of a class */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trMemberList()
{
return "Cписок членов класса";
}
/*! this is the first part of a sentence that is followed by a class name */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trThisIsTheListOfAllMembers()
{ return "Полный список членов класса "; }
/*! this is the remainder of the sentence after the class name */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trIncludingInheritedMembers()
{ return ", включая наследуемые из базового класса"; }
diff --git a/src/translator_ua.h b/src/translator_ua.h
index eac14aa..034cb1b 100644
--- a/src/translator_ua.h
+++ b/src/translator_ua.h
@@ -76,26 +76,26 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4
{ return "Детальніше..."; }
/*! put in the class documentation */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trListOfAllMembers()
{
return "Список всіх елементів" ;
}
/*! used as the title of the "list of all members" page of a class */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trMemberList()
{
return "Cписок елементів" ;
}
/*! this is the first part of a sentence that is followed by a class name */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trThisIsTheListOfAllMembers()
{ return "Повний список елементів"; }
/*! this is the remainder of the sentence after the class name */
- /* Dosn't use when optimization for C is on. */
+ /* Isn't used when optimization for C is on. */
virtual QCString trIncludingInheritedMembers()
{ return ", включаючи всі успадковані елементи"; }