Remove base/override.h (use override keyword directly)

src/app/commands/cmd_about.cpp

@@ -32,7 +32,7 @@ using namespace ui;
 class AboutCommand : public Command {
 public:
   AboutCommand();
-  Command* clone() const OVERRIDE { return new AboutCommand(*this); }
+  Command* clone() const override { return new AboutCommand(*this); }
 
 protected:
   void onExecute(Context* context);

src/app/commands/cmd_advanced_mode.cpp

@@ -38,7 +38,7 @@ using namespace ui;
 class AdvancedModeCommand : public Command {
 public:
   AdvancedModeCommand();
-  Command* clone() const OVERRIDE { return new AdvancedModeCommand(*this); }
+  Command* clone() const override { return new AdvancedModeCommand(*this); }
 
 protected:
   void onExecute(Context* context);

src/app/commands/cmd_background_from_layer.cpp

@@ -37,7 +37,7 @@ namespace app {
 class BackgroundFromLayerCommand : public Command {
 public:
   BackgroundFromLayerCommand();
-  Command* clone() const OVERRIDE { return new BackgroundFromLayerCommand(*this); }
+  Command* clone() const override { return new BackgroundFromLayerCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_cancel.cpp

@@ -25,7 +25,6 @@
 #include "app/commands/commands.h"
 #include "app/commands/params.h"
 #include "app/context.h"
-#include "base/override.h"
 
 namespace app {
 
@@ -37,7 +36,7 @@ public:
   };
 
   CancelCommand();
-  Command* clone() const OVERRIDE { return new CancelCommand(*this); }
+  Command* clone() const override { return new CancelCommand(*this); }
 
 protected:
   void onLoadParams(Params* params);

src/app/commands/cmd_canvas_size.cpp

@@ -99,7 +99,7 @@ public:
 
 protected:
   // SelectBoxDelegate impleentation
-  virtual void onChangeRectangle(const gfx::Rect& rect) OVERRIDE
+  virtual void onChangeRectangle(const gfx::Rect& rect) override
   {
     m_rect = rect;
 
@@ -124,7 +124,7 @@ protected:
     m_editor->invalidate();
   }
 
-  virtual void onBroadcastMouseMessage(WidgetsList& targets) OVERRIDE
+  virtual void onBroadcastMouseMessage(WidgetsList& targets) override
   {
     Window::onBroadcastMouseMessage(targets);
 
@@ -149,7 +149,7 @@ class CanvasSizeCommand : public Command {
 
 public:
   CanvasSizeCommand();
-  Command* clone() const OVERRIDE { return new CanvasSizeCommand(*this); }
+  Command* clone() const override { return new CanvasSizeCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_cel_properties.cpp

@@ -45,7 +45,7 @@ using namespace ui;
 class CelPropertiesCommand : public Command {
 public:
   CelPropertiesCommand();
-  Command* clone() const OVERRIDE { return new CelPropertiesCommand(*this); }
+  Command* clone() const override { return new CelPropertiesCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_change_pixel_format.cpp

@@ -41,7 +41,7 @@ class ChangePixelFormatCommand : public Command {
   DitheringMethod m_dithering;
 public:
   ChangePixelFormatCommand();
-  Command* clone() const OVERRIDE { return new ChangePixelFormatCommand(*this); }
+  Command* clone() const override { return new ChangePixelFormatCommand(*this); }
 
 protected:
   void onLoadParams(Params* params);

src/app/commands/cmd_clear.cpp

@@ -40,7 +40,7 @@ namespace app {
 class ClearCommand : public Command {
 public:
   ClearCommand();
-  Command* clone() const OVERRIDE { return new ClearCommand(*this); }
+  Command* clone() const override { return new ClearCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_close_file.cpp

@@ -51,7 +51,7 @@ public:
   {
   }
 
-  Command* clone() const OVERRIDE { return new CloseFileCommand(*this); }
+  Command* clone() const override { return new CloseFileCommand(*this); }
 
 protected:
 
@@ -98,7 +98,7 @@ public:
   {
   }
 
-  Command* clone() const OVERRIDE { return new CloseAllFilesCommand(*this); }
+  Command* clone() const override { return new CloseAllFilesCommand(*this); }
 
 protected:
 

src/app/commands/cmd_configure_tools.cpp

@@ -60,7 +60,7 @@ static void on_exit_delete_this_widget()
 class ConfigureTools : public Command {
 public:
   ConfigureTools();
-  Command* clone() const OVERRIDE { return new ConfigureTools(*this); }
+  Command* clone() const override { return new ConfigureTools(*this); }
 
 protected:
   void onExecute(Context* context);

src/app/commands/cmd_copy.cpp

@@ -37,7 +37,7 @@ namespace app {
 class CopyCommand : public Command {
 public:
   CopyCommand();
-  Command* clone() const OVERRIDE { return new CopyCommand(*this); }
+  Command* clone() const override { return new CopyCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_copy_cel.cpp

@@ -32,7 +32,7 @@ namespace app {
 class CopyCelCommand : public Command {
 public:
   CopyCelCommand();
-  Command* clone() const OVERRIDE { return new CopyCelCommand(*this); }
+  Command* clone() const override { return new CopyCelCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_crop.cpp

@@ -40,7 +40,7 @@ namespace app {
 class CropSpriteCommand : public Command {
 public:
   CropSpriteCommand();
-  Command* clone() const OVERRIDE { return new CropSpriteCommand(*this); }
+  Command* clone() const override { return new CropSpriteCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);
@@ -81,7 +81,7 @@ void CropSpriteCommand::onExecute(Context* context)
 class AutocropSpriteCommand : public Command {
 public:
   AutocropSpriteCommand();
-  Command* clone() const OVERRIDE { return new AutocropSpriteCommand(*this); }
+  Command* clone() const override { return new AutocropSpriteCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_cut.cpp

@@ -34,7 +34,7 @@ namespace app {
 class CutCommand : public Command {
 public:
   CutCommand();
-  Command* clone() const OVERRIDE { return new CutCommand(*this); }
+  Command* clone() const override { return new CutCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_deselect_mask.cpp

@@ -33,7 +33,7 @@ namespace app {
 class DeselectMaskCommand : public Command {
 public:
   DeselectMaskCommand();
-  Command* clone() const OVERRIDE { return new DeselectMaskCommand(*this); }
+  Command* clone() const override { return new DeselectMaskCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_duplicate_layer.cpp

@@ -41,7 +41,7 @@ namespace app {
 class DuplicateLayerCommand : public Command {
 public:
   DuplicateLayerCommand();
-  Command* clone() const OVERRIDE { return new DuplicateLayerCommand(*this); }
+  Command* clone() const override { return new DuplicateLayerCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_duplicate_sprite.cpp

@@ -43,7 +43,7 @@ using namespace ui;
 class DuplicateSpriteCommand : public Command {
 public:
   DuplicateSpriteCommand();
-  Command* clone() const OVERRIDE { return new DuplicateSpriteCommand(*this); }
+  Command* clone() const override { return new DuplicateSpriteCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_exit.cpp

@@ -32,7 +32,7 @@ namespace app {
 class ExitCommand : public Command {
 public:
   ExitCommand();
-  Command* clone() const OVERRIDE { return new ExitCommand(*this); }
+  Command* clone() const override { return new ExitCommand(*this); }
 
 protected:
   void onExecute(Context* context);

src/app/commands/cmd_export_sprite_sheet.h

@@ -21,7 +21,6 @@
 #pragma once
 
 #include "app/commands/command.h"
-#include "base/override.h"
 #include "doc/export_data.h"
 
 #include <string>
@@ -34,7 +33,7 @@ namespace app {
     enum ExportAction { SaveCopyAs, SaveAs, Save, DoNotSave };
 
     ExportSpriteSheetCommand();
-    Command* clone() const OVERRIDE { return new ExportSpriteSheetCommand(*this); }
+    Command* clone() const override { return new ExportSpriteSheetCommand(*this); }
 
     SpriteSheetType type() const { return m_type; }
     ExportAction action() const { return m_action; }
@@ -44,8 +43,8 @@ namespace app {
     void setAction(ExportAction action) { m_action = action; }
 
   protected:
-    virtual bool onEnabled(Context* context) OVERRIDE;
-    virtual void onExecute(Context* context) OVERRIDE;
+    virtual bool onEnabled(Context* context) override;
+    virtual void onExecute(Context* context) override;
 
   private:
     bool m_useUI;

src/app/commands/cmd_eyedropper.cpp

@@ -50,7 +50,7 @@ class EyedropperCommand : public Command {
 
 public:
   EyedropperCommand();
-  Command* clone() const OVERRIDE { return new EyedropperCommand(*this); }
+  Command* clone() const override { return new EyedropperCommand(*this); }
 
 protected:
   void onLoadParams(Params* params);

src/app/commands/cmd_flatten_layers.cpp

@@ -35,7 +35,7 @@ namespace app {
 class FlattenLayersCommand : public Command {
 public:
   FlattenLayersCommand();
-  Command* clone() const OVERRIDE { return new FlattenLayersCommand(*this); }
+  Command* clone() const override { return new FlattenLayersCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_flip.h

@@ -21,7 +21,6 @@
 #pragma once
 
 #include "app/commands/command.h"
-#include "base/override.h"
 #include "raster/algorithm/flip_type.h"
 
 namespace app {
@@ -29,7 +28,7 @@ namespace app {
   class FlipCommand : public Command {
   public:
     FlipCommand();
-    Command* clone() const OVERRIDE { return new FlipCommand(*this); }
+    Command* clone() const override { return new FlipCommand(*this); }
 
     raster::algorithm::FlipType getFlipType() const { return m_flipType; }
 

src/app/commands/cmd_frame_properties.cpp

@@ -41,7 +41,7 @@ using namespace ui;
 class FramePropertiesCommand : public Command {
 public:
   FramePropertiesCommand();
-  Command* clone() const OVERRIDE { return new FramePropertiesCommand(*this); }
+  Command* clone() const override { return new FramePropertiesCommand(*this); }
 
 protected:
   void onLoadParams(Params* params);

src/app/commands/cmd_goto_frame.cpp

@@ -41,11 +41,11 @@ protected:
   GotoCommand(const char* short_name, const char* friendly_name)
     : Command(short_name, friendly_name, CmdRecordableFlag) { }
 
-  bool onEnabled(Context* context) OVERRIDE {
+  bool onEnabled(Context* context) override {
     return (current_editor != NULL);
   }
 
-  void onExecute(Context* context) OVERRIDE {
+  void onExecute(Context* context) override {
     ASSERT(current_editor != NULL);
 
     current_editor->setFrame(onGetFrame(current_editor));
@@ -59,10 +59,10 @@ public:
   GotoFirstFrameCommand()
     : GotoCommand("GotoFirstFrame",
                   "Goto First Frame") { }
-  Command* clone() const OVERRIDE { return new GotoFirstFrameCommand(*this); }
+  Command* clone() const override { return new GotoFirstFrameCommand(*this); }
 
 protected:
-  FrameNumber onGetFrame(Editor* editor) OVERRIDE {
+  FrameNumber onGetFrame(Editor* editor) override {
     return FrameNumber(0);
   }
 };
@@ -72,10 +72,10 @@ public:
   GotoPreviousFrameCommand()
     : GotoCommand("GotoPreviousFrame",
                   "Goto Previous Frame") { }
-  Command* clone() const OVERRIDE { return new GotoPreviousFrameCommand(*this); }
+  Command* clone() const override { return new GotoPreviousFrameCommand(*this); }
 
 protected:
-  FrameNumber onGetFrame(Editor* editor) OVERRIDE {
+  FrameNumber onGetFrame(Editor* editor) override {
     FrameNumber frame = editor->frame();
 
     if (frame > FrameNumber(0))
@@ -89,10 +89,10 @@ class GotoNextFrameCommand : public GotoCommand {
 public:
   GotoNextFrameCommand() : GotoCommand("GotoNextFrame",
                                        "Goto Next Frame") { }
-  Command* clone() const OVERRIDE { return new GotoNextFrameCommand(*this); }
+  Command* clone() const override { return new GotoNextFrameCommand(*this); }
 
 protected:
-  FrameNumber onGetFrame(Editor* editor) OVERRIDE {
+  FrameNumber onGetFrame(Editor* editor) override {
     FrameNumber frame = editor->frame();
     if (frame < editor->sprite()->lastFrame())
       return frame.next();
@@ -105,10 +105,10 @@ class GotoLastFrameCommand : public GotoCommand {
 public:
   GotoLastFrameCommand() : GotoCommand("GotoLastFrame",
                                        "Goto Last Frame") { }
-  Command* clone() const OVERRIDE { return new GotoLastFrameCommand(*this); }
+  Command* clone() const override { return new GotoLastFrameCommand(*this); }
 
 protected:
-  FrameNumber onGetFrame(Editor* editor) OVERRIDE {
+  FrameNumber onGetFrame(Editor* editor) override {
     return editor->sprite()->lastFrame();
   }
 };
@@ -118,17 +118,17 @@ public:
   GotoFrameCommand() : GotoCommand("GotoFrame",
                                    "Goto Frame")
                      , m_frame(0) { }
-  Command* clone() const OVERRIDE { return new GotoFrameCommand(*this); }
+  Command* clone() const override { return new GotoFrameCommand(*this); }
 
 protected:
-  void onLoadParams(Params* params) OVERRIDE
+  void onLoadParams(Params* params) override
   {
     std::string frame = params->get("frame");
     if (!frame.empty()) m_frame = ustrtol(frame.c_str(), NULL, 10);
     else m_frame = 0;
   }
 
-  FrameNumber onGetFrame(Editor* editor) OVERRIDE {
+  FrameNumber onGetFrame(Editor* editor) override {
     if (m_frame == 0) {
       base::UniquePtr<Window> window(app::load_widget<Window>("goto_frame.xml", "goto_frame"));
       Widget* frame = app::find_widget<Widget>(window, "frame");

src/app/commands/cmd_goto_layer.cpp

@@ -50,7 +50,7 @@ protected:
 class GotoPreviousLayerCommand : public GotoCommand {
 public:
   GotoPreviousLayerCommand();
-  Command* clone() const OVERRIDE { return new GotoPreviousLayerCommand(*this); }
+  Command* clone() const override { return new GotoPreviousLayerCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);
@@ -92,7 +92,7 @@ void GotoPreviousLayerCommand::onExecute(Context* context)
 class GotoNextLayerCommand : public GotoCommand {
 public:
   GotoNextLayerCommand();
-  Command* clone() const OVERRIDE { return new GotoNextLayerCommand(*this); }
+  Command* clone() const override { return new GotoNextLayerCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_goto_tab.cpp

@@ -31,7 +31,7 @@ namespace app {
 class GotoNextTabCommand : public Command {
 public:
   GotoNextTabCommand();
-  Command* clone() const OVERRIDE { return new GotoNextTabCommand(*this); }
+  Command* clone() const override { return new GotoNextTabCommand(*this); }
 
 protected:
   void onExecute(Context* context);
@@ -52,7 +52,7 @@ void GotoNextTabCommand::onExecute(Context* context)
 class GotoPreviousTabCommand : public Command {
 public:
   GotoPreviousTabCommand();
-  Command* clone() const OVERRIDE { return new GotoPreviousTabCommand(*this); }
+  Command* clone() const override { return new GotoPreviousTabCommand(*this); }
 
 protected:
   void onExecute(Context* context);

src/app/commands/cmd_grid.cpp

@@ -48,7 +48,7 @@ public:
   {
   }
 
-  Command* clone() const OVERRIDE { return new ShowGridCommand(*this); }
+  Command* clone() const override { return new ShowGridCommand(*this); }
 
 protected:
   bool onChecked(Context* context)
@@ -75,7 +75,7 @@ public:
   {
   }
 
-  Command* clone() const OVERRIDE { return new SnapToGridCommand(*this); }
+  Command* clone() const override { return new SnapToGridCommand(*this); }
 
 protected:
   bool onChecked(Context* context)
@@ -102,7 +102,7 @@ protected:
 class GridSettingsCommand : public Command {
 public:
   GridSettingsCommand();
-  Command* clone() const OVERRIDE { return new GridSettingsCommand(*this); }
+  Command* clone() const override { return new GridSettingsCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_import_sprite_sheet.cpp

@@ -273,7 +273,7 @@ protected:
     }
   }
 
-  bool onProcessMessage(ui::Message* msg) OVERRIDE
+  bool onProcessMessage(ui::Message* msg) override
   {
     switch (msg->type()) {
       case kCloseMessage:
@@ -283,7 +283,7 @@ protected:
     return Window::onProcessMessage(msg);
   }
 
-  virtual void onBroadcastMouseMessage(WidgetsList& targets) OVERRIDE
+  virtual void onBroadcastMouseMessage(WidgetsList& targets) override
   {
     Window::onBroadcastMouseMessage(targets);
 
@@ -293,7 +293,7 @@ protected:
   }
 
   // SelectBoxDelegate impleentation
-  virtual void onChangeRectangle(const gfx::Rect& rect) OVERRIDE
+  virtual void onChangeRectangle(const gfx::Rect& rect) override
   {
     m_rect = rect;
 
@@ -362,10 +362,10 @@ private:
 class ImportSpriteSheetCommand : public Command {
 public:
   ImportSpriteSheetCommand();
-  Command* clone() const OVERRIDE { return new ImportSpriteSheetCommand(*this); }
+  Command* clone() const override { return new ImportSpriteSheetCommand(*this); }
 
 protected:
-  virtual void onExecute(Context* context) OVERRIDE;
+  virtual void onExecute(Context* context) override;
 };
 
 ImportSpriteSheetCommand::ImportSpriteSheetCommand()

src/app/commands/cmd_invert_mask.cpp

@@ -37,7 +37,7 @@ namespace app {
 class InvertMaskCommand : public Command {
 public:
   InvertMaskCommand();
-  Command* clone() const OVERRIDE { return new InvertMaskCommand(*this); }
+  Command* clone() const override { return new InvertMaskCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_launch.cpp

@@ -24,7 +24,6 @@
 #include "app/commands/params.h"
 #include "app/launcher.h"
 #include "app/resource_finder.h"
-#include "base/override.h"
 #include "base/fs.h"
 
 namespace app {
@@ -32,11 +31,11 @@ namespace app {
 class LaunchCommand : public Command {
 public:
   LaunchCommand();
-  Command* clone() const OVERRIDE { return new LaunchCommand(*this); }
+  Command* clone() const override { return new LaunchCommand(*this); }
 
 protected:
-  void onLoadParams(Params* params) OVERRIDE;
-  void onExecute(Context* context) OVERRIDE;
+  void onLoadParams(Params* params) override;
+  void onExecute(Context* context) override;
 
 private:
   enum Type { Url, FileInDocs };

src/app/commands/cmd_layer_from_background.cpp

@@ -34,7 +34,7 @@ namespace app {
 class LayerFromBackgroundCommand : public Command {
 public:
   LayerFromBackgroundCommand();
-  Command* clone() const OVERRIDE { return new LayerFromBackgroundCommand(*this); }
+  Command* clone() const override { return new LayerFromBackgroundCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_layer_properties.cpp

@@ -39,7 +39,7 @@ using namespace ui;
 class LayerPropertiesCommand : public Command {
 public:
   LayerPropertiesCommand();
-  Command* clone() const OVERRIDE { return new LayerPropertiesCommand(*this); }
+  Command* clone() const override { return new LayerPropertiesCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_load_mask.cpp

@@ -39,7 +39,7 @@ class LoadMaskCommand : public Command {
 
 public:
   LoadMaskCommand();
-  Command* clone() const OVERRIDE { return new LoadMaskCommand(*this); }
+  Command* clone() const override { return new LoadMaskCommand(*this); }
 
 protected:
   void onLoadParams(Params* params);

src/app/commands/cmd_load_palette.cpp

@@ -25,7 +25,6 @@
 #include "app/commands/commands.h"
 #include "app/context.h"
 #include "app/file_selector.h"
-#include "base/override.h"
 #include "base/unique_ptr.h"
 #include "raster/palette.h"
 #include "ui/alert.h"
@@ -37,10 +36,10 @@ using namespace ui;
 class LoadPaletteCommand : public Command {
 public:
   LoadPaletteCommand();
-  Command* clone() const OVERRIDE { return new LoadPaletteCommand(*this); }
+  Command* clone() const override { return new LoadPaletteCommand(*this); }
 
 protected:
-  void onExecute(Context* context) OVERRIDE;
+  void onExecute(Context* context) override;
 };
 
 LoadPaletteCommand::LoadPaletteCommand()

src/app/commands/cmd_mask_all.cpp

@@ -33,7 +33,7 @@ namespace app {
 class MaskAllCommand : public Command {
 public:
   MaskAllCommand();
-  Command* clone() const OVERRIDE { return new MaskAllCommand(*this); }
+  Command* clone() const override { return new MaskAllCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_mask_by_color.cpp

@@ -54,7 +54,7 @@ using namespace ui;
 class MaskByColorCommand : public Command {
 public:
   MaskByColorCommand();
-  Command* clone() const OVERRIDE { return new MaskByColorCommand(*this); }
+  Command* clone() const override { return new MaskByColorCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_merge_down_layer.cpp

@@ -46,7 +46,7 @@ namespace app {
 class MergeDownLayerCommand : public Command {
 public:
   MergeDownLayerCommand();
-  Command* clone() const OVERRIDE { return new MergeDownLayerCommand(*this); }
+  Command* clone() const override { return new MergeDownLayerCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_move_cel.cpp

@@ -32,7 +32,7 @@ namespace app {
 class MoveCelCommand : public Command {
 public:
   MoveCelCommand();
-  Command* clone() const OVERRIDE { return new MoveCelCommand(*this); }
+  Command* clone() const override { return new MoveCelCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_move_mask.h

@@ -21,7 +21,6 @@
 #pragma once
 
 #include "app/commands/command.h"
-#include "base/override.h"
 
 namespace app {
 
@@ -41,7 +40,7 @@ namespace app {
     };
 
     MoveMaskCommand();
-    Command* clone() const OVERRIDE { return new MoveMaskCommand(*this); }
+    Command* clone() const override { return new MoveMaskCommand(*this); }
 
     Target getTarget() const { return m_target; }
 

src/app/commands/cmd_new_file.cpp

@@ -57,7 +57,7 @@ namespace app {
 class NewFileCommand : public Command {
 public:
   NewFileCommand();
-  Command* clone() const OVERRIDE { return new NewFileCommand(*this); }
+  Command* clone() const override { return new NewFileCommand(*this); }
 
 protected:
   void onExecute(Context* context);

src/app/commands/cmd_new_frame.cpp

@@ -43,7 +43,7 @@ namespace app {
 class NewFrameCommand : public Command {
 public:
   NewFrameCommand();
-  Command* clone() const OVERRIDE { return new NewFrameCommand(*this); }
+  Command* clone() const override { return new NewFrameCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_new_layer.cpp

@@ -44,7 +44,7 @@ using namespace ui;
 class NewLayerCommand : public Command {
 public:
   NewLayerCommand();
-  Command* clone() const OVERRIDE { return new NewLayerCommand(*this); }
+  Command* clone() const override { return new NewLayerCommand(*this); }
 
 protected:
   void onLoadParams(Params* params);

src/app/commands/cmd_new_layer_set.cpp

@@ -41,7 +41,7 @@ using namespace ui;
 class NewLayerSetCommand : public Command {
 public:
   NewLayerSetCommand();
-  Command* clone() const OVERRIDE { return new NewLayerSetCommand(*this); }
+  Command* clone() const override { return new NewLayerSetCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_onionskin.cpp

@@ -25,7 +25,6 @@
 #include "app/context.h"
 #include "app/settings/document_settings.h"
 #include "app/settings/settings.h"
-#include "base/override.h"
 
 namespace app {
 
@@ -41,7 +40,7 @@ public:
   {
   }
 
-  Command* clone() const OVERRIDE { return new ShowOnionSkinCommand(*this); }
+  Command* clone() const override { return new ShowOnionSkinCommand(*this); }
 
 protected:
   bool onChecked(Context* context)

src/app/commands/cmd_open_file.cpp

@@ -48,11 +48,11 @@ namespace app {
 class OpenFileCommand : public Command {
 public:
   OpenFileCommand();
-  Command* clone() const OVERRIDE { return new OpenFileCommand(*this); }
+  Command* clone() const override { return new OpenFileCommand(*this); }
 
 protected:
-  void onLoadParams(Params* params) OVERRIDE;
-  void onExecute(Context* context) OVERRIDE;
+  void onLoadParams(Params* params) override;
+  void onExecute(Context* context) override;
 
 private:
   std::string m_filename;
@@ -78,7 +78,7 @@ public:
 
 private:
   // Thread to do the hard work: load the file from the disk.
-  virtual void onJob() OVERRIDE {
+  virtual void onJob() override {
     try {
       fop_operate(m_fop, this);
     }
@@ -94,7 +94,7 @@ private:
     fop_done(m_fop);
   }
 
-  virtual void ackFileOpProgress(double progress) OVERRIDE {
+  virtual void ackFileOpProgress(double progress) override {
     jobProgress(progress);
   }
 

src/app/commands/cmd_open_in_folder.cpp

@@ -25,18 +25,17 @@
 #include "app/context_access.h"
 #include "app/document.h"
 #include "app/launcher.h"
-#include "base/override.h"
 
 namespace app {
 
 class OpenInFolderCommand : public Command {
 public:
   OpenInFolderCommand();
-  Command* clone() const OVERRIDE { return new OpenInFolderCommand(*this); }
+  Command* clone() const override { return new OpenInFolderCommand(*this); }
 
 protected:
-  bool onEnabled(Context* context) OVERRIDE;
-  void onExecute(Context* context) OVERRIDE;
+  bool onEnabled(Context* context) override;
+  void onExecute(Context* context) override;
 };
 
 OpenInFolderCommand::OpenInFolderCommand()

src/app/commands/cmd_open_with_app.cpp

@@ -25,18 +25,17 @@
 #include "app/context_access.h"
 #include "app/document.h"
 #include "app/launcher.h"
-#include "base/override.h"
 
 namespace app {
 
 class OpenWithAppCommand : public Command {
 public:
   OpenWithAppCommand();
-  Command* clone() const OVERRIDE { return new OpenWithAppCommand(*this); }
+  Command* clone() const override { return new OpenWithAppCommand(*this); }
 
 protected:
-  bool onEnabled(Context* context) OVERRIDE;
-  void onExecute(Context* context) OVERRIDE;
+  bool onEnabled(Context* context) override;
+  void onExecute(Context* context) override;
 };
 
 OpenWithAppCommand::OpenWithAppCommand()

src/app/commands/cmd_options.cpp

@@ -197,7 +197,7 @@ private:
 class OptionsCommand : public Command {
 public:
   OptionsCommand();
-  Command* clone() const OVERRIDE { return new OptionsCommand(*this); }
+  Command* clone() const override { return new OptionsCommand(*this); }
 
 protected:
   void onExecute(Context* context);

src/app/commands/cmd_palette_editor.cpp

@@ -47,7 +47,6 @@
 #include "app/undo_transaction.h"
 #include "app/undoers/set_palette_colors.h"
 #include "base/bind.h"
-#include "base/override.h"
 #include "base/fs.h"
 #include "base/path.h"
 #include "gfx/hsv.h"
@@ -77,7 +76,7 @@ public:
   void setColor(const app::Color& color);
 
 protected:
-  bool onProcessMessage(Message* msg) OVERRIDE;
+  bool onProcessMessage(Message* msg) override;
 
   void onExit();
   void onCloseWindow();
@@ -145,11 +144,11 @@ static PaletteEntryEditor* g_window = NULL;
 class PaletteEditorCommand : public Command {
 public:
   PaletteEditorCommand();
-  Command* clone() const OVERRIDE { return new PaletteEditorCommand(*this); }
+  Command* clone() const override { return new PaletteEditorCommand(*this); }
 
 protected:
-  void onLoadParams(Params* params) OVERRIDE;
-  void onExecute(Context* context) OVERRIDE;
+  void onLoadParams(Params* params) override;
+  void onExecute(Context* context) override;
 
 private:
   bool m_open;

src/app/commands/cmd_paste.cpp

@@ -23,7 +23,6 @@
 #include "app/commands/command.h"
 #include "app/context.h"
 #include "app/util/clipboard.h"
-#include "base/override.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 
@@ -32,7 +31,7 @@ namespace app {
 class PasteCommand : public Command {
 public:
   PasteCommand();
-  Command* clone() const OVERRIDE { return new PasteCommand(*this); }
+  Command* clone() const override { return new PasteCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_play_animation.cpp

@@ -97,7 +97,7 @@ protected:
     }
   }
 
-  virtual bool onProcessMessage(Message* msg) OVERRIDE {
+  virtual bool onProcessMessage(Message* msg) override {
     switch (msg->type()) {
 
       case kOpenMessage:
@@ -134,7 +134,7 @@ protected:
     return Window::onProcessMessage(msg);
   }
 
-  virtual void onPaint(PaintEvent& ev) OVERRIDE {
+  virtual void onPaint(PaintEvent& ev) override {
     Graphics* g = ev.getGraphics();
     g->fillRect(gfx::rgba(0, 0, 0), getClientBounds());
 
@@ -165,7 +165,7 @@ private:
 class PlayAnimationCommand : public Command {
 public:
   PlayAnimationCommand();
-  Command* clone() const OVERRIDE { return new PlayAnimationCommand(*this); }
+  Command* clone() const override { return new PlayAnimationCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_preview.cpp

@@ -94,7 +94,7 @@ public:
   }
 
 protected:
-  virtual bool onProcessMessage(Message* msg) OVERRIDE {
+  virtual bool onProcessMessage(Message* msg) override {
     switch (msg->type()) {
 
       case kCloseMessage:
@@ -185,7 +185,7 @@ protected:
     return Window::onProcessMessage(msg);
   }
 
-  virtual void onPaint(PaintEvent& ev) OVERRIDE {
+  virtual void onPaint(PaintEvent& ev) override {
     Graphics* g = ev.getGraphics();
 
     // Render sprite and leave the result in 'render' variable
@@ -260,7 +260,7 @@ private:
 class PreviewCommand : public Command {
 public:
   PreviewCommand();
-  Command* clone() const OVERRIDE { return new PreviewCommand(*this); }
+  Command* clone() const override { return new PreviewCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_refresh.cpp

@@ -40,7 +40,7 @@ namespace app {
 class RefreshCommand : public Command {
 public:
   RefreshCommand();
-  Command* clone() const OVERRIDE { return new RefreshCommand(*this); }
+  Command* clone() const override { return new RefreshCommand(*this); }
 
 protected:
   void onExecute(Context* context);

src/app/commands/cmd_remove_cel.cpp

@@ -37,7 +37,7 @@ namespace app {
 class RemoveCelCommand : public Command {
 public:
   RemoveCelCommand();
-  Command* clone() const OVERRIDE { return new RemoveCelCommand(*this); }
+  Command* clone() const override { return new RemoveCelCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_remove_frame.cpp

@@ -36,7 +36,7 @@ namespace app {
 class RemoveFrameCommand : public Command {
 public:
   RemoveFrameCommand();
-  Command* clone() const OVERRIDE { return new RemoveFrameCommand(*this); }
+  Command* clone() const override { return new RemoveFrameCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_remove_layer.cpp

@@ -39,7 +39,7 @@ namespace app {
 class RemoveLayerCommand : public Command {
 public:
   RemoveLayerCommand();
-  Command* clone() const OVERRIDE { return new RemoveLayerCommand(*this); }
+  Command* clone() const override { return new RemoveLayerCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_repeat_last_export.cpp

@@ -26,18 +26,17 @@
 #include "app/commands/params.h"
 #include "app/context.h"
 #include "app/context_access.h"
-#include "base/override.h"
 
 namespace app {
 
 class RepeatLastExportCommand : public Command {
 public:
   RepeatLastExportCommand();
-  Command* clone() const OVERRIDE { return new RepeatLastExportCommand(*this); }
+  Command* clone() const override { return new RepeatLastExportCommand(*this); }
 
 protected:
-  virtual bool onEnabled(Context* context) OVERRIDE;
-  virtual void onExecute(Context* context) OVERRIDE;
+  virtual bool onEnabled(Context* context) override;
+  virtual void onExecute(Context* context) override;
 };
 
 RepeatLastExportCommand::RepeatLastExportCommand()

src/app/commands/cmd_reselect_mask.cpp

@@ -33,7 +33,7 @@ namespace app {
 class ReselectMaskCommand : public Command {
 public:
   ReselectMaskCommand();
-  Command* clone() const OVERRIDE { return new ReselectMaskCommand(*this); }
+  Command* clone() const override { return new ReselectMaskCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_rotate_canvas.cpp

@@ -45,7 +45,7 @@ class RotateCanvasCommand : public Command {
 
 public:
   RotateCanvasCommand();
-  Command* clone() const OVERRIDE { return new RotateCanvasCommand(*this); }
+  Command* clone() const override { return new RotateCanvasCommand(*this); }
 
 protected:
   void onLoadParams(Params* params);

src/app/commands/cmd_save_file.cpp

@@ -64,7 +64,7 @@ public:
 private:
 
   // Thread to do the hard work: save the file to the disk.
-  virtual void onJob() OVERRIDE {
+  virtual void onJob() override {
     try {
       fop_operate(m_fop, this);
     }
@@ -74,7 +74,7 @@ private:
     fop_done(m_fop);
   }
 
-  virtual void ackFileOpProgress(double progress) OVERRIDE {
+  virtual void ackFileOpProgress(double progress) override {
     jobProgress(progress);
   }
 
@@ -122,13 +122,13 @@ public:
   }
 
 protected:
-  void onLoadParams(Params* params) OVERRIDE {
+  void onLoadParams(Params* params) override {
     m_filename = params->get("filename");
   }
 
   // Returns true if there is a current sprite to save.
   // [main thread]
-  bool onEnabled(Context* context) OVERRIDE {
+  bool onEnabled(Context* context) override {
     return context->checkFlags(ContextFlags::ActiveDocumentIsWritable);
   }
 
@@ -224,7 +224,7 @@ protected:
 class SaveFileCommand : public SaveFileBaseCommand {
 public:
   SaveFileCommand();
-  Command* clone() const OVERRIDE { return new SaveFileCommand(*this); }
+  Command* clone() const override { return new SaveFileCommand(*this); }
 
 protected:
   void onExecute(Context* context);
@@ -265,7 +265,7 @@ void SaveFileCommand::onExecute(Context* context)
 class SaveFileAsCommand : public SaveFileBaseCommand {
 public:
   SaveFileAsCommand();
-  Command* clone() const OVERRIDE { return new SaveFileAsCommand(*this); }
+  Command* clone() const override { return new SaveFileAsCommand(*this); }
 
 protected:
   void onExecute(Context* context);
@@ -285,7 +285,7 @@ void SaveFileAsCommand::onExecute(Context* context)
 class SaveFileCopyAsCommand : public SaveFileBaseCommand {
 public:
   SaveFileCopyAsCommand();
-  Command* clone() const OVERRIDE { return new SaveFileCopyAsCommand(*this); }
+  Command* clone() const override { return new SaveFileCopyAsCommand(*this); }
 
 protected:
   void onExecute(Context* context);

src/app/commands/cmd_save_file.h

@@ -21,7 +21,6 @@
 #pragma once
 
 #include "app/commands/command.h"
-#include "base/override.h"
 
 #include <string>
 
@@ -37,8 +36,8 @@ namespace app {
     }
 
   protected:
-    void onLoadParams(Params* params) OVERRIDE;
-    bool onEnabled(Context* context) OVERRIDE;
+    void onLoadParams(Params* params) override;
+    bool onEnabled(Context* context) override;
 
     void saveAsDialog(const ContextReader& reader, const char* dlgTitle, bool markAsSaved);
 

src/app/commands/cmd_save_mask.cpp

@@ -35,7 +35,7 @@ namespace app {
 class SaveMaskCommand : public Command {
 public:
   SaveMaskCommand();
-  Command* clone() const OVERRIDE { return new SaveMaskCommand(*this); }
+  Command* clone() const override { return new SaveMaskCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_save_palette.cpp

@@ -23,7 +23,6 @@
 #include "app/commands/command.h"
 #include "app/file_selector.h"
 #include "app/modules/palettes.h"
-#include "base/override.h"
 #include "base/fs.h"
 #include "base/path.h"
 #include "raster/palette.h"
@@ -36,10 +35,10 @@ using namespace ui;
 class SavePaletteCommand : public Command {
 public:
   SavePaletteCommand();
-  Command* clone() const OVERRIDE { return new SavePaletteCommand(*this); }
+  Command* clone() const override { return new SavePaletteCommand(*this); }
 
 protected:
-  void onExecute(Context* context) OVERRIDE;
+  void onExecute(Context* context) override;
 };
 
 SavePaletteCommand::SavePaletteCommand()

src/app/commands/cmd_scroll.cpp

@@ -46,7 +46,7 @@ public:
   };
 
   ScrollCommand();
-  Command* clone() const OVERRIDE { return new ScrollCommand(*this); }
+  Command* clone() const override { return new ScrollCommand(*this); }
 
 protected:
   void onLoadParams(Params* params);

src/app/commands/cmd_set_palette.cpp

@@ -27,7 +27,6 @@
 #include "app/ini_file.h"
 #include "app/modules/palettes.h"
 #include "app/undo_transaction.h"
-#include "base/override.h"
 #include "base/unique_ptr.h"
 #include "raster/palette.h"
 #include "ui/alert.h"

src/app/commands/cmd_set_palette.h

@@ -21,7 +21,6 @@
 #pragma once
 
 #include "app/commands/command.h"
-#include "base/override.h"
 
 namespace raster {
   class Palette;
@@ -32,12 +31,12 @@ namespace app {
   class SetPaletteCommand : public Command {
   public:
     SetPaletteCommand();
-    Command* clone() const OVERRIDE { return new SetPaletteCommand(*this); }
+    Command* clone() const override { return new SetPaletteCommand(*this); }
 
     void setPalette(raster::Palette* palette) { m_palette = palette; }
 
   protected:
-    virtual void onExecute(Context* context) OVERRIDE;
+    virtual void onExecute(Context* context) override;
 
   private:
     raster::Palette* m_palette;

src/app/commands/cmd_sprite_editor.cpp

@@ -31,7 +31,7 @@ namespace app {
 class MakeUniqueEditorCommand : public Command {
 public:
   MakeUniqueEditorCommand();
-  Command* clone() const OVERRIDE { return new MakeUniqueEditorCommand(*this); }
+  Command* clone() const override { return new MakeUniqueEditorCommand(*this); }
 
 protected:
   void onExecute(Context* context);
@@ -54,7 +54,7 @@ void MakeUniqueEditorCommand::onExecute(Context* context)
 class SplitEditorHorizontallyCommand : public Command {
 public:
   SplitEditorHorizontallyCommand();
-  Command* clone() const OVERRIDE { return new SplitEditorHorizontallyCommand(*this); }
+  Command* clone() const override { return new SplitEditorHorizontallyCommand(*this); }
 
 protected:
   void onExecute(Context* context);
@@ -77,7 +77,7 @@ void SplitEditorHorizontallyCommand::onExecute(Context* context)
 class SplitEditorVerticallyCommand : public Command {
 public:
   SplitEditorVerticallyCommand();
-  Command* clone() const OVERRIDE { return new SplitEditorVerticallyCommand(*this); }
+  Command* clone() const override { return new SplitEditorVerticallyCommand(*this); }
 
 protected:
   void onExecute(Context* context);

src/app/commands/cmd_sprite_properties.cpp

@@ -46,7 +46,7 @@ using namespace ui;
 class SpritePropertiesCommand : public Command {
 public:
   SpritePropertiesCommand();
-  Command* clone() const OVERRIDE { return new SpritePropertiesCommand(*this); }
+  Command* clone() const override { return new SpritePropertiesCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_sprite_size.cpp

@@ -162,7 +162,7 @@ protected:
 class SpriteSizeCommand : public Command {
 public:
   SpriteSizeCommand();
-  Command* clone() const OVERRIDE { return new SpriteSizeCommand(*this); }
+  Command* clone() const override { return new SpriteSizeCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_timeline.cpp

@@ -34,11 +34,11 @@ namespace app {
 class TimelineCommand : public Command {
 public:
   TimelineCommand();
-  Command* clone() const OVERRIDE { return new TimelineCommand(*this); }
+  Command* clone() const override { return new TimelineCommand(*this); }
 
 protected:
-  void onLoadParams(Params* params) OVERRIDE;
-  void onExecute(Context* context) OVERRIDE;
+  void onLoadParams(Params* params) override;
+  void onExecute(Context* context) override;
 
   bool m_open;
   bool m_close;

src/app/commands/cmd_undo.cpp

@@ -42,7 +42,7 @@ public:
   enum Type { Undo, Redo };
 
   UndoCommand(Type type);
-  Command* clone() const OVERRIDE { return new UndoCommand(*this); }
+  Command* clone() const override { return new UndoCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/cmd_zoom.cpp

@@ -32,7 +32,7 @@ public:
   enum Action { In, Out, Set };
 
   ZoomCommand();
-  Command* clone() const OVERRIDE { return new ZoomCommand(*this); }
+  Command* clone() const override { return new ZoomCommand(*this); }
 
 protected:
   void onLoadParams(Params* params);

src/app/commands/filters/cmd_color_curve.cpp

@@ -89,7 +89,7 @@ private:
 class ColorCurveCommand : public Command {
 public:
   ColorCurveCommand();
-  Command* clone() const OVERRIDE { return new ColorCurveCommand(*this); }
+  Command* clone() const override { return new ColorCurveCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/filters/cmd_convolution_matrix.cpp

@@ -156,7 +156,7 @@ private:
 class ConvolutionMatrixCommand : public Command {
 public:
   ConvolutionMatrixCommand();
-  Command* clone() const OVERRIDE { return new ConvolutionMatrixCommand(*this); }
+  Command* clone() const override { return new ConvolutionMatrixCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/filters/cmd_despeckle.cpp

@@ -94,7 +94,7 @@ class DespeckleCommand : public Command
 {
 public:
   DespeckleCommand();
-  Command* clone() const OVERRIDE { return new DespeckleCommand(*this); }
+  Command* clone() const override { return new DespeckleCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/filters/cmd_invert_color.cpp

@@ -60,7 +60,7 @@ private:
 class InvertColorCommand : public Command {
 public:
   InvertColorCommand();
-  Command* clone() const OVERRIDE { return new InvertColorCommand(*this); }
+  Command* clone() const override { return new InvertColorCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/filters/cmd_replace_color.cpp

@@ -123,7 +123,7 @@ private:
 class ReplaceColorCommand : public Command {
 public:
   ReplaceColorCommand();
-  Command* clone() const OVERRIDE { return new ReplaceColorCommand(*this); }
+  Command* clone() const override { return new ReplaceColorCommand(*this); }
 
 protected:
   bool onEnabled(Context* context);

src/app/commands/filters/color_curve_editor.h

@@ -20,7 +20,6 @@
 #define APP_COMMANDS_FILTERS_COLOR_CURVE_EDITOR_H_INCLUDED
 #pragma once
 
-#include "base/override.h"
 #include "base/signal.h"
 #include "gfx/point.h"
 #include "ui/widget.h"
@@ -41,8 +40,8 @@ namespace app {
     Signal0<void> CurveEditorChange;
 
   protected:
-    bool onProcessMessage(ui::Message* msg) OVERRIDE;
-    void onPreferredSize(ui::PreferredSizeEvent& ev) OVERRIDE;
+    bool onProcessMessage(ui::Message* msg) override;
+    void onPreferredSize(ui::PreferredSizeEvent& ev) override;
 
   private:
     gfx::Point* getClosestPoint(int x, int y, int** edit_x, int** edit_y);

src/app/commands/filters/filter_preview.h

@@ -20,7 +20,6 @@
 #define APP_COMMANDS_FILTERS_FILTER_PREVIEW_H_INCLUDED
 #pragma once
 
-#include "base/override.h"
 #include "ui/timer.h"
 #include "ui/widget.h"
 
@@ -39,7 +38,7 @@ namespace app {
     FilterManagerImpl* getFilterManager() const;
 
   protected:
-    bool onProcessMessage(ui::Message* msg) OVERRIDE;
+    bool onProcessMessage(ui::Message* msg) override;
 
   private:
     FilterManagerImpl* m_filterMgr;

src/app/context.h

@@ -69,7 +69,7 @@ namespace app {
     Signal1<void, Command*> AfterCommandExecution;
 
   protected:
-    virtual void onCreateDocument(doc::CreateDocumentArgs* args) OVERRIDE;
+    virtual void onCreateDocument(doc::CreateDocumentArgs* args) override;
     virtual void onGetActiveLocation(DocumentLocation* location) const;
 
   private:

src/app/data_recovery.h

@@ -20,7 +20,6 @@
 #define APP_DATA_RECOVERY_H_INCLUDED
 #pragma once
 
-#include "base/override.h"
 #include "base/disable_copying.h"
 #include "base/slot.h"
 #include "doc/context_observer.h"
@@ -51,8 +50,8 @@ namespace app {
     Backup* getBackup() { return m_backup; }
 
   private:
-    virtual void onAddDocument(doc::Document* document) OVERRIDE;
-    virtual void onRemoveDocument(doc::Document* document) OVERRIDE;
+    virtual void onAddDocument(doc::Document* document) override;
+    virtual void onRemoveDocument(doc::Document* document) override;
 
     base::TempDir* m_tempDir;
     Backup* m_backup;

src/app/document.h

@@ -20,7 +20,6 @@
 #define APP_DOCUMENT_H_INCLUDED
 #pragma once
 
-#include "base/override.h"
 #include "base/disable_copying.h"
 #include "base/observable.h"
 #include "base/shared_ptr.h"
@@ -183,7 +182,7 @@ namespace app {
     void unlock();
 
   protected:
-    virtual void onContextChanged() OVERRIDE;
+    virtual void onContextChanged() override;
 
   private:
     // Undo and redo information about the document.

src/app/document_exporter.cpp

@@ -26,7 +26,6 @@
 #include "app/document_api.h"
 #include "app/file/file.h"
 #include "app/ui_context.h"
-#include "base/override.h"
 #include "base/path.h"
 #include "base/unique_ptr.h"
 #include "gfx/size.h"
@@ -113,7 +112,7 @@ public:
 class DocumentExporter::SimpleLayoutSamples :
     public DocumentExporter::LayoutSamples {
 public:
-  void layoutSamples(Samples& samples) OVERRIDE {
+  void layoutSamples(Samples& samples) override {
     const Sprite* oldSprite = NULL;
 
     gfx::Point framePt(0, 0);

src/app/document_undo.h

@@ -20,7 +20,6 @@
 #define APP_DOCUMENT_UNDO_H_INCLUDED
 #pragma once
 
-#include "base/override.h"
 #include "base/disable_copying.h"
 #include "base/unique_ptr.h"
 #include "raster/sprite_position.h"
@@ -64,8 +63,8 @@ namespace app {
     void impossibleToBackToSavedState();
 
     // UndoHistoryDelegate implementation.
-    undo::ObjectsContainer* getObjects() const OVERRIDE { return m_objects; }
-    size_t getUndoSizeLimit() const OVERRIDE;
+    undo::ObjectsContainer* getObjects() const override { return m_objects; }
+    size_t getUndoSizeLimit() const override;
 
     void pushUndoer(undo::Undoer* undoer);
 

src/app/file/ase_format.cpp

@@ -142,9 +142,9 @@ class AseFormat : public FileFormat {
       FILE_SUPPORT_PALETTES;
   }
 
-  bool onLoad(FileOp* fop) OVERRIDE;
+  bool onLoad(FileOp* fop) override;
 #ifdef ENABLE_SAVE
-  bool onSave(FileOp* fop) OVERRIDE;
+  bool onSave(FileOp* fop) override;
 #endif
 };
 

src/app/file/bmp_format.cpp

@@ -69,9 +69,9 @@ class BmpFormat : public FileFormat {
       FILE_SUPPORT_SEQUENCES;
   }
 
-  bool onLoad(FileOp* fop) OVERRIDE;
+  bool onLoad(FileOp* fop) override;
 #ifdef ENABLE_SAVE
-  bool onSave(FileOp* fop) OVERRIDE;
+  bool onSave(FileOp* fop) override;
 #endif
 };
 

src/app/file/fli_format.cpp

@@ -50,9 +50,9 @@ class FliFormat : public FileFormat {
       FILE_SUPPORT_PALETTES;
   }
 
-  bool onLoad(FileOp* fop) OVERRIDE;
+  bool onLoad(FileOp* fop) override;
 #ifdef ENABLE_SAVE
-  bool onSave(FileOp* fop) OVERRIDE;
+  bool onSave(FileOp* fop) override;
 #endif
 };
 

src/app/file/gif_format.cpp

@@ -97,12 +97,12 @@ class GifFormat : public FileFormat {
   }
 
   bool onLoad(FileOp* fop);
-  bool onPostLoad(FileOp* fop) OVERRIDE;
-  void onDestroyData(FileOp* fop) OVERRIDE;
+  bool onPostLoad(FileOp* fop) override;
+  void onDestroyData(FileOp* fop) override;
 #ifdef ENABLE_SAVE
-  bool onSave(FileOp* fop) OVERRIDE;
+  bool onSave(FileOp* fop) override;
 #endif
-  SharedPtr<FormatOptions> onGetFormatOptions(FileOp* fop) OVERRIDE;
+  SharedPtr<FormatOptions> onGetFormatOptions(FileOp* fop) override;
 };
 
 FileFormat* CreateGifFormat()

src/app/file/ico_format.cpp

@@ -48,9 +48,9 @@ class IcoFormat : public FileFormat {
       FILE_SUPPORT_INDEXED;
   }
 
-  bool onLoad(FileOp* fop) OVERRIDE;
+  bool onLoad(FileOp* fop) override;
 #ifdef ENABLE_SAVE
-  bool onSave(FileOp* fop) OVERRIDE;
+  bool onSave(FileOp* fop) override;
 #endif
 };
 

src/app/file/jpeg_format.cpp

@@ -30,7 +30,6 @@
 #include "app/find_widget.h"
 #include "app/ini_file.h"
 #include "app/load_widget.h"
-#include "base/override.h"
 #include "base/file_handle.h"
 #include "base/memory.h"
 #include "raster/raster.h"
@@ -65,12 +64,12 @@ class JpegFormat : public FileFormat {
       FILE_SUPPORT_GET_FORMAT_OPTIONS;
   }
 
-  bool onLoad(FileOp* fop) OVERRIDE;
+  bool onLoad(FileOp* fop) override;
 #ifdef ENABLE_SAVE
-  bool onSave(FileOp* fop) OVERRIDE;
+  bool onSave(FileOp* fop) override;
 #endif
 
-  SharedPtr<FormatOptions> onGetFormatOptions(FileOp* fop) OVERRIDE;
+  SharedPtr<FormatOptions> onGetFormatOptions(FileOp* fop) override;
 };
 
 FileFormat* CreateJpegFormat()

src/app/file/pcx_format.cpp

@@ -48,9 +48,9 @@ class PcxFormat : public FileFormat {
       FILE_SUPPORT_SEQUENCES;
   }
 
-  bool onLoad(FileOp* fop) OVERRIDE;
+  bool onLoad(FileOp* fop) override;
 #ifdef ENABLE_SAVE
-  bool onSave(FileOp* fop) OVERRIDE;
+  bool onSave(FileOp* fop) override;
 #endif
 };
 

src/app/file/png_format.cpp

@@ -53,9 +53,9 @@ class PngFormat : public FileFormat {
       FILE_SUPPORT_SEQUENCES;
   }
 
-  bool onLoad(FileOp* fop) OVERRIDE;
+  bool onLoad(FileOp* fop) override;
 #ifdef ENABLE_SAVE
-  bool onSave(FileOp* fop) OVERRIDE;
+  bool onSave(FileOp* fop) override;
 #endif
 };
 

src/app/file/tga_format.cpp

@@ -50,9 +50,9 @@ class TgaFormat : public FileFormat {
       FILE_SUPPORT_SEQUENCES;
   }
 
-  bool onLoad(FileOp* fop) OVERRIDE;
+  bool onLoad(FileOp* fop) override;
 #ifdef ENABLE_SAVE
-  bool onSave(FileOp* fop) OVERRIDE;
+  bool onSave(FileOp* fop) override;
 #endif
 };
 

src/app/modules/gui.cpp

@@ -128,12 +128,12 @@ class CustomizedGuiManager : public Manager
                            , public LayoutIO
 {
 protected:
-  bool onProcessMessage(Message* msg) OVERRIDE;
-  LayoutIO* onGetLayoutIO() OVERRIDE { return this; }
+  bool onProcessMessage(Message* msg) override;
+  LayoutIO* onGetLayoutIO() override { return this; }
 
   // LayoutIO implementation
-  std::string loadLayout(Widget* widget) OVERRIDE;
-  void saveLayout(Widget* widget, const std::string& str) OVERRIDE;
+  std::string loadLayout(Widget* widget) override;
+  void saveLayout(Widget* widget, const std::string& str) override;
 };
 
 static she::Display* main_display = NULL;

src/app/res/palette_resource.h

@@ -36,7 +36,7 @@ namespace app {
     }
     virtual ~PaletteResource() { }
     virtual raster::Palette* palette() { return m_palette; }
-    virtual const std::string& name() const OVERRIDE { return m_name; }
+    virtual const std::string& name() const override { return m_name; }
 
   private:
     raster::Palette* m_palette;

src/app/res/palettes_loader_delegate.h

@@ -21,15 +21,14 @@
 #pragma once
 
 #include "app/res/resources_loader_delegate.h"
-#include "base/override.h"
 
 namespace app {
 
   class PalettesLoaderDelegate : public ResourcesLoaderDelegate {
   public:
     // ResourcesLoaderDelegate impl
-    virtual std::string resourcesLocation() const OVERRIDE;
-    virtual Resource* loadResource(const std::string& filename) OVERRIDE;
+    virtual std::string resourcesLocation() const override;
+    virtual Resource* loadResource(const std::string& filename) override;
   };
 
 } // namespace app

src/app/settings/ui_settings_impl.cpp

@@ -98,60 +98,60 @@ public:
 
   // Tiled mode
 
-  virtual TiledMode getTiledMode() OVERRIDE;
-  virtual void setTiledMode(TiledMode mode) OVERRIDE;
+  virtual TiledMode getTiledMode() override;
+  virtual void setTiledMode(TiledMode mode) override;
 
   // Grid settings
 
-  virtual bool getSnapToGrid() OVERRIDE;
-  virtual bool getGridVisible() OVERRIDE;
-  virtual gfx::Rect getGridBounds() OVERRIDE;
-  virtual app::Color getGridColor() OVERRIDE;
+  virtual bool getSnapToGrid() override;
+  virtual bool getGridVisible() override;
+  virtual gfx::Rect getGridBounds() override;
+  virtual app::Color getGridColor() override;
 
-  virtual void setSnapToGrid(bool state) OVERRIDE;
-  virtual void setGridVisible(bool state) OVERRIDE;
-  virtual void setGridBounds(const gfx::Rect& rect) OVERRIDE;
-  virtual void setGridColor(const app::Color& color) OVERRIDE;
+  virtual void setSnapToGrid(bool state) override;
+  virtual void setGridVisible(bool state) override;
+  virtual void setGridBounds(const gfx::Rect& rect) override;
+  virtual void setGridColor(const app::Color& color) override;
 
-  virtual void snapToGrid(gfx::Point& point) const OVERRIDE;
+  virtual void snapToGrid(gfx::Point& point) const override;
 
   // Pixel grid
 
-  virtual bool getPixelGridVisible() OVERRIDE;
-  virtual app::Color getPixelGridColor() OVERRIDE;
+  virtual bool getPixelGridVisible() override;
+  virtual app::Color getPixelGridColor() override;
 
-  virtual void setPixelGridVisible(bool state) OVERRIDE;
-  virtual void setPixelGridColor(const app::Color& color) OVERRIDE;
+  virtual void setPixelGridVisible(bool state) override;
+  virtual void setPixelGridColor(const app::Color& color) override;
 
   // Onionskin settings
 
-  virtual bool getUseOnionskin() OVERRIDE;
-  virtual int getOnionskinPrevFrames() OVERRIDE;
-  virtual int getOnionskinNextFrames() OVERRIDE;
-  virtual int getOnionskinOpacityBase() OVERRIDE;
-  virtual int getOnionskinOpacityStep() OVERRIDE;
-  virtual OnionskinType getOnionskinType() OVERRIDE;
+  virtual bool getUseOnionskin() override;
+  virtual int getOnionskinPrevFrames() override;
+  virtual int getOnionskinNextFrames() override;
+  virtual int getOnionskinOpacityBase() override;
+  virtual int getOnionskinOpacityStep() override;
+  virtual OnionskinType getOnionskinType() override;
 
-  virtual void setUseOnionskin(bool state) OVERRIDE;
-  virtual void setOnionskinPrevFrames(int frames) OVERRIDE;
-  virtual void setOnionskinNextFrames(int frames) OVERRIDE;
-  virtual void setOnionskinOpacityBase(int base) OVERRIDE;
-  virtual void setOnionskinOpacityStep(int step) OVERRIDE;
-  virtual void setOnionskinType(OnionskinType type) OVERRIDE;
-  virtual void setDefaultOnionskinSettings() OVERRIDE;
+  virtual void setUseOnionskin(bool state) override;
+  virtual void setOnionskinPrevFrames(int frames) override;
+  virtual void setOnionskinNextFrames(int frames) override;
+  virtual void setOnionskinOpacityBase(int base) override;
+  virtual void setOnionskinOpacityStep(int step) override;
+  virtual void setOnionskinType(OnionskinType type) override;
+  virtual void setDefaultOnionskinSettings() override;
 
   // Animation
 
-  virtual bool getLoopAnimation() OVERRIDE;
-  virtual void getLoopRange(raster::FrameNumber* begin, raster::FrameNumber* end) OVERRIDE;
-  virtual AniDir getAnimationDirection() OVERRIDE;
+  virtual bool getLoopAnimation() override;
+  virtual void getLoopRange(raster::FrameNumber* begin, raster::FrameNumber* end) override;
+  virtual AniDir getAnimationDirection() override;
 
-  virtual void setLoopAnimation(bool state) OVERRIDE;
-  virtual void setLoopRange(raster::FrameNumber begin, raster::FrameNumber end) OVERRIDE;
-  virtual void setAnimationDirection(AniDir dir) OVERRIDE;
+  virtual void setLoopAnimation(bool state) override;
+  virtual void setLoopRange(raster::FrameNumber begin, raster::FrameNumber end) override;
+  virtual void setAnimationDirection(AniDir dir) override;
 
-  virtual void addObserver(DocumentSettingsObserver* observer) OVERRIDE;
-  virtual void removeObserver(DocumentSettingsObserver* observer) OVERRIDE;
+  virtual void addObserver(DocumentSettingsObserver* observer) override;
+  virtual void removeObserver(DocumentSettingsObserver* observer) override;
 
 private:
   void redrawDocumentViews() {
@@ -695,11 +695,11 @@ public:
     m_fireSignals = state;
   }
 
-  void addObserver(BrushSettingsObserver* observer) OVERRIDE{
+  void addObserver(BrushSettingsObserver* observer) override{
     base::Observable<BrushSettingsObserver>::addObserver(observer);
   }
 
-  void removeObserver(BrushSettingsObserver* observer) OVERRIDE{
+  void removeObserver(BrushSettingsObserver* observer) override{
     base::Observable<BrushSettingsObserver>::removeObserver(observer);
   }
 };
@@ -791,25 +791,25 @@ public:
 
   IBrushSettings* getBrush() { return &m_brush; }
 
-  int getOpacity() OVERRIDE { return m_opacity; }
-  int getTolerance() OVERRIDE { return m_tolerance; }
-  bool getContiguous() OVERRIDE { return m_contiguous; }
-  bool getFilled() OVERRIDE { return m_filled; }
-  bool getPreviewFilled() OVERRIDE { return m_previewFilled; }
-  int getSprayWidth() OVERRIDE { return m_spray_width; }
-  int getSpraySpeed() OVERRIDE { return m_spray_speed; }
-  InkType getInkType() OVERRIDE { return m_inkType; }
-  FreehandAlgorithm getFreehandAlgorithm() OVERRIDE { return m_freehandAlgorithm; }
+  int getOpacity() override { return m_opacity; }
+  int getTolerance() override { return m_tolerance; }
+  bool getContiguous() override { return m_contiguous; }
+  bool getFilled() override { return m_filled; }
+  bool getPreviewFilled() override { return m_previewFilled; }
+  int getSprayWidth() override { return m_spray_width; }
+  int getSpraySpeed() override { return m_spray_speed; }
+  InkType getInkType() override { return m_inkType; }
+  FreehandAlgorithm getFreehandAlgorithm() override { return m_freehandAlgorithm; }
 
-  void setOpacity(int opacity) OVERRIDE { m_opacity = opacity; }
-  void setTolerance(int tolerance) OVERRIDE { m_tolerance = tolerance; }
-  void setContiguous(bool state) OVERRIDE { m_contiguous = state; }
-  void setFilled(bool state) OVERRIDE { m_filled = state; }
-  void setPreviewFilled(bool state) OVERRIDE { m_previewFilled = state; }
-  void setSprayWidth(int width) OVERRIDE { m_spray_width = width; }
-  void setSpraySpeed(int speed) OVERRIDE { m_spray_speed = speed; }
-  void setInkType(InkType inkType) OVERRIDE { m_inkType = inkType; }
-  void setFreehandAlgorithm(FreehandAlgorithm algorithm) OVERRIDE {
+  void setOpacity(int opacity) override { m_opacity = opacity; }
+  void setTolerance(int tolerance) override { m_tolerance = tolerance; }
+  void setContiguous(bool state) override { m_contiguous = state; }
+  void setFilled(bool state) override { m_filled = state; }
+  void setPreviewFilled(bool state) override { m_previewFilled = state; }
+  void setSprayWidth(int width) override { m_spray_width = width; }
+  void setSpraySpeed(int speed) override { m_spray_speed = speed; }
+  void setInkType(InkType inkType) override { m_inkType = inkType; }
+  void setFreehandAlgorithm(FreehandAlgorithm algorithm) override {
     m_freehandAlgorithm = algorithm;
 
     tools::ToolBox* toolBox = App::instance()->getToolBox();
@@ -831,11 +831,11 @@ public:
     }
   }
 
-  void addObserver(ToolSettingsObserver* observer) OVERRIDE {
+  void addObserver(ToolSettingsObserver* observer) override {
     base::Observable<ToolSettingsObserver>::addObserver(observer);
   }
 
-  void removeObserver(ToolSettingsObserver* observer) OVERRIDE{
+  void removeObserver(ToolSettingsObserver* observer) override{
     base::Observable<ToolSettingsObserver>::removeObserver(observer);
   }
 

src/app/settings/ui_settings_impl.h

@@ -26,7 +26,6 @@
 
 #include "app/settings/settings.h"
 #include "app/settings/settings_observers.h"
-#include "base/override.h"
 #include "base/observable.h"
 #include "base/unique_ptr.h"
 
@@ -42,47 +41,47 @@ namespace app {
     ~UISettingsImpl();
 
     // Undo settings
-    size_t undoSizeLimit() const OVERRIDE;
-    bool undoGotoModified() const OVERRIDE;
-    void setUndoSizeLimit(size_t size) OVERRIDE;
-    void setUndoGotoModified(bool state) OVERRIDE;
+    size_t undoSizeLimit() const override;
+    bool undoGotoModified() const override;
+    void setUndoSizeLimit(size_t size) override;
+    void setUndoGotoModified(bool state) override;
 
     // ISettings implementation
-    bool getZoomWithScrollWheel() OVERRIDE;
-    bool getShowSpriteEditorScrollbars() OVERRIDE;
-    bool getGrabAlpha() OVERRIDE;
-    app::Color getFgColor() OVERRIDE;
-    app::Color getBgColor() OVERRIDE;
-    tools::Tool* getCurrentTool() OVERRIDE;
-    app::ColorSwatches* getColorSwatches() OVERRIDE;
+    bool getZoomWithScrollWheel() override;
+    bool getShowSpriteEditorScrollbars() override;
+    bool getGrabAlpha() override;
+    app::Color getFgColor() override;
+    app::Color getBgColor() override;
+    tools::Tool* getCurrentTool() override;
+    app::ColorSwatches* getColorSwatches() override;
 
-    void setZoomWithScrollWheel(bool state) OVERRIDE;
-    void setShowSpriteEditorScrollbars(bool state) OVERRIDE;
-    void setGrabAlpha(bool state) OVERRIDE;
-    void setFgColor(const app::Color& color) OVERRIDE;
-    void setBgColor(const app::Color& color) OVERRIDE;
-    void setCurrentTool(tools::Tool* tool) OVERRIDE;
-    void setColorSwatches(app::ColorSwatches* colorSwatches) OVERRIDE;
+    void setZoomWithScrollWheel(bool state) override;
+    void setShowSpriteEditorScrollbars(bool state) override;
+    void setGrabAlpha(bool state) override;
+    void setFgColor(const app::Color& color) override;
+    void setBgColor(const app::Color& color) override;
+    void setCurrentTool(tools::Tool* tool) override;
+    void setColorSwatches(app::ColorSwatches* colorSwatches) override;
 
-    IDocumentSettings* getDocumentSettings(const Document* document) OVERRIDE;
-    IToolSettings* getToolSettings(tools::Tool* tool) OVERRIDE;
-    IColorSwatchesStore* getColorSwatchesStore() OVERRIDE;
+    IDocumentSettings* getDocumentSettings(const Document* document) override;
+    IToolSettings* getToolSettings(tools::Tool* tool) override;
+    IColorSwatchesStore* getColorSwatchesStore() override;
 
-    ISelectionSettings* selection() OVERRIDE;
-    IExperimentalSettings* experimental() OVERRIDE;
+    ISelectionSettings* selection() override;
+    IExperimentalSettings* experimental() override;
 
     // IExperimentalSettings implementation
 
-    bool useNativeCursor() const OVERRIDE;
-    void setUseNativeCursor(bool state) OVERRIDE;
+    bool useNativeCursor() const override;
+    void setUseNativeCursor(bool state) override;
 
     // IColorSwatchesStore implementation
 
-    void addColorSwatches(app::ColorSwatches* colorSwatches) OVERRIDE;
-    void removeColorSwatches(app::ColorSwatches* colorSwatches) OVERRIDE;
+    void addColorSwatches(app::ColorSwatches* colorSwatches) override;
+    void removeColorSwatches(app::ColorSwatches* colorSwatches) override;
 
-    void addObserver(GlobalSettingsObserver* observer) OVERRIDE;
-    void removeObserver(GlobalSettingsObserver* observer) OVERRIDE;
+    void addObserver(GlobalSettingsObserver* observer) override;
+    void removeObserver(GlobalSettingsObserver* observer) override;
 
   private:
     tools::Tool* m_currentTool;

src/app/test_context.h

@@ -40,7 +40,7 @@ namespace app {
     }
 
   protected:
-    void onGetActiveLocation(DocumentLocation* location) const OVERRIDE {
+    void onGetActiveLocation(DocumentLocation* location) const override {
       Document* doc = activeDocument();
       if (!doc)
         return;

src/app/tools/intertwiners.h

@@ -240,11 +240,11 @@ class IntertwineAsPixelPerfect : public Intertwine {
   Points m_pts;
 
 public:
-  void prepareIntertwine() OVERRIDE {
+  void prepareIntertwine() override {
     m_pts.clear();
   }
 
-  void joinPoints(ToolLoop* loop, const Points& points) OVERRIDE {
+  void joinPoints(ToolLoop* loop, const Points& points) override {
     if (points.size() == 0)
       return;
     else if (m_pts.empty() && points.size() == 1) {