solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix extra semicolon warnings

Browse source
This commit is contained in:
Maarten Bent 2018-11-25 20:22:55 +01:00
parent eb23d4735c
commit bcf53d6b96
27 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
demos/life/game.cpp
View file

@ -925,7 +925,7 @@ class LifeModule: public wxModule
wxDECLARE_DYNAMIC_CLASS(LifeModule);
public:
LifeModule() {};
LifeModule() {}
bool OnInit() wxOVERRIDE;
void OnExit() wxOVERRIDE;
};

10
demos/life/game.h
View file

@ -29,7 +29,7 @@ public:
m_description = description;
m_rules = rules;
m_shape = shape;
};
}
// A more convenient ctor for the built-in samples
LifePattern(wxString name,
@ -58,7 +58,7 @@ public:
m_shape.Add( tmp );
}
};
}
wxString m_name;
wxString m_description;
@ -90,9 +90,9 @@ public:
~Life();
// accessors
inline wxUint32 GetNumCells() const { return m_numcells; };
inline wxString GetRules() const { return m_rules; };
inline wxString GetDescription() const { return m_description; };
inline wxUint32 GetNumCells() const { return m_numcells; }
inline wxString GetRules() const { return m_rules; }
inline wxString GetDescription() const { return m_description; }
bool IsAlive(wxInt32 x, wxInt32 y);
void SetCell(wxInt32 x, wxInt32 y, bool alive = true);
void SetPattern(const LifePattern &pattern);

10
demos/life/life.h
View file

@ -31,7 +31,7 @@ public:
virtual ~LifeCanvas();
// view management
int GetCellSize() const { return m_cellsize; };
int GetCellSize() const { return m_cellsize; }
void SetCellSize(int cellsize);
void Recenter(wxInt32 i, wxInt32 j);
@ -54,10 +54,10 @@ private:
void OnEraseBackground(wxEraseEvent& event);
// conversion between cell and screen coordinates
inline wxInt32 XToCell(wxCoord x) const { return (x / m_cellsize) + m_viewportX; };
inline wxInt32 YToCell(wxCoord y) const { return (y / m_cellsize) + m_viewportY; };
inline wxCoord CellToX(wxInt32 i) const { return (i - m_viewportX) * m_cellsize; };
inline wxCoord CellToY(wxInt32 j) const { return (j - m_viewportY) * m_cellsize; };
inline wxInt32 XToCell(wxCoord x) const { return (x / m_cellsize) + m_viewportX; }
inline wxInt32 YToCell(wxCoord y) const { return (y / m_cellsize) + m_viewportY; }
inline wxCoord CellToX(wxInt32 i) const { return (i - m_viewportX) * m_cellsize; }
inline wxCoord CellToY(wxInt32 j) const { return (j - m_viewportY) * m_cellsize; }
// what is the user doing?
enum MouseStatus

10
demos/life/reader.h
View file

@ -22,14 +22,14 @@ class LifeReader
public:
LifeReader(wxInputStream& is);
inline bool IsOk() const { return m_ok; };
inline wxString GetDescription() const { return m_description; };
inline wxString GetRules() const { return m_rules; };
inline wxArrayString GetShape() const { return m_shape; };
inline bool IsOk() const { return m_ok; }
inline wxString GetDescription() const { return m_description; }
inline wxString GetRules() const { return m_rules; }
inline wxArrayString GetShape() const { return m_shape; }
inline LifePattern GetPattern() const
{
return LifePattern(wxEmptyString, m_description, m_rules, m_shape);
};
}
private:
bool m_ok;