diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2011-02-23 20:32:21 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2011-02-23 20:32:21 (GMT) |
| commit | c881e33e7e510204fabd061dac08a00b10b432fb (patch) | |
| tree | b5a5210eef8d309a17aca7d20b457879b584913f /tools/qdoc3/plaincodemarker.cpp | |
| parent | 309c48a70b46678ef92da441fcc2dc96ceb8fcf3 (diff) | |
| parent | 3c982b5d214cc7a37ace1d956ac8fb0b9a281722 (diff) | |
| download | Qt-c881e33e7e510204fabd061dac08a00b10b432fb.zip Qt-c881e33e7e510204fabd061dac08a00b10b432fb.tar.gz Qt-c881e33e7e510204fabd061dac08a00b10b432fb.tar.bz2 | |
Merge branch '4.7' into mimir
Diffstat (limited to 'tools/qdoc3/plaincodemarker.cpp')
| -rw-r--r-- | tools/qdoc3/plaincodemarker.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/qdoc3/plaincodemarker.cpp b/tools/qdoc3/plaincodemarker.cpp index d825c13..edeee39 100644 --- a/tools/qdoc3/plaincodemarker.cpp +++ b/tools/qdoc3/plaincodemarker.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -66,6 +66,11 @@ bool PlainCodeMarker::recognizeLanguage( const QString& /* lang */ ) return false; } +Atom::Type PlainCodeMarker::atomType() const +{ + return Atom::Code; +} + QString PlainCodeMarker::plainName( const Node * /* node */ ) { return ""; @@ -78,7 +83,7 @@ QString PlainCodeMarker::plainFullName(const Node * /* node */, const Node * /* QString PlainCodeMarker::markedUpCode( const QString& code, const Node * /* relative */, - const QString& /* dirPath */ ) + const Location & /* location */ ) { return protect( code ); } |