From c2de645c8cb8aa4790317ff61f5ee4f714072bdd Mon Sep 17 00:00:00 2001 From: Nelsson Huotari Date: Wed, 9 Oct 2019 01:31:13 +0300 Subject: [PATCH] override, virtual -> final, remove unused variables, public to private. --- apps/opencs/view/render/terrainshapemode.cpp | 2 +- apps/opencs/view/render/terrainshapemode.hpp | 20 ++++++++++---------- apps/opencs/view/render/terrainstorage.cpp | 2 -- apps/opencs/view/render/terrainstorage.hpp | 12 ++++++------ 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp index 419d222c0..934388acf 100644 --- a/apps/opencs/view/render/terrainshapemode.cpp +++ b/apps/opencs/view/render/terrainshapemode.cpp @@ -47,7 +47,7 @@ CSVRender::TerrainShapeMode::TerrainShapeMode (WorldspaceWidget *worldspaceWidge : EditMode (worldspaceWidget, QIcon {":scenetoolbar/editing-terrain-shape"}, Mask_Terrain | Mask_Reference, "Terrain land editing", parent), mBrushSize(1), mBrushShape(CSVWidget::BrushShape_Point), - mShapeBrushScenetool(0), + mShapeBrushScenetool(nullptr), mDragMode(InteractionType_None), mParentNode(parentNode), mIsEditing(false), diff --git a/apps/opencs/view/render/terrainshapemode.hpp b/apps/opencs/view/render/terrainshapemode.hpp index 912aec2ce..8af81dff9 100644 --- a/apps/opencs/view/render/terrainshapemode.hpp +++ b/apps/opencs/view/render/terrainshapemode.hpp @@ -72,24 +72,25 @@ namespace CSVRender void deactivate(CSVWidget::SceneToolbar*); /// Start shape editing command macro - virtual bool primaryEditStartDrag (const QPoint& pos); + bool primaryEditStartDrag (const QPoint& pos) final; - virtual bool secondaryEditStartDrag (const QPoint& pos); - virtual bool primarySelectStartDrag (const QPoint& pos); - virtual bool secondarySelectStartDrag (const QPoint& pos); + bool secondaryEditStartDrag (const QPoint& pos) final; + bool primarySelectStartDrag (const QPoint& pos) final; + bool secondarySelectStartDrag (const QPoint& pos) final; /// Handle shape edit behavior during dragging - virtual void drag (const QPoint& pos, int diffX, int diffY, double speedFactor); + void drag (const QPoint& pos, int diffX, int diffY, double speedFactor) final; /// End shape editing command macro - virtual void dragCompleted(const QPoint& pos); + void dragCompleted(const QPoint& pos) final; /// Cancel shape editing, and reset all pending changes - virtual void dragAborted(); + void dragAborted() final; - virtual void dragWheel (int diff, double speedFactor); - virtual void dragMoveEvent (QDragMoveEvent *event); + void dragWheel (int diff, double speedFactor) final; + void dragMoveEvent (QDragMoveEvent *event) final; + private: /// Move pending alteredHeights changes to omwgame/omeaddon -data void applyTerrainEditChanges(); @@ -138,7 +139,6 @@ namespace CSVRender /// Create new cell and land if needed bool allowLandShapeEditing(const std::string& textureFileName); - private: std::string mCellId; std::string mBrushTexture; int mBrushSize; diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp index 7f5dc1208..65c89ae5c 100644 --- a/apps/opencs/view/render/terrainstorage.cpp +++ b/apps/opencs/view/render/terrainstorage.cpp @@ -13,8 +13,6 @@ namespace CSVRender { - const float defaultHeight = ESM::Land::DEFAULT_HEIGHT; - TerrainStorage::TerrainStorage(const CSMWorld::Data &data) : ESMTerrain::Storage(data.getResourceSystem()->getVFS()) , mData(data) diff --git a/apps/opencs/view/render/terrainstorage.hpp b/apps/opencs/view/render/terrainstorage.hpp index 9e5226d5f..032261ad4 100644 --- a/apps/opencs/view/render/terrainstorage.hpp +++ b/apps/opencs/view/render/terrainstorage.hpp @@ -16,7 +16,6 @@ namespace CSVRender { public: TerrainStorage(const CSMWorld::Data& data); - std::array mAlteredHeight; void setAlteredHeight(int inCellX, int inCellY, float heightMap); void resetHeights(); float getSumOfAlteredAndTrueHeight(int cellX, int cellY, int inCellX, int inCellY); @@ -24,11 +23,12 @@ namespace CSVRender private: const CSMWorld::Data& mData; + std::array mAlteredHeight; - virtual osg::ref_ptr getLand (int cellX, int cellY) override; - virtual const ESM::LandTexture* getLandTexture(int index, short plugin) override; + osg::ref_ptr getLand (int cellX, int cellY) final; + const ESM::LandTexture* getLandTexture(int index, short plugin) final; - virtual void getBounds(float& minX, float& maxX, float& minY, float& maxY) override; + void getBounds(float& minX, float& maxX, float& minY, float& maxY) final; int getThisHeight(int col, int row, const ESM::Land::LandData *heightData) const; int getLeftHeight(int col, int row, const ESM::Land::LandData *heightData) const; @@ -42,8 +42,8 @@ namespace CSVRender bool leftOrUpIsOverTheLimit(int col, int row, int heightWarningLimit, const ESM::Land::LandData *heightData) const; bool rightOrDownIsOverTheLimit(int col, int row, int heightWarningLimit, const ESM::Land::LandData *heightData) const; - void adjustColor(int col, int row, const ESM::Land::LandData *heightData, osg::Vec4ub& color) const override; - float getAlteredHeight(int col, int row) const override; + void adjustColor(int col, int row, const ESM::Land::LandData *heightData, osg::Vec4ub& color) const final; + float getAlteredHeight(int col, int row) const final; }; }