Skip to content

Commit

Permalink
r.terrafow: explicit use of default constructors (OSGeo#2660)
Browse files Browse the repository at this point in the history
Fixes -Wclass-memaccess and -Wdeprecated-declaration warnings.

Use 'default' for implicitly-declared constructors and use default
(implicit) destructor.

Simplify; modernise constructs.
  • Loading branch information
a0x8o committed Sep 5, 2024
1 parent 929f3bf commit f460646
Show file tree
Hide file tree
Showing 28 changed files with 939 additions and 34 deletions.
19 changes: 19 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> main
# COPYRIGHT: (C) 2002-2023 by the GRASS Development Team
=======
Expand Down Expand Up @@ -124,8 +127,16 @@
=======
=======
>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
=======
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
# COPYRIGHT: (C) 2002-2024 by the GRASS Development Team
=======
# COPYRIGHT: (C) 2002-2022 by the GRASS Development Team
Expand Down Expand Up @@ -323,8 +334,16 @@
# COPYRIGHT: (C) 2002-2022 by the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
=======
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
#
# This program is free software under the GNU General Public
# License (>=v2). Read the file COPYING that comes with GRASS
Expand Down
6 changes: 6 additions & 0 deletions REQUIREMENTS.html
Original file line number Diff line number Diff line change
Expand Up @@ -684,9 +684,12 @@ <h3>Note:</h3>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8dce6e5f7e (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
=======
=======
>>>>>>> osgeo-main
=======
Expand Down Expand Up @@ -824,6 +827,9 @@ <h3>Note:</h3>
=======
=======
<i>&copy; GRASS Development Team 1997-2022</i>
=======
<i>&copy; GRASS Development Team 1997-2023</i>
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))

<p>Please report bugs here:
<br><a href="https://grass.osgeo.org/contribute/">https://grass.osgeo.org/contribute/</a>
Expand Down
19 changes: 19 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> main
# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
=======
Expand Down Expand Up @@ -124,8 +127,16 @@
=======
=======
>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
=======
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
# COPYRIGHT: (C) 2000-2024 by the GRASS Development Team
=======
# COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
Expand Down Expand Up @@ -323,8 +334,16 @@
# COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
=======
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
#
# This program is free software under the GNU General
# Public License (>=v2). Read the file COPYING that
Expand Down
38 changes: 38 additions & 0 deletions grasslib.dox
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,16 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fe7bbc01f5 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 8dce6e5f7e (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> main
* updated 8/2005, 2006-2008, 2010-2011, 2017-2023
=======
Expand Down Expand Up @@ -170,8 +173,16 @@
=======
=======
>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
=======
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
* updated 8/2005, 2006-2024
=======
* updated 8/2005, 2006-2008, 2010-2011, 2017, 2018, 2019, 2021
Expand Down Expand Up @@ -464,8 +475,16 @@
* updated 8/2005, 2006-2008, 2010-2011, 2017-2022
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
=======
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
-->

<a href="https://grass.osgeo.org">GRASS GIS</a> (<b>Geographic
Expand Down Expand Up @@ -517,9 +536,12 @@ pages.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> main
&copy; 2000-2023 by the GRASS Development Team
=======
Expand Down Expand Up @@ -602,8 +624,16 @@ pages.
=======
=======
>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
=======
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
&copy; 2000-2024 by the GRASS Development Team
=======
&copy; 2000-2022 by the GRASS Development Team
Expand Down Expand Up @@ -801,8 +831,16 @@ pages.
&copy; 2000-2022 by the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
>>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
=======
=======
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))

This manual is published under <a
href="http://www.fsf.org/copyleft/fdl.html">GNU Free Documentation
Expand Down
57 changes: 57 additions & 0 deletions gui/wxpython/gui_core/goutput.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,21 @@
=======
>>>>>>> osgeo-main
=======
<<<<<<< HEAD
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794))
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794))
=======
<<<<<<< HEAD
>>>>>>> osgeo-main
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
from gui_core.wrap import Button, ClearButton, StaticText
=======
from gui_core.wrap import Button, ClearButton, StaticText, StaticBox
Expand Down Expand Up @@ -193,6 +201,7 @@
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> osgeo-main
=======
<<<<<<< HEAD
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
=======
=======
Expand All @@ -206,6 +215,16 @@
from gui_core.wrap import Button, ClearButton, StaticText, StaticBox
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794))
=======
<<<<<<< HEAD
=======
from gui_core.wrap import Button, ClearButton, StaticText, StaticBox
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> osgeo-main
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
from core.settings import UserSettings


Expand Down Expand Up @@ -359,13 +378,21 @@ def __init__(
=======
>>>>>>> osgeo-main
=======
<<<<<<< HEAD
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794))
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794))
=======
<<<<<<< HEAD
>>>>>>> osgeo-main
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))

self.btnClear.Bind(wx.EVT_BUTTON, self.OnClear)
self.btnOutputSave.Bind(wx.EVT_BUTTON, self.OnOutputSave)
Expand Down Expand Up @@ -444,6 +471,7 @@ def __init__(
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> osgeo-main
=======
<<<<<<< HEAD
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
=======
=======
Expand All @@ -455,6 +483,15 @@ def __init__(
=======
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794))
=======
<<<<<<< HEAD
=======
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> osgeo-main
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
self.btnCmdExportHistory = Button(parent=self.panelOutput, id=wx.ID_ANY)
self.btnCmdExportHistory.SetLabel(_("&Export history"))
self.btnCmdExportHistory.SetToolTip(
Expand Down Expand Up @@ -566,6 +603,7 @@ def __init__(
>>>>>>> osgeo-main
=======
>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
<<<<<<< HEAD
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
Expand All @@ -580,6 +618,15 @@ def __init__(
=======
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794))
=======
<<<<<<< HEAD
=======
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> osgeo-main
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))

self._layout()

Expand Down Expand Up @@ -964,6 +1011,7 @@ def OnCmdProgress(self, event):
>>>>>>> osgeo-main
=======
=======
<<<<<<< HEAD
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
=======
=======
Expand All @@ -978,6 +1026,15 @@ def OnCmdProgress(self, event):
=======
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794))
=======
<<<<<<< HEAD
=======
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> osgeo-main
=======
>>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 7188d0ede2 (r.terrafow: explicit use of default constructors (#2660))
>>>>>>> 6e758524ae (r.terrafow: explicit use of default constructors (#2660))
def OnCmdExportHistory(self, event):
"""Export the history of executed commands stored
in a .wxgui_history file to a selected file."""
Expand Down
Loading

0 comments on commit f460646

Please sign in to comment.