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

+ rename signal to signalRelabelObject and remove unused code

Browse Source
This commit is contained in:
wmayer
2015-09-22 17:13:03 +02:00
parent a8507628fa
commit b33be62bb6
12 changed files with 24 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/App/Application.cpp
View File

@@ -315,7 +315,7 @@ Document* Application::newDocument(const char * Name, const char * UserName)
_pActiveDoc->signalNewObject.connect(boost::bind(&App::Application::slotNewObject, this, _1));
_pActiveDoc->signalDeletedObject.connect(boost::bind(&App::Application::slotDeletedObject, this, _1));
_pActiveDoc->signalChangedObject.connect(boost::bind(&App::Application::slotChangedObject, this, _1, _2));
_pActiveDoc->signalRenamedObject.connect(boost::bind(&App::Application::slotRenamedObject, this, _1));
_pActiveDoc->signalRelabelObject.connect(boost::bind(&App::Application::slotRelabelObject, this, _1));
_pActiveDoc->signalActivatedObject.connect(boost::bind(&App::Application::slotActivatedObject, this, _1));
_pActiveDoc->signalUndo.connect(boost::bind(&App::Application::slotUndoDocument, this, _1));
_pActiveDoc->signalRedo.connect(boost::bind(&App::Application::slotRedoDocument, this, _1));
@@ -859,9 +859,9 @@ void Application::slotChangedObject(const App::DocumentObject&O, const App::Prop
this->signalChangedObject(O,P);
}
void Application::slotRenamedObject(const App::DocumentObject&O)
void Application::slotRelabelObject(const App::DocumentObject&O)
{
this->signalRenamedObject(O);
this->signalRelabelObject(O);
}
void Application::slotActivatedObject(const App::DocumentObject&O)

6
src/App/Application.h
View File

@@ -135,8 +135,8 @@ public:
boost::signal<void (const App::DocumentObject&)> signalDeletedObject;
/// signal on changed Object
boost::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
/// signal on renamed Object
boost::signal<void (const App::DocumentObject&)> signalRenamedObject;
/// signal on relabeled Object
boost::signal<void (const App::DocumentObject&)> signalRelabelObject;
/// signal on activated Object
boost::signal<void (const App::DocumentObject&)> signalActivatedObject;
//@}
@@ -251,7 +251,7 @@ protected:
void slotNewObject(const App::DocumentObject&);
void slotDeletedObject(const App::DocumentObject&);
void slotChangedObject(const App::DocumentObject&, const App::Property& Prop);
void slotRenamedObject(const App::DocumentObject&);
void slotRelabelObject(const App::DocumentObject&);
void slotActivatedObject(const App::DocumentObject&);
void slotUndoDocument(const App::Document&);
void slotRedoDocument(const App::Document&);

4
src/App/Document.h
View File

@@ -106,8 +106,8 @@ public:
boost::signal<void (const App::DocumentObject&)> signalDeletedObject;
/// signal on changed Object
boost::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
/// signal on renamed Object
boost::signal<void (const App::DocumentObject&)> signalRenamedObject;
/// signal on relabeled Object
boost::signal<void (const App::DocumentObject&)> signalRelabelObject;
/// signal on activated Object
boost::signal<void (const App::DocumentObject&)> signalActivatedObject;
/// signal on undo

4
src/App/DocumentObject.cpp
View File

@@ -207,7 +207,7 @@ void DocumentObject::onChanged(const Property* prop)
_pDoc->onChangedProperty(this,prop);
if (prop == &Label && _pDoc)
_pDoc->signalRenamedObject(*this);
_pDoc->signalRelabelObject(*this);
if (prop->getType() & Prop_Output)
return;
@@ -303,7 +303,7 @@ void DocumentObject::connectRelabelSignals()
// Not already connected?
if (!onRelabledObjectConnection.connected())
onRelabledObjectConnection = getDocument()->signalRenamedObject.connect(boost::bind(&PropertyExpressionEngine::slotObjectRenamed, &ExpressionEngine, _1));
onRelabledObjectConnection = getDocument()->signalRelabelObject.connect(boost::bind(&PropertyExpressionEngine::slotObjectRenamed, &ExpressionEngine, _1));
try {
// Crude method to resolve all expression dependencies