Skip to content
Snippets Groups Projects
Commit b1088a0c authored by Dirk Wilden's avatar Dirk Wilden
Browse files

moved deleteObject to LoadSaveInterface

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5383 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 7280cbb8
No related branches found
No related tags found
No related merge requests found
...@@ -222,7 +222,7 @@ void DataControlPlugin::slotObjectPropertiesChanged( int _identifier ){ ...@@ -222,7 +222,7 @@ void DataControlPlugin::slotObjectPropertiesChanged( int _identifier ){
//****************************************************************************** //******************************************************************************
/** \brief Update the model if an object was created/deleted /** \brief Update the model if an object was deleted
* *
* @param _identifier id of an object * @param _identifier id of an object
*/ */
...@@ -254,7 +254,6 @@ void DataControlPlugin::addedEmptyObject(int){ ...@@ -254,7 +254,6 @@ void DataControlPlugin::addedEmptyObject(int){
model_->objectChanged(-1); model_->objectChanged(-1);
} }
//****************************************************************************** //******************************************************************************
/** \brief a key event occurred /** \brief a key event occurred
......
...@@ -81,7 +81,8 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, KeyIn ...@@ -81,7 +81,8 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, KeyIn
// ContextMenuInterface // ContextMenuInterface
void addContextMenuItem(QAction* _action , ContextMenuType _type); void addContextMenuItem(QAction* _action , ContextMenuType _type);
void addContextMenuItem(QAction* _action , DataType _objectType , ContextMenuType _type ); void addContextMenuItem(QAction* _action , DataType _objectType , ContextMenuType _type );
// LoadSaveInterface
void deleteObject( int _id );
private slots : private slots :
// BaseInterface // BaseInterface
void pluginsInitialized(); void pluginsInitialized();
...@@ -241,7 +242,7 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, KeyIn ...@@ -241,7 +242,7 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, KeyIn
QString getObjectName( int objectId ); QString getObjectName( int objectId );
/// Delete the given object /// Delete the given object
void deleteObject(int objectId); void objectDelete(int objectId);
/// Creates an object copy /// Creates an object copy
int copyObject( int objectId ); int copyObject( int objectId );
......
...@@ -72,7 +72,7 @@ void DataControlPlugin::setDescriptions(){ ...@@ -72,7 +72,7 @@ void DataControlPlugin::setDescriptions(){
emit setSlotDescription("groupObjects(idList)","Group given Objects together.", emit setSlotDescription("groupObjects(idList)","Group given Objects together.",
QStringList("objectIds"), QStringList("List of objects that should be grouped.")); QStringList("objectIds"), QStringList("List of objects that should be grouped."));
emit setSlotDescription("deleteObject(int)","Delete an object", emit setSlotDescription("objectDelete(int)","Delete an object",
QStringList("objectId"), QStringList("Delete the given object.")); QStringList("objectId"), QStringList("Delete the given object."));
emit setSlotDescription("copyObject(int)","Create a copy of an object", emit setSlotDescription("copyObject(int)","Create a copy of an object",
...@@ -233,7 +233,7 @@ void DataControlPlugin::setObjectName( int objectId, QString _name ) { ...@@ -233,7 +233,7 @@ void DataControlPlugin::setObjectName( int objectId, QString _name ) {
* *
* @param objectId id of the object that should be deleted * @param objectId id of the object that should be deleted
*/ */
void DataControlPlugin::deleteObject( int objectId ) { void DataControlPlugin::objectDelete( int objectId ) {
BaseObjectData* object; BaseObjectData* object;
if ( ! PluginFunctions::getObject(objectId,object) ) if ( ! PluginFunctions::getObject(objectId,object) )
...@@ -242,7 +242,7 @@ void DataControlPlugin::deleteObject( int objectId ) { ...@@ -242,7 +242,7 @@ void DataControlPlugin::deleteObject( int objectId ) {
if ( object == 0) if ( object == 0)
return; return;
PluginFunctions::deleteObject(objectId); emit deleteObject(objectId);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment