0020136: EDF 933 DEV : Drag&Drop in OB, complete implementation

Correct spelling in isDraggable() method

diff --git a/src/LightApp/LightApp_DataObject.cxx b/src/LightApp/LightApp_DataObject.cxx
index 98b17cc3ac6d6633dd9fd79858015b2ec4c191c9..937fef62896e1f05e74b08a0041d3e99efb49944 100644 (file)
--- a/src/LightApp/LightApp_DataObject.cxx
+++ b/src/LightApp/LightApp_DataObject.cxx
@@ -152,17 +152,17 @@ bool LightApp_DataObject::isVisible() const
 }
 
 /*!
-  \brief Check if the object is dragable.
+  \brief Check if the object is draggable.
 
   This method can be re-implemented in the subclasses.
 
   \return \c true if it is possible to drag this object
 */
-bool LightApp_DataObject::isDragable() const
+bool LightApp_DataObject::isDraggable() const
 {
   LightApp_Module* aModule = dynamic_cast<LightApp_Module*>(module());
   if (aModule) {
-    return aModule->isDragable(this);
+    return aModule->isDraggable(this);
   }
   return false;
 }

diff --git a/src/LightApp/LightApp_DataObject.h b/src/LightApp/LightApp_DataObject.h
index 6ba9c446e398f1b7ffc41d82f46187ce9e685d0e..48cc0e2ee3b3f0c582f35a3014dc19b1d2078146 100644 (file)
--- a/src/LightApp/LightApp_DataObject.h
+++ b/src/LightApp/LightApp_DataObject.h
@@ -64,7 +64,7 @@ public:
   virtual QVariant                customData(Qtx::CustomDataType type);
 
   virtual bool                    isVisible() const;
-  virtual bool                    isDragable() const;
+  virtual bool                    isDraggable() const;
   virtual bool                    isDropAccepted() const;
   virtual bool                    renameAllowed( const int = NameId ) const;
   virtual bool                    setName( const QString& );

diff --git a/src/LightApp/LightApp_Module.cxx b/src/LightApp/LightApp_Module.cxx
index d4b094d243db230aeef8ae954b88e8f7d9dafbb9..28cbe5c360f5ea628375001775d535d16d019417 100644 (file)
--- a/src/LightApp/LightApp_Module.cxx
+++ b/src/LightApp/LightApp_Module.cxx
@@ -707,7 +707,7 @@ void LightApp_Module::paste()
   virtual method
   \return true if module allows dragging the given object
 */
-bool LightApp_Module::isDragable( const SUIT_DataObject* /*what*/ ) const
+bool LightApp_Module::isDraggable( const SUIT_DataObject* /*what*/ ) const
 {
   return false;
 }

diff --git a/src/LightApp/LightApp_Module.h b/src/LightApp/LightApp_Module.h
index 16bcc29ed52d73814a2c06614b6abc1a7c62ee50..5372fccd872ab4908f336ed7190ab9d3a97f4eda 100644 (file)
--- a/src/LightApp/LightApp_Module.h
+++ b/src/LightApp/LightApp_Module.h
@@ -95,7 +95,7 @@ public:
 
   virtual bool                        canCopy() const;
   virtual bool                        canPaste() const;
-  virtual bool                        isDragable( const SUIT_DataObject* ) const;
+  virtual bool                        isDraggable( const SUIT_DataObject* ) const;
   virtual bool                        isDropAccepted( const SUIT_DataObject* ) const;
   virtual void                        dropObjects( const DataObjectList&, SUIT_DataObject*,
                                                   const int, Qt::DropAction );

diff --git a/src/SUIT/SUIT_DataObject.cxx b/src/SUIT/SUIT_DataObject.cxx
index d0b58b3d071a6170ed776a9258f34d5881ba613a..b98051122160506a0db59815329dfd38093c9ffe 100755 (executable)
--- a/src/SUIT/SUIT_DataObject.cxx
+++ b/src/SUIT/SUIT_DataObject.cxx
@@ -571,7 +571,7 @@ bool SUIT_DataObject::isVisible() const
 
   \return \c true if it is possible to drag this object
 */
-bool SUIT_DataObject::isDragable() const
+bool SUIT_DataObject::isDraggable() const
 {
   return false;
 }

diff --git a/src/SUIT/SUIT_DataObject.h b/src/SUIT/SUIT_DataObject.h
index 6851fbd80395d144780e91dc9787c68d055f66a2..607c577e75e96e7606489522675152d8a28f028d 100755 (executable)
--- a/src/SUIT/SUIT_DataObject.h
+++ b/src/SUIT/SUIT_DataObject.h
@@ -114,7 +114,7 @@ public:
 
   virtual bool                expandable() const;
   virtual bool                isVisible() const;
-  virtual bool                isDragable() const;
+  virtual bool                isDraggable() const;
   virtual bool                isDropAccepted() const;
 
   virtual bool                isEnabled() const;

diff --git a/src/SUIT/SUIT_TreeModel.cxx b/src/SUIT/SUIT_TreeModel.cxx
index f6f784707918a188b9f8c27a9acdff7ffb586559..595b42f5140fc05ef7b4cce72be23f9162fdf597 100755 (executable)
--- a/src/SUIT/SUIT_TreeModel.cxx
+++ b/src/SUIT/SUIT_TreeModel.cxx
@@ -1004,7 +1004,7 @@ Qt::ItemFlags SUIT_TreeModel::flags( const QModelIndex& index ) const
       f = f | Qt::ItemIsEditable;
     
     // data object can be dragged
-    if (obj->isDragable())
+    if (obj->isDraggable())
       f = f | Qt::ItemIsDragEnabled;
     
     // another data object(s) can be dropped on this one