Cleanup: use override specifier everywhere, and enable gcc warning to check for it.

src/gui/set/cards_panel.cpp

@@ -284,13 +284,9 @@ void CardsPanel::onMenuOpen(wxMenuEvent& ev) {
   wxMenu* menu = editor->getMenu(ID_INSERT_SYMBOL);
   if (insertSymbolMenu->GetSubMenu() != menu || (menu && menu->GetParent() != menuFormat)) {
     // re-add the menu
-    fprintf(stderr,"insert1 %p %p\n", menuFormat,insertSymbolMenu);fflush(stderr);
     menuFormat->Remove(ID_INSERT_SYMBOL);
-    fprintf(stderr,"insert2\n");fflush(stderr);
     insertSymbolMenu->SetSubMenu(menu);
-    fprintf(stderr,"insert3\n");fflush(stderr);
     menuFormat->Append(insertSymbolMenu);
-    fprintf(stderr,"insert4\n");fflush(stderr);
   }
 }
 
@@ -418,7 +414,7 @@ void CardsPanel::doSelectAll() {
 class CardsPanel::SearchFindInfo : public FindInfo {
 public:
   SearchFindInfo(CardsPanel& panel, wxFindReplaceData& what) : FindInfo(what), panel(panel) {}
-  virtual bool handle(const CardP& card, const TextValueP& value, size_t pos, bool was_selection) {
+  bool handle(const CardP& card, const TextValueP& value, size_t pos, bool was_selection) override {
     // Select the card
     panel.card_list->setCard(card);
     return true;
@@ -430,7 +426,7 @@ private:
 class CardsPanel::ReplaceFindInfo : public FindInfo {
 public:
   ReplaceFindInfo(CardsPanel& panel, wxFindReplaceData& what) : FindInfo(what), panel(panel) {}
-  virtual bool handle(const CardP& card, const TextValueP& value, size_t pos, bool was_selection) {
+  bool handle(const CardP& card, const TextValueP& value, size_t pos, bool was_selection) override {
     // Select the card
     panel.card_list->setCard(card);
     // Replace
@@ -441,7 +437,7 @@ public:
       return true;
     }
   }
-  virtual bool searchSelection() const { return true; }
+  bool searchSelection() const override { return true; }
 private:
   CardsPanel& panel;
 };

src/gui/set/cards_panel.hpp

@@ -27,27 +27,27 @@ public:
   CardsPanel(Window* parent, int id);
   ~CardsPanel();
   
-  virtual void onChangeSet();
+  void onChangeSet() override;
   
   // --------------------------------------------------- : UI
   
-  virtual void initUI   (wxToolBar* tb, wxMenuBar* mb);
-  virtual void destroyUI(wxToolBar* tb, wxMenuBar* mb);
-  virtual void onUpdateUI(wxUpdateUIEvent&);
-  virtual void onCommand(int id);
-  virtual void onMenuOpen(wxMenuEvent&);
+  void initUI   (wxToolBar* tb, wxMenuBar* mb) override;
+  void destroyUI(wxToolBar* tb, wxMenuBar* mb) override;
+  void onUpdateUI(wxUpdateUIEvent&) override;
+  void onCommand(int id) override;
+  void onMenuOpen(wxMenuEvent&) override;
   
   // --------------------------------------------------- : Actions
   
-  virtual bool wantsToHandle(const Action&, bool undone) const;
+  bool wantsToHandle(const Action&, bool undone) const override;
   
   // --------------------------------------------------- : Clipboard
-  virtual bool canCut() const;
-  virtual bool canCopy() const;
-  virtual bool canPaste() const;
-  virtual void doCut();
-  virtual void doCopy();
-  virtual void doPaste();
+  bool canCut() const override;
+  bool canCopy() const override;
+  bool canPaste() const override;
+  void doCut() override;
+  void doCopy() override;
+  void doPaste() override;
   
   // --------------------------------------------------- : Text selection
 
@@ -56,11 +56,11 @@ public:
 
   // --------------------------------------------------- : Searching (find/replace)
 
-  virtual bool canFind()    const { return true; }
-  virtual bool canReplace() const { return true; }
-  virtual bool doFind      (wxFindReplaceData&);
-  virtual bool doReplace   (wxFindReplaceData&);
-  virtual bool doReplaceAll(wxFindReplaceData&);
+  bool canFind()    const override { return true; }
+  bool canReplace() const override { return true; }
+  bool doFind      (wxFindReplaceData&) override;
+  bool doReplace   (wxFindReplaceData&) override;
+  bool doReplaceAll(wxFindReplaceData&) override;
 private:
   /// Do a search or replace action for the given FindInfo in all cards
   bool search(FindInfo& find, bool from_start);
@@ -71,9 +71,9 @@ private:
 public:
 
   // --------------------------------------------------- : Selection
-  virtual CardP selectedCard() const;
-  virtual void selectCard(const CardP& card);
-  virtual void selectFirstCard();
+  CardP selectedCard() const override;
+  void selectCard(const CardP& card) override;
+  void selectFirstCard() override;
 
 private:
   // --------------------------------------------------- : Controls
@@ -92,7 +92,7 @@ private:
   void updateNotesPosition();
   // before Layout, call updateNotesPosition.
   // NOTE: docs say this function returns void, but the code says bool
-  virtual bool Layout();
+  bool Layout() override;
   
   // --------------------------------------------------- : Menus & tools
   wxMenu* menuCard, *menuFormat;

src/gui/set/console_panel.hpp

@@ -25,16 +25,16 @@ public:
   
   void onIdle(wxIdleEvent&);
   void onEnter(wxCommandEvent&);
-  virtual void initUI   (wxToolBar* tb, wxMenuBar* mb);
-  virtual void destroyUI(wxToolBar* tb, wxMenuBar* mb);
-  virtual void onUpdateUI(wxUpdateUIEvent&);
-  virtual void onCommand(int id);
+  void initUI   (wxToolBar* tb, wxMenuBar* mb) override;
+  void destroyUI(wxToolBar* tb, wxMenuBar* mb) override;
+  void onUpdateUI(wxUpdateUIEvent&) override;
+  void onCommand(int id) override;
   
   // --------------------------------------------------- : Clipboard
   
-  virtual bool canCut()   const;
-  virtual bool canCopy()  const;
-  virtual void doCopy();
+  bool canCut() const override;
+  bool canCopy() const override;
+  void doCopy() override;
   
 protected:
   void onChangeSet() override;

src/gui/set/keywords_panel.hpp

@@ -26,26 +26,26 @@ public:
   KeywordsPanel(Window* parent, int id);
   ~KeywordsPanel();
   
-  virtual void onChangeSet();
-  virtual void onAction(const Action&, bool);
+  void onChangeSet() override;
+  void onAction(const Action&, bool) override;
   
   // --------------------------------------------------- : UI
   
-  virtual void initUI   (wxToolBar* tb, wxMenuBar* mb);
-  virtual void destroyUI(wxToolBar* tb, wxMenuBar* mb);
-  virtual void onUpdateUI(wxUpdateUIEvent&);
-  virtual void onCommand(int id);
+  void initUI   (wxToolBar* tb, wxMenuBar* mb) override;
+  void destroyUI(wxToolBar* tb, wxMenuBar* mb) override;
+  void onUpdateUI(wxUpdateUIEvent&) override;
+  void onCommand(int id) override;
   
   // --------------------------------------------------- : Clipboard
-  virtual bool canCut() const;
-  virtual bool canCopy() const;
-  virtual bool canPaste() const;
-  virtual void doCut();
-  virtual void doCopy();
-  virtual void doPaste();
+  bool canCut() const override;
+  bool canCopy() const override;
+  bool canPaste() const override;
+  void doCut() override;
+  void doCopy() override;
+  void doPaste() override;
 
-  virtual bool canSelectAll() const;
-  virtual void doSelectAll();
+  bool canSelectAll() const override;
+  void doSelectAll() override;
 
 private:
   DECLARE_EVENT_TABLE();

src/gui/set/panel.hpp

@@ -51,7 +51,7 @@ public:
   /// Should return true if this panel wants to get focus to show an action
   virtual bool wantsToHandle(const Action&, bool undone) const { return false; }
   /// Handle an action that changes the current set
-  virtual void onAction(const Action&, bool undone) {}
+  virtual void onAction(const Action&, bool undone) override {}
   
   // --------------------------------------------------- : Clipboard
   virtual bool canPaste() const { return false; }    ///< Is pasting possible?

src/gui/set/random_pack_panel.cpp

@@ -36,8 +36,8 @@ public:
   vector<CardP> cards;
   
 protected:
-  virtual void getItems(vector<VoidP>& out) const;
-  virtual void onChangeSet();
+  void getItems(vector<VoidP>& out) const override;
+  void onChangeSet() override;
 };
 
 RandomCardList::RandomCardList(Window* parent, int id, long style)
@@ -68,7 +68,7 @@ public:
   PackTotalsPanel(Window* parent, int id, PackGenerator& generator, bool show_all = false)
     : wxPanel(parent,id), generator(generator), show_all(show_all) {}
   void setGame(const GameP& game);
-  virtual wxSize DoGetBestSize() const;
+  virtual wxSize DoGetBestSize() const override;
 private:
   DECLARE_EVENT_TABLE();
   GameP game;
@@ -157,7 +157,7 @@ public:
     , interactive(interactive)
     , buddy(nullptr)
   {}
-  void draw(DC& dc) {
+  void draw(DC& dc) override {
     Color bg = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     Color fg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT);
     // clear background
@@ -176,7 +176,7 @@ public:
     dc.GetTextExtent(label,&w,&h);
     dc.DrawText(interactive && hover ? label + _("...") : label, 2, (s.y-h)/2);
   }
-  wxSize DoGetBestSize() const {
+  wxSize DoGetBestSize() const override {
     int w,h;
     wxClientDC dc(const_cast<SelectableLabel*>(this));
     dc.SetFont(*wxNORMAL_FONT);
@@ -186,7 +186,7 @@ public:
   void setBuddy(wxWindow* buddy) {
     this->buddy = buddy;
   }
-  virtual void onClick() {
+  void onClick() override {
     if (buddy) buddy->SetFocus();
   }
   void onDoubleClick(wxMouseEvent&) {

src/gui/set/random_pack_panel.hpp

@@ -43,24 +43,24 @@ public:
   
   // --------------------------------------------------- : UI
   
-  virtual void onBeforeChangeSet();
-  virtual void onChangeSet();
-  virtual void onAction(const Action&, bool undone);
+  void onBeforeChangeSet() override;
+  void onChangeSet() override;
+  void onAction(const Action&, bool undone) override;
   
-  virtual void initUI   (wxToolBar* tb, wxMenuBar* mb);
-  virtual void destroyUI(wxToolBar* tb, wxMenuBar* mb);
-  virtual void onUpdateUI(wxUpdateUIEvent&);
-  virtual void onCommand(int id);
+  void initUI   (wxToolBar* tb, wxMenuBar* mb) override;
+  void destroyUI(wxToolBar* tb, wxMenuBar* mb) override;
+  void onUpdateUI(wxUpdateUIEvent&) override;
+  void onCommand(int id) override;
   
   // --------------------------------------------------- : Selection
-  virtual CardP selectedCard() const;
-  virtual void selectCard(const CardP& card);
-  virtual void selectionChoices(ExportCardSelectionChoices& out);
+  CardP selectedCard() const override;
+  void selectCard(const CardP& card) override;
+  void selectionChoices(ExportCardSelectionChoices& out) override;
   
   // --------------------------------------------------- : Clipboard
   
-  virtual bool canCopy()  const;
-  virtual void doCopy();
+  bool canCopy() const override;
+  void doCopy() override;
   
 private:
   DECLARE_EVENT_TABLE();

src/gui/set/set_info_panel.hpp

@@ -21,24 +21,24 @@ public:
   
   // --------------------------------------------------- : UI
   
-  virtual void initUI   (wxToolBar* tb, wxMenuBar* mb);
-  virtual void destroyUI(wxToolBar* tb, wxMenuBar* mb);
-  virtual void onUpdateUI(wxUpdateUIEvent&);
-  virtual void onCommand(int id);
+  void initUI   (wxToolBar* tb, wxMenuBar* mb) override;
+  void destroyUI(wxToolBar* tb, wxMenuBar* mb) override;
+  void onUpdateUI(wxUpdateUIEvent&) override;
+  void onCommand(int id) override;
   
   // --------------------------------------------------- : Clipboard
   
-  virtual bool canCut() const;
-  virtual bool canCopy() const;
-  virtual bool canPaste() const;
-  virtual bool canSelectAll() const;
-  virtual void doCut();
-  virtual void doCopy();
-  virtual void doPaste();
-  virtual void doSelectAll();
+  bool canCut() const override;
+  bool canCopy() const override;
+  bool canPaste() const override;
+  bool canSelectAll() const override;
+  void doCut() override;
+  void doCopy() override;
+  void doPaste() override;
+  void doSelectAll() override;
   
 protected:
-  virtual void onChangeSet();
+  void onChangeSet() override;
   
 private:
   SetInfoEditor* editor;

src/gui/set/stats_panel.cpp

@@ -146,14 +146,14 @@ public:
   }
   
 protected:
-  virtual size_t itemCount() const;
-  virtual void drawItem(DC& dc, int x, int y, size_t item);
+  size_t itemCount() const override;
+  void drawItem(DC& dc, int x, int y, size_t item) override;
   
-  virtual double subcolumnActivity(size_t col) const {
+  double subcolumnActivity(size_t col) const override {
     return col-1 >= prefered_dimension_count ? 0.2 : 0.7;
   }
   
-  virtual void onSelect(size_t item, size_t old_col, bool& changes) {
+  void onSelect(size_t item, size_t old_col, bool& changes) override {
     // swap selection with another subcolumn?
     for (size_t j = 1 ; j < subcolumns.size() ; ++j) {
       if (j != active_subcolumn && subcolumns[j].selection == item &&
@@ -527,7 +527,7 @@ public:
   StatsFilter(GraphData& data, const vector<int> match) {
     data.indices(match, indices);
   }
-  virtual void getItems(const vector<CardP>& cards, vector<VoidP>& out) const {
+  void getItems(const vector<CardP>& cards, vector<VoidP>& out) const override {
     FOR_EACH_CONST(idx, indices) {
       out.push_back(cards.at(idx));
     }

src/gui/set/stats_panel.hpp

@@ -31,17 +31,17 @@ public:
   
   // --------------------------------------------------- : UI
   
-  virtual void onChangeSet();
-  virtual void onAction(const Action&, bool undone);
+  void onChangeSet() override;
+  void onAction(const Action&, bool undone) override;
   
-  virtual void initUI   (wxToolBar*, wxMenuBar*);
-  virtual void destroyUI(wxToolBar*, wxMenuBar*);
-  virtual void onUpdateUI(wxUpdateUIEvent&);
-  virtual void onCommand(int id);
+  void initUI   (wxToolBar*, wxMenuBar*) override;
+  void destroyUI(wxToolBar*, wxMenuBar*) override;
+  void onUpdateUI(wxUpdateUIEvent&) override;
+  void onCommand(int id) override;
   
   // --------------------------------------------------- : Selection
-  virtual CardP selectedCard() const;
-  virtual void selectCard(const CardP& card);
+  CardP selectedCard() const override;
+  void selectCard(const CardP& card) override;
   
   // --------------------------------------------------- : Data
 private:

src/gui/set/style_panel.hpp

@@ -22,25 +22,25 @@ class StylePanel : public SetWindowPanel {
 public:
   StylePanel(Window* parent, int id);
   
-  virtual void onChangeSet();
-  virtual void onAction(const Action&, bool undone);
+  void onChangeSet() override;
+  void onAction(const Action&, bool undone) override;
   
   // --------------------------------------------------- : UI
   
-  virtual void initUI(wxToolBar*, wxMenuBar*);
+  void initUI(wxToolBar*, wxMenuBar*) override;
   
   // --------------------------------------------------- : Clipboard
-  virtual bool canCut() const;
-  virtual bool canCopy() const;
-  virtual bool canPaste() const;
-  virtual bool canSelectAll() const;
-  virtual void doCut();
-  virtual void doCopy();
-  virtual void doPaste();
-  virtual void doSelectAll();
+  bool canCut() const override;
+  bool canCopy() const override;
+  bool canPaste() const override;
+  bool canSelectAll() const override;
+  void doCut() override;
+  void doCopy() override;
+  void doPaste() override;
+  void doSelectAll() override;
   
   // --------------------------------------------------- : Selection
-  virtual void selectCard(const CardP& card);
+  void selectCard(const CardP& card) override;
   
 private:
   DECLARE_EVENT_TABLE();
@@ -58,7 +58,7 @@ private:
   
   /// Determine the best size for the list of stylesheets based on available space
   void updateListSize();
-  virtual bool Layout();
+  bool Layout() override;
   
   /// Actual intialization of the controls
   void initControls();

src/gui/set/window.cpp

@@ -460,7 +460,7 @@ bool SetWindow::askSaveAndContinue() {
         set->actions.setSavePoint();
         return true;
       }
-    } catch (Error e) {
+    } catch (Error const& e) {
       // something went wrong with saving, don't proceed
       handle_error(e);
       return false;

src/gui/set/window.hpp

@@ -74,9 +74,9 @@ private:
   // --------------------------------------------------- : Action related
 protected:
   /// We want to respond to set changes
-  virtual void onChangeSet();
+  void onChangeSet() override;
   /// Actions that change the set
-  virtual void onAction(const Action&, bool undone);
+  void onAction(const Action&, bool undone) override;
   
 public:
   // minSize = mainSizer->getMinWindowSize(this)