Merge changes to use the C++11 override keyword.

This keyword replaces the 'virtual' keyword in derived classes that
are overriding the base class function.  It has the additional benefit
of ensuring that the type signatures are an exact match.

mythplugins/mytharchive/mytharchive/editmetadata.h

@@ -25,8 +25,8 @@ class EditMetadataDialog : public MythScreenType
     EditMetadataDialog(MythScreenStack *parent, ArchiveItem *source_metadata);
     ~EditMetadataDialog();
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *e);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *e) override; // MythScreenType
 
   signals:
     void haveResult(bool ok, ArchiveItem *item);

mythplugins/mytharchive/mytharchive/exportnative.h

@@ -37,8 +37,8 @@ class ExportNative : public MythScreenType
 
     ~ExportNative(void);
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *) override; // MythScreenType
 
     void createConfigFile(const QString &filename);
 

mythplugins/mytharchive/mytharchive/fileselector.h

@@ -44,8 +44,8 @@ class FileSelector : public MythScreenType
                  FSTYPE type, const QString &startDir, const QString &filemask);
     ~FileSelector();
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *e);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *e) override; // MythScreenType
 
     QString getSelected(void);
 

mythplugins/mytharchive/mytharchive/importnative.h

@@ -51,7 +51,7 @@ class ArchiveFileSelector : public FileSelector
     explicit ArchiveFileSelector(MythScreenStack *parent);
     ~ArchiveFileSelector(void);
 
-    bool Create(void);
+    bool Create(void) override; // FileSelector
 
   private slots:
     void nextPressed(void);
@@ -79,8 +79,8 @@ class ImportNative : public MythScreenType
                    const QString &xmlFile, FileDetails details);
       ~ImportNative();
 
-      bool Create(void);
-      bool keyPressEvent(QKeyEvent *e);
+      bool Create(void) override; // MythScreenType
+      bool keyPressEvent(QKeyEvent *e) override; // MythScreenType
 
   private slots:
     void finishedPressed();

mythplugins/mytharchive/mytharchive/logviewer.h

@@ -22,8 +22,8 @@ class LogViewer : public MythScreenType
     explicit LogViewer(MythScreenStack *parent);
    ~LogViewer(void);
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *e);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *e) override; // MythScreenType
 
     void setFilenames(const QString &progressLog, const QString &fullLog);
 
@@ -39,7 +39,7 @@ class LogViewer : public MythScreenType
     void updateLogItem(MythUIButtonListItem *item);
 
   private:
-    void Init(void);
+    void Init(void) override; // MythScreenType
     QString getSetting(const QString &key);
 
     bool                m_autoUpdate;

mythplugins/mytharchive/mytharchive/mythburn.h

@@ -22,7 +22,7 @@ class ProfileDialog : public MythScreenType
     ProfileDialog(MythScreenStack *parent, ArchiveItem *archiveItem,
                   QList<EncoderProfile *> profileList);
 
-    bool Create();
+    bool Create() override; // MythScreenType
 
   signals:
     void haveResult(int profile);
@@ -57,8 +57,8 @@ class MythBurn : public MythScreenType
 
     ~MythBurn(void);
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *) override; // MythScreenType
 
     void createConfigFile(const QString &filename);
 
@@ -140,7 +140,7 @@ class BurnMenu : public QObject
     void start(void);
 
   private:
-    void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override; // QObject
     void doBurn(int mode);
 };
 

mythplugins/mytharchive/mytharchive/recordingselector.cpp

@@ -39,7 +39,7 @@ class GetRecordingListThread : public MThread
         start();
     }
 
-    virtual void run(void)
+    void run(void) override // MThread
     {
         RunProlog();
         m_parent->getRecordingList();

mythplugins/mytharchive/mytharchive/recordingselector.h

@@ -36,8 +36,8 @@ class RecordingSelector : public MythScreenType
 
     ~RecordingSelector(void);
 
-    bool Create();
-    bool keyPressEvent(QKeyEvent *e);
+    bool Create() override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *e) override; // MythScreenType
 
   signals:
     void haveResult(bool ok);
@@ -55,7 +55,7 @@ class RecordingSelector : public MythScreenType
     void toggleSelected(MythUIButtonListItem *item);
 
   private:
-    void Init(void);
+    void Init(void) override; // MythScreenType
     void updateRecordingList(void);
     void updateSelectedList(void);
     void updateCategorySelector(void);

mythplugins/mytharchive/mytharchive/selectdestination.h

@@ -26,8 +26,8 @@ class SelectDestination : public MythScreenType
     SelectDestination(MythScreenStack *parent, bool nativeMode, QString name);
     ~SelectDestination(void);
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *) override; // MythScreenType
 
   public slots:
 

mythplugins/mytharchive/mytharchive/themeselector.h

@@ -26,8 +26,8 @@ class DVDThemeSelector : public MythScreenType
                      ArchiveDestination archiveDestination, QString name);
     ~DVDThemeSelector(void);
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *) override; // MythScreenType
 
   protected slots:
     void handleNextPage(void);

mythplugins/mytharchive/mytharchive/thumbfinder.h

@@ -46,8 +46,8 @@ class ThumbFinder : public MythScreenType
                   const QString &menuTheme);
     ~ThumbFinder();
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *) override; // MythScreenType
 
 
   private slots:
@@ -58,7 +58,7 @@ class ThumbFinder : public MythScreenType
     void updateThumb(void);
 
   private:
-    void Init(void);
+    void Init(void) override; // MythScreenType
     bool getThumbImages(void);
     int  getChapterCount(const QString &menuTheme);
     void changeSeekAmount(bool up);

mythplugins/mytharchive/mytharchive/videoselector.h

@@ -44,8 +44,8 @@ class VideoSelector : public MythScreenType
 
     ~VideoSelector(void);
 
-    bool Create();
-    bool keyPressEvent(QKeyEvent *e);
+    bool Create() override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *e) override; // MythScreenType
 
   signals:
     void haveResult(bool ok);

mythplugins/mytharchive/mytharchivehelper/main.cpp

@@ -2245,7 +2245,7 @@ class MPUBLIC MythArchiveHelperCommandLineParser : public MythCommandLineParser
 {
   public:
     MythArchiveHelperCommandLineParser();
-    void LoadArguments(void);
+    void LoadArguments(void) override; // MythCommandLineParser
 };
 
 MythArchiveHelperCommandLineParser::MythArchiveHelperCommandLineParser() :

mythplugins/mythbrowser/mythbrowser/bookmarkeditor.h

@@ -25,8 +25,8 @@ class BookmarkEditor : public MythScreenType
                    const char *name);
     ~BookmarkEditor() = default;
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *event);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *event) override; // MythScreenType
 
   private:
     Bookmark   *m_site;

mythplugins/mythbrowser/mythbrowser/bookmarkmanager.h

@@ -37,8 +37,8 @@ class BrowserConfig : public MythScreenType
     BrowserConfig(MythScreenStack *parent, const char *name = nullptr);
     ~BrowserConfig() = default;
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *) override; // MythScreenType
 
   private:
     MythUITextEdit   *m_commandEdit;
@@ -64,8 +64,8 @@ class BookmarkManager : public MythScreenType
     BookmarkManager(MythScreenStack *parent, const char *name);
     ~BookmarkManager();
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *) override; // MythScreenType
 
   private slots:
     void slotGroupSelected(MythUIButtonListItem *item);

mythplugins/mythbrowser/mythbrowser/mythbrowser.h

@@ -22,8 +22,8 @@ class MythBrowser : public MythScreenType
     MythBrowser(MythScreenStack *parent, QStringList &urlList);
     ~MythBrowser();
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *) override; // MythScreenType
 
     void setDefaultSaveDirectory(const QString &saveDir) { m_defaultSaveDir = saveDir; }
     void setDefaultSaveFilename(const QString &saveFile) { m_defaultSaveFilename = saveFile; }

mythplugins/mythbrowser/mythbrowser/mythflashplayer.h

@@ -13,8 +13,8 @@ class MythFlashPlayer : public MythScreenType
     MythFlashPlayer(MythScreenStack *parent, QStringList &urlList);
     ~MythFlashPlayer();
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *) override; // MythScreenType
 
   private:
     QVariant evaluateJavaScript(const QString&);

mythplugins/mythgallery/dcrawplugin/dcrawhandler.h

@@ -5,8 +5,8 @@
 class DcrawHandler : public QImageIOHandler
 {
   public:
-    bool canRead() const;
-    bool read(QImage *image);
+    bool canRead() const override; // QImageIOHandler
+    bool read(QImage *image) override; // QImageIOHandler
     static int loadThumbnail(QImage *image, QString fileName);
 };
 

mythplugins/mythgallery/dcrawplugin/dcrawplugin.h

@@ -14,6 +14,8 @@ class DcrawPlugin : public QImageIOPlugin
 public:
 
     QStringList keys() const;
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format) const;
+    Capabilities capabilities(QIODevice *device,
+                              const QByteArray &format) const override; // QImageIOPlugin
+    QImageIOHandler *create(QIODevice *device,
+                            const QByteArray &format) const override; // QImageIOPlugin
 };

mythplugins/mythgallery/mythgallery/galleryfilterdlg.cpp

@@ -43,7 +43,7 @@ class FilterScanThread : public MThread
   public:
     FilterScanThread(const QString& dir, const GalleryFilter& flt,
                      int *dirCount, int *imageCount, int *movieCount);
-    virtual void run();
+    void run() override; // MThread
 
   private:
     GalleryFilter m_filter;

mythplugins/mythgallery/mythgallery/galleryfilterdlg.h

@@ -42,7 +42,7 @@ class GalleryFilterDialog : public MythScreenType
                         GalleryFilter *filter);
     ~GalleryFilterDialog();
 
-    bool Create();
+    bool Create() override; // MythScreenType
 
   signals:
     void filterChanged();

mythplugins/mythgallery/mythgallery/glsingleview.h

@@ -51,7 +51,7 @@ class GLSDialog : public MythDialog
               MythMainWindow *parent, const char *name="GLSDialog");
 
   protected:
-    void closeEvent(QCloseEvent *e);
+    void closeEvent(QCloseEvent *e) override; // QWidget
 
   private:
     GLSingleView *m_view;
@@ -72,30 +72,30 @@ class GLSingleView : public QGLWidget, public ImageView
 
 
   protected:
-    void initializeGL(void);
+    void initializeGL(void) override; // QGLWidget
 
     // Commands
-    virtual void Rotate(int angle);
-    virtual void DisplayNext(bool reset, bool loadImage);
-    virtual void DisplayPrev(bool reset, bool loadImage);
-    virtual void Load(void);
-    void resizeGL(int w, int h);
+    void Rotate(int angle) override; // ImageView
+    void DisplayNext(bool reset, bool loadImage) override; // ImageView
+    void DisplayPrev(bool reset, bool loadImage) override; // ImageView
+    void Load(void) override; // ImageView
+    void resizeGL(int w, int h) override; // QGLWidget
 
-    void paintGL(void);
+    void paintGL(void) override; // QGLWidget
     void paintTexture(void);
     void createTexInfo(void);
-    virtual void keyPressEvent(QKeyEvent *e);
+    void keyPressEvent(QKeyEvent *e) override; // QWidget
     void checkPosition(void);
 
     // Sets
-    virtual void SetZoom(float zoom);
+    void SetZoom(float zoom) override; // ImageView
     void SetTransitionTimeout(int timeout);
 
     // Gets
     int GetNearestGLTextureSize(int) const;
 
-    virtual void RegisterEffects(void);
-    virtual void RunEffect(const QString &effect);
+    void RegisterEffects(void) override; // ImageView
+    void RunEffect(const QString &effect) override; // ImageView
 
     void EffectNone(void);
     void EffectBlend(void);
@@ -162,7 +162,7 @@ class KenBurnsImageLoader : public MThread
 {
 public:
     KenBurnsImageLoader(GLSingleView *singleView, QSize m_texSize, QSize m_screenSize);
-    void run();
+    void run() override; // MThread
 private:
     GLSingleView *m_singleView;
     QSize         m_screenSize;

mythplugins/mythgallery/mythgallery/iconview.cpp

@@ -63,7 +63,7 @@ class FileCopyThread : public MThread
 {
   public:
     FileCopyThread(IconView *parent, bool move);
-    virtual void run();
+    void run() override; // MThread
     int GetProgress(void) { return m_progress; }
 
   private:

mythplugins/mythgallery/mythgallery/iconview.h

@@ -57,9 +57,9 @@ class IconView : public MythScreenType
              const QString &galleryDir, MythMediaDevice *initialDevice);
     ~IconView();
 
-    bool Create(void);
-    bool keyPressEvent(QKeyEvent *);
-    void customEvent(QEvent*);
+    bool Create(void) override; // MythScreenType
+    bool keyPressEvent(QKeyEvent *) override; // MythScreenType
+    void customEvent(QEvent*) override; // MythUIType
     void HandleRandomShow(void);
     void HandleSeasonalShow(void);
 
@@ -191,7 +191,7 @@ class ChildCountThread : public MThread
     void cancel();
 
 protected:
-    void run();
+    void run() override; // MThread
 
 private:
 
@@ -207,7 +207,7 @@ class ImportThread: public MThread
 {
     public:
         explicit ImportThread(const QString &cmd);
-        virtual void run();
+        void run() override; // MThread
     private:
         QString m_command;
 };

mythplugins/mythgallery/mythgallery/imageview.cpp

@@ -70,7 +70,7 @@ class ImageView::LoadAlbumRunnable : public QRunnable {
             int slideshow_sequencing);
 
     void abort();
-    virtual void run();
+    void run() override; // QRunnable
 
     /** Separate the input into files and directories */
     static void filterDirectories(const ThumbList &input,