Housekeeping in include path sub-folders.

include/api/api_plugin.h

@@ -137,7 +137,8 @@ private:
  */
 struct CompareApiPluginIdentifiers
 {
-    bool operator()( const std::unique_ptr<API_PLUGIN>& item1, const std::unique_ptr<API_PLUGIN>& item2 ) const
+    bool operator()( const std::unique_ptr<API_PLUGIN>& item1,
+                     const std::unique_ptr<API_PLUGIN>& item2 ) const
     {
         return item1->Identifier() < item2->Identifier();
     }

include/cli/exit_codes.h

@@ -32,10 +32,11 @@ namespace CLI
         static const int ERR_UNKNOWN = 2;
         static const int ERR_INVALID_INPUT_FILE = 3;
         static const int ERR_INVALID_OUTPUT_CONFLICT = 4;
-        ///< Rules check violation count was greater than 0
+
+        /// Rules check violation count was greater than 0.
         static const int ERR_RC_VIOLATIONS = 5;
         static const int ERR_JOBS_RUN_FAILED = 6;
     };
 }
 
-#endif
+#endif

include/dialogs/dialog_image_editor.h

@@ -44,8 +44,7 @@ public:
 
 public:
     /**
-     * Function TransferToImage
-     * copy edited image to aItem
+     * Copy edited image to \a aItem.
      */
     void TransferToImage( BITMAP_BASE* aItem );
 

include/dialogs/dialog_plugin_options.h

@@ -23,17 +23,16 @@
 
 #include <dialog_plugin_options_base.h>
 #include <core/utf8.h>
+
 /**
- * DIALOG_PLUGIN_OPTIONS
- * is an options editor in the form of a two column name/value
- * spreadsheet like (table) UI.
+ * An options editor in the form of a two column name/value spreadsheet like (table) UI.
  */
 class DIALOG_PLUGIN_OPTIONS : public DIALOG_PLUGIN_OPTIONS_BASE
 {
 public:
     DIALOG_PLUGIN_OPTIONS( wxWindow* aParent, const wxString& aNickname,
-                           const std::map<std::string, UTF8>& aPluginOptions, const wxString& aFormattedOptions,
-                           wxString* aResult );
+                           const std::map<std::string, UTF8>& aPluginOptions,
+                           const wxString& aFormattedOptions, wxString* aResult );
 
     ~DIALOG_PLUGIN_OPTIONS() override;
 

include/dialogs/dialog_unit_entry.h

@@ -39,7 +39,7 @@ public:
                           long long int aDefaultValue );
 
     /**
-     * Returns the value in internal units
+     * Return the value in internal units.
      */
     int GetValue();
 
@@ -55,7 +55,7 @@ public:
                         const wxString& aLabelY, const VECTOR2I& aDefaultValue );
 
     /**
-     * Returns the value in internal units
+     * Return the value in internal units.
      */
     VECTOR2I GetValue();
 

include/dialogs/panel_image_editor.h

@@ -41,8 +41,7 @@ public:
     bool TransferDataFromWindow() override;
 
     /**
-     * Function TransferToImage
-     * copy edited image to aItem
+     * Copy edited image to \a aItem.
      */
     void TransferToImage( BITMAP_BASE& aItem );
 
@@ -54,4 +53,4 @@ private:
 
     // A copy of BITMAP_BASE to be edited
     std::unique_ptr<BITMAP_BASE> m_workingImage;
-};
+};

include/dialogs/panel_setup_netclasses.h

@@ -39,7 +39,7 @@ public:
     PANEL_SETUP_NETCLASSES( wxWindow* aParentWindow, EDA_DRAW_FRAME* aFrame,
                             std::shared_ptr<NET_SETTINGS> aSettings,
                             const std::set<wxString>& aNetNames, bool isEEschema );
-    ~PANEL_SETUP_NETCLASSES( ) override;
+    ~PANEL_SETUP_NETCLASSES() override;
 
     bool TransferDataToWindow() override;
     bool TransferDataFromWindow() override;

include/dialogs/panel_setup_severities.h

@@ -36,20 +36,10 @@ class wxRadioButton;
 
 class PANEL_SETUP_SEVERITIES : public wxPanel
 {
-private:
-    std::map<int, SEVERITY>& m_severities;
-
-    /// A list of item templates (to get descriptive text and error codes from)
-    std::vector<std::reference_wrapper<RC_ITEM>> m_items;
-
-    /// For ERC settings; a pointer to ERC_ITEM::pinTableConflict
-    RC_ITEM* m_pinMapSpecialCase;
-
-    std::map<int, wxRadioButton*[4]> m_buttonMap;   // map from DRC error code to button group
-
 public:
     /**
-     * Creates the severities setup panel
+     * Create the severities setup panel.
+     *
      * @param aItems is a list of error types that can have a severity.  Must have one or more!
      * @param aSeverities is a map of error code to severity
      * @param aPinMapSpecialCase is used to special-case the ERCE_PIN_TO_PIN_WARNING
@@ -68,7 +58,17 @@ private:
     void checkReload();
 
 private:
+    std::map<int, SEVERITY>& m_severities;
+
+    /// A list of item templates (to get descriptive text and error codes from)
+    std::vector<std::reference_wrapper<RC_ITEM>> m_items;
+
+    /// For ERC settings; a pointer to ERC_ITEM::pinTableConflict
+    RC_ITEM* m_pinMapSpecialCase;
+
+    std::map<int, wxRadioButton*[4]> m_buttonMap;   // map from DRC error code to button group
+
     std::map<int, SEVERITY> m_lastLoaded;
 };
 
-#endif //KICAD_PANEL_SETUP_SEVERITIES_H
+#endif // KICAD_PANEL_SETUP_SEVERITIES_H

include/drawing_sheet/ds_data_model.h

@@ -46,7 +46,7 @@ public:
     }
 
     /**
-     * static function: returns the instance of DS_DATA_MODEL used in the application
+     * Return the instance of DS_DATA_MODEL used in the application.
      */
     static DS_DATA_MODEL& GetTheInstance();
 
@@ -143,7 +143,7 @@ public:
     static wxString DefaultLayout();
 
     /**
-     * Populates the list with a custom layout or the default layout if no custom layout
+     * Populate the list with a custom layout or the default layout if no custom layout
      * is  available.
      *
      * @param aFullFileName is the custom drawing sheet file. If empty, load the file defined by

include/drawing_sheet/ds_proxy_view_item.h

@@ -67,12 +67,12 @@ public:
     void SetSheetPath( const std::string& aSheetPath ) { m_sheetPath = aSheetPath; }
 
     /**
-     * Changes the page number displayed in the title block.
+     * Change the page number displayed in the title block.
      */
     void SetPageNumber( const std::string& aPageNumber ) { m_pageNumber = aPageNumber; }
 
     /**
-     * Changes the sheet-count number displayed in the title block.
+     * Change the sheet-count number displayed in the title block.
      */
     void SetSheetCount( int aSheetCount ) { m_sheetCount = aSheetCount; }
 
@@ -91,7 +91,8 @@ public:
     void SetColorLayer( int aLayerId ) { m_colorLayer = aLayerId; }
 
     /**
-     * Overrides the layer used to pick the color of the page border (normally LAYER_GRID)
+     * Override the layer used to pick the color of the page border (normally LAYER_GRID)
+     *
      * @param aLayerId is the layer to use
      */
     void SetPageBorderColorLayer( int aLayerId ) { m_pageBorderColorLayer = aLayerId; }
@@ -113,7 +114,9 @@ public:
     void Show( int x, std::ostream& st ) const override { }
 #endif
 
-    /** Get class name
+    /**
+     * Get class name.
+     *
      * @return  string "DS_PROXY_VIEW_ITEM"
      */
     virtual wxString GetClass() const override
@@ -142,7 +145,10 @@ protected:
 
     const std::map<wxString, wxString>* m_properties;
 
-    /// Layer that is used for drawing sheet color (LAYER_DRAWINGSHEET is always used for visibility)
+    /**
+     * Layer that is used for drawing sheet color (LAYER_DRAWINGSHEET is always used
+     * for visibility).
+     */
     int                 m_colorLayer;
 
     /// Layer that is used for page border color

include/font/font.h

@@ -211,7 +211,7 @@ public:
 
 protected:
     /**
-     * Returns number of lines for a given text.
+     * Return number of lines for a given text.
      *
      * @param aText is the text to be checked.
      * @return unsigned - The number of lines in aText.
@@ -226,7 +226,7 @@ protected:
     }
 
     /**
-     * Draws a single line of text. Multiline texts should be split before using the
+     * Draw a single line of text. Multiline texts should be split before using the
      * function.
      *
      * @param aGal is a pointer to the graphics abstraction layer, or nullptr (nothing is drawn)
@@ -245,7 +245,8 @@ protected:
                              bool aItalic, bool aUnderline, const METRICS& aFontMetrics ) const;
 
     /**
-     * Computes the bounding box for a single line of text.
+     * Compute the bounding box for a single line of text.
+     *
      * Multiline texts should be split before using the function.
      *
      * @param aBBox is an optional pointer to be filled with the bounding box.
@@ -255,7 +256,8 @@ protected:
      * @return new cursor position
      */
     VECTOR2I boundingBoxSingleLine( BOX2I* aBBox, const wxString& aText, const VECTOR2I& aPosition,
-                                    const VECTOR2I& aSize, bool aItalic, const METRICS& aFontMetrics ) const;
+                                    const VECTOR2I& aSize, bool aItalic,
+                                    const METRICS& aFontMetrics ) const;
 
     void getLinePositions( const wxString& aText, const VECTOR2I& aPosition,
                            wxArrayString& aTextLines, std::vector<VECTOR2I>& aPositions,

include/font/fontconfig.h

@@ -65,8 +65,10 @@ public:
     /**
      * List the current available font families.
      *
-     * @param aDesiredLang The desired language of font name to report back if available, otherwise it will fallback
-     * @param aEmbeddedFiles A list of embedded to use for searching fonts, if nullptr, this is not used
+     * @param aDesiredLang The desired language of font name to report back if available,
+     *                     otherwise it will fallback.
+     * @param aEmbeddedFiles A list of embedded to use for searching fonts, if nullptr, this
+     *                       is not used
      * @param aForce If true, force rebuilding the font cache
      */
     void ListFonts( std::vector<std::string>& aFonts, const std::string& aDesiredLang,
@@ -85,12 +87,12 @@ private:
     static REPORTER*                s_reporter;
 
     /**
-     * Matches the two rfc 3306 language entries, used for when searching for matching family names
+     * Match two rfc 3306 language entries, used for when searching for matching family names
      *
-     * The overall logic is simple, either both language tags matched exactly or one tag is "single" level
-     * that the other language tag contains.
-     * There's nuances to language tags beyond this but font tags will most likely never be more complex than
-     * say "zh-CN" or single tag "en".
+     * The overall logic is simple, either both language tags matched exactly or one tag is
+     * "single" level that the other language tag contains.  There are nuances to language tags
+     * beyond this but font tags will most likely never be more complex than say "zh-CN" or
+     * single tag "en".
      *
      * @param aSearchLang the language being searched for
      * @param aSupportedLang the language being offered
@@ -98,17 +100,20 @@ private:
     bool isLanguageMatch( const wxString& aSearchLang, const wxString& aSupportedLang );
 
     /**
-     * Gets a list of all family name strings maped to lang
+     * Get a list of all family name strings mapped to lang
      *
      * @param aPat reference to FcPattern container
-     * @param aFamStringMap Map to be populated with key, value pairs representing lang to family name
+     * @param aFamStringMap Map to be populated with key, value pairs representing lang to
+     *                      family name
      */
     void getAllFamilyStrings( FONTCONFIG_PAT&                               aPat,
                               std::unordered_map<std::string, std::string>& aFamStringMap );
 
     /**
-     * Gets a family name based on desired language.
-     * This will fallback to english or first available string if no language matching string is found.
+     * Get a family name based on desired language.
+     *
+     * This will fallback to English or first available string if no language matching string
+     * is found.
      *
      * @param aPat reference to FcPattern container
      * @param aDesiredLang Language to research for (RFC3066 format)

include/font/glyph.h

@@ -89,7 +89,8 @@ public:
      * Cache the triangulation for the glyph from a known set of triangle indexes.
      * (See GetTriangulationData() above for more info.)
      */
-    void CacheTriangulation( std::vector<std::unique_ptr<SHAPE_POLY_SET::TRIANGULATED_POLYGON>>& aHintData );
+    void CacheTriangulation(
+            std::vector<std::unique_ptr<SHAPE_POLY_SET::TRIANGULATED_POLYGON>>& aHintData );
 };
 
 

include/font/outline_decomposer.h

@@ -43,6 +43,7 @@ namespace KIFONT
 {
 
 constexpr int GLYPH_DEFAULT_DPI = 72;  ///< FreeType default
+
 // The FreeType default of 72 DPI is not enough for outline decomposition;
 // so we'll use something larger than that.
 constexpr int GLYPH_RESOLUTION  = 1152;

include/font/outline_font.h

@@ -92,6 +92,7 @@ public:
 
     /**
      * Load an outline font. TrueType (.ttf) and OpenType (.otf) are supported.
+     *
      * @param aFontFileName is the (platform-specific) fully qualified name of the font file
      */
     static OUTLINE_FONT* LoadFont( const wxString& aFontFileName, bool aBold, bool aItalic,
@@ -99,8 +100,9 @@ public:
                                    bool aForDrawingSheet );
 
     /**
-     * Compute the distance (interline) between 2 lines of text (for multiline texts).  This is
-     * the distance between baselines, not the space between line bounding boxes.
+     * Compute the distance (interline) between 2 lines of text (for multiline texts).
+     *
+     * This is the distance between baselines, not the space between line bounding boxes.
      */
     double GetInterline( double aGlyphHeight, const METRICS& aFontMetrics ) const override;
 
@@ -182,6 +184,7 @@ private:
     {
         return aSize * m_charSizeScaler * m_outlineFontSizeCompensation;
     };
+
     int faceSize() const { return faceSize( m_faceSize ); }
 
     // also for superscripts

include/font/stroke_font.h

@@ -66,8 +66,9 @@ public:
     static STROKE_FONT* LoadFont( const wxString& aFontName );
 
     /**
-     * Compute the distance (interline) between 2 lines of text (for multiline texts).  This is
-     * the distance between baselines, not the space between line bounding boxes.
+     * Compute the distance (interline) between 2 lines of text (for multiline texts).
+     *
+     * This is the distance between baselines, not the space between line bounding boxes.
      */
     double GetInterline( double aGlyphHeight, const METRICS& aFontMetrics ) const override;
 

include/font/text_attributes.h

@@ -38,7 +38,7 @@ class FONT;
 // NB: values -1,0,1 are used in computations, do not change them
 //
 
-// This is API surface mapped to common.types.HorizontalAlignment
+/// This is API surface mapped to common.types.HorizontalAlignment
 enum GR_TEXT_H_ALIGN_T
 {
     GR_TEXT_H_ALIGN_LEFT   = -1,
@@ -47,7 +47,7 @@ enum GR_TEXT_H_ALIGN_T
     GR_TEXT_H_ALIGN_INDETERMINATE
 };
 
-// This is API surface mapped to common.types.VertialAlignment
+/// This is API surface mapped to common.types.VertialAlignment
 enum GR_TEXT_V_ALIGN_T
 {
     GR_TEXT_V_ALIGN_TOP    = -1,
@@ -58,8 +58,7 @@ enum GR_TEXT_V_ALIGN_T
 
 
 /**
- * Get the reverse alignment: left-right are swapped,
- * others are unchanged.
+ * Get the reverse alignment: left-right are swapped, others are unchanged.
  */
 constexpr GR_TEXT_H_ALIGN_T GetFlippedAlignment( GR_TEXT_H_ALIGN_T aAlign )
 {
@@ -79,8 +78,7 @@ constexpr GR_TEXT_H_ALIGN_T GetFlippedAlignment( GR_TEXT_H_ALIGN_T aAlign )
 
 
 /**
- * Get the reverse alignment: top-bottom are swapped,
- * others are unchanged.
+ * Get the reverse alignment: top-bottom are swapped, others are unchanged.
  */
 constexpr GR_TEXT_V_ALIGN_T GetFlippedAlignment( GR_TEXT_V_ALIGN_T aAlign )
 {
@@ -149,7 +147,8 @@ public:
 };
 
 
-extern GAL_API std::ostream& operator<<( std::ostream& aStream, const TEXT_ATTRIBUTES& aAttributes );
+extern GAL_API std::ostream& operator<<( std::ostream& aStream,
+                                         const TEXT_ATTRIBUTES& aAttributes );
 
 
 template<>

include/gal/gal_display_options.h

@@ -41,7 +41,7 @@ class wxWindow;
 namespace KIGFX
 {
     /**
-     * GRID_STYLE: Type definition of the grid style
+     * Type definition of the grid style.
      */
     enum class GRID_STYLE
     {
@@ -77,6 +77,7 @@ namespace KIGFX
     {
     public:
         virtual void OnGalDisplayOptionsChanged( const GAL_DISPLAY_OPTIONS& ) = 0;
+
     protected:
         // Observer lifetimes aren't handled by base class pointer
         virtual ~GAL_DISPLAY_OPTIONS_OBSERVER() {}

include/gal/gal_print.h

@@ -39,7 +39,7 @@ public:
 
 
 /**
- * @brief Wrapper around GAL to provide information needed for printing.
+ * Wrapper around GAL to provide information needed for printing.
  */
 class GAL_API GAL_PRINT
 {

include/gal/graphics_abstraction_layer.h

@@ -161,6 +161,9 @@ public:
      * DrawArcSegment() with fill *on* behaves like DrawArc() with fill *off*.
      * DrawArcSegment() with fill *off* draws the outline of what it would have drawn with fill on.
      *
+     * This has meaning only for back ends that can't draw a true arc, and use segments to
+     * approximate.
+     *
      * TODO: Unify Arc routines
      *
      * @param aCenterPoint  is the center point of the arc.
@@ -169,7 +172,6 @@ public:
      * @param aAngle        is the angle of the arc.
      * @param aWidth        is the thickness of the arc (pen size).
      * @param aMaxError     is the max allowed error to create segments to approximate a circle.
-     *  It has meaning only for back ends that can't draw a true arc, and use segments to approximate.
      */
     virtual void DrawArcSegment( const VECTOR2D& aCenterPoint, double aRadius,
                                  const EDA_ANGLE& aStartAngle, const EDA_ANGLE& aAngle,
@@ -210,7 +212,8 @@ public:
      */
     virtual void DrawPolygon( const std::deque<VECTOR2D>& aPointList ) {};
     virtual void DrawPolygon( const VECTOR2D aPointList[], int aListSize ) {};
-    virtual void DrawPolygon( const SHAPE_POLY_SET& aPolySet, bool aStrokeTriangulation = false ) {};
+    virtual void DrawPolygon( const SHAPE_POLY_SET& aPolySet,
+                              bool aStrokeTriangulation = false ) {};
     virtual void DrawPolygon( const SHAPE_LINE_CHAIN& aPolySet ) {};
 
     /**
@@ -386,8 +389,10 @@ public:
      */
     virtual void SetLayerDepth( double aLayerDepth )
     {
-        wxCHECK_MSG( aLayerDepth <= m_depthRange.y, /*void*/, wxT( "SetLayerDepth: below minimum" ) );
-        wxCHECK_MSG( aLayerDepth >= m_depthRange.x, /*void*/, wxT( "SetLayerDepth: above maximum" ) );
+        wxCHECK_MSG( aLayerDepth <= m_depthRange.y, /*void*/,
+                     wxT( "SetLayerDepth: below minimum" ) );
+        wxCHECK_MSG( aLayerDepth >= m_depthRange.x, /*void*/,
+                     wxT( "SetLayerDepth: above maximum" ) );
 
         m_layerDepth = aLayerDepth;
     }
@@ -1007,7 +1012,7 @@ protected:
     }
 
     /**
-     * compute minimum grid spacing from the grid settings
+     * Compute minimum grid spacing from the grid settings.
      *
      * @return the minimum spacing to use for drawing the grid
      */
@@ -1021,7 +1026,7 @@ protected:
     static const int GRID_DEPTH;
 
     /**
-     * Get the actual cursor color to draw
+     * Get the actual cursor color to draw.
      */
     COLOR4D getCursorColor() const;
 
@@ -1044,7 +1049,7 @@ protected:
     virtual bool updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions );
 
     /**
-     * Ensure that the first element is smaller than the second
+     * Ensure that the first element is smaller than the second.
      */
     template <typename T>
     void normalize( T &a, T &b )
@@ -1207,7 +1212,7 @@ public:
     };
 
     /**
-     * Instantiates a GAL_SCOPED_ATTRS object, saving the current attributes of the GAL.
+     * Instantiate a GAL_SCOPED_ATTRS object, saving the current attributes of the GAL.
      *
      * Specify the flags to save/restore in aFlags.
      */
@@ -1231,13 +1236,16 @@ public:
 
         if( m_flags & STROKE_WIDTH )
             m_gal.SetLineWidth( m_strokeWidth );
+
         if( m_flags & STROKE_COLOR )
             m_gal.SetStrokeColor( m_strokeColor );
+
         if( m_flags & IS_STROKE )
             m_gal.SetIsStroke( m_isStroke );
 
         if( m_flags & FILL_COLOR )
             m_gal.SetFillColor( m_fillColor );
+
         if( m_flags & IS_FILL )
             m_gal.SetIsFill( m_isFill );
 

include/gal/opengl/gl_utils.h

@@ -41,7 +41,7 @@ class GL_UTILS
 {
 public:
     /**
-     * Attempts to set the OpenGL swap interval.
+     * Attempt to set the OpenGL swap interval.
      *
      * @param aVal if -1 = try to set adaptive swapping, 0 = sync off, 1 = sync with VSYNC rate.
      * @return actual value set
@@ -112,7 +112,6 @@ public:
 #elif defined( _WIN32 )
 
         const GLubyte* vendor = glGetString( GL_VENDOR );
-        //const GLubyte* renderer = glGetString( GL_RENDERER );
         const GLubyte* version = glGetString( GL_VERSION );
 
         if( wglSwapIntervalEXT && wxGLCanvas::IsExtensionSupported( "WGL_EXT_swap_control" ) )

include/gal/opengl/gpu_manager.h

@@ -106,10 +106,12 @@ public:
     struct VRANGE
     {
         VRANGE( int aStart, int aEnd, bool aContinuous ) :
-        m_start( aStart ),
-        m_end( aEnd ),
-        m_isContinuous ( aContinuous )
-        {}
+                m_start( aStart ),
+                m_end( aEnd ),
+                m_isContinuous( aContinuous )
+        {
+        }
+
         unsigned int m_start, m_end;
         bool m_isContinuous;
     };
@@ -180,5 +182,7 @@ public:
     ///< @copydoc GPU_MANAGER::EndDrawing()
     virtual void EndDrawing() override;
 };
+
 } // namespace KIGFX
+
 #endif /* GPU_MANAGER_H_ */

include/gal/opengl/opengl_gal.h

@@ -282,10 +282,10 @@ public:
     void DrawCursor( const VECTOR2D& aCursorPosition ) override;
 
     /**
-     * @brief Function PostPaint
-     * posts an event to m_paint_listener.  A post is used so that the actual drawing
-     * function can use a device context type that is not specific to the wxEVT_PAINT event,
-     * just by changing the PostPaint code.
+     * Post an event to #m_paint_listener.
+     *
+     * A post is used so that the actual drawing function can use a device context type that
+     * is not specific to the wxEVT_PAINT event, just by changing the PostPaint code.
      */
     void PostPaint( wxPaintEvent& aEvent );
 
@@ -349,7 +349,9 @@ private:
     VERTEX_MANAGER*         m_cachedManager;    ///< Container for storing cached VERTEX_ITEMs
     VERTEX_MANAGER*         m_nonCachedManager; ///< Container for storing non-cached VERTEX_ITEMs
     VERTEX_MANAGER*         m_overlayManager;   ///< Container for storing overlaid VERTEX_ITEMs
-    VERTEX_MANAGER*         m_tempManager;      ///< Container for storing temp (diff mode) VERTEX_ITEMs
+
+    /// Container for storing temp (diff mode) VERTEX_ITEMs
+    VERTEX_MANAGER*         m_tempManager;
 
     // Framebuffer & compositing
     OPENGL_COMPOSITOR*      m_compositor;       ///< Handles multiple rendering targets
@@ -359,8 +361,8 @@ private:
     RENDER_TARGET           m_currentTarget;    ///< Current rendering target
 
     // Shader
-    SHADER*                 m_shader;           ///< There is only one shader used for different
-                                                ///< objects.
+    /// There is only one shader used for different objects.
+    SHADER*                 m_shader;
 
     // Internal flags
     bool                    m_isFramebufferInitialized; ///< Are the framebuffers initialized?
@@ -376,7 +378,8 @@ private:
     GLint                   ufm_pixelSizeMultiplier;
     GLint                   ufm_antialiasingOffset;
 
-    wxCursor                m_currentwxCursor;          ///< wxCursor showing the current native cursor
+    /// wxCursor showing the current native cursor.
+    wxCursor                m_currentwxCursor;
 
     std::unique_ptr<GL_BITMAP_CACHE>            m_bitmapCache;
 
@@ -394,7 +397,7 @@ private:
     bool updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions ) override;
 
     /**
-     * @brief Draw a quad for the line.
+     * Draw a quad for the line.
      *
      * @param aStartPoint is the start point of the line.
      * @param aEndPoint is the end point of the line.
@@ -405,7 +408,7 @@ private:
                        bool aReserve = true );
 
     /**
-     * @brief Reserves specified number of line quads.
+     * Reserve specified number of line quads.
      *
      * @param aLineCount the number of line quads to reserve.
      */

include/gal/opengl/shader.h

@@ -82,13 +82,13 @@ public:
     virtual ~SHADER();
 
     /**
-    * Add a shader and compile the shader sources.
-    *
-    * @param aArgs is the list of strings (std::string or convertible to const char*) which
-    *              are concatenated and compiled as a single shader source code.
-    * @param aShaderType is the type of the shader.
-    * @return True in case of success, false otherwise.
-    */
+     * Add a shader and compile the shader sources.
+     *
+     * @param aArgs is the list of strings (std::string or convertible to const char*) which
+     *              are concatenated and compiled as a single shader source code.
+     * @param aShaderType is the type of the shader.
+     * @return True in case of success, false otherwise.
+     */
     template< typename... Args >
     bool LoadShaderFromStrings( SHADER_TYPE aShaderType, Args&&... aArgs )
     {
@@ -190,11 +190,11 @@ public:
     int GetAttribute( const std::string& aAttributeName ) const;
 
     /**
-    * Read the shader source file
-    *
-    * @param aShaderSourceName is the shader source file name.
-    * @return the source as string
-    */
+     * Read the shader source file
+     *
+     * @param aShaderSourceName is the shader source file name.
+     * @return the source as string
+     */
     static std::string ReadSource( const std::string& aShaderSourceName );
 
 private:

include/gal/opengl/vertex_common.h

@@ -64,23 +64,25 @@ struct VERTEX
     GLfloat shader[4];      // Shader type & params
 };
 
-static constexpr size_t VERTEX_SIZE   = sizeof(VERTEX);
-static constexpr size_t VERTEX_STRIDE = VERTEX_SIZE / sizeof(GLfloat);
+static constexpr size_t VERTEX_SIZE   = sizeof( VERTEX );
+static constexpr size_t VERTEX_STRIDE = VERTEX_SIZE / sizeof( GLfloat );
 
-static constexpr size_t COORD_OFFSET  = offsetof(VERTEX, x);
-static constexpr size_t COORD_SIZE    = sizeof(VERTEX::x) + sizeof(VERTEX::y) + sizeof(VERTEX::z);
-static constexpr size_t COORD_STRIDE  = COORD_SIZE / sizeof(GLfloat);
+static constexpr size_t COORD_OFFSET  = offsetof( VERTEX, x );
+static constexpr size_t COORD_SIZE    = sizeof( VERTEX::x ) + sizeof( VERTEX::y ) +
+                                        sizeof( VERTEX::z );
+static constexpr size_t COORD_STRIDE  = COORD_SIZE / sizeof( GLfloat );
 
-static constexpr size_t COLOR_OFFSET  = offsetof(VERTEX, r);
-static constexpr size_t COLOR_SIZE    = sizeof(VERTEX::r) + sizeof(VERTEX::g) + sizeof(VERTEX::b) + sizeof(VERTEX::a);
-static constexpr size_t COLOR_STRIDE  = COLOR_SIZE / sizeof(GLubyte);
+static constexpr size_t COLOR_OFFSET = offsetof( VERTEX, r );
+static constexpr size_t COLOR_SIZE = sizeof( VERTEX::r ) + sizeof( VERTEX::g ) +
+                                     sizeof( VERTEX::b ) + sizeof( VERTEX::a );
+static constexpr size_t COLOR_STRIDE = COLOR_SIZE / sizeof( GLubyte );
 
 // Shader attributes
-static constexpr size_t SHADER_OFFSET = offsetof(VERTEX, shader);
-static constexpr size_t SHADER_SIZE   = sizeof(VERTEX::shader);
-static constexpr size_t SHADER_STRIDE = SHADER_SIZE / sizeof(GLfloat);
+static constexpr size_t SHADER_OFFSET = offsetof( VERTEX, shader );
+static constexpr size_t SHADER_SIZE = sizeof( VERTEX::shader );
+static constexpr size_t SHADER_STRIDE = SHADER_SIZE / sizeof( GLfloat );
 
-static constexpr size_t INDEX_SIZE    = sizeof(GLuint);
+static constexpr size_t INDEX_SIZE = sizeof( GLuint );
 
 } // namespace KIGFX