kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

declare getMDIView and getMDIViewPage as const

Browse Source
This commit is contained in:
wmayer
2019-12-29 13:55:39 +01:00
parent 6a4dd82415
commit e900384250
13 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Gui/ViewProvider.h
View File

@@ -470,7 +470,9 @@ public:
static Base::Matrix4D convert(const SbMatrix &sbMat);
//@}
virtual MDIView *getMDIView() {return 0;}
virtual MDIView *getMDIView() const {
return nullptr;
}
public:
// this method is called by the viewer when the ViewProvider is in edit

7
src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
View File

@@ -169,10 +169,11 @@ SheetView *ViewProviderSheet::showSpreadsheetView()
}
return view;
}
}
Gui::MDIView *ViewProviderSheet::getMDIView() {
return showSpreadsheetView();
Gui::MDIView *ViewProviderSheet::getMDIView() const
{
return const_cast<ViewProviderSheet*>(this)->showSpreadsheetView();
}
void ViewProviderSheet::updateData(const App::Property* prop)

2
src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h
View File

@@ -65,7 +65,7 @@ public:
virtual bool isShow(void) const override { return true; }
virtual Gui::MDIView *getMDIView() override;
virtual Gui::MDIView *getMDIView() const override;
protected:
SheetView* showSpreadsheetView();

3
src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
View File

@@ -257,7 +257,8 @@ MDIViewPage* ViewProviderDrawingView::getMDIViewPage() const
return result;
}
Gui::MDIView *ViewProviderDrawingView::getMDIView() {
Gui::MDIView *ViewProviderDrawingView::getMDIView() const
{
return getMDIViewPage();
}

2
src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
View File

@@ -70,7 +70,7 @@ public:
QGIView* getQView(void);
MDIViewPage* getMDIViewPage() const;
virtual Gui::MDIView *getMDIView() override;
virtual Gui::MDIView *getMDIView() const override;
/** @name Restoring view provider from document load */
//@{

3
src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp
View File

@@ -203,7 +203,8 @@ TechDraw::DrawGeomHatch* ViewProviderGeomHatch::getViewObject() const
return dynamic_cast<TechDraw::DrawGeomHatch*>(pcObject);
}
Gui::MDIView *ViewProviderGeomHatch::getMDIView() {
Gui::MDIView *ViewProviderGeomHatch::getMDIView() const
{
auto obj = getViewObject();
if(!obj) return 0;
auto vp = Gui::Application::Instance->getViewProvider(obj->getSourceView());

2
src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h
View File

@@ -68,7 +68,7 @@ public:
TechDraw::DrawGeomHatch* getViewObject() const;
virtual Gui::MDIView *getMDIView() override;
virtual Gui::MDIView *getMDIView() const override;
};
} // namespace TechDrawGui

3
src/Mod/TechDraw/Gui/ViewProviderHatch.cpp
View File

@@ -123,7 +123,8 @@ TechDraw::DrawHatch* ViewProviderHatch::getViewObject() const
return dynamic_cast<TechDraw::DrawHatch*>(pcObject);
}
Gui::MDIView *ViewProviderHatch::getMDIView() {
Gui::MDIView *ViewProviderHatch::getMDIView() const
{
auto obj = getViewObject();
if(!obj) return 0;
auto vp = Gui::Application::Instance->getViewProvider(obj->getSourceView());

2
src/Mod/TechDraw/Gui/ViewProviderHatch.h
View File

@@ -57,7 +57,7 @@ public:
TechDraw::DrawHatch* getViewObject() const;
virtual Gui::MDIView *getMDIView() override;
virtual Gui::MDIView *getMDIView() const override;
private:
static App::PropertyFloatConstraint::Constraints scaleRange;

7
src/Mod/TechDraw/Gui/ViewProviderPage.cpp
View File

@@ -335,7 +335,7 @@ void ViewProviderPage::unsetEdit(int ModNum)
}
MDIViewPage* ViewProviderPage::getMDIViewPage()
MDIViewPage* ViewProviderPage::getMDIViewPage() const
{
if (m_mdiView.isNull()) {
Base::Console().Log("INFO - ViewProviderPage::getMDIViewPage has no m_mdiView!\n");
@@ -444,7 +444,8 @@ TechDraw::DrawPage* ViewProviderPage::getDrawPage() const
return dynamic_cast<TechDraw::DrawPage*>(pcObject);
}
Gui::MDIView *ViewProviderPage::getMDIView() {
showMDIViewPage();
Gui::MDIView *ViewProviderPage::getMDIView() const
{
const_cast<ViewProviderPage*>(this)->showMDIViewPage();
return m_mdiView.data();
}

4
src/Mod/TechDraw/Gui/ViewProviderPage.h
View File

@@ -81,11 +81,11 @@ public:
Connection connectGuiRepaint;
void unsetEdit(int ModNum) override;
MDIViewPage* getMDIViewPage();
MDIViewPage* getMDIViewPage() const;
bool showMDIViewPage();
void removeMDIView(void);
virtual Gui::MDIView *getMDIView() override;
virtual Gui::MDIView *getMDIView() const override;
bool getFrameState(void);
void setFrameState(bool state);

5
src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp
View File

@@ -182,7 +182,7 @@ void ViewProviderTemplate::setMarkers(bool state)
}
}
MDIViewPage* ViewProviderTemplate::getMDIViewPage(void)
MDIViewPage* ViewProviderTemplate::getMDIViewPage(void) const
{
MDIViewPage* myMdi = nullptr;
auto t = getTemplate();
@@ -195,7 +195,8 @@ MDIViewPage* ViewProviderTemplate::getMDIViewPage(void)
return myMdi;
}
Gui::MDIView *ViewProviderTemplate::getMDIView() {
Gui::MDIView *ViewProviderTemplate::getMDIView() const
{
return getMDIViewPage();
}

4
src/Mod/TechDraw/Gui/ViewProviderTemplate.h
View File

@@ -56,8 +56,8 @@ public:
virtual bool isShow(void) const override;
QGITemplate* getQTemplate(void);
TechDraw::DrawTemplate* getTemplate() const;
MDIViewPage* getMDIViewPage(void);
virtual Gui::MDIView *getMDIView() override;
MDIViewPage* getMDIViewPage(void) const;
virtual Gui::MDIView *getMDIView() const override;
void setMarkers(bool state);
};