Browse Source

Merge pull request #4884 from krishty/remove-useless-virtual

Remove Useless “virtual”
Kim Kulling 2 years ago
parent
commit
cff81568f3
2 changed files with 5 additions and 5 deletions
  1. 4 4
      code/AssetLib/Ogre/OgreImporter.h
  2. 1 1
      code/AssetLib/glTF2/glTF2Importer.h

+ 4 - 4
code/AssetLib/Ogre/OgreImporter.h

@@ -60,17 +60,17 @@ namespace Ogre {
 class OgreImporter : public BaseImporter {
 class OgreImporter : public BaseImporter {
 public:
 public:
     /// BaseImporter override.
     /// BaseImporter override.
-    virtual bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const override;
+    bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const override;
 
 
 protected:
 protected:
     /// BaseImporter override.
     /// BaseImporter override.
-    virtual void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) override;
+    void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) override;
 
 
     /// BaseImporter override.
     /// BaseImporter override.
-    virtual const aiImporterDesc *GetInfo() const override;
+    const aiImporterDesc *GetInfo() const override;
 
 
     /// BaseImporter override.
     /// BaseImporter override.
-    virtual void SetupProperties(const Importer *pImp) override;
+    void SetupProperties(const Importer *pImp) override;
 
 
 private:
 private:
     /// Read materials referenced by the @c mesh to @c pScene.
     /// Read materials referenced by the @c mesh to @c pScene.

+ 1 - 1
code/AssetLib/glTF2/glTF2Importer.h

@@ -65,7 +65,7 @@ public:
 protected:
 protected:
     const aiImporterDesc *GetInfo() const override;
     const aiImporterDesc *GetInfo() const override;
     void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) override;
     void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) override;
-    virtual void SetupProperties(const Importer *pImp) override;
+    void SetupProperties(const Importer *pImp) override;
 
 
 private:
 private:
     void ImportEmbeddedTextures(glTF2::Asset &a);
     void ImportEmbeddedTextures(glTF2::Asset &a);