summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2010-03-25 21:19:44 +0100
committerOlivier Goffart <ogoffart@trolltech.com>2010-03-25 21:19:44 +0100
commit075918e796b98155b81871f15bf2eb266a783561 (patch)
tree27dd331cd17f2a7390354d8bd70043e5d09f5408 /tools
parent986873b239f15df43a3ebbc88a38f8ff8d6d07bf (diff)
downloadqt4-tools-075918e796b98155b81871f15bf2eb266a783561.tar.gz
Fix bad merge
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/generator.cpp22
1 files changed, 7 insertions, 15 deletions
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index c5b150c487..3f955bfdc3 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -322,11 +322,11 @@ void Generator::generateBody(const Node *node, CodeMarker *marker)
bool quiet = false;
if (node->type() == Node::Function) {
-#if 0
+#if 0
const FunctionNode *func = (const FunctionNode *) node;
if (func->isOverload() && func->metaness() != FunctionNode::Ctor)
generateOverload(node, marker);
-#endif
+#endif
}
else if (node->type() == Node::Fake) {
const FakeNode *fake = static_cast<const FakeNode *>(node);
@@ -347,7 +347,7 @@ void Generator::generateBody(const Node *node, CodeMarker *marker)
if (func->reimplementedFrom() != 0)
generateReimplementedFrom(func, marker);
}
-
+
if (!generateText(node->doc().body(), node, marker))
if (node->isReimp())
return;
@@ -452,7 +452,7 @@ void Generator::generateBody(const Node *node, CodeMarker *marker)
// Now we put this at the top, before the other text.
if (func->reimplementedFrom() != 0)
generateReimplementedFrom(func, marker);
-#endif
+#endif
}
}
@@ -544,7 +544,7 @@ void Generator::generateInheritedBy(const ClassNode *classe,
example is being formatted. It outputs the list of source
files comprising the example, and the list of images used
by the example. The images are copied into a subtree of
- \c{...doc/html/images/used-in-examples/...}
+ \c{...doc/html/images/used-in-examples/...}
*/
void Generator::generateFileList(const FakeNode* fake,
CodeMarker* marker,
@@ -946,7 +946,7 @@ void Generator::generateThreadSafeness(const Node *node, CodeMarker *marker)
}
++c;
}
- if (!exceptions)
+ if (!exceptions)
text << ".";
else if (threadSafeness == Node::Reentrant) {
if (nonreentrant.isEmpty()) {
@@ -1033,7 +1033,7 @@ void Generator::generateOverload(const Node *node, CodeMarker *marker)
text << Atom::ParaLeft
<< "This function overloads ";
QString t = node->name() + "()";
- text << Atom::AutoLink << t
+ text << Atom::AutoLink << t
<< Atom::ParaRight;
generateText(text, node, marker);
}
@@ -1194,20 +1194,12 @@ void Generator::appendSortedQmlNames(Text& text,
QMap<QString,Text> classMap;
int index = 0;
-<<<<<<< HEAD
-#ifdef DEBUG_MULTIPLE
-=======
#ifdef DEBUG_MULTIPLE_QDOCCONF_FILES
->>>>>>> origin/4.7
qDebug() << "Generator::appendSortedQmlNames():" << base->name() << "is inherited by...";
#endif
for (int i = 0; i < subs.size(); ++i) {
Text t;
-<<<<<<< HEAD
-#ifdef DEBUG_MULTIPLE
-=======
#ifdef DEBUG_MULTIPLE_QDOCCONF_FILES
->>>>>>> origin/4.7
qDebug() << " " << subs[i]->name();
#endif
appendFullName(t, subs[i], base, marker);