Skip to content

Commit

Permalink
Fix clang compiler warnings:
Browse files Browse the repository at this point in the history
+ fix -Winconsistent-missing-override
+ fix -Wunused-variable
+ fix -Wbraced-scalar-init
+ fix -Wparentheses (View3DInventorViewer::checkGroupOnTop: operator '?:' has lower precedence than '+'; '+' will be evaluated first)
+ fix -Wundefined-bool-conversion (MainWindow::updateActions)
+ suppress -Woverloaded-virtual but fix later
  • Loading branch information
wwmayer committed Aug 17, 2019
1 parent 3e6ae0d commit 5172c3b
Show file tree
Hide file tree
Showing 16 changed files with 128 additions and 118 deletions.
1 change: 0 additions & 1 deletion src/Gui/ExpressionCompleter.cpp
Expand Up @@ -259,7 +259,6 @@ class ExpressionCompleterModel: public QAbstractItemModel {
}

int rowCount(const QModelIndex & parent = QModelIndex()) const {
const auto &docs = App::GetApplication().getDocuments();
Info info;
int row = 0;
if(!parent.isValid()) {
Expand Down
5 changes: 3 additions & 2 deletions src/Gui/MainWindow.cpp
Expand Up @@ -1279,9 +1279,10 @@ void MainWindow::appendRecentFile(const QString& filename)
}
}

void MainWindow::updateActions(bool delay) {
void MainWindow::updateActions(bool delay)
{
//make it safe to call before the main window is actually created
if(!this)
if (!instance)
return;
if(!d->activityTimer->isActive())
d->activityTimer->start(150);
Expand Down
16 changes: 8 additions & 8 deletions src/Gui/ProgressBar.h
Expand Up @@ -100,10 +100,10 @@ class GuiExport Sequencer : public Base::SequencerBase
* to indicate that the user can click on the dialog. Every pause() must eventually be followed
* by a corresponding @ref resume().
*/
void pause();
void pause() override;
/** This sets the wait cursor again and grabs the keyboard. @see pause() */
void resume();
bool isBlocking() const;
void resume() override;
bool isBlocking() const override;
/** Returns an instance of the progress bar. It creates one if needed. */
QProgressBar* getProgressBar(QWidget* parent=0);

Expand All @@ -116,15 +116,15 @@ class GuiExport Sequencer : public Base::SequencerBase
~Sequencer ();

/** Puts text to the status bar */
void setText (const char* pszTxt);
void setText (const char* pszTxt) override;
/** Starts the progress bar */
void startStep();
void startStep() override;
/** Increase the progress bar. */
void nextStep(bool canAbort);
void nextStep(bool canAbort) override;
/** Sets the progress indicator to a certain position. */
void setProgress(size_t);
void setProgress(size_t) override;
/** Resets the sequencer */
void resetData();
void resetData() override;
void showRemainingTime();

private:
Expand Down
4 changes: 2 additions & 2 deletions src/Gui/PropertyView.h
Expand Up @@ -75,12 +75,12 @@ public Q_SLOTS:
void onTimer();

protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void showEvent(QShowEvent *) override;
void hideEvent(QHideEvent *) override;

private:
void onSelectionChanged(const SelectionChanges& msg);
void onSelectionChanged(const SelectionChanges& msg) override;
void slotChangePropertyData(const App::DocumentObject&, const App::Property&);
void slotChangePropertyView(const Gui::ViewProvider&, const App::Property&);
void slotAppendDynamicProperty(const App::Property&);
Expand Down
8 changes: 4 additions & 4 deletions src/Gui/SelectionView.h
Expand Up @@ -62,16 +62,16 @@ class SelectionView : public Gui::DockWindow,
virtual ~SelectionView();

/// Observer message from the Selection
virtual void onSelectionChanged(const SelectionChanges& msg);
virtual void onSelectionChanged(const SelectionChanges& msg) override;

virtual void leaveEvent(QEvent*) override;

bool onMsg(const char* pMsg,const char** ppReturn);
bool onMsg(const char* pMsg,const char** ppReturn) override;

virtual const char *getName(void) const {return "SelectionView";}
virtual const char *getName(void) const override {return "SelectionView";}

/// get called when the document is changed or updated
virtual void onUpdate(void);
virtual void onUpdate(void) override;

QListWidget* selectionView;
QLabel* countLabel;
Expand Down
4 changes: 2 additions & 2 deletions src/Gui/Tree.cpp
Expand Up @@ -198,7 +198,7 @@ struct Stats {
DEFINE_STATS
};

static Stats _Stats;
//static Stats _Stats;

struct TimingInfo {
bool timed = false;
Expand Down Expand Up @@ -2054,7 +2054,7 @@ void TreeWidget::dropEvent(QDropEvent *event)
if(copied.size())
res = copied.back();
}else
res = thisDoc->moveObject({obj},true);
res = thisDoc->moveObject(obj,true);
if(res) {
propPlacement = dynamic_cast<App::PropertyPlacement*>(
res->getPropertyByName("Placement"));
Expand Down
34 changes: 17 additions & 17 deletions src/Gui/Tree.h
Expand Up @@ -83,7 +83,7 @@ class TreeWidget : public QTreeWidget, public SelectionObserver
void selectAllLinks(App::DocumentObject *obj);
void expandSelectedItems(TreeItemMode mode);

bool eventFilter(QObject *, QEvent *ev);
bool eventFilter(QObject *, QEvent *ev) override;

struct SelInfo {
App::DocumentObject *topParent;
Expand Down Expand Up @@ -127,24 +127,24 @@ class TreeWidget : public QTreeWidget, public SelectionObserver

protected:
/// Observer message from the Selection
void onSelectionChanged(const SelectionChanges& msg);
void contextMenuEvent (QContextMenuEvent * e);
void drawRow(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const;
void onSelectionChanged(const SelectionChanges& msg) override;
void contextMenuEvent (QContextMenuEvent * e) override;
void drawRow(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
/** @name Drag and drop */
//@{
void startDrag(Qt::DropActions supportedActions);
void startDrag(Qt::DropActions supportedActions) override;
bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data,
Qt::DropAction action);
Qt::DropActions supportedDropActions () const;
QMimeData * mimeData (const QList<QTreeWidgetItem *> items) const;
void dragEnterEvent(QDragEnterEvent * event);
void dragLeaveEvent(QDragLeaveEvent * event);
void dragMoveEvent(QDragMoveEvent *event);
void dropEvent(QDropEvent *event);
Qt::DropAction action) override;
Qt::DropActions supportedDropActions () const override;
QMimeData * mimeData (const QList<QTreeWidgetItem *> items) const override;
void dragEnterEvent(QDragEnterEvent * event) override;
void dragLeaveEvent(QDragLeaveEvent * event) override;
void dragMoveEvent(QDragMoveEvent *event) override;
void dropEvent(QDropEvent *event) override;
//@}
bool event(QEvent *e);
void keyPressEvent(QKeyEvent *event);
void mouseDoubleClickEvent(QMouseEvent * event);
bool event(QEvent *e) override;
void keyPressEvent(QKeyEvent *event) override;
void mouseDoubleClickEvent(QMouseEvent * event) override;

protected:
void showEvent(QShowEvent *) override;
Expand Down Expand Up @@ -195,7 +195,7 @@ private Q_SLOTS:
void slotChangeObject(const Gui::ViewProviderDocumentObject&, const App::Property &prop);
void slotTouchedObject(const App::DocumentObject&);

void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void setupText();

void updateChildren(App::DocumentObject *obj,
Expand Down Expand Up @@ -274,7 +274,7 @@ class DocumentItem : public QTreeWidgetItem, public Base::Persistence
void updateItemSelection(DocumentObjectItem *);
void selectItems(bool sync);
void testStatus(void);
void setData(int column, int role, const QVariant & value);
void setData(int column, int role, const QVariant & value) override;
void populateItem(DocumentObjectItem *item, bool refresh=false, bool delayUpdate=true);
bool populateObject(App::DocumentObject *obj);
void selectAllInstances(const ViewProviderDocumentObject &vpd);
Expand Down
2 changes: 1 addition & 1 deletion src/Gui/View3DInventorViewer.cpp
Expand Up @@ -756,7 +756,7 @@ void View3DInventorViewer::checkGroupOnTop(const SelectionChanges &Reason) {
SoSelectionElementAction action(node->getDetail()?
SoSelectionElementAction::Remove:SoSelectionElementAction::None,true);
auto path = node->getPath();
SoTempPath tmpPath(2+path?path->getLength():0);
SoTempPath tmpPath(2 + (path ? path->getLength() : 0));
tmpPath.ref();
tmpPath.append(pcGroup);
tmpPath.append(node);
Expand Down
22 changes: 11 additions & 11 deletions src/Gui/ViewProviderDocumentObject.h
Expand Up @@ -48,7 +48,7 @@ class Document;

class GuiExport ViewProviderDocumentObject : public ViewProvider
{
PROPERTY_HEADER(Gui::ViewProviderDocumentObject);
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderDocumentObject);

public:
/// constructor.
Expand All @@ -69,30 +69,30 @@ class GuiExport ViewProviderDocumentObject : public ViewProvider
/// Set the active mode, i.e. the first item of the 'Display' property.
void setActiveMode();
/// Hide the object in the view
virtual void hide(void);
virtual void hide(void) override;
/// Show the object in the view
virtual void show(void);
virtual void show(void) override;

virtual bool canDropObjectEx(App::DocumentObject *, App::DocumentObject *,
const char *, const std::vector<std::string> &) const override;

virtual int replaceObject(App::DocumentObject*, App::DocumentObject*) override;

virtual bool showInTree() const;
virtual bool showInTree() const override;

/// Get a list of TaskBoxes associated with this object
virtual void getTaskViewContent(std::vector<Gui::TaskView::TaskContent*>&) const;
virtual void getTaskViewContent(std::vector<Gui::TaskView::TaskContent*>&) const override;

/// Run a redraw
void updateView();
/// Get the object of this ViewProvider object
App::DocumentObject *getObject(void) const {return pcObject;}
/// Asks the view provider if the given object can be deleted.
virtual bool canDelete(App::DocumentObject* obj) const;
virtual bool canDelete(App::DocumentObject* obj) const override;
/// Get the GUI document to this ViewProvider object
Gui::Document* getDocument() const;
/// Get the python wrapper for that ViewProvider
PyObject* getPyObject();
PyObject* getPyObject() override;

/// return a hit element given the picked point which contains the full node path
virtual bool getElementPicked(const SoPickedPoint *, std::string &subname) const override;
Expand Down Expand Up @@ -162,9 +162,9 @@ class GuiExport ViewProviderDocumentObject : public ViewProvider
*/
Gui::MDIView* getViewOfNode(SoNode* node) const;
/// get called before the value is changed
virtual void onBeforeChange(const App::Property* prop);
virtual void onBeforeChange(const App::Property* prop) override;
/// Gets called by the container whenever a property has been changed
virtual void onChanged(const App::Property* prop);
virtual void onChanged(const App::Property* prop) override;
/** Searches in all view providers that are attached to an object that
* is part of the same document as the object this view provider is
* attached to for an front root of \a type.
Expand All @@ -177,8 +177,8 @@ class GuiExport ViewProviderDocumentObject : public ViewProvider
/** @name Transaction handling
*/
//@{
virtual bool isAttachedToDocument() const;
virtual const char* detachFromDocument();
virtual bool isAttachedToDocument() const override;
virtual const char* detachFromDocument() override;

/// get called when a property status has changed
virtual void onPropertyStatusChanged(const App::Property &prop, unsigned long oldStatus) override;
Expand Down
4 changes: 2 additions & 2 deletions src/Gui/ViewProviderDocumentObjectGroup.h
Expand Up @@ -43,8 +43,8 @@ class GuiExport ViewProviderDocumentObjectGroup : public ViewProviderDocumentObj
virtual ~ViewProviderDocumentObjectGroup();

/// returns a list of all possible modes
std::vector<std::string> getDisplayModes(void) const;
bool isShow(void) const;
std::vector<std::string> getDisplayModes(void) const override;
bool isShow(void) const override;


protected:
Expand Down
16 changes: 8 additions & 8 deletions src/Gui/ViewProviderDragger.h
Expand Up @@ -43,7 +43,7 @@ class SoFCCSysDragger;
*/
class GuiExport ViewProviderDragger : public ViewProviderDocumentObject
{
PROPERTY_HEADER(Gui::ViewProviderDragger);
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderDragger);

public:
/// constructor.
Expand All @@ -54,20 +54,20 @@ class GuiExport ViewProviderDragger : public ViewProviderDocumentObject

/** @name Edit methods */
//@{
bool doubleClicked(void);
void setupContextMenu(QMenu*, QObject*, const char*);
void updateData(const App::Property*);
bool doubleClicked(void) override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
void updateData(const App::Property*) override;

virtual ViewProvider *startEditing(int ModNum=0) override;

/*! synchronize From FC placement to Coin placement*/
static void updateTransform(const Base::Placement &from, SoTransform *to);

protected:
bool setEdit(int ModNum);
void unsetEdit(int ModNum);
void setEditViewer(View3DInventorViewer*, int ModNum);
void unsetEditViewer(View3DInventorViewer*);
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
void setEditViewer(View3DInventorViewer*, int ModNum) override;
void unsetEditViewer(View3DInventorViewer*) override;
//@}
SoFCCSysDragger *csysDragger = nullptr;

Expand Down
6 changes: 3 additions & 3 deletions src/Gui/ViewProviderLink.h
Expand Up @@ -71,15 +71,15 @@ class GuiExport LinkOwner {
};

class GuiExport LinkView : public Base::BaseClass, public LinkOwner {
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:

LinkView();
~LinkView();
LinkView &operator=(const LinkView&) = delete;
LinkView(const LinkView&) = delete;

virtual PyObject *getPyObject(void);
virtual PyObject *getPyObject(void) override;

virtual void unlink(LinkInfoPtr) override;
virtual void onLinkedIconChange(LinkInfoPtr) override;
Expand Down Expand Up @@ -181,7 +181,7 @@ class GuiExport LinkView : public Base::BaseClass, public LinkOwner {

class GuiExport ViewProviderLink : public ViewProviderDocumentObject
{
PROPERTY_HEADER(Gui::ViewProviderLink);
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderLink);
typedef ViewProviderDocumentObject inherited;

public:
Expand Down
6 changes: 3 additions & 3 deletions src/Gui/ViewProviderPart.h
Expand Up @@ -43,12 +43,12 @@ class GuiExport ViewProviderPart : public ViewProviderDragger,
/// destructor.
virtual ~ViewProviderPart();

virtual bool doubleClicked(void);
virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member);
virtual bool doubleClicked(void) override;
virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;

protected:
/// get called by the container whenever a property has been changed
virtual void onChanged(const App::Property* prop);
virtual void onChanged(const App::Property* prop) override;
};

typedef ViewProviderPythonFeatureT<ViewProviderPart> ViewProviderPartPython;
Expand Down
16 changes: 8 additions & 8 deletions src/Gui/ViewProviderPlacement.h
Expand Up @@ -43,28 +43,28 @@ namespace Gui

class GuiExport ViewProviderPlacement : public ViewProviderGeometryObject
{
PROPERTY_HEADER(Gui::ViewProviderPlacement);
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderPlacement);

public:
/// Constructor
ViewProviderPlacement(void);
virtual ~ViewProviderPlacement();

void attach(App::DocumentObject *);
void updateData(const App::Property*);
std::vector<std::string> getDisplayModes(void) const;
void setDisplayMode(const char* ModeName);
void attach(App::DocumentObject *) override;
void updateData(const App::Property*) override;
std::vector<std::string> getDisplayModes(void) const override;
void setDisplayMode(const char* ModeName) override;

/// indicates if the ViewProvider use the new Selection model
virtual bool useNewSelectionModel(void) const {return true;}
virtual bool useNewSelectionModel(void) const override {return true;}
/// indicates if the ViewProvider can be selected
virtual bool isSelectable(void) const ;
virtual bool isSelectable(void) const override;

virtual bool getElementPicked(const SoPickedPoint *pp, std::string &subname) const override;
virtual bool getDetailPath(const char *, SoFullPath *, bool, SoDetail *&) const override;

protected:
void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;

};

Expand Down

0 comments on commit 5172c3b

Please sign in to comment.