Skip to content

Commit

Permalink
Fix first truckload of clang warnings, mostly due to missing override…
Browse files Browse the repository at this point in the history 
… keywords and type conversions.
  • Loading branch information
@codereader
codereader committed Mar 4, 2017
1 parent 7afcf3c commit 0c3eba9
Show file tree
Hide file tree
Showing 21 changed files with 141 additions and 142 deletions.
2 changes: 1 addition & 1 deletion libs/math/FloatTools.h
View file
Expand Up @@ -65,7 +65,7 @@ inline Element float_mid(const Element& self, const Element& other)
template<typename Element>
inline int float_to_integer(const Element& f)
{
return lrint(f);
return static_cast<int>(lrint(f));
}

/// \brief Returns \p f rounded to the nearest multiple of \p snap.
Expand Down
48 changes: 25 additions & 23 deletions libs/scene/Node.h
View file
Expand Up @@ -84,12 +84,12 @@ class Node :
static unsigned long getNewId();

// Default name for generic nodes
std::string name() const { return "node"; }
std::string name() const override { return "node"; }

void setSceneGraph(const GraphPtr& sceneGraph);
void setSceneGraph(const GraphPtr& sceneGraph) override;

bool isRoot() const;
void setIsRoot(bool isRoot);
bool isRoot() const override;
void setIsRoot(bool isRoot) override;

void enable(unsigned int state) override;
void disable(unsigned int state) override;
Expand All @@ -102,42 +102,44 @@ class Node :
void setForcedVisibility(bool forceVisible, bool includeChildren) override;

// Layered implementation
virtual void addToLayer(int layerId);
virtual void removeFromLayer(int layerId);
virtual void moveToLayer(int layerId);
virtual LayerList getLayers() const;
virtual void assignToLayers(const LayerList& newLayers);
virtual void addToLayer(int layerId) override;
virtual void removeFromLayer(int layerId) override;
virtual void moveToLayer(int layerId) override;
virtual LayerList getLayers() const override;
virtual void assignToLayers(const LayerList& newLayers) override;

virtual void addChildNode(const INodePtr& node) override;
virtual void addChildNodeToFront(const INodePtr& node) override;
virtual void removeChildNode(const INodePtr& node) override;
virtual bool hasChildNodes() const override;

virtual void traverse(NodeVisitor& visitor);
virtual void traverseChildren(NodeVisitor& visitor) const;
virtual bool foreachNode(const VisitorFunc& functor) const;
virtual void traverse(NodeVisitor& visitor) override;
virtual void traverseChildren(NodeVisitor& visitor) const override;
virtual bool foreachNode(const VisitorFunc& functor) const override;

virtual void setParent(const INodePtr& parent);
virtual scene::INodePtr getParent() const;
virtual void setParent(const INodePtr& parent) override;
virtual scene::INodePtr getParent() const override;

const AABB& worldAABB() const;
const AABB& worldAABB() const override;

const AABB& childBounds() const;

virtual void boundsChanged();
virtual void boundsChanged() override;

/**
* Return the filtered status of this Instance.
*/
virtual bool isFiltered() const {
virtual bool isFiltered() const override
{
return (_state & eFiltered) != 0;
}

/**
* Set the filtered status of this Node. Setting filtered to true will
* prevent the node from being rendered.
*/
virtual void setFiltered(bool filtered) {
virtual void setFiltered(bool filtered) override
{
if (filtered) {
_state |= eFiltered;
}
Expand All @@ -146,11 +148,11 @@ class Node :
}
}

const Matrix4& localToWorld() const;
const Matrix4& localToWorld() const override;

void transformChangedLocal() override;

void transformChanged();
void transformChanged() override;

void setTransformChangedCallback(const Callback& callback);

Expand All @@ -164,7 +166,7 @@ class Node :
virtual void onRemoveFromScene(IMapRootNode& root) override;

// Returns TRUE if this node is inserted in the scene, FALSE otherwise
bool inScene() const
bool inScene() const override
{
return _instantiated;
}
Expand All @@ -177,7 +179,7 @@ class Node :
scene::Path getPath();

// Returns a shared reference to this node
scene::INodePtr getSelf();
scene::INodePtr getSelf() override;

IRenderEntity* getRenderEntity() const override
{
Expand All @@ -192,7 +194,7 @@ class Node :

// Base renderable implementation
virtual RenderSystemPtr getRenderSystem() const;
virtual void setRenderSystem(const RenderSystemPtr& renderSystem);
virtual void setRenderSystem(const RenderSystemPtr& renderSystem) override;

protected:
// Method for subclasses to check whether this node is forcedly visible
Expand Down
2 changes: 1 addition & 1 deletion libs/wxutil/TreeModel.cpp
View file
Expand Up @@ -623,7 +623,7 @@ unsigned int TreeModel::GetChildren(const wxDataViewItem& item, wxDataViewItemAr
children.Add((*iter)->item);
}

return owningNode->children.size();
return static_cast<unsigned int>(owningNode->children.size());
}

wxDataViewItem TreeModel::GetRoot()
Expand Down
25 changes: 13 additions & 12 deletions libs/wxutil/TreeModel.h
View file
Expand Up @@ -218,7 +218,7 @@ class TreeModel :

int getInteger() const
{
return getVariant().GetInteger();
return static_cast<int>(getVariant().GetInteger());
}

double getDouble() const
Expand Down Expand Up @@ -435,30 +435,31 @@ class TreeModel :

// Base class implementation / overrides

virtual bool HasDefaultCompare() const;
virtual unsigned int GetColumnCount() const;
virtual bool HasDefaultCompare() const override;
virtual unsigned int GetColumnCount() const override;

// return type as reported by wxVariant
virtual wxString GetColumnType(unsigned int col) const;
virtual wxString GetColumnType(unsigned int col) const override;

// get value into a wxVariant
virtual void GetValue(wxVariant &variant,
const wxDataViewItem &item, unsigned int col) const;
const wxDataViewItem &item, unsigned int col) const override;
virtual bool SetValue(const wxVariant &variant,
const wxDataViewItem &item,
unsigned int col);
unsigned int col) override;

virtual bool GetAttr(const wxDataViewItem& item, unsigned int col, wxDataViewItemAttr& attr) const;
virtual bool GetAttr(const wxDataViewItem& item, unsigned int col, wxDataViewItemAttr& attr) const override;

virtual wxDataViewItem GetParent(const wxDataViewItem &item) const;
virtual bool IsContainer(const wxDataViewItem& item) const;
virtual wxDataViewItem GetParent(const wxDataViewItem &item) const override;
virtual bool IsContainer(const wxDataViewItem& item) const override;

virtual unsigned int GetChildren(const wxDataViewItem& item, wxDataViewItemArray& children) const;
virtual unsigned int GetChildren(const wxDataViewItem& item, wxDataViewItemArray& children) const override;
virtual wxDataViewItem GetRoot();

virtual bool IsListModel() const;
virtual bool IsListModel() const override;

virtual int Compare(const wxDataViewItem& item1, const wxDataViewItem& item2, unsigned int column, bool ascending) const;
virtual int Compare(const wxDataViewItem& item1, const wxDataViewItem& item2,
unsigned int column, bool ascending) const override;

protected:
// Returns a reference to the actual rootnode, only allowed for use in subclasses
Expand Down
2 changes: 1 addition & 1 deletion libs/wxutil/TreeModelFilter.cpp
View file
Expand Up @@ -213,7 +213,7 @@ unsigned int TreeModelFilter::GetChildren(const wxDataViewItem& item, wxDataView
}
});

return children.size();
return static_cast<int>(children.size());
}

} // namespace
2 changes: 0 additions & 2 deletions plugins/archivezip/ZipArchive.cpp
View file
Expand Up @@ -79,8 +79,6 @@ ArchiveTextFilePtr ZipArchive::openTextFile(const std::string& name)
{
ZipRecord* file = i->second.file();

FileInputStream::size_type position = 0;

{
// Guard against concurrent access
std::lock_guard<std::mutex> lock(_streamLock);
Expand Down
4 changes: 2 additions & 2 deletions plugins/eclassmgr/EClassManager.h
View file
Expand Up @@ -67,8 +67,8 @@ class EClassManager :
void unrealise() override;

// VFS::Observer implementation
virtual void onFileSystemInitialise();
virtual void onFileSystemShutdown();
virtual void onFileSystemInitialise() override;
virtual void onFileSystemShutdown() override;

// Find the modeldef with the given name
virtual IModelDefPtr findModel(const std::string& name) override;
Expand Down
8 changes: 4 additions & 4 deletions plugins/entity/EntityCreator.h
View file
Expand Up @@ -18,10 +18,10 @@ class Doom3EntityCreator :
ITargetManagerPtr createTargetManager() override;

// RegisterableModule implementation
virtual const std::string& getName() const;
virtual const StringSet& getDependencies() const;
virtual void initialiseModule(const ApplicationContext& ctx);
virtual void shutdownModule();
virtual const std::string& getName() const override;
virtual const StringSet& getDependencies() const override;
virtual void initialiseModule(const ApplicationContext& ctx) override;
virtual void shutdownModule() override;
};
typedef std::shared_ptr<Doom3EntityCreator> Doom3EntityCreatorPtr;

Expand Down
40 changes: 20 additions & 20 deletions plugins/entity/EntityNode.h
View file
Expand Up @@ -85,37 +85,37 @@ class EntityNode :
virtual ~EntityNode();

// IEntityNode implementation
Entity& getEntity();
virtual void refreshModel();
Entity& getEntity() override;
virtual void refreshModel() override;

// RenderEntity implementation
virtual float getShaderParm(int parmNum) const;
virtual const Vector3& getDirection() const;
virtual float getShaderParm(int parmNum) const override;
virtual const Vector3& getDirection() const override;

// SelectionTestable implementation
virtual void testSelect(Selector& selector, SelectionTest& test);
virtual void testSelect(Selector& selector, SelectionTest& test) override;

// Namespaced implementation
// Gets/sets the namespace of this named object
std::string getName() const;
void setNamespace(INamespace* space);
INamespace* getNamespace() const;
void connectNameObservers();
void disconnectNameObservers();
void changeName(const std::string& newName);
std::string getName() const override;
void setNamespace(INamespace* space) override;
INamespace* getNamespace() const override;
void connectNameObservers() override;
void disconnectNameObservers() override;
void changeName(const std::string& newName) override;

void attachNames();
void detachNames();
void attachNames() override;
void detachNames() override;

virtual void onInsertIntoScene(scene::IMapRootNode& root) override;
virtual void onRemoveFromScene(scene::IMapRootNode& root) override;

// Sets/clears render entity references on child nodes
virtual void onChildAdded(const scene::INodePtr& child);
virtual void onChildRemoved(const scene::INodePtr& child);
virtual void onChildAdded(const scene::INodePtr& child) override;
virtual void onChildRemoved(const scene::INodePtr& child) override;

virtual std::string name() const;
Type getNodeType() const;
virtual std::string name() const override;
Type getNodeType() const override;

// Renderable implementation, can be overridden by subclasses
virtual void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override;
Expand All @@ -133,11 +133,11 @@ class EntityNode :

ModelKey& getModelKey(); // needed by the Doom3Group class, could be a fixme

const ShaderPtr& getWireShader() const;
const ShaderPtr& getWireShader() const override;
const ShaderPtr& getFillShader() const;

virtual void onPostUndo();
virtual void onPostRedo();
virtual void onPostUndo() override;
virtual void onPostRedo() override;

protected:
virtual void onModelKeyChanged(const std::string& value);
Expand Down
30 changes: 15 additions & 15 deletions plugins/entity/doom3group/Doom3GroupNode.h
View file
Expand Up @@ -50,20 +50,20 @@ class Doom3GroupNode :
virtual ~Doom3GroupNode();

// CurveNode implementation
virtual bool hasEmptyCurve();
virtual void appendControlPoints(unsigned int numPoints);
virtual void removeSelectedControlPoints();
virtual void insertControlPointsAtSelected();
virtual void convertCurveType();
virtual bool hasEmptyCurve() override;
virtual void appendControlPoints(unsigned int numPoints) override;
virtual void removeSelectedControlPoints() override;
virtual void insertControlPointsAtSelected() override;
virtual void convertCurveType() override;

// Bounded implementation
virtual const AABB& localAABB() const;
virtual const AABB& localAABB() const override;

/** greebo: Tests the contained Doom3Group for selection.
*
* Note: This can be successful in vertex mode only, func_statics do not use this method.
*/
void testSelect(Selector& selector, SelectionTest& test);
void testSelect(Selector& selector, SelectionTest& test) override;

// ComponentSelectionTestable implementation
bool isSelectedComponents() const override;
Expand All @@ -76,23 +76,23 @@ class Doom3GroupNode :
virtual void onRemoveFromScene(scene::IMapRootNode& root) override;

// ComponentEditable implementation
const AABB& getSelectedComponentsBounds() const;
const AABB& getSelectedComponentsBounds() const override;

// ComponentSnappable implementation
void snapComponents(float snap);
void snapComponents(float snap) override;

// Snappable implementation
virtual void snapto(float snap);
virtual void snapto(float snap) override;

void selectionChangedComponent(const ISelectable& selectable);

scene::INodePtr clone() const;
scene::INodePtr clone() const override;

/** greebo: Call this right before map save to let the child
* brushes have their origin recalculated.
*/
void addOriginToChildren();
void removeOriginFromChildren();
void addOriginToChildren() override;
void removeOriginFromChildren() override;

// Renderable implementation
void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override;
Expand All @@ -116,10 +116,10 @@ class Doom3GroupNode :
void _applyTransformation() override;

// Model Key changed signal
void onModelKeyChanged(const std::string& value);
void onModelKeyChanged(const std::string& value) override;

// Override EntityNode::construct()
virtual void construct();
virtual void construct() override;

private:
void evaluateTransform();
Expand Down
8 changes: 4 additions & 4 deletions plugins/entity/eclassmodel/EclassModelNode.h
View file
Expand Up @@ -55,12 +55,12 @@ class EclassModelNode :
virtual ~EclassModelNode();

// Snappable implementation
virtual void snapto(float snap);
virtual void snapto(float snap) override;

// Bounded implementation
virtual const AABB& localAABB() const;
virtual const AABB& localAABB() const override;

scene::INodePtr clone() const;
scene::INodePtr clone() const override;

// Renderable implementation
void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override;
Expand All @@ -80,7 +80,7 @@ class EclassModelNode :
void _applyTransformation() override;

// Override EntityNode::construct()
void construct();
void construct() override;

private:
void translate(const Vector3& translation);
Expand Down

0 comments on commit 0c3eba9

Please sign in to comment.