diff --git a/Doxyfile-mcss b/Doxyfile-mcss index ba41602f6..630c09389 100644 --- a/Doxyfile-mcss +++ b/Doxyfile-mcss @@ -8,6 +8,7 @@ GENERATE_HTML = NO GENERATE_XML = YES XML_PROGRAMLISTING = NO XML_NS_MEMB_FILE_SCOPE = YES +EXTRACT_PRIV_VIRTUAL = YES GENERATE_TAGFILE = build/doc-mcss/magnum.tag TAGFILES = ../corrade/build/doc-mcss/corrade.tag=../../../../corrade/build/doc-mcss/html \ ../corrade/doc/stl.tag=http://en.cppreference.com/w/ diff --git a/src/Magnum/Audio/AbstractImporter.h b/src/Magnum/Audio/AbstractImporter.h index 8e5ecf1ec..fe2cfeeae 100644 --- a/src/Magnum/Audio/AbstractImporter.h +++ b/src/Magnum/Audio/AbstractImporter.h @@ -161,11 +161,7 @@ class MAGNUM_AUDIO_EXPORT AbstractImporter: public PluginManager::AbstractManagi /*@}*/ - #ifndef DOXYGEN_GENERATING_OUTPUT private: - #else - protected: - #endif /** @brief Implementation for @ref features() */ virtual Features doFeatures() const = 0; diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h index b2f07d13e..24980e878 100644 --- a/src/Magnum/Platform/AbstractXApplication.h +++ b/src/Magnum/Platform/AbstractXApplication.h @@ -207,11 +207,7 @@ class AbstractXApplication { /** @copydoc Sdl2Application::redraw() */ void redraw() { _flags |= Flag::Redraw; } - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** * @brief Viewport event * diff --git a/src/Magnum/Platform/AndroidApplication.h b/src/Magnum/Platform/AndroidApplication.h index 3e3800922..223e55457 100644 --- a/src/Magnum/Platform/AndroidApplication.h +++ b/src/Magnum/Platform/AndroidApplication.h @@ -365,11 +365,7 @@ class AndroidApplication { /** @copydoc Sdl2Application::redraw() */ void redraw() { _flags |= Flag::Redraw; } - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** * @brief Viewport event * @@ -410,11 +406,7 @@ class AndroidApplication { /** @{ @name Mouse handling */ - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** * @brief Mouse press event * diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h index ea1132d76..3d5b3fffb 100644 --- a/src/Magnum/Platform/GlfwApplication.h +++ b/src/Magnum/Platform/GlfwApplication.h @@ -422,11 +422,7 @@ class GlfwApplication { /** @copydoc Sdl2Application::redraw() */ void redraw() { _flags |= Flag::Redraw; } - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** * @brief Exit event * @@ -493,11 +489,7 @@ class GlfwApplication { glfwSetCursorPos(_window, Double(position.x()), Double(position.y())); } - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** @copydoc Sdl2Application::mousePressEvent() */ virtual void mousePressEvent(MouseEvent& event); @@ -545,11 +537,7 @@ class GlfwApplication { */ void stopTextInput() { _flags &= ~Flag::TextInputActive; } - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** * @brief Text input event * diff --git a/src/Magnum/Platform/GlutApplication.h b/src/Magnum/Platform/GlutApplication.h index b92cb4e37..59b67c1af 100644 --- a/src/Magnum/Platform/GlutApplication.h +++ b/src/Magnum/Platform/GlutApplication.h @@ -292,11 +292,7 @@ class CORRADE_DEPRECATED("scheduled for removal, consider switching to Sdl2Appli /** @copydoc Sdl2Application::redraw() */ void redraw() { glutPostRedisplay(); } - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** * @brief Viewport event * @@ -373,11 +369,7 @@ class CORRADE_DEPRECATED("scheduled for removal, consider switching to Sdl2Appli glutWarpPointer(position.x(), position.y()); } - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** @copydoc Sdl2Application::mousePressEvent() */ virtual void mousePressEvent(MouseEvent& event); diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 11b73313b..043b45c47 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -733,11 +733,7 @@ class Sdl2Application { */ void redraw() { _flags |= Flag::Redraw; } - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** * @brief Exit event * @@ -844,11 +840,7 @@ class Sdl2Application { */ void setMouseLocked(bool enabled); - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** * @brief Mouse press event * @@ -937,11 +929,7 @@ class Sdl2Application { */ void setTextInputRect(const Range2Di& rect); - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** * @brief Text input event * diff --git a/src/Magnum/Text/AbstractFont.h b/src/Magnum/Text/AbstractFont.h index 3bc1d6b06..286da3d13 100644 --- a/src/Magnum/Text/AbstractFont.h +++ b/src/Magnum/Text/AbstractFont.h @@ -297,11 +297,7 @@ class MAGNUM_TEXT_EXPORT AbstractFont: public PluginManager::AbstractPlugin { Float lineHeight; }; - #ifdef DOXYGEN_GENERATING_OUTPUT - protected: - #else private: - #endif /** @brief Implementation for @ref features() */ virtual Features doFeatures() const = 0; diff --git a/src/Magnum/Text/AbstractFontConverter.h b/src/Magnum/Text/AbstractFontConverter.h index 4b0dd1bda..8962e431f 100644 --- a/src/Magnum/Text/AbstractFontConverter.h +++ b/src/Magnum/Text/AbstractFontConverter.h @@ -289,11 +289,7 @@ class MAGNUM_TEXT_EXPORT AbstractFontConverter: public PluginManager::AbstractPl */ std::unique_ptr importGlyphCacheFromFile(const std::string& filename) const; - #ifndef DOXYGEN_GENERATING_OUTPUT private: - #else - protected: - #endif /** @brief Implementation for @ref features() */ virtual Features doFeatures() const = 0; diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h index 745d1e843..b075471a8 100644 --- a/src/Magnum/Trade/AbstractImageConverter.h +++ b/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); - #ifndef DOXYGEN_GENERATING_OUTPUT private: - #else - protected: - #endif /** @brief Implementation of @ref features() */ virtual Features doFeatures() const = 0; diff --git a/src/Magnum/Trade/AbstractImporter.h b/src/Magnum/Trade/AbstractImporter.h index 186ad92f8..d1285d41b 100644 --- a/src/Magnum/Trade/AbstractImporter.h +++ b/src/Magnum/Trade/AbstractImporter.h @@ -840,11 +840,7 @@ class MAGNUM_TRADE_EXPORT AbstractImporter: public PluginManager::AbstractManagi */ virtual void doOpenFile(const std::string& filename); - #ifndef DOXYGEN_GENERATING_OUTPUT private: - #else - protected: - #endif /** @brief Implementation for @ref features() */ virtual Features doFeatures() const = 0;