Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

24
demos/bombs/game.h
View File

@@ -27,17 +27,17 @@ public:
{
m_width = m_height = 0;
m_field = NULL;
};
}
~BombsGame();
int GetWidth() const { return m_width; };
int GetHeight() const { return m_height; };
int GetWidth() const { return m_width; }
int GetHeight() const { return m_height; }
int Get(int x, int y) const
{
return m_field[x+y*m_width];
};
}
int IsFocussed(int x, int y) const
{
@@ -47,42 +47,42 @@ public:
int IsHidden(int x, int y) const
{
return Get(x,y) & BG_HIDDEN;
};
}
int IsMarked(int x, int y) const
{
return Get(x,y) & BG_MARKED;
};
}
int IsBomb(int x, int y) const
{
return Get(x,y) & BG_BOMB;
};
}
int IsExploded(int x, int y) const
{
return Get(x,y) & BG_EXPLODED;
};
}
int IsSelected(int x, int y) const
{
return Get(x,y) & BG_SELECTED;
};
}
int GetNumBombs() const
{
return m_numBombCells;
};
}
int GetNumRemainingCells() const
{
return m_numRemainingCells;
};
}
int GetNumMarkedCells() const
{
return m_numMarkedCells;
};
}
bool Init(int width, int height, bool easyCorner = false);

8
demos/forty/card.h
View File

@@ -43,7 +43,7 @@ class Card {
public:
Card(int value, WayUp way_up = facedown);
virtual ~Card(){};
virtual ~Card(){}
void Draw(wxDC& pDC, int x, int y);
static void DrawNullCard(wxDC& pDC, int x, int y); // Draw card place-holder
@@ -55,9 +55,9 @@ public:
Suit GetSuit() const { return m_suit; }
SuitColour GetColour() const { return m_colour; }
static void SetScale(double scale);
static int GetHeight() { return m_height; };
static int GetWidth() { return m_width; };
static double GetScale() { return m_scale; };
static int GetHeight() { return m_height; }
static int GetWidth() { return m_width; }
static double GetScale() { return m_scale; }
private:
Suit m_suit;

2
demos/forty/forty.h
View File

@@ -38,7 +38,7 @@ class FortyFrame: public wxFrame
{
public:
FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size, bool largecards);
virtual ~FortyFrame(){};
virtual ~FortyFrame(){}
void OnCloseWindow(wxCloseEvent& event);

4
demos/forty/pile.h
View File

@@ -41,7 +41,7 @@ const int NumCards = 2 * PackSize;
class Pile {
public:
Pile(int x, int y, int dx = 0, int dy = 0);
virtual ~Pile(){};
virtual ~Pile(){}
// General functions
virtual void ResetPile() { m_topCard = -1; }
@@ -68,7 +68,7 @@ public:
virtual bool AcceptCard(Card*) { return false; }
virtual void AddCard(Card* card); // Add card to top of pile
virtual void AddCard(wxDC& pDC, Card* card); // Add card + redraw it
void SetPos(int x,int y) {m_x = x;m_y = y;};
void SetPos(int x,int y) {m_x = x;m_y = y;}
protected:
int m_x, m_y; // Position of the pile on the screen

2
demos/forty/playerdg.h
View File

@@ -16,7 +16,7 @@ class PlayerSelectionDialog : public wxDialog
{
public:
PlayerSelectionDialog(wxWindow* parent, ScoreFile* file);
virtual ~PlayerSelectionDialog(){};
virtual ~PlayerSelectionDialog(){}
const wxString& GetPlayersName();
void ButtonCallback(wxCommandEvent& event);

2
demos/forty/scoredg.h
View File

@@ -16,7 +16,7 @@ class ScoreDialog : public wxDialog
{
public:
ScoreDialog(wxWindow* parent, ScoreFile* file);
virtual ~ScoreDialog(){};
virtual ~ScoreDialog(){}
void Display();

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;