[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [rocs] RocsCore: Remove redundant value from API.
From:       Andreas Cord-Landwehr <cordlandwehr () kde ! org>
Date:       2013-05-21 20:07:27
Message-ID: 20130521200727.3BDE7A605B () git ! kde ! org
[Download RAW message or body]

Git commit 9199fc8c464317c23c39dce6a16d5c8a563c7c48 by Andreas Cord-Landwehr.
Committed on 21/05/2013 at 21:46.
Pushed by cordlandwehr into branch 'master'.

Remove redundant value from API.

M  +7    -10   RocsCore/DataStructure.cpp
M  +2    -2    RocsCore/DataStructure.h
M  +1    -1    RocsCore/DataStructures/Graph/GraphStructure.cpp
M  +2    -2    RocsCore/DataStructures/LinkedList/ListStructure.cpp
M  +1    -1    RocsCore/DataStructures/RootedTree/RootedTreeStructure.cpp

http://commits.kde.org/rocs/9199fc8c464317c23c39dce6a16d5c8a563c7c48

diff --git a/RocsCore/DataStructure.cpp b/RocsCore/DataStructure.cpp
index 2c63f76..86965f9 100644
--- a/RocsCore/DataStructure.cpp
+++ b/RocsCore/DataStructure.cpp
@@ -299,20 +299,19 @@ DataPtr DataStructure::createData(const QString& name, int \
dataType)  if (d->_readOnly) {
         return DataPtr();
     }
-
     DataPtr n = Data::create(this->getDataStructure(), generateUniqueIdentifier(), \
dataType);  n->setProperty("name", name);
 
-    return addData(n, dataType);
+    return addData(n);
 }
 
-DataPtr DataStructure::addData(DataPtr data, int dataType)
+DataPtr DataStructure::addData(DataPtr data)
 {
-    Q_ASSERT(dataType >= 0 && dataType <= d->_dataTypeLists.size());
+    Q_ASSERT(data->dataType() >= 0 && data->dataType() <= d->_dataTypeLists.size());
 
     // set data type properties
-    d->_dataTypeLists[dataType].append(data);
-    DataTypePtr type = document()->dataType(dataType);
+    d->_dataTypeLists[data->dataType()].append(data);
+    DataTypePtr type = document()->dataType(data->dataType());
     foreach(const QString &property, type->properties()) {
         if (!data->property(property.toLatin1()).isValid()
             || data->property(property.toLatin1()).isNull())
@@ -343,12 +342,10 @@ DataPtr DataStructure::createData(const QString& name, const \
QPointF& pos, int d  return DataPtr();
 }
 
-DataList DataStructure::addDataList(DataList dataList, int dataType)
+DataList DataStructure::addDataList(DataList dataList)
 {
-    Q_ASSERT(dataType >= 0 && dataType < d->_dataTypeLists.size());
-
     foreach(DataPtr n, dataList) {
-        addData(n, dataType);
+        addData(n);
     }
 
     return dataList;
diff --git a/RocsCore/DataStructure.h b/RocsCore/DataStructure.h
index 92aebe3..5db2982 100644
--- a/RocsCore/DataStructure.h
+++ b/RocsCore/DataStructure.h
@@ -145,7 +145,7 @@ public Q_SLOTS:
      * \deprecated
      * This method only calls \ref addData for each element
      */
-    virtual DataList addDataList(DataList dataList, int dataType);
+    virtual DataList addDataList(DataList dataList);
 
     /**
      * Creates new pointer from data element "from" to data element "to" of
@@ -253,7 +253,7 @@ Q_SIGNALS:
     void scriptError(const QString &message);
 
 protected:
-    DataPtr addData(DataPtr data, int dataType);
+    DataPtr addData(DataPtr data);
     PointerPtr addPointer(PointerPtr pointer, int pointerType);
     int generateUniqueIdentifier();
 
diff --git a/RocsCore/DataStructures/Graph/GraphStructure.cpp \
b/RocsCore/DataStructures/Graph/GraphStructure.cpp index de58e46..a3de72a 100644
--- a/RocsCore/DataStructures/Graph/GraphStructure.cpp
+++ b/RocsCore/DataStructures/Graph/GraphStructure.cpp
@@ -448,7 +448,7 @@ DataPtr Rocs::GraphStructure::createData(const QString& name, int \
                dataType)
                                          GraphNode::create(getDataStructure(), \
generateUniqueIdentifier(), dataType)  );
     n->setProperty("name", name);
-    return addData(n, dataType);
+    return addData(n);
 }
 
 QMap<QString, QString> Rocs::GraphStructure::pluginProperties() const
diff --git a/RocsCore/DataStructures/LinkedList/ListStructure.cpp \
b/RocsCore/DataStructures/LinkedList/ListStructure.cpp index c3756df..2cf0c9e 100644
--- a/RocsCore/DataStructures/LinkedList/ListStructure.cpp
+++ b/RocsCore/DataStructures/LinkedList/ListStructure.cpp
@@ -116,7 +116,7 @@ DataPtr Rocs::ListStructure::createData(const QString& name, int \
                dataType)
                                         ListNode::create(getDataStructure(), \
generateUniqueIdentifier(), dataType)  );
     n->setProperty("name", name);
-    addData(n, dataType);
+    addData(n);
 
     // insert node as new head
     n->pointTo(m_begin);
@@ -176,7 +176,7 @@ QScriptValue Rocs::ListStructure::createNode()
 QScriptValue Rocs::ListStructure::createNode(int type)
 {
     boost::shared_ptr<ListNode> n = boost::static_pointer_cast<ListNode>(
-                                        \
DataStructure::addData(ListNode::create(getDataStructure(), \
generateUniqueIdentifier(), type), type) +                                        \
DataStructure::addData(ListNode::create(getDataStructure(), \
generateUniqueIdentifier(), type))  );
     n->setEngine(engine());
     return n->scriptValue();
diff --git a/RocsCore/DataStructures/RootedTree/RootedTreeStructure.cpp \
b/RocsCore/DataStructures/RootedTree/RootedTreeStructure.cpp index 7337058..faf7f6d \
                100644
--- a/RocsCore/DataStructures/RootedTree/RootedTreeStructure.cpp
+++ b/RocsCore/DataStructures/RootedTree/RootedTreeStructure.cpp
@@ -202,7 +202,7 @@ DataPtr RootedTreeStructure::createData(const QString& name, int \
                dataType)
     boost::shared_ptr<RootedTreeNode> n = \
                boost::static_pointer_cast<RootedTreeNode>(
         RootedTreeNode::create(getDataStructure(), generateUniqueIdentifier(), \
dataType) );  n->setProperty("name", name);
-    addData(n, dataType);
+    addData(n);
     return n;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]