Browse Source

Doxygen: extract private virtuals.

simd
Vladimír Vondruš 7 years ago
parent
commit
6cc7d2e3a5
  1. 1
      Doxyfile-mcss
  2. 4
      src/Magnum/Audio/AbstractImporter.h
  3. 4
      src/Magnum/Platform/AbstractXApplication.h
  4. 8
      src/Magnum/Platform/AndroidApplication.h
  5. 12
      src/Magnum/Platform/GlfwApplication.h
  6. 8
      src/Magnum/Platform/GlutApplication.h
  7. 12
      src/Magnum/Platform/Sdl2Application.h
  8. 4
      src/Magnum/Text/AbstractFont.h
  9. 4
      src/Magnum/Text/AbstractFontConverter.h
  10. 4
      src/Magnum/Trade/AbstractImageConverter.h
  11. 4
      src/Magnum/Trade/AbstractImporter.h

1
Doxyfile-mcss

@ -8,6 +8,7 @@ GENERATE_HTML = NO
GENERATE_XML = YES GENERATE_XML = YES
XML_PROGRAMLISTING = NO XML_PROGRAMLISTING = NO
XML_NS_MEMB_FILE_SCOPE = YES XML_NS_MEMB_FILE_SCOPE = YES
EXTRACT_PRIV_VIRTUAL = YES
GENERATE_TAGFILE = build/doc-mcss/magnum.tag GENERATE_TAGFILE = build/doc-mcss/magnum.tag
TAGFILES = ../corrade/build/doc-mcss/corrade.tag=../../../../corrade/build/doc-mcss/html \ TAGFILES = ../corrade/build/doc-mcss/corrade.tag=../../../../corrade/build/doc-mcss/html \
../corrade/doc/stl.tag=http://en.cppreference.com/w/ ../corrade/doc/stl.tag=http://en.cppreference.com/w/

4
src/Magnum/Audio/AbstractImporter.h

@ -161,11 +161,7 @@ class MAGNUM_AUDIO_EXPORT AbstractImporter: public PluginManager::AbstractManagi
/*@}*/ /*@}*/
#ifndef DOXYGEN_GENERATING_OUTPUT
private: private:
#else
protected:
#endif
/** @brief Implementation for @ref features() */ /** @brief Implementation for @ref features() */
virtual Features doFeatures() const = 0; virtual Features doFeatures() const = 0;

4
src/Magnum/Platform/AbstractXApplication.h

@ -207,11 +207,7 @@ class AbstractXApplication {
/** @copydoc Sdl2Application::redraw() */ /** @copydoc Sdl2Application::redraw() */
void redraw() { _flags |= Flag::Redraw; } void redraw() { _flags |= Flag::Redraw; }
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** /**
* @brief Viewport event * @brief Viewport event
* *

8
src/Magnum/Platform/AndroidApplication.h

@ -365,11 +365,7 @@ class AndroidApplication {
/** @copydoc Sdl2Application::redraw() */ /** @copydoc Sdl2Application::redraw() */
void redraw() { _flags |= Flag::Redraw; } void redraw() { _flags |= Flag::Redraw; }
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** /**
* @brief Viewport event * @brief Viewport event
* *
@ -410,11 +406,7 @@ class AndroidApplication {
/** @{ @name Mouse handling */ /** @{ @name Mouse handling */
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** /**
* @brief Mouse press event * @brief Mouse press event
* *

12
src/Magnum/Platform/GlfwApplication.h

@ -422,11 +422,7 @@ class GlfwApplication {
/** @copydoc Sdl2Application::redraw() */ /** @copydoc Sdl2Application::redraw() */
void redraw() { _flags |= Flag::Redraw; } void redraw() { _flags |= Flag::Redraw; }
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** /**
* @brief Exit event * @brief Exit event
* *
@ -493,11 +489,7 @@ class GlfwApplication {
glfwSetCursorPos(_window, Double(position.x()), Double(position.y())); glfwSetCursorPos(_window, Double(position.x()), Double(position.y()));
} }
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** @copydoc Sdl2Application::mousePressEvent() */ /** @copydoc Sdl2Application::mousePressEvent() */
virtual void mousePressEvent(MouseEvent& event); virtual void mousePressEvent(MouseEvent& event);
@ -545,11 +537,7 @@ class GlfwApplication {
*/ */
void stopTextInput() { _flags &= ~Flag::TextInputActive; } void stopTextInput() { _flags &= ~Flag::TextInputActive; }
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** /**
* @brief Text input event * @brief Text input event
* *

8
src/Magnum/Platform/GlutApplication.h

@ -292,11 +292,7 @@ class CORRADE_DEPRECATED("scheduled for removal, consider switching to Sdl2Appli
/** @copydoc Sdl2Application::redraw() */ /** @copydoc Sdl2Application::redraw() */
void redraw() { glutPostRedisplay(); } void redraw() { glutPostRedisplay(); }
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** /**
* @brief Viewport event * @brief Viewport event
* *
@ -373,11 +369,7 @@ class CORRADE_DEPRECATED("scheduled for removal, consider switching to Sdl2Appli
glutWarpPointer(position.x(), position.y()); glutWarpPointer(position.x(), position.y());
} }
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** @copydoc Sdl2Application::mousePressEvent() */ /** @copydoc Sdl2Application::mousePressEvent() */
virtual void mousePressEvent(MouseEvent& event); virtual void mousePressEvent(MouseEvent& event);

12
src/Magnum/Platform/Sdl2Application.h

@ -733,11 +733,7 @@ class Sdl2Application {
*/ */
void redraw() { _flags |= Flag::Redraw; } void redraw() { _flags |= Flag::Redraw; }
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** /**
* @brief Exit event * @brief Exit event
* *
@ -844,11 +840,7 @@ class Sdl2Application {
*/ */
void setMouseLocked(bool enabled); void setMouseLocked(bool enabled);
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** /**
* @brief Mouse press event * @brief Mouse press event
* *
@ -937,11 +929,7 @@ class Sdl2Application {
*/ */
void setTextInputRect(const Range2Di& rect); void setTextInputRect(const Range2Di& rect);
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** /**
* @brief Text input event * @brief Text input event
* *

4
src/Magnum/Text/AbstractFont.h

@ -297,11 +297,7 @@ class MAGNUM_TEXT_EXPORT AbstractFont: public PluginManager::AbstractPlugin {
Float lineHeight; Float lineHeight;
}; };
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
#else
private: private:
#endif
/** @brief Implementation for @ref features() */ /** @brief Implementation for @ref features() */
virtual Features doFeatures() const = 0; virtual Features doFeatures() const = 0;

4
src/Magnum/Text/AbstractFontConverter.h

@ -289,11 +289,7 @@ class MAGNUM_TEXT_EXPORT AbstractFontConverter: public PluginManager::AbstractPl
*/ */
std::unique_ptr<GlyphCache> importGlyphCacheFromFile(const std::string& filename) const; std::unique_ptr<GlyphCache> importGlyphCacheFromFile(const std::string& filename) const;
#ifndef DOXYGEN_GENERATING_OUTPUT
private: private:
#else
protected:
#endif
/** @brief Implementation for @ref features() */ /** @brief Implementation for @ref features() */
virtual Features doFeatures() const = 0; virtual Features doFeatures() const = 0;

4
src/Magnum/Trade/AbstractImageConverter.h

@ -233,11 +233,7 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
*/ */
bool exportToFile(const ImageData2D& image, const std::string& filename); bool exportToFile(const ImageData2D& image, const std::string& filename);
#ifndef DOXYGEN_GENERATING_OUTPUT
private: private:
#else
protected:
#endif
/** @brief Implementation of @ref features() */ /** @brief Implementation of @ref features() */
virtual Features doFeatures() const = 0; virtual Features doFeatures() const = 0;

4
src/Magnum/Trade/AbstractImporter.h

@ -840,11 +840,7 @@ class MAGNUM_TRADE_EXPORT AbstractImporter: public PluginManager::AbstractManagi
*/ */
virtual void doOpenFile(const std::string& filename); virtual void doOpenFile(const std::string& filename);
#ifndef DOXYGEN_GENERATING_OUTPUT
private: private:
#else
protected:
#endif
/** @brief Implementation for @ref features() */ /** @brief Implementation for @ref features() */
virtual Features doFeatures() const = 0; virtual Features doFeatures() const = 0;

Loading…
Cancel
Save