diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-02-24 10:48:32 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-02-24 10:48:32 (GMT) |
| commit | e51fda7db531628b54297ae020dda4a5f962d394 (patch) | |
| tree | 846fa261f80459529235e890ed897cf6186e9351 /tools/qdoc3/plaincodemarker.h | |
| parent | 66aba9ad196c24d6844e39901bf152d0951ccfb7 (diff) | |
| parent | c881e33e7e510204fabd061dac08a00b10b432fb (diff) | |
| download | Qt-e51fda7db531628b54297ae020dda4a5f962d394.zip Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.gz Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.bz2 | |
Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir
Diffstat (limited to 'tools/qdoc3/plaincodemarker.h')
| -rw-r--r-- | tools/qdoc3/plaincodemarker.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/qdoc3/plaincodemarker.h b/tools/qdoc3/plaincodemarker.h index 7afb88e..3c39e12 100644 --- a/tools/qdoc3/plaincodemarker.h +++ b/tools/qdoc3/plaincodemarker.h @@ -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) ** @@ -59,9 +59,10 @@ public: bool recognizeCode( const QString& code ); bool recognizeExtension( const QString& ext ); bool recognizeLanguage( const QString& lang ); + Atom::Type atomType() const; QString plainName( const Node *node ); QString plainFullName( const Node *node, const Node *relative ); - QString markedUpCode( const QString& code, const Node *relative, const QString& dirPath ); + QString markedUpCode( const QString& code, const Node *relative, const Location &location ); QString markedUpSynopsis( const Node *node, const Node *relative, SynopsisStyle style ); QString markedUpName( const Node *node ); |