Browse Source

Doc++

pull/680/head
Vladimír Vondruš 11 months ago
parent
commit
188c981003
  1. 4
      src/Magnum/DebugTools/FrameProfiler.h
  2. 6
      src/Magnum/GL/Shader.h
  3. 2
      src/Magnum/Platform/Platform.js.in
  4. 2
      src/Magnum/Text/AbstractShaper.h
  5. 2
      src/Magnum/Trade/AbstractSceneConverter.h

4
src/Magnum/DebugTools/FrameProfiler.h

@ -755,8 +755,8 @@ template<> struct MAGNUM_DEBUGTOOLS_EXPORT ConfigurationValue<Magnum::DebugTools
* @brief Writes enum value as a string
*
* If the value is invalid, returns an empty string. The returned view is
* always @relativeref{Corrade,Containers::StringViewFlag::NullTerminated}
* and @relativeref{Corrade,Containers::StringViewFlag::Global}.
* always @relativeref{Corrade,Containers::StringViewFlag::Global}
* and @relativeref{Corrade::Containers::StringViewFlag,NullTerminated}.
*/
static Containers::StringView toString(Magnum::DebugTools::FrameProfilerGL::Value value, ConfigurationValueFlags);

6
src/Magnum/GL/Shader.h

@ -702,9 +702,9 @@ class MAGNUM_GL_EXPORT Shader: public AbstractObject {
* @ref GL-Shader-errors "compilation error reporting". If it's empty,
* the function is a no-op.
*
* If the view is both @relativeref{Corrade,Containers::StringViewFlag::NullTerminated}
* and @relativeref{Corrade,Containers::StringViewFlag::Global}, it's
* directly referenced, otherwise a copy is made internally. For
* If the view is both @relativeref{Corrade,Containers::StringViewFlag::Global}
* and @relativeref{Corrade::Containers::StringViewFlag,NullTerminated},
* it's directly referenced, otherwise a copy is made internally. For
* dynamic strings prefer to use the @ref addSource(Containers::String&&)
* overload to avoid copies.
* @see @ref addFile()

2
src/Magnum/Platform/Platform.js.in

@ -50,7 +50,7 @@
recognize #ifndef, tells me to use #if if I attempt to use #ifdef, and then
while it does what's expected on 3.1.34, on 3.1.35 it fails on
ReferenceError: STRUCT_INFO is not defined
Ourageously stupid. All of this. So what I do instead is passing this file
Outrageously stupid. All of this. So what I do instead is passing this file
through configure_file() and replacing MagnumPlatform_EMSCRIPTEN_3135_ONLY
with a // on older versions. */

2
src/Magnum/Text/AbstractShaper.h

@ -355,7 +355,7 @@ class MAGNUM_TEXT_EXPORT AbstractShaper {
*
* The returned view is generally neither
* @relativeref{Corrade,Containers::StringViewFlag::Global} nor
* @relativeref{Corrade,Containers::StringViewFlag::NullTerminated} and
* @relativeref{Corrade::Containers::StringViewFlag,NullTerminated} and
* is only guaranteed to stay valid until the next @ref setLanguage()
* or @ref shape() call. Particular @ref AbstractFont implementations
* may give better guarantees, see their documentation for more

2
src/Magnum/Trade/AbstractSceneConverter.h

@ -2121,7 +2121,7 @@ class MAGNUM_TRADE_EXPORT AbstractSceneConverter: public PluginManager::Abstract
* The @p filename string is guaranteed to stay in scope until a call
* to @ref doEndFile(). It's not guaranteed to be
* @relativeref{Corrade,Containers::StringViewFlag::Global} or
* @relativeref{Corrade,Containers::StringViewFlag::NullTerminated},
* @relativeref{Corrade::Containers::StringViewFlag,NullTerminated},
* however.
*/
virtual bool doBeginFile(Containers::StringView filename);

Loading…
Cancel
Save