Remove elementLocation and use elementsLocation instead

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4377 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-03-15 15:23:11 +00:00
parent 764d50c4ac
commit 1170522d9c
28 changed files with 626 additions and 924 deletions

View File

@@ -59,31 +59,3 @@ Element * ElementFactory::createElement(const ElementsLocation &location, QGraph
//default if nothing match for link_type
return (new SimpleElement(location, qgi, state));
}
/**
* @brief ElementFactory::createElement
* @param location : The location of the element
* @param parent : parent item for the new element
* @param state : state of the creation
* @return : the element or nullptr if the creation failed
*/
Element *ElementFactory::createElement(ElementLocation &location, QGraphicsItem *parent, int *state)
{
if (!location.isElement() || location.isNull())
{
if (state) *state = 1;
return nullptr;
}
if (location.xml().hasAttribute("link_type"))
{
QString link_type = location.xml().attribute("link_type");
if (link_type == "next_report" || link_type == "previous_report") return (new ReportElement(location, link_type, parent, state));
if (link_type == "master") return (new MasterElement (location, parent, state));
if (link_type == "slave") return (new SlaveElement (location, parent, state));
if (link_type == "terminal") return (new TerminalElement (location, parent, state));
}
//default if nothing match for link_type
return (new SimpleElement(location, parent, state));
}

View File

@@ -19,7 +19,7 @@
#define ELEMENTFACTORY_H
#include <QMutex>
#include "elementlocation.h"
class Element;
class ElementsLocation;
class QGraphicsItem;
@@ -71,7 +71,6 @@ class ElementFactory
public:
Element *createElement (const ElementsLocation &, QGraphicsItem * = 0, int * = 0);
Element *createElement(ElementLocation &location, QGraphicsItem *parent = nullptr, int *state = nullptr);
};
//ElementFactory ElementFactory::factory_ = 0;
#endif // ELEMENTFACTORY_H