From 0603c3fb61bb55f1a883d7b53574b935c6aa09ee Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sun, 2 Aug 2015 18:52:03 +0300 Subject: [PATCH] App/DocumentObserver: make slot methods unimplemented rather pure-virtual and clenup derived classes accordingly --- src/App/DocumentObserver.h | 15 ++++++++++----- src/Mod/Fem/Gui/ActiveAnalysisObserver.cpp | 12 ------------ src/Mod/Fem/Gui/ActiveAnalysisObserver.h | 3 --- src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp | 4 ---- src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h | 2 -- src/Mod/Mesh/Gui/ViewProviderCurvature.cpp | 16 ---------------- src/Mod/Mesh/Gui/ViewProviderCurvature.h | 9 --------- src/Mod/Sandbox/App/DocumentProtector.cpp | 16 ---------------- src/Mod/Sandbox/Gui/AppSandboxGui.cpp | 12 ------------ src/Mod/Spreadsheet/App/SheetObserver.cpp | 18 ------------------ src/Mod/Spreadsheet/App/SheetObserver.h | 2 -- 11 files changed, 10 insertions(+), 99 deletions(-) diff --git a/src/App/DocumentObserver.h b/src/App/DocumentObserver.h index af0eb974d..c0c885736 100644 --- a/src/App/DocumentObserver.h +++ b/src/App/DocumentObserver.h @@ -61,15 +61,20 @@ public: private: /** Checks if a new document was created */ - virtual void slotCreatedDocument(const App::Document& Doc) = 0; + virtual void slotCreatedDocument(const App::Document& Doc) + {} /** Checks if the given document is about to be closed */ - virtual void slotDeletedDocument(const App::Document& Doc) = 0; + virtual void slotDeletedDocument(const App::Document& Doc) + {} /** Checks if a new object was added. */ - virtual void slotCreatedObject(const App::DocumentObject& Obj) = 0; + virtual void slotCreatedObject(const App::DocumentObject& Obj) + {} /** Checks if the given object is about to be removed. */ - virtual void slotDeletedObject(const App::DocumentObject& Obj) = 0; + virtual void slotDeletedObject(const App::DocumentObject& Obj) + {} /** The property of an observed object has changed */ - virtual void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) = 0; + virtual void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) + {} protected: Document* getDocument() const; diff --git a/src/Mod/Fem/Gui/ActiveAnalysisObserver.cpp b/src/Mod/Fem/Gui/ActiveAnalysisObserver.cpp index 4d28fd316..2abbc7ee8 100644 --- a/src/Mod/Fem/Gui/ActiveAnalysisObserver.cpp +++ b/src/Mod/Fem/Gui/ActiveAnalysisObserver.cpp @@ -80,10 +80,6 @@ void ActiveAnalysisObserver::highlightActiveObject(const Gui::HighlightMode& mod activeDocument->signalHighlightObject(*activeView, mode, on); } -void ActiveAnalysisObserver::slotCreatedDocument(const App::Document& Doc) -{ -} - void ActiveAnalysisObserver::slotDeletedDocument(const App::Document& Doc) { App::Document* d = getDocument(); @@ -95,10 +91,6 @@ void ActiveAnalysisObserver::slotDeletedDocument(const App::Document& Doc) } } -void ActiveAnalysisObserver::slotCreatedObject(const App::DocumentObject& Obj) -{ -} - void ActiveAnalysisObserver::slotDeletedObject(const App::DocumentObject& Obj) { if (activeObject == &Obj) { @@ -106,7 +98,3 @@ void ActiveAnalysisObserver::slotDeletedObject(const App::DocumentObject& Obj) activeView = 0; } } - -void ActiveAnalysisObserver::slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) -{ -} diff --git a/src/Mod/Fem/Gui/ActiveAnalysisObserver.h b/src/Mod/Fem/Gui/ActiveAnalysisObserver.h index 28987d3c0..2387b1563 100644 --- a/src/Mod/Fem/Gui/ActiveAnalysisObserver.h +++ b/src/Mod/Fem/Gui/ActiveAnalysisObserver.h @@ -50,11 +50,8 @@ private: ActiveAnalysisObserver(); ~ActiveAnalysisObserver(); - void slotCreatedDocument(const App::Document& Doc); void slotDeletedDocument(const App::Document& Doc); - void slotCreatedObject(const App::DocumentObject& Obj); void slotDeletedObject(const App::DocumentObject& Obj); - void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop); private: static ActiveAnalysisObserver* inst; diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp index 0a4e0736e..92279128b 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp +++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp @@ -148,10 +148,6 @@ void DlgEvaluateMeshImp::slotChangedObject(const App::DocumentObject& Obj, const } } -void DlgEvaluateMeshImp::slotCreatedDocument(const App::Document& Doc) -{ -} - void DlgEvaluateMeshImp::slotDeletedDocument(const App::Document& Doc) { if (&Doc == getDocument()) { diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h index f5abef9ac..ca67891a0 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h +++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h @@ -72,8 +72,6 @@ public: void setMesh( Mesh::Feature* ); private: - /** Checks if a new document was created */ - void slotCreatedDocument(const App::Document& Doc); /** Checks if the given document is about to be closed */ void slotDeletedDocument(const App::Document& Doc); /** Checks if a new object was added. */ diff --git a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp index 475da1f1d..8ce4a3180 100644 --- a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp @@ -224,14 +224,6 @@ void ViewProviderMeshCurvature::init(const Mesh::PropertyCurvatureList* pCurvInf pcColorBar->setRange( fMin, fMax, 3 ); } -void ViewProviderMeshCurvature::slotCreatedObject(const App::DocumentObject& Obj) -{ -} - -void ViewProviderMeshCurvature::slotDeletedObject(const App::DocumentObject& Obj) -{ -} - void ViewProviderMeshCurvature::slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) { // we get this for any object for that a property has changed. Thus, we must regard that object @@ -248,14 +240,6 @@ void ViewProviderMeshCurvature::slotChangedObject(const App::DocumentObject& Obj } } -void ViewProviderMeshCurvature::slotCreatedDocument(const App::Document& Doc) -{ -} - -void ViewProviderMeshCurvature::slotDeletedDocument(const App::Document& Doc) -{ -} - void ViewProviderMeshCurvature::attach(App::DocumentObject *pcFeat) { // creats the standard viewing modes diff --git a/src/Mod/Mesh/Gui/ViewProviderCurvature.h b/src/Mod/Mesh/Gui/ViewProviderCurvature.h index cb9edd485..0b9b8d749 100644 --- a/src/Mod/Mesh/Gui/ViewProviderCurvature.h +++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.h @@ -101,15 +101,6 @@ protected: private: void init(const Mesh::PropertyCurvatureList *prop); - /** Checks if a new document was created */ - void slotCreatedDocument(const App::Document& Doc); - /** Checks if the given document is about to be closed */ - void slotDeletedDocument(const App::Document& Doc); - /** Checks if a new object was added. */ - void slotCreatedObject(const App::DocumentObject& Obj); - /** Checks if the given object is about to be removed. */ - void slotDeletedObject(const App::DocumentObject& Obj); - /** The property of an observed object has changed */ void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop); protected: diff --git a/src/Mod/Sandbox/App/DocumentProtector.cpp b/src/Mod/Sandbox/App/DocumentProtector.cpp index 36cf6042b..b0f5b7040 100644 --- a/src/Mod/Sandbox/App/DocumentProtector.cpp +++ b/src/Mod/Sandbox/App/DocumentProtector.cpp @@ -254,10 +254,6 @@ void DocumentProtector::init() moveToThread(QCoreApplication::instance()->thread()); } -void DocumentProtector::slotCreatedDocument(const App::Document& Doc) -{ -} - void DocumentProtector::slotDeletedDocument(const App::Document& Doc) { if (&Doc == getDocument()) { @@ -265,18 +261,6 @@ void DocumentProtector::slotDeletedDocument(const App::Document& Doc) } } -void DocumentProtector::slotCreatedObject(const App::DocumentObject& Obj) -{ -} - -void DocumentProtector::slotDeletedObject(const App::DocumentObject& Obj) -{ -} - -void DocumentProtector::slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) -{ -} - void DocumentProtector::validate() { if (!this->getDocument()) diff --git a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp index ffb09cf80..2d66b9ea4 100644 --- a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp +++ b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp @@ -61,18 +61,6 @@ public: { } private: - void slotCreatedDocument(const App::Document& Doc) - { - } - void slotDeletedDocument(const App::Document& Doc) - { - } - void slotCreatedObject(const App::DocumentObject& Obj) - { - } - void slotDeletedObject(const App::DocumentObject& Obj) - { - } void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) { if (object == &Obj && Prop.getTypeId() == Part::PropertyGeometryList::getClassTypeId()) { diff --git a/src/Mod/Spreadsheet/App/SheetObserver.cpp b/src/Mod/Spreadsheet/App/SheetObserver.cpp index ae739b679..311bdc321 100644 --- a/src/Mod/Spreadsheet/App/SheetObserver.cpp +++ b/src/Mod/Spreadsheet/App/SheetObserver.cpp @@ -42,24 +42,6 @@ SheetObserver::SheetObserver(App::Document * document, PropertySheet *_sheet) { } -/** - * Unimplemented. - * - */ - -void SheetObserver::slotCreatedDocument(const App::Document &Doc) -{ -} - -/** - * Unimplemented. - * - */ - -void SheetObserver::slotDeletedDocument(const App::Document &Doc) -{ -} - /** * Invalidate cells that depend on this document object. * diff --git a/src/Mod/Spreadsheet/App/SheetObserver.h b/src/Mod/Spreadsheet/App/SheetObserver.h index ef8659803..568d88769 100644 --- a/src/Mod/Spreadsheet/App/SheetObserver.h +++ b/src/Mod/Spreadsheet/App/SheetObserver.h @@ -33,8 +33,6 @@ class SheetObserver : public App::DocumentObserver { public: SheetObserver(App::Document* document, PropertySheet *_sheet); ~SheetObserver() { } - virtual void slotCreatedDocument(const App::Document& Doc); - virtual void slotDeletedDocument(const App::Document& Doc); virtual void slotCreatedObject(const App::DocumentObject& Obj); virtual void slotDeletedObject(const App::DocumentObject& Obj); virtual void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop);